deps(resty-luasocket) switch to resty-luasocket for compat code

The previously bundled compatibility code landed in a new
module `lua-resty-luasocket`.

Author: Tieske

lua-resty-aws-dev-1.rockspec.template

@@ -25,6 +25,7 @@ description = {
 dependencies = {
   "penlight ~> 1",
   "lua-resty-http >= 0.16",
+  "lua-resty-luasocket ~> 1",
 }
 
 build = {
@@ -37,8 +38,6 @@ build = {
     ["resty.aws.request.build"]                               = "src/resty/aws/request/build.lua",
     ["resty.aws.request.sign"]                                = "src/resty/aws/request/sign.lua",
     ["resty.aws.request.execute"]                             = "src/resty/aws/request/execute.lua",
-    ["resty.aws.request.http.http"]                           = "src/resty/aws/request/http/http.lua",
-    ["resty.aws.request.http.socket"]                         = "src/resty/aws/request/http/socket.lua",
     ["resty.aws.request.signatures.v4"]                       = "src/resty/aws/request/signatures/v4.lua",
     ["resty.aws.request.signatures.none"]                     = "src/resty/aws/request/signatures/none.lua",
     ["resty.aws.credentials.Credentials"]                     = "src/resty/aws/credentials/Credentials.lua",

spec/03-credentials/02-EC2MetadataCredentials_spec.lua

@@ -42,11 +42,11 @@ describe("EC2MetadataCredentials", function()
   local EC2MetadataCredentials
 
   setup(function()
-    package.loaded["resty.aws.request.http.http"] = http
+    package.loaded["resty.luasocket.http"] = http
   end)
 
   teardown(function()
-    package.loaded["resty.aws.request.http.http"] = nil
+    package.loaded["resty.luasocket.http"] = nil
   end)
 
   before_each(function()

spec/03-credentials/04-RemoteCredentials_spec.lua

@@ -40,7 +40,7 @@ describe("RemoteCredentials", function()
     restore.setenv("AWS_CONTAINER_CREDENTIALS_FULL_URI", "https://localhost/test/path")
 
     local _ = require("resty.aws.config").global -- load config before mocking http client
-    package.loaded["resty.aws.request.http.http"] = http
+    package.loaded["resty.luasocket.http"] = http
 
     RemoteCredentials = require "resty.aws.credentials.RemoteCredentials"
   end)

src/resty/aws/credentials/EC2MetadataCredentials.lua

@@ -1,7 +1,7 @@
 --- EC2MetadataCredentials class.
 -- @classmod EC2MetadataCredentials
 
-local http = require "resty.aws.request.http.http"
+local http = require "resty.luasocket.http"
 local json = require("cjson.safe").new()
 local log = ngx.log
 local DEBUG = ngx.DEBUG

src/resty/aws/credentials/RemoteCredentials.lua

@@ -11,7 +11,7 @@ local DEBUG = ngx.DEBUG
 local DEFAULT_SERVICE_REQUEST_TIMEOUT = 5000
 
 local url = require "socket.url"
-local http = require "resty.aws.request.http.http"
+local http = require "resty.luasocket.http"
 local json = require "cjson"
 
 

src/resty/aws/request/execute.lua

@@ -1,4 +1,4 @@
-local http = require "resty.aws.request.http.http"
+local http = require "resty.luasocket.http"
 local json_decode = require("cjson.safe").new().decode
 
 -- TODO: retries and back-off: https://docs.aws.amazon.com/general/latest/gr/api-retries.html

src/resty/aws/request/http/http.lua

@@ -3,7 +3,7 @@
 -- Provides methods for detecting the AWS Region, as well as fetching metadata.
 
 local semaphore = require "ngx.semaphore"
-local http = require "resty.aws.request.http.http"
+local http = require "resty.luasocket.http"
 local json = require "cjson"
 local global_config = require("resty.aws.config").global