refactor: provider-cloudformation and amplify-category-storage

package.json

@@ -113,7 +113,7 @@
     "@types/glob": "^7.1.1",
     "@types/jest": "^29.0.0",
     "@types/js-yaml": "^4.0.0",
-    "@types/node": "^18.16.1",
+    "@types/node": "^20.9.0",
     "@types/yargs": "^17",
     "@typescript-eslint/eslint-plugin": "^5.34.0",
     "@typescript-eslint/parser": "^5.34.0",

packages/amplify-appsync-simulator/package.json

@@ -61,7 +61,7 @@
     "@aws-amplify/amplify-graphiql-explorer": "2.6.2",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.3",
-    "@types/node": "^12.12.6",
+    "@types/node": "^20.9.0",
     "@types/ws": "^8.2.2",
     "jose": "^5.2.0"
   },

packages/amplify-category-storage/package.json

@@ -32,10 +32,11 @@
     "@aws-amplify/amplify-prompts": "2.8.7",
     "@aws-amplify/amplify-util-import": "2.8.3",
     "@aws-amplify/cli-extensibility-helper": "3.0.39",
+    "@aws-sdk/client-dynamodb": "^3.515.0",
+    "@aws-sdk/client-s3": "^3.515.0",
     "amplify-headless-interface": "1.17.8",
     "amplify-util-headless-input": "1.9.19",
     "aws-cdk-lib": "~2.189.1",
-    "aws-sdk": "^2.1464.0",
     "chalk": "^4.1.1",
     "constructs": "^10.0.5",
     "enquirer": "^2.3.6",

packages/amplify-category-storage/src/provider-utils/awscloudformation/import/import-s3.ts

@@ -10,7 +10,7 @@ import {
 } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
 import { IS3Service } from '@aws-amplify/amplify-util-import';
-import { Bucket } from 'aws-sdk/clients/s3';
+import { Bucket } from '@aws-sdk/client-s3';
 import Enquirer from 'enquirer';
 import _ from 'lodash';
 import { v4 as uuid } from 'uuid';

packages/amplify-category-storage/src/provider-utils/awscloudformation/import/types.ts

@@ -1,7 +1,7 @@
 import { $TSContext, $TSObject } from '@aws-amplify/amplify-cli-core';
 import { IDynamoDBService, IS3Service } from '@aws-amplify/amplify-util-import';
