aws-amplify · ShadowCat567 · Oct 30, 2025 · Jul 9, 2025 · Jul 9, 2025 · Jul 10, 2025
@@ -62,23 +62,19 @@ describe('cloudfront-manager', () => {
 
   const mockcftInvalidationData = {};
 
-  const mockInvalidateMethod = jest.fn(() => {
-    return {
-      promise: () => Promise.resolve(mockcftInvalidationData),
-    };
-  });
+  const mockSendMethod = jest.fn(() => Promise.resolve(mockcftInvalidationData));
 
-  class mockCloudFront {
+  class mockCloudFrontClient {
     constructor() {
-      this.createInvalidation = mockInvalidateMethod;
+      this.send = mockSendMethod;
     }
   }
 
   test('invalidateCloudFront', async () => {
-    const mockCloudFrontClient = async (context, action) => Promise.resolve(new mockCloudFront());
-    const result = await cloudFrontManager.invalidateCloudFront(mockContext, mockCloudFrontClient);
+    const mockCloudFrontClientFactory = async (context, action) => Promise.resolve(new mockCloudFrontClient());
+    const result = await cloudFrontManager.invalidateCloudFront(mockContext, mockCloudFrontClientFactory);
     expect(result).toBe(mockContext);
-    expect(mockInvalidateMethod).toBeCalled();
+    expect(mockSendMethod).toBeCalled();
     expect(mockContext.exeInfo.cftInvalidationData).toEqual(mockcftInvalidationData);
   });
 });
@@ -1,6 +1,6 @@
 const chalk = require('chalk');
 const constants = require('../../constants');
-const CloudFront = require('aws-sdk/clients/cloudfront');
+const { CloudFrontClient, CreateInvalidationCommand } = require('@aws-sdk/client-cloudfront');
 
 const providerName = 'awscloudformation';
 
@@ -28,7 +28,8 @@ async function invalidate(context, cloudFrontClient = getCloudFrontClient) {
     };
 
     try {
-      const data = await cloudFront.createInvalidation(invalidateParams).promise();
+      const command = new CreateInvalidationCommand(invalidateParams);
+      const data = await cloudFront.send(command);
       context.print.info('CloudFront invalidation request sent successfuly.');
       context.print.info(chalk.green(CloudFrontSecureURL));
       context.exeInfo.cftInvalidationData = data;
@@ -45,7 +46,7 @@ async function getCloudFrontClient(context, action) {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = require(providerPlugins[providerName]);
   const config = await provider.getConfiguredAWSClientConfig(context, constants.CategoryName, action);
-  return new CloudFront(config);
+  return new CloudFrontClient(config);
 }
 
 module.exports = {

@@ -3,7 +3,7 @@ const sequential = require('promise-sequential');
 const fileScanner = require('./file-scanner');
 const constants = require('../../constants');
 const { uploadFile } = require('./upload-file');
-const S3 = require('aws-sdk/clients/s3');
+const { S3Client } = require('@aws-sdk/client-s3');
 
 const serviceName = 'S3AndCloudFront';
 const providerName = 'awscloudformation';
@@ -43,7 +43,7 @@ async function getS3Client(context, action) {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = require(providerPlugins[providerName]);
   const config = await provider.getConfiguredAWSClientConfig(context, constants.CategoryName, action);
-  return new S3(config);
+  return new S3Client(config);
 }
 
 function getHostingBucketName(context) {

@@ -1,6 +1,7 @@
 const fs = require('fs-extra');
 const path = require('path');
 const mime = require('mime-types');
+const { Upload } = require('@aws-sdk/lib-storage');
 
 async function uploadFile(s3Client, hostingBucketName, distributionDirPath, filePath, hasCloudFront) {
   let relativeFilePath = path.relative(distributionDirPath, filePath);
@@ -19,7 +20,12 @@ async function uploadFile(s3Client, hostingBucketName, distributionDirPath, file
     uploadParams.ACL = 'public-read';
   }
 
-  const data = await s3Client.upload(uploadParams).promise();
+  const upload = new Upload({
+    client: s3Client,
+    params: uploadParams,
+  });
+
+  const data = await upload.done();
 
   return data;
 }

@@ -23,7 +23,9 @@
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.4.3",
     "@aws-amplify/amplify-prompts": "2.8.7",
-    "aws-sdk": "^2.1692.0",
+    "@aws-sdk/client-cloudfront": "^3.919.0",
+    "@aws-sdk/client-s3": "^3.919.0",
+    "@aws-sdk/lib-storage": "^3.919.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
     "mime-types": "^2.1.26",

@@ -31,7 +31,7 @@
     "@aws-amplify/amplify-prompts": "2.8.7",
     "@aws-amplify/amplify-provider-awscloudformation": "8.11.14",
     "@aws-sdk/client-iam": "^3.919.0",
-    "@aws-sdk/client-pinpoint": "^3.919.0",
+    "@aws-sdk/client-pinpoint": "3.901.0",
     "@smithy/node-http-handler": "^4.4.3",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",

@@ -12,7 +12,6 @@
     "@aws-sdk/client-amplify": "^3.919.0",
     "@aws-sdk/client-s3": "^3.919.0",
     "archiver": "^7.0.1",
-    "aws-sdk": "^2.1692.0",
     "chalk": "^4.1.1",
     "cli-table3": "^0.6.0",
     "execa": "^5.1.1",

@@ -29,6 +29,8 @@
     "@aws-amplify/amplify-category-api": "^5.15.1",
     "@aws-amplify/amplify-cli-core": "4.4.3",
     "@aws-amplify/amplify-environment-parameters": "1.9.22",
+    "@aws-sdk/client-s3": "^3.919.0",
+    "@aws-sdk/lib-storage": "^3.919.0",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
     "mime-types": "^2.1.26",

@@ -1,13 +1,14 @@
 const fs = require('fs-extra');
 const mime = require('mime-types');
 const constants = require('../constants');
-const S3 = require('aws-sdk/clients/s3');
+const { S3Client } = require('@aws-sdk/client-s3');
+const { Upload } = require('@aws-sdk/lib-storage');
 
 export async function getS3Client(context, action) {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = require(providerPlugins[constants.providerName]);
   const config = await provider.getConfiguredAWSClientConfig(context, constants.CategoryName, action);
-  return new S3(config);
+  return new S3Client(config);
 }
 
 export async function uploadFile(s3Client, bucketName, filePath, fileKey) {
@@ -20,7 +21,12 @@ export async function uploadFile(s3Client, bucketName, filePath, fileKey) {
     ContentType: contentType || 'text/plain',
   };
 
-  const data = await s3Client.upload(uploadParams).promise();
+  const upload = new Upload({
+    client: s3Client,
+    params: uploadParams,
+  });
+
+  const data = await upload.done();
 
   return data;
 }
@@ -23,13 +23,30 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.4.3",
-    "@aws-sdk/client-pinpoint": "^3.919.0",
+    "@aws-sdk/client-amplifybackend": "^3.919.0",
+    "@aws-sdk/client-amplifyuibuilder": "^3.919.0",
+    "@aws-sdk/client-appsync": "^3.919.0",
+    "@aws-sdk/client-cloudformation": "^3.919.0",
+    "@aws-sdk/client-cloudwatch-events": "^3.919.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.919.0",
+    "@aws-sdk/client-cognito-identity": "^3.919.0",
+    "@aws-sdk/client-cognito-identity-provider": "^3.919.0",
+    "@aws-sdk/client-dynamodb": "^3.919.0",
+    "@aws-sdk/client-iam": "^3.919.0",
+    "@aws-sdk/client-kinesis": "^3.919.0",
+    "@aws-sdk/client-lambda": "^3.919.0",
+    "@aws-sdk/client-lex-model-building-service": "^3.919.0",
+    "@aws-sdk/client-location": "^3.919.0",
+    "@aws-sdk/client-pinpoint": "3.901.0",
+    "@aws-sdk/client-rekognition": "^3.919.0",
+    "@aws-sdk/client-s3": "^3.919.0",
+    "@aws-sdk/client-ssm": "^3.919.0",
     "@aws-sdk/client-sts": "^3.919.0",
     "@aws-sdk/credential-providers": "^3.919.0",
+    "@aws-sdk/lib-dynamodb": "^3.919.0",
     "amplify-headless-interface": "1.17.8",
     "aws-amplify": "^5.3.16",
     "aws-appsync": "^4.1.1",
-    "aws-sdk": "^2.1464.0",
     "chalk": "^4.1.1",
     "dotenv": "^8.2.0",
     "execa": "^5.1.1",

@@ -1,5 +1,5 @@
 import { nspawn as spawn, ExecutionContext, KEY_DOWN_ARROW, getCLIPath, getProjectMeta, getBackendAmplifyMeta, invokeFunction } from '..';
-import { Lambda } from 'aws-sdk';
+import { InvokeCommandOutput } from '@aws-sdk/client-lambda';
 import { singleSelect, multiSelect, moveUp, moveDown } from '../utils/selectors';
 import { globSync } from 'glob';
 import * as path from 'path';
@@ -636,21 +636,18 @@ export const functionMockAssert = (
   });
 };
 
-export const functionCloudInvoke = async (
-  cwd: string,
-  settings: { funcName: string; payload: string },
-): Promise<Lambda.InvocationResponse> => {
+export const functionCloudInvoke = async (cwd: string, settings: { funcName: string; payload: string }): Promise<InvokeCommandOutput> => {
   const meta = getProjectMeta(cwd);
   const lookupName = settings.funcName;
   expect(meta.function[lookupName]).toBeDefined();
   const { Name: functionName, Region: region } = meta.function[lookupName].output;
   expect(functionName).toBeDefined();
   expect(region).toBeDefined();
   const result = await invokeFunction(functionName, settings.payload, region);
-  if (!result.$response.data) {
-    throw new Error('No data in lambda response');
+  if (!result.Payload) {
+    throw new Error('No payload in lambda response');
   }
-  return result.$response.data as Lambda.InvocationResponse;
+  return result;
 };
 
 const getTemplateChoices = (runtime: FunctionRuntimes) => {

@@ -1,9 +1,9 @@
-import { AmplifyUIBuilder } from 'aws-sdk';
+import { CreateComponentData } from '@aws-sdk/client-amplifyuibuilder';
 
 // FormCheckout used from AmplifyUIKit
 // Source: https://www.figma.com/community/file/1047600760128127424
 
-export const formCheckoutComponent: AmplifyUIBuilder.CreateComponentData = {
+export const formCheckoutComponent: CreateComponentData = {
   name: 'FormCheckout',
   componentType: 'Flex',
   schemaVersion: '1.0',

@@ -1,9 +1,9 @@
-import { AmplifyUIBuilder } from 'aws-sdk';
+import { CreateComponentData } from '@aws-sdk/client-amplifyuibuilder';
 
 // MyIcon used from AmplifyUIKit
 // Source: https://www.figma.com/community/file/1047600760128127424
 
-export const myIconComponent: AmplifyUIBuilder.CreateComponentData = {
+export const myIconComponent: CreateComponentData = {
   name: 'MyIcon',
   componentType: 'Icon',
   schemaVersion: '1.0',

@@ -1,6 +1,10 @@
 import { Amplify, Auth } from 'aws-amplify';
 import AWSAppSyncClient, { AUTH_TYPE } from 'aws-appsync';
-import { CognitoIdentityServiceProvider } from 'aws-sdk';
+import {
+  CognitoIdentityProviderClient,
+  AdminCreateUserCommand,
+  AdminAddUserToGroupCommand,
+} from '@aws-sdk/client-cognito-identity-provider';
 import fs from 'fs-extra';
 import path from 'path';
 import { getAwsAndroidConfig, getAwsIOSConfig, getBackendAmplifyMeta, getCLIInputs, getProjectMeta, setCLIInputs } from './projectMeta';
@@ -19,53 +23,48 @@ export async function setupUser(
   region?: string,
 ): Promise<void> {
   const cognitoClient = getConfiguredCognitoClient(region);
-  await cognitoClient
-    .adminCreateUser({
-      UserPoolId: userPoolId,
-      UserAttributes: [{ Name: 'email', Value: 'username@amazon.com' }],
-      Username: username,
-      MessageAction: 'SUPPRESS',
-      TemporaryPassword: tempPassword,
-    })
-    .promise();
+  const createUserCommand = new AdminCreateUserCommand({
+    UserPoolId: userPoolId,
+    UserAttributes: [{ Name: 'email', Value: 'username@amazon.com' }],
+    Username: username,
+    MessageAction: 'SUPPRESS',
+    TemporaryPassword: tempPassword,
+  });
+  await cognitoClient.send(createUserCommand);
 
   await authenticateUser(username, tempPassword, password);
 
   if (groupName) {
-    await cognitoClient
-      .adminAddUserToGroup({
-        UserPoolId: userPoolId,
-        Username: username,
-        GroupName: groupName,
-      })
-      .promise();
+    const addToGroupCommand = new AdminAddUserToGroupCommand({
+      UserPoolId: userPoolId,
+      Username: username,
+      GroupName: groupName,
+    });
+    await cognitoClient.send(addToGroupCommand);
   }
 }
 
 export async function addUserToGroup(userPoolId: string, username: string, groupName: string, region?: string): Promise<void> {
   const cognitoClient = getConfiguredCognitoClient(region);
-  await cognitoClient
-    .adminAddUserToGroup({
-      UserPoolId: userPoolId,
-      Username: username,
-      GroupName: groupName,
-    })
-    .promise();
+  const command = new AdminAddUserToGroupCommand({
+    UserPoolId: userPoolId,
+    Username: username,
+    GroupName: groupName,
+  });
+  await cognitoClient.send(command);
 }
 
-export function getConfiguredCognitoClient(region = process.env.CLI_REGION): CognitoIdentityServiceProvider {
-  const cognitoClient = new CognitoIdentityServiceProvider({ apiVersion: '2016-04-19', region });
-
+export function getConfiguredCognitoClient(region = process.env.CLI_REGION): CognitoIdentityProviderClient {
   const awsconfig = {
-    accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-    secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-    sessionToken: process.env.AWS_SESSION_TOKEN,
+    credentials: {
+      accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+      secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+      sessionToken: process.env.AWS_SESSION_TOKEN,
+    },
     region,
   };
 
-  cognitoClient.config.update(awsconfig);
-
-  return cognitoClient;
+  return new CognitoIdentityProviderClient(awsconfig);
 }
 
 export function getConfiguredAppsyncClientCognitoAuth(url: string, region: string, user: any) {

@@ -39,7 +39,7 @@ export async function pinpointAppExist(pinpointProjectId: string, region: string
       ApplicationId: pinpointProjectId,
     });
     const response = await pinpointClient.send(command);
-    if (response.ApplicationResponse.Id === pinpointProjectId) {
+    if (response.ApplicationResponse?.Id === pinpointProjectId) {
       result = true;
     }
   } catch (err) {