change ngx time hack from each block to setup/teardown block

Author: windmgc

spec/02-requests/05-presign_v4_spec.lua

@@ -24,11 +24,19 @@ aws.config.region = "test_region"
 describe("Presign request", function()
   local presigned_request_data
 
-  before_each(function()
+  setup(function()
     ngx.origin_time = ngx.time
     ngx.time = function ()
       return 1667543171
     end
+  end)
+
+  teardown(function ()
+    ngx.time = ngx.origin_time
+    ngx.origin_time = nil
+  end)
+
+  before_each(function()
     local request_data = {
       method = "GET",
       scheme = "https",
@@ -47,8 +55,6 @@ describe("Presign request", function()
 
   after_each(function()
     presigned_request_data = nil
-    ngx.time = ngx.origin_time
-    ngx.origin_time = nil
   end)
 
   it("should have correct signed request host header", function()

spec/04-services/01-secret_manager.lua

@@ -23,19 +23,26 @@ aws.config.region = "test_region"
 
 describe("Secret Manager service", function()
   local sm
-  before_each(function()
-    sm = assert(aws:SecretsManager {})
+
+  setup(function()
     ngx.origin_time = ngx.time
     ngx.time = function ()
       return 1667543171
     end
   end)
 
-  after_each(function()
+  teardown(function ()
     ngx.time = ngx.origin_time
     ngx.origin_time = nil
   end)
 
+  before_each(function()
+    sm = assert(aws:SecretsManager {})
+  end)
+
+  after_each(function()
+  end)
+
   local testcases = {
     -- API = { param, expected_result_aws, },
     getSecretValue = {

spec/04-services/02-s3.lua

@@ -23,6 +23,19 @@ aws.config.region = "test_region"
 
 describe("S3 service", function()
   local s3, s3_3rd
+
+  setup(function()
+    ngx.origin_time = ngx.time
+    ngx.time = function ()
+      return 1667543171
+    end
+  end)
+
+  teardown(function ()
+    ngx.time = ngx.origin_time
+    ngx.origin_time = nil
+  end)
+
   before_each(function()
     s3 = assert(aws:S3 {})
     s3_3rd = assert(aws:S3 {
@@ -31,15 +44,9 @@ describe("S3 service", function()
       port = 443,
       tls = false,
     })
-    ngx.origin_time = ngx.time
-    ngx.time = function ()
-      return 1667543171
-    end
   end)
 
   after_each(function()
-    ngx.time = ngx.origin_time
-    ngx.origin_time = nil
   end)
 
   local testcases = {

spec/04-services/03-s3_compat_api.lua

@@ -25,6 +25,19 @@ aws.config.region = "test_region"
 
 describe("S3 service", function()
   local s3, s3_3rd
+
+  setup(function()
+    ngx.origin_time = ngx.time
+    ngx.time = function ()
+      return 1667543171
+    end
+  end)
+
+  teardown(function ()
+    ngx.time = ngx.origin_time
+    ngx.origin_time = nil
+  end)
+
   before_each(function()
     s3 = assert(aws:S3 {})
     s3_3rd = assert(aws:S3 {
@@ -33,15 +46,9 @@ describe("S3 service", function()
       port = 443,
       tls = false,
     })
-    ngx.origin_time = ngx.time
-    ngx.time = function ()
-      return 1667543171
-    end
   end)
 
   after_each(function()
-    ngx.time = ngx.origin_time
-    ngx.origin_time = nil
   end)
 
   local testcases = {

spec/04-services/04-rds-utils_spec.lua

@@ -21,18 +21,24 @@ aws.config.credentials = aws:Credentials {
 aws.config.region = "test_region"
 
 describe("RDS utils", function()
-  before_each(function()
+  setup(function()
     ngx.origin_time = ngx.time
     ngx.time = function ()
       return 1667543171
     end
   end)
 
-  after_each(function()
+  teardown(function ()
     ngx.time = ngx.origin_time
     ngx.origin_time = nil
   end)
 
+  before_each(function()
+  end)
+
+  after_each(function()
+  end)
+
   it("should generate expected IAM auth token with mock key", function()
     local auth_token, err = build_auth_token(aws.config, "test_database.test_cluster.us-east-1.rds.amazonaws.com", "us-east-1", "test_user")
     local expected_auth_token = "test_database.test_cluster.us-east-1.rds.amazonaws.com:443/?X-Amz-Signature=ff72d46f1937c1f5917f69d694929ca814b781619b8d730451c7ffef050059b0&Action=connect&DBUser=test_user&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=test_id%2F20221104%2Fus-east-1%2Frds-db%2Faws4_request&X-Amz-Date=20221104T062611Z&X-Amz-Expires=900&X-Amz-SignedHeaders=host"