fix(config): auto detection and default to tls

README.md

@@ -150,6 +150,10 @@ Release process:
 1. upload using: `VERSION=x.y.z APIKEY=abc... make upload`
 1. test installing the rock from LuaRocks
 
+### 1.1.2 (5-Dec-2022)
+
+- fix: auto detection scheme and default to tls [#42](https://github.com/Kong/lua-resty-aws/pull/42)
+
 ### 1.1.1 (21-Nov-2022)
 
 - fix: port is repeated when port is not standard [#39](https://github.com/Kong/lua-resty-aws/pull/39)

spec/02-requests/02-build_request_spec.lua

@@ -155,7 +155,7 @@ describe("operations protocol", function()
       method = 'POST',
       path = '/hello%20world/42',
       host = 'sts.amazonaws.com',
-      port = 80,
+      port = 443,
       query = {
         RoleArn = 'hello',
         RoleSessionName = 'world',
@@ -189,7 +189,7 @@ describe("operations protocol", function()
       method = 'POST',
       path = '/hello%20world/42',
       host = 'sts.amazonaws.com',
-      port = 80,
+      port = 443,
       body = {
         subStructure = {
           hello = "the default hello thinghy",
@@ -228,7 +228,7 @@ describe("operations protocol", function()
       method = 'POST',
       path = '/hello%20world/42',
       host = 'sts.amazonaws.com',
-      port = 80,
+      port = 443,
       body = {
         subStructure = {
           hello = "the default hello thinghy",
@@ -283,7 +283,7 @@ describe("operations protocol", function()
       method = 'POST',
       path = '/hello%20world/42',
       host = 'sts.amazonaws.com',
-      port = 80,
+      port = 443,
       body = {
         RoleArn = {
           [1] = 'hello' },

spec/04-services/02-s3.lua

@@ -34,7 +34,7 @@ describe("S3 service", function()
     s3_3rd = assert(aws:S3 {
       scheme = "http",
       endpoint = "testendpoint.com",
-      port = 80,
+      port = 443,
       tls = false,
     })
   end)
@@ -83,7 +83,7 @@ describe("S3 service", function()
         host = 'testbucket.testendpoint.com',
         method = 'PUT',
         path = '/testkey',
-        port = 80,
+        port = 443,
         query = {},
         tls = false,
       },
@@ -117,7 +117,7 @@ describe("S3 service", function()
         ['host'] = 'testbucket.testendpoint.com',
         ['method'] = 'GET',
         ['path'] = '/testkey',
-        ['port'] = 80,
+        ['port'] = 443,
         ['query'] = {},
         ['tls'] = false,
       }
@@ -152,7 +152,7 @@ describe("S3 service", function()
         ['host'] = 'testbucket.testendpoint.com',
         ['method'] = 'GET',
         ['path'] = '',
-        ['port'] = 80,
+        ['port'] = 443,
         ['query'] = {
           ['acl'] = ''
         },

spec/04-services/03-s3_compat_api.lua

@@ -36,7 +36,7 @@ describe("S3 service", function()
     s3_3rd = assert(aws:S3 {
       scheme = "http",
       endpoint = "testendpoint.com",
-      port = 80,
+      port = 443,
       tls = false,
     })
   end)
@@ -85,7 +85,7 @@ describe("S3 service", function()
         host = 'testendpoint.com',
         method = 'PUT',
         path = '/testbucket/testkey',
-        port = 80,
+        port = 443,
         query = {},
         tls = false,
       },
@@ -119,7 +119,7 @@ describe("S3 service", function()
         ['host'] = 'testendpoint.com',
         ['method'] = 'GET',
         ['path'] = '/testbucket/testkey',
-        ['port'] = 80,
+        ['port'] = 443,
         ['query'] = {},
         ['tls'] = false,
       }
@@ -154,7 +154,7 @@ describe("S3 service", function()
         ['host'] = 'testendpoint.com',
         ['method'] = 'GET',
         ['path'] = '/testbucket',
-        ['port'] = 80,
+        ['port'] = 443,
         ['query'] = {
           ['acl'] = ''
         },

src/resty/aws/request/build.lua

@@ -73,16 +73,21 @@ local function parse_query(q)
 end
 
 local function get_host_port(config)
-  local host = config.endpoint or config.globalEndpoint
+  local endpoint = config.endpoint or config.globalEndpoint
   do
-    local s, e = host:find("://")
+    local s, e = endpoint:find("://")
+    local scheme = config.scheme
     if s then
+      scheme = scheme or endpoint:sub(1, s-1):lower()
       -- the "globalSSL" one from the region_config_data file
-      local scheme = host:sub(1, s-1):lower()
-      host = host:sub(e+1, -1)
-      if config.tls == nil then
-        config.tls = scheme == "https"
-      end
+      endpoint = endpoint:sub(e+1, -1)
+    end
+
+    scheme = scheme or "https"
+    config.scheme = scheme
+
+    if config.tls == nil then
+      config.tls = scheme == "https"
     end
   end
 
@@ -97,13 +102,13 @@ local function get_host_port(config)
       with_port = port ~= 80
     end
     if with_port then
-      host_header = string.format("%s:%d", host, port)
+      host_header = string.format("%s:%d", endpoint, port)
     else
-      host_header = host
+      host_header = endpoint
     end
   end
 
-  return host, port, host_header
+  return endpoint, port, host_header
 end
 
 -- implement AWS api protocols.