Merge pull request #604 from amplify-education/feature/AT-10914-deps-fix

AT-10914: Fixed deprecated packages
amplify-education · Nov 30, 2023 · 4f920d0 · 4f920d0
2 parents 504a6cd + 4a3e89c
commit 4f920d0
Show file tree

Hide file tree

Showing 29 changed files with 450 additions and 2,030 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [7.3.0] - 2023-11-30
+
+### Fixed 
+- Fixed deprecated packages warnings
+
 ## [7.2.1] - 2023-11-27
 
 ### Fixed 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-domain-manager",
-  "version": "7.2.1",
+  "version": "7.3.0",
   "engines": {
     "node": ">=14"
   },
@@ -67,18 +67,19 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@aws-sdk/client-acm": "^3.374.0",
-    "@aws-sdk/client-api-gateway": "^3.374.0",
-    "@aws-sdk/client-apigatewayv2": "^3.374.0",
-    "@aws-sdk/client-cloudformation": "^3.374.0",
-    "@aws-sdk/client-route-53": "^3.374.0",
-    "@aws-sdk/client-s3": "^3.374.0",
-    "@aws-sdk/config-resolver": "^3.374.0",
-    "@aws-sdk/credential-providers": "^3.374.0",
-    "@aws-sdk/node-config-provider": "^3.374.0",
-    "@aws-sdk/smithy-client": "^3.374.0",
-    "@aws-sdk/util-retry": "^3.374.0",
+    "@aws-sdk/client-acm": "^3.460.0",
+    "@aws-sdk/client-api-gateway": "^3.460.0",
+    "@aws-sdk/client-apigatewayv2": "^3.460.0",
+    "@aws-sdk/client-cloudformation": "^3.460.0",
+    "@aws-sdk/client-route-53": "^3.460.0",
+    "@aws-sdk/client-s3": "^3.460.0",
+    "@aws-sdk/credential-providers": "^3.460.0",
+    "@smithy/config-resolver": "^2.0.19",
+    "@smithy/node-config-provider": "^2.1.6",
     "@smithy/node-http-handler": "^2.1.10",
