refactor: category-auth, category-geo, and category-predictions to SDK V3 (#14221)

* refactor: upgrade category auth

* fix: update function

* refactor: geo

* fix: identityPool test

* fix: remove region

* fix: region stuff

* fix: identityPool test

* fix: dedupe and api

* refactor: update clients

* fix: api and proxy

* refactor: e2e-core and some e2e-test files

* refactor: e2e-tests and ui-builder

* fix: e2e cleanup

* fix: dedupe

* fix: toString

* fix: some e2e tests

* fix: trying something with some function tests

* fix: part of the attempt

* fix: function tests

* fix: e2e tests

* fix: some e2e tests and gaining info

* fix: adding to if statement

* fix: attempt for api

* fix: updates to hosted-ui

* fix: api e2es

* chore: gathering info

* fix: cleanup resources

* fix: bucket problems

* fix: update memory for cleanup_resources

* chore: adjustments

* fix: possible fix for special cases

* chore: remove sdk migrations for e2e-core

* refactor: yarnlock and some e2e test reverts

* refactor: revert some e2e tests changes

* chore: reverting some more files

* chore: revert e2e test changes

* chore: yarn lock

* chore: collecting info

* chore: node version

* chore: node version linux

* fix: clean up

* chore: minor adjustments

---------

Co-authored-by: aws-amplify-bot <aws@amazon.com>
Co-authored-by: Vieltojarvi <lvielto@amazon.com>

Author: 3 people

.circleci/local_publish_helpers_codebuild.sh

@@ -139,10 +139,10 @@ function verifyPkgCli {
       fi
     }
 
-    # TODO: After V3 migrations are done, decrease 995 back to 930 and 825 back to 750
-    verifySinglePkg "amplify-pkg-linux-x64" "amplify-pkg-linux-x64.tgz" $((995 * 1024 * 1024))
-    verifySinglePkg "amplify-pkg-macos-x64" "amplify-pkg-macos-x64.tgz" $((995 * 1024 * 1024))
-    verifySinglePkg "amplify-pkg-win-x64.exe" "amplify-pkg-win-x64.tgz" $((995 * 1024 * 1024))
+    # TODO: After V3 migrations are done, decrease 1020 back to 930 and 825 back to 750
+    verifySinglePkg "amplify-pkg-linux-x64" "amplify-pkg-linux-x64.tgz" $((1020 * 1024 * 1024))
+    verifySinglePkg "amplify-pkg-macos-x64" "amplify-pkg-macos-x64.tgz" $((1020 * 1024 * 1024))
+    verifySinglePkg "amplify-pkg-win-x64.exe" "amplify-pkg-win-x64.tgz" $((1020 * 1024 * 1024))
     verifySinglePkg "amplify-pkg-linux-arm64" "amplify-pkg-linux-arm64.tgz" $((825 * 1024 * 1024))
 }
 

packages/amplify-category-auth/package.json

@@ -34,10 +34,12 @@
     "@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-cognito-identity": "^3.624.0",
+    "@aws-sdk/client-cognito-identity-provider": "^3.624.0",
+    "@aws-sdk/client-s3": "^3.624.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",
     "axios": "^1.6.7",
     "chalk": "^4.1.1",
     "change-case": "^4.1.1",
@@ -52,7 +54,6 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@aws-sdk/client-cognito-identity-provider": "3.624.0",
     "@aws-sdk/client-iam": "3.624.0",
     "@types/mime-types": "^2.1.1",
     "cloudform-types": "^4.2.0",

packages/amplify-category-auth/src/provider-utils/awscloudformation/import/index.ts

@@ -1,12 +1,7 @@
 import { ICognitoUserPoolService, IIdentityPoolService } from '@aws-amplify/amplify-util-import';
 import { $TSAny, $TSContext, ServiceSelection, stateManager, AmplifyError, AmplifyFrontend } from '@aws-amplify/amplify-cli-core';
-import { CognitoIdentityProvider, IdentityPool } from 'aws-sdk/clients/cognitoidentity';
-import {
-  IdentityProviderType,
-  UserPoolClientType,
-  UserPoolDescriptionType,
-  UserPoolType,
-} from 'aws-sdk/clients/cognitoidentityserviceprovider';
+import { CognitoIdentityProvider, IdentityPool } from '@aws-sdk/client-cognito-identity';
+import { IdentityProviderType, UserPoolClientType, UserPoolDescriptionType, UserPoolType } from '@aws-sdk/client-cognito-identity-provider';
 import { printer } from '@aws-amplify/amplify-prompts';
 import { ensureEnvParamManager } from '@aws-amplify/amplify-environment-parameters';
 import Enquirer from 'enquirer';
@@ -82,7 +77,7 @@ const printSuccess = (context: $TSContext, authSelections: AuthSelections, userP
   if (authSelections === 'userPoolOnly') {
     printer.info(importMessages.UserPoolOnlySuccess(userPool.Name!));
   } else {
-    printer.info(importMessages.UserPoolAndIdentityPoolSuccess(userPool.Name!, identityPool!.IdentityPoolName));
+    printer.info(importMessages.UserPoolAndIdentityPoolSuccess(userPool.Name!, identityPool!.IdentityPoolName!));
   }
   printer.blankLine();
   printer.info('Next steps:');
@@ -294,7 +289,7 @@ const importServiceWalkthrough = async (
     if (questionParameters.validatedIdentityPools!.length === 1) {
       const { identityPool } = questionParameters.validatedIdentityPools![0];
 
-      printer.info(importMessages.OneIdentityPoolValid(identityPool.IdentityPoolName, identityPool.IdentityPoolId));
+      printer.info(importMessages.OneIdentityPoolValid(identityPool.IdentityPoolName!, identityPool.IdentityPoolId!));
 
       answers.identityPoolId = identityPool.IdentityPoolId;
       answers.identityPool = identityPool;

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

@@ -4,8 +4,8 @@ import {
   IdentityProviderType,
   UserPoolClientType,
   UserPoolType,
-} from 'aws-sdk/clients/cognitoidentityserviceprovider';
-import { CognitoIdentityProvider, IdentityPool } from 'aws-sdk/clients/cognitoidentity';
+} from '@aws-sdk/client-cognito-identity-provider';
+import { CognitoIdentityProvider, IdentityPool } from '@aws-sdk/client-cognito-identity';
 import { ICognitoUserPoolService, IIdentityPoolService } from '@aws-amplify/amplify-util-import';
 
 export type AuthSelections = 'userPoolOnly' | 'identityPoolAndUserPool';

packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/get-app-client-secret-sdk.ts

@@ -1,5 +1,5 @@
 import { $TSContext, AmplifyFault } from '@aws-amplify/amplify-cli-core';
-import { CognitoIdentityServiceProvider } from 'aws-sdk';
+import { CognitoIdentityProviderClient, DescribeUserPoolClientCommand } from '@aws-sdk/client-cognito-identity-provider';
 
 export const getAppClientSecret = async (context: $TSContext, userpoolId: string, clientId: string): Promise<string | undefined> => {
   try {
@@ -8,7 +8,8 @@ export const getAppClientSecret = async (context: $TSContext, userpoolId: string
       ClientId: clientId,
       UserPoolId: userpoolId,
     };
-    const result = await identity.describeUserPoolClient(params).promise();
+    const command = new DescribeUserPoolClientCommand(params);
+    const result = await identity.send(command);
     return result.UserPoolClient?.ClientSecret;
   } catch (error) {
     throw new AmplifyFault(
@@ -21,8 +22,8 @@ export const getAppClientSecret = async (context: $TSContext, userpoolId: string
   }
 };
 
-const getCognitoIdentityProviderClient = async (context: $TSContext): Promise<CognitoIdentityServiceProvider> => {
-  const { client } = await context.amplify.invokePluginMethod<{ client: CognitoIdentityServiceProvider }>(
+const getCognitoIdentityProviderClient = async (context: $TSContext): Promise<CognitoIdentityProviderClient> => {
+  const { client } = await context.amplify.invokePluginMethod<{ client: CognitoIdentityProviderClient }>(
     context,
     'awscloudformation',
     undefined,

packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/get-oauth-secrets-from-cognito.ts

@@ -1,6 +1,6 @@
 import { ICognitoUserPoolService } from '@aws-amplify/amplify-util-import';
 import { $TSContext, stateManager, JSONUtilities } from '@aws-amplify/amplify-cli-core';
-import { IdentityProviderType } from 'aws-sdk/clients/cognitoidentityserviceprovider';
+import { IdentityProviderType } from '@aws-sdk/client-cognito-identity-provider';
 import { createOAuthCredentials } from '../import';
 
 /**

packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/trigger-file-uploader.ts

@@ -1,18 +1,17 @@
 import { $TSContext, pathManager, stateManager, AmplifyCategories, spinner, AmplifyFault } from '@aws-amplify/amplify-cli-core';
-import type { S3 } from 'aws-sdk';
+import { S3Client, PutObjectCommand, PutObjectCommandInput, PutObjectCommandOutput } from '@aws-sdk/client-s3';
 import { createReadStream, readdirSync, existsSync } from 'fs-extra';
 import mime from 'mime-types';
 import * as path from 'path';
 import { getAuthResourceName } from '../../../utils/getAuthResourceName';
-import s3 from 'aws-sdk/clients/s3';
 
 const providerName = 'awscloudformation';
 
-const getS3Client = async (context: $TSContext, action: string): Promise<S3> => {
+const getS3Client = async (context: $TSContext, action: string): Promise<S3Client> => {
   const providerPlugins = context.amplify.getProviderPlugins(context);
   const provider = await import(providerPlugins[providerName]);
   const config = await provider.getConfiguredAWSClientConfig(context, AmplifyCategories.AUTH, action);
-  return new s3(config);
+  return new S3Client(config);
 };
 
 /**
@@ -36,7 +35,7 @@ export const uploadFiles = async (context: $TSContext): Promise<void> => {
       return;
     }
     const fileList = readdirSync(assetPath);
-    const uploadFileTasks: (() => Promise<S3.ManagedUpload.SendData>)[] = [];
+    const uploadFileTasks: (() => Promise<PutObjectCommandOutput>)[] = [];
     fileList.forEach((file) => {
       uploadFileTasks.push(async () => uploadFile(s3Client, bucketName, path.join(assetPath, file), file));
     });
@@ -54,16 +53,22 @@ export const uploadFiles = async (context: $TSContext): Promise<void> => {
   }
 };
 
-const uploadFile = async (s3Client: S3, hostingBucketName: string, filePath: string, file: string): Promise<S3.ManagedUpload.SendData> => {
+const uploadFile = async (
+  s3Client: S3Client,
+  hostingBucketName: string,
+  filePath: string,
+  file: string,
+): Promise<PutObjectCommandOutput> => {
   const fileStream = createReadStream(filePath);
   const contentType = mime.lookup(filePath);
-  const uploadParams = {
+  const uploadParams: PutObjectCommandInput = {
     Bucket: hostingBucketName,
     Key: file,
     Body: fileStream,
     ContentType: contentType || 'text/plain',
     ACL: 'public-read',
   };
 
-  return s3Client.upload(uploadParams).promise();
+  const command = new PutObjectCommand(uploadParams);
+  return await s3Client.send(command);
 };

packages/amplify-category-geo/package.json

@@ -28,19 +28,16 @@
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.4.2",
     "@aws-amplify/amplify-prompts": "2.8.7",
+    "@aws-sdk/client-location": "^3.624.0",
     "ajv": "^6.12.6",
     "amplify-headless-interface": "1.17.8",
     "amplify-util-headless-input": "1.9.19",
     "aws-cdk-lib": "~2.189.1",
-    "aws-sdk": "^2.1464.0",
     "constructs": "^10.0.5",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.21",
     "uuid": "^8.3.2"
   },
-  "devDependencies": {
-    "@aws-sdk/client-location": "3.624.0"
-  },
   "jest": {
     "collectCoverage": true,
     "collectCoverageFrom": [

packages/amplify-category-geo/src/provider-controllers/import.ts

@@ -3,7 +3,7 @@ import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { prompter, printer } from '@aws-amplify/amplify-prompts';
 import { existsSync, writeFileSync } from 'fs-extra';
 import { join } from 'path';
-import Location from 'aws-sdk/clients/location';
+import { LocationClient, BatchPutGeofenceCommand } from '@aws-sdk/client-location';
 import { ServiceName } from '../service-utils/constants';
 import { validateGeoJSONObj } from '../service-utils/validateGeoJSONObj';
 import {
@@ -112,7 +112,7 @@ export const importResource = async (context: $TSContext) => {
 const bulkUploadGeofence = async (context: $TSContext, params: ImportParams, region: string) => {
   printer.info('Updating your Geofences in the collection...');
   try {
-    const { client } = await context.amplify.invokePluginMethod<{ client: Location }>(
+    const { client } = await context.amplify.invokePluginMethod<{ client: LocationClient }>(
       context,
       'awscloudformation',
       undefined,
@@ -127,7 +127,8 @@ const bulkUploadGeofence = async (context: $TSContext, params: ImportParams, reg
         CollectionName: params.collectionToImport,
         Entries: geofenceEntries.splice(0, MAX_ENTRIES_PER_BATCH),
       };
-      uploadTasks.push(client.batchPutGeofence(geofenceCollectionPerBatch).promise());
+      const command = new BatchPutGeofenceCommand(geofenceCollectionPerBatch);
+      uploadTasks.push(client.send(command));
     }
     await Promise.all(uploadTasks);
     printer.success(`Successfully added/updated ${totalGeofenceCount} Geofences in your "${params.collectionToImport}" collection`);

packages/amplify-category-predictions/package.json

@@ -27,7 +27,6 @@
   "dependencies": {
     "@aws-amplify/amplify-cli-core": "4.4.2",
     "@aws-amplify/amplify-prompts": "2.8.7",
-    "aws-sdk": "^2.1464.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
     "uuid": "^8.3.2"