-import { Bucket } from 'aws-sdk/clients/s3';
-import { TableDescription } from 'aws-sdk/clients/dynamodb';
+import { Bucket } from '@aws-sdk/client-s3';
+import { TableDescription } from '@aws-sdk/client-dynamodb';
 
 // parameters.json
 export type S3ResourceParameters = {

packages/amplify-cli-core/package.json

@@ -68,7 +68,7 @@
     "@types/hjson": "^2.4.2",
     "@types/json-schema": "^7.0.5",
     "@types/lodash": "^4.14.149",
-    "@types/node": "^12.12.6",
+    "@types/node": "^20.9.0",
     "@types/rimraf": "^3.0.0",
     "@types/uuid": "^8.0.0",
     "@types/yarnpkg__lockfile": "^1.1.5",

packages/amplify-cli/package.json

@@ -66,6 +66,7 @@
     "@aws-amplify/amplify-util-mock": "5.10.16",
     "@aws-amplify/amplify-util-uibuilder": "1.14.20",
     "@aws-cdk/cloudformation-diff": "~2.68.0",
+    "@aws-sdk/client-amplify": "^3.624.0",
     "amplify-codegen": "^4.10.3",
     "amplify-dotnet-function-runtime-provider": "2.1.5",
     "amplify-go-function-runtime-provider": "2.3.52",
@@ -112,7 +113,7 @@
     "@types/fs-extra": "^8.0.1",
     "@types/glob": "^7.1.1",
     "@types/gunzip-maybe": "^1.4.0",
-    "@types/node": "^12.12.6",
+    "@types/node": "^20.9.0",
     "@types/node-fetch": "^2.6.12",
     "@types/progress": "^2.0.3",
     "@types/promise-sequential": "^1.1.0",

packages/amplify-cli/src/__tests__/extensions/amplify-helpers/delete-project.test.ts

@@ -31,27 +31,29 @@ jest.mock('@aws-amplify/amplify-cli-core', () => ({
 jest.mock('../../../extensions/amplify-helpers/get-plugin-instance', () => ({
   getPluginInstance: jest.fn().mockReturnValue({
     getConfiguredAmplifyClient: jest.fn().mockResolvedValue({
-      listBackendEnvironments: jest.fn().mockReturnValue({
-        promise: jest
-          .fn()
-          .mockImplementationOnce(() => ({
+      send: jest
+        .fn()
+        // first ListBackendEnv Call
+        .mockImplementationOnce(() =>
+          Promise.resolve({
             backendEnvironments: [],
-          }))
-          .mockImplementationOnce(() => {
-            throw new Error('listBackendEnvironments error');
-          })
-          .mockImplementationOnce(() => {
-            // eslint-disable-next-line no-throw-literal
-            throw {
-              name: 'BucketNotFoundError',
-              message: 'Bucket not found',
-              link: 'https://docs.aws.amazon.com/',
-            };
           }),
-      }),
-      deleteApp: jest.fn().mockReturnValue({
-        promise: jest.fn().mockResolvedValue(true),
-      }),
+        )
+        // DeleteApp call
+        .mockImplementationOnce(() => Promise.resolve(true))
+        // second ListBackendEnv Call
+        .mockImplementationOnce(() => {
+          throw new Error('listBackendEnvironments error');
+        })
+        // third ListBackendEnv Call
+        .mockImplementationOnce(() => {
+          // eslint-disable-next-line no-throw-literal
+          throw {
+            name: 'BucketNotFoundError',
+            message: 'Bucket not found',
+            link: 'https://docs.aws.amazon.com/',
+          };
+        }),
     }),
   }),
 }));

packages/amplify-cli/src/extensions/amplify-helpers/delete-project.ts

@@ -3,6 +3,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 import ora from 'ora';
 import chalk from 'chalk';
+import { ListBackendEnvironmentsCommand, DeleteAppCommand } from '@aws-sdk/client-amplify';
 import { FeatureFlags, $TSContext, AmplifyFault } from '@aws-amplify/amplify-cli-core';
 import { printer, prompter } from '@aws-amplify/amplify-prompts';
 import { removeEnvFromCloud } from './remove-env-from-cloud';
@@ -37,7 +38,7 @@ export const deleteProject = async (context: $TSContext): Promise<void> => {
         const amplifyClient = await awsCloudPlugin.getConfiguredAmplifyClient(context, {});
         const environments = await amplifyBackendEnvironments(amplifyClient, appId);
         if (environments.length === 0) {
-          await amplifyClient.deleteApp({ appId }).promise();
+          await amplifyClient.send(new DeleteAppCommand({ appId }));
         } else {
           printer.warn('Amplify App cannot be deleted, other environments still linked to Application');
         }
@@ -77,11 +78,7 @@ const removeLocalAmplifyDir = (context: $TSContext): void => {
 };
 
 const amplifyBackendEnvironments = async (client, appId): Promise<string[]> => {
-  const data = await client
-    .listBackendEnvironments({
-      appId,
-    })
-    .promise();
+  const data = await client.send(new ListBackendEnvironmentsCommand({ appId }));
   return data.backendEnvironments;
 };
 

packages/amplify-dotnet-function-runtime-provider/package.json

@@ -31,7 +31,7 @@
     "which": "^2.0.2"
   },
   "devDependencies": {
-    "@types/node": "^12.12.6",
+    "@types/node": "^20.9.0",
     "@types/which": "^1.3.2"
   },
   "berry": {

packages/amplify-dotnet-function-template-provider/package.json

@@ -32,7 +32,7 @@
   "devDependencies": {
     "@types/inquirer": "^6.5.0",
     "@types/lodash": "^4.14.149",
-    "@types/node": "^12.12.6"
+    "@types/node": "^20.9.0"
   },
   "berry": {
     "plugins": [

packages/amplify-e2e-tests/package.json

@@ -69,7 +69,7 @@
     "@types/body-parser": "^1.19.2",
     "@types/express": "^4.17.3",
     "@types/lodash": "^4.14.149",
-    "@types/node": "^18.16.1",
+    "@types/node": "^20.9.0",
     "@types/openpgp": "^4.4.18",
     "@types/ws": "^7.4.4",
     "jest": "^29.7.0",

packages/amplify-e2e-tests/src/init-special-cases/index.ts

@@ -31,12 +31,17 @@ export async function initWithoutCredentialFileAndNoNewUserSetup(projRoot) {
     }
     await initWorkflow(projRoot, settings);
   } finally {
+    console.log('resetting credentials and config files');
     if (fs.existsSync(configFilePathHide)) {
       fs.renameSync(configFilePathHide, configFilePath);
     }
     if (fs.existsSync(credentialsFilePathHide)) {
       fs.renameSync(credentialsFilePathHide, credentialsFilePath);
     }
+    process.env.AWS_ACCESS_KEY_ID = settings.accessKeyId;
+    process.env.AWS_SECRET_ACCESS_KEY = settings.secretAccessKey;
+    process.env.AWS_DEFAULT_REGION = settings.region;
+    process.env.AWS_REGION = settings.region;
   }
 }
 

packages/amplify-go-function-runtime-provider/package.json

@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@types/archiver": "^5.1.1",
-    "@types/node": "^12.12.6",
+    "@types/node": "^20.9.0",
     "@types/semver": "^7.1.0",
     "@types/which": "^1.3.2"
   },

packages/amplify-go-function-template-provider/package.json

@@ -30,6 +30,6 @@
   "devDependencies": {
     "@types/fs-extra": "^8.0.1",
     "@types/lodash": "^4.14.149",
-    "@types/node": "^12.12.6"
+    "@types/node": "^20.9.0"
   }
 }

packages/amplify-graphiql-explorer/package.json

@@ -74,7 +74,7 @@
   "devDependencies": {
     "@semantic-ui-react/css-patch": "^1.0.0",
     "@types/jest": "^29.5.1",
-    "@types/node": "^12.12.6",
+    "@types/node": "^20.9.0",
     "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.11"
   },

packages/amplify-java-function-runtime-provider/package.json

@@ -34,7 +34,7 @@
     "which": "^2.0.2"
   },
   "devDependencies": {
-    "@types/node": "^12.12.6",
+    "@types/node": "^20.9.0",
     "@types/semver": "^7.1.0",
     "@types/which": "^1.3.2"
   },

packages/amplify-nodejs-function-runtime-provider/package.json

@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@types/exit": "^0.1.31",
-    "@types/node": "^12.12.6",
+    "@types/node": "^20.9.0",
     "@types/semver": "^7",
     "semver": "^7.5.4"
   },

packages/amplify-nodejs-function-template-provider/package.json

@@ -34,7 +34,7 @@
   "devDependencies": {
     "@types/fs-extra": "^8.0.1",
     "@types/inquirer": "^6.5.0",
-    "@types/node": "^12.12.6"
+    "@types/node": "^20.9.0"
   },
   "berry": {
     "plugins": [

packages/amplify-opensearch-simulator/package.json

@@ -40,7 +40,7 @@
     "wait-port": "^0.2.7"
   },
   "devDependencies": {
-    "@types/node": "^12.12.6",
+    "@types/node": "^20.9.0",
     "@types/openpgp": "^4.4.19",
     "uuid": "^8.3.2"
   },

packages/amplify-provider-awscloudformation/API.md

@@ -7,28 +7,30 @@
 import { $TSAny } from '@aws-amplify/amplify-cli-core';
 import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { $TSObject } from '@aws-amplify/amplify-cli-core';
-import * as AWS_2 from 'aws-sdk';
 import { CognitoIdentityProviderClient } from '@aws-sdk/client-cognito-identity-provider';
 import { IAmplifyResource } from '@aws-amplify/amplify-cli-core';
 import { LocationClient } from '@aws-sdk/client-location';
+import { NodeHttpHandler } from '@smithy/node-http-handler';
+import { SSMClient } from '@aws-sdk/client-ssm';
 import { Template } from '@aws-amplify/amplify-cli-core';
 
 // @public (undocumented)
 export interface AwsSdkConfig {
     // (undocumented)
-    accessKeyId: string;
-    // (undocumented)
-    expiration?: Date;
+    credentials: {
+        accessKeyId: string;
+        secretAccessKey: string;
+        sessionToken?: string;
+        expiration?: Date;
+    };
     // (undocumented)
     httpOptions?: {
         agent: $TSAny;
     };
     // (undocumented)
     region: string;
     // (undocumented)
-    secretAccessKey: string;
-    // (undocumented)
-    sessionToken?: string;
+    requestHandler?: NodeHttpHandler;
 }
 
 // @public (undocumented)

packages/amplify-provider-awscloudformation/package.json

@@ -37,12 +37,34 @@
     "@aws-amplify/cli-extensibility-helper": "3.0.39",
     "@aws-amplify/graphql-transformer-core": "^2.11.1",
     "@aws-amplify/graphql-transformer-interfaces": "^3.12.0",
+    "@aws-sdk/client-amplify": "^3.624.0",
+    "@aws-sdk/client-api-gateway": "^3.624.0",
+    "@aws-sdk/client-appsync": "^3.624.0",
+    "@aws-sdk/client-cloudformation": "^3.624.0",
     "@aws-sdk/client-cognito-identity": "^3.624.0",
     "@aws-sdk/client-cognito-identity-provider": "^3.624.0",
+    "@aws-sdk/client-dynamodb": "^3.624.0",
+    "@aws-sdk/client-ec2": "^3.624.0",
+    "@aws-sdk/client-ecr": "^3.624.0",
+    "@aws-sdk/client-iam": "^3.624.0",
+    "@aws-sdk/client-lambda": "^3.624.0",
+    "@aws-sdk/client-lex-model-building-service": "^3.624.0",
     "@aws-sdk/client-location": "^3.624.0",
+    "@aws-sdk/client-polly": "^3.624.0",
+    "@aws-sdk/client-route-53": "^3.624.0",
+    "@aws-sdk/client-s3": "^3.624.0",
+    "@aws-sdk/client-sagemaker": "^3.624.0",
+    "@aws-sdk/client-secrets-manager": "^3.624.0",
+    "@aws-sdk/client-sns": "^3.624.0",
+    "@aws-sdk/client-ssm": "^3.624.0",
     "@aws-sdk/client-sts": "^3.624.0",
+    "@aws-sdk/credential-provider-node": "^3.624.0",
+    "@aws-sdk/credential-providers": "^3.624.0",
+    "@aws-sdk/lib-dynamodb": "^3.624.0",
+    "@aws-sdk/lib-storage": "^3.624.0",
+    "@aws-sdk/s3-request-presigner": "^3.624.0",
     "@aws-sdk/types": "^3.624.0",
-    "@smithy/node-http-handler": "^4.0.6",
+    "@smithy/node-http-handler": "^4.1.0",
     "amplify-codegen": "^4.10.3",
     "archiver": "^7.0.1",
     "aws-cdk-lib": "~2.189.1",
@@ -80,8 +102,10 @@
     "@types/deep-diff": "^1.0.0",
     "@types/folder-hash": "^4.0.1",
     "@types/lodash.throttle": "^4.1.6",
-    "@types/node": "^18.16.0",
+    "@types/node": "^20.9.0",
     "@types/uuid": "^8.0.0",
+    "aws-sdk-client-mock": "^4.1.0",
+    "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^29.7.0",
     "typescript": "^4.9.5"
   },