+    "@smithy/smithy-client": "^2.1.16",
+    "@smithy/types": "^2.6.0",
+    "@smithy/util-retry": "^2.0.7",
     "proxy-agent": "^6.3.1"
   },
   "peerDependencies": {

diff --git a/src/globals.ts b/src/globals.ts
@@ -1,6 +1,6 @@
 import {ServerlessInstance, ServerlessOptions, ServerlessUtils} from "./types";
 import {fromIni} from "@aws-sdk/credential-providers";
-import {ConfiguredRetryStrategy} from "@aws-sdk/util-retry";
+import {ConfiguredRetryStrategy} from "@smithy/util-retry";
 import { NodeHttpHandler } from "@smithy/node-http-handler";
 import { ProxyAgent } from "proxy-agent";
 

diff --git a/src/index.ts b/src/index.ts
@@ -12,8 +12,8 @@ import APIGatewayV1Wrapper = require("./aws/api-gateway-v1-wrapper");
 import APIGatewayV2Wrapper = require("./aws/api-gateway-v2-wrapper");
 import APIGatewayBase = require("./models/apigateway-base");
 import Logging from "./logging";
-import {loadConfig} from "@aws-sdk/node-config-provider";
-import {NODE_REGION_CONFIG_FILE_OPTIONS, NODE_REGION_CONFIG_OPTIONS} from "@aws-sdk/config-resolver";
+import {loadConfig} from "@smithy/node-config-provider";
+import {NODE_REGION_CONFIG_FILE_OPTIONS, NODE_REGION_CONFIG_OPTIONS} from "@smithy/config-resolver";
 import {ChangeAction} from "@aws-sdk/client-route-53";
 
 class ServerlessCustomDomain {

diff --git a/test/integration-tests/basic/apigateway-with-export/serverless.yml b/test/integration-tests/basic/apigateway-with-export/serverless.yml
@@ -5,7 +5,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   endpointType: REGIONAL
   stage: test

diff --git a/test/integration-tests/basic/apigateway-with-import/serverless.yml b/test/integration-tests/basic/apigateway-with-import/serverless.yml
@@ -5,7 +5,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
   apiGateway:

diff --git a/test/integration-tests/basic/basepath-mapping/serverless.yml b/test/integration-tests/basic/basepath-mapping/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
   stackTags:

diff --git a/test/integration-tests/basic/create-domain-idempotent/serverless.yml b/test/integration-tests/basic/create-domain-idempotent/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/basic/deploy-idempotent/serverless.yml b/test/integration-tests/basic/deploy-idempotent/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/basic/http-api-multiple/serverless.yml b/test/integration-tests/basic/http-api-multiple/serverless.yml
@@ -3,7 +3,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
   stackTags:

diff --git a/test/integration-tests/basic/mutual-tls/serverless.yml b/test/integration-tests/basic/mutual-tls/serverless.yml
@@ -3,7 +3,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/basic/null-basepath-mapping/serverless.yml b/test/integration-tests/basic/null-basepath-mapping/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
   stackTags:

diff --git a/test/integration-tests/basic/route53-profile/serverless.yml b/test/integration-tests/basic/route53-profile/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/debug/pr-example/serverless.yml b/test/integration-tests/debug/pr-example/serverless.yml
@@ -3,7 +3,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/deploy/auto-domain/serverless.yml b/test/integration-tests/deploy/auto-domain/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/deploy/basepath-nested-stack/serverless.yml b/test/integration-tests/deploy/basepath-nested-stack/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/deploy/basepath/serverless.yml b/test/integration-tests/deploy/basepath/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/deploy/custom-apigateway/serverless.yml b/test/integration-tests/deploy/custom-apigateway/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
   apiGateway:

diff --git a/test/integration-tests/deploy/default/serverless.yml b/test/integration-tests/deploy/default/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/deploy/http-api/serverless.yml b/test/integration-tests/deploy/http-api/serverless.yml
@@ -3,7 +3,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/deploy/regional-basepath/serverless.yml b/test/integration-tests/deploy/regional-basepath/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   endpointType: REGIONAL
   stage: test

diff --git a/test/integration-tests/deploy/regional-stage-basepath/serverless.yml b/test/integration-tests/deploy/regional-stage-basepath/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   endpointType: REGIONAL
   stage: test

diff --git a/test/integration-tests/deploy/regional-tls-1-0/serverless.yml b/test/integration-tests/deploy/regional-tls-1-0/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
   endpointType: REGIONAL

diff --git a/test/integration-tests/deploy/route-53-latency-routing/serverless.yml b/test/integration-tests/deploy/route-53-latency-routing/serverless.yml
@@ -3,7 +3,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   endpointType: REGIONAL
   stage: test

diff --git a/test/integration-tests/deploy/route-53-weighted-routing/serverless.yml b/test/integration-tests/deploy/route-53-weighted-routing/serverless.yml
@@ -3,7 +3,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   endpointType: REGIONAL
   stage: test

diff --git a/test/integration-tests/deploy/split-horizon-dns/serverless.yml b/test/integration-tests/deploy/split-horizon-dns/serverless.yml
@@ -3,7 +3,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   endpointType: REGIONAL
   stage: test

diff --git a/test/integration-tests/deploy/stage-basepath/serverless.yml b/test/integration-tests/deploy/stage-basepath/serverless.yml
@@ -4,7 +4,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions:

diff --git a/test/integration-tests/deploy/web-socket/serverless.yml b/test/integration-tests/deploy/web-socket/serverless.yml
@@ -3,7 +3,7 @@ provider:
   name: aws
   iam:
     role: arn:aws:iam::${aws:accountId}:role/sls_domain_manager_lambda
-  runtime: nodejs14.x
+  runtime: nodejs16.x
   region: us-west-2
   stage: test
 functions: