refactor: e2e tests aside from resource clean up

Author: Vieltojarvi

packages/amplify-e2e-tests/functions/mutation-appsync.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 require('isomorphic-fetch');
-const AWS = require('aws-sdk');
+const { fromNodeProviderChain } = require('@aws-sdk/credential-providers');
 const AWSAppSyncClient = require('aws-appsync').default;
 const { AUTH_TYPE } = require('aws-appsync');
 const gql = require('graphql-tag');
@@ -11,7 +11,8 @@ const runGQLMutation = async (gql_url, mutation, variables) => {
     region: process.env.REGION,
     auth: {
       type: AUTH_TYPE.AWS_IAM,
-      credentials: AWS.config.credentials,
+      // See documentation here: https://www.npmjs.com/package/@aws-sdk/credential-providers
+      credentials: fromNodeProviderChain(),
     },
     disableOffline: true,
   });

packages/amplify-e2e-tests/functions/s3-list-objects.js

@@ -1,13 +1,13 @@
-const AWS = require('aws-sdk');
-const awsS3Client = new AWS.S3();
+const { S3Client, ListObjectsV2Command } = require('@aws-sdk/client-s3');
+const awsS3Client = new S3Client();
 const bucketEnvVar = '{{bucketEnvVar}}'; // This value is replaced from test
 
 exports.handler = async () => {
-  const listObjects = await awsS3Client
-    .listObjectsV2({
-      Bucket: process.env[bucketEnvVar],
-    })
-    .promise();
+  const command = new ListObjectsV2Command({
+    Bucket: process.env[bucketEnvVar],
+  });
+
+  const listObjects = await awsS3Client.send(command);
 
   return listObjects;
 };

packages/amplify-e2e-tests/package.json

@@ -30,10 +30,22 @@
     "@aws-amplify/amplify-e2e-core": "5.7.5",
     "@aws-amplify/amplify-opensearch-simulator": "1.7.20",
     "@aws-amplify/graphql-transformer-core": "^2.11.1",
+    "@aws-sdk/client-amplify": "3.624.0",
+    "@aws-sdk/client-amplifyuibuilder": "3.624.0",
     "@aws-sdk/client-appsync": "3.624.0",
+    "@aws-sdk/client-cloudformation": "3.624.0",
+    "@aws-sdk/client-cloudfront": "3.624.0",
+    "@aws-sdk/client-codebuild": "3.624.0",
+    "@aws-sdk/client-cognito-identity-provider": "3.624.0",
     "@aws-sdk/client-dynamodb": "3.624.0",
+    "@aws-sdk/client-iam": "3.624.0",
+    "@aws-sdk/client-organizations": "3.624.0",
+    "@aws-sdk/client-pinpoint": "3.624.0",
     "@aws-sdk/client-s3": "3.624.0",
     "@aws-sdk/client-ssm": "3.624.0",
+    "@aws-sdk/client-sts": "3.624.0",
+    "@aws-sdk/credential-providers": "3.624.0",
+    "@aws-sdk/lib-storage": "3.624.0",
     "@babel/core": "^7.23.2",
     "@babel/plugin-transform-modules-commonjs": "7.10.4",
     "amplify-dynamodb-simulator": "2.9.24",

packages/amplify-e2e-tests/src/__tests__/api_1.test.ts

@@ -58,12 +58,12 @@ describe('amplify add api (GraphQL)', () => {
     expect(graphqlApi).toBeDefined();
     expect(graphqlApi.apiId).toEqual(GraphQLAPIIdOutput);
     const tableName = `AmplifyDataStore-${graphqlApi.apiId}-${envName}`;
-    const error = { message: null };
+    let error: Error;
     try {
       const table = await getDDBTable(tableName, region);
-      expect(table).toBeUndefined();
+      expect(table.Table).toBeUndefined();
     } catch (ex) {
-      Object.assign(error, ex);
+      error = ex;
     }
     expect(error).toBeDefined();
     expect(error.message).toContain(`${tableName} not found`);
@@ -117,12 +117,12 @@ describe('amplify add api (GraphQL)', () => {
     expect(graphqlApi).toBeDefined();
     expect(graphqlApi.apiId).toEqual(GraphQLAPIIdOutput);
     const tableName = `AmplifyDataStore-${graphqlApi.apiId}-${envName}`;
-    const error = { message: null };
+    let error: Error;
     try {
       const table = await getDDBTable(tableName, region);
-      expect(table).toBeUndefined();
+      expect(table.Table).toBeUndefined();
     } catch (ex) {
-      Object.assign(error, ex);
+      error = ex;
     }
     expect(error).toBeDefined();
     expect(error.message).toContain(`${tableName} not found`);

packages/amplify-e2e-tests/src/__tests__/api_3.test.ts

@@ -185,7 +185,7 @@ describe('amplify add api (GraphQL)', () => {
       await getAppSyncApi(GraphQLAPIIdOutput, meta.providers.awscloudformation.Region);
       expect(true).toBe(false); // expecting failure
     } catch (err) {
-      expect(err.message).toBe(`GraphQL API ${GraphQLAPIIdOutput} not found.`);
+      expect(err.message).toBe(`API not found.`);
     }
   });
 });

packages/amplify-e2e-tests/src/__tests__/api_7.test.ts

@@ -59,12 +59,12 @@ describe('amplify add api (GraphQL)', () => {
     expect(graphqlApi).toBeDefined();
     expect(graphqlApi.apiId).toEqual(GraphQLAPIIdOutput);
     const tableName = `AmplifyDataStore-${graphqlApi.apiId}-${envName}`;
-    const error = { message: null };
+    let error: Error;
     try {
       const table = await getDDBTable(tableName, region);
-      expect(table).toBeUndefined();
+      expect(table.Table).toBeUndefined();
     } catch (ex) {
-      Object.assign(error, ex);
+      error = ex;
     }
     expect(error).toBeDefined();
     expect(error.message).toContain(`${tableName} not found`);

packages/amplify-e2e-tests/src/__tests__/api_9b.test.ts

@@ -74,12 +74,12 @@ describe('amplify add api (GraphQL)', () => {
     expect(graphqlApi).toBeDefined();
     expect(graphqlApi.apiId).toEqual(GraphQLAPIIdOutput);
     const tableName = `Comment-${GraphQLAPIIdOutput}-integtest`;
-    const error = { message: null };
+    let error: Error;
     try {
       const table = await getDDBTable(tableName, region);
-      expect(table).toBeUndefined();
+      expect(table.Table).toBeUndefined();
     } catch (ex) {
-      Object.assign(error, ex);
+      error = ex;
     }
     expect(error).toBeDefined();
     expect(error.message).toContain(`${tableName} not found`);

packages/amplify-e2e-tests/src/__tests__/auth/admin-api.test.ts

@@ -31,7 +31,7 @@ describe('auth admin api tests', () => {
       };
     }
     const lambdaResponse = await invokeFunction(adminLambdaName, JSON.stringify(request), adminLambdaRegion);
-    return JSON.parse(lambdaResponse.Payload.toString());
+    return JSON.parse(lambdaResponse.Payload.transformToString());
   };
 
   beforeAll(async () => {

packages/amplify-e2e-tests/src/__tests__/auth/hosted-ui.test.ts

@@ -135,7 +135,9 @@ describe('hosted ui tests', () => {
         const updatedDomainRes = await getUserPoolDomain(hostedUIDomain, region);
         expect(updatedDomainRes).toBeDefined();
         const originalDomainRes = await getUserPoolDomain(originalHostedUIDomain, region);
-        expect(originalDomainRes).toEqual({ DomainDescription: {} });
+        // originalDomainRes has 2 properties $metadata and DomainDescription, we expect DomainDescription to be an empty object
+        // $metadata property is common in SDK V3 objects
+        expect(originalDomainRes.DomainDescription).toEqual({});
 
         const deleteOriginalDomainRes = await deleteUserPoolDomain(originalHostedUIDomain, userPoolId, region);
         // undefined response as it throws InvalidParameterException: No such domain or user pool exists.

packages/amplify-e2e-tests/src/__tests__/auth_9.test.ts

@@ -10,7 +10,7 @@ import {
   initJSProjectWithProfile,
   nspawn as spawn,
 } from '@aws-amplify/amplify-e2e-core';
-import { CognitoIdentityServiceProvider } from 'aws-sdk';
+import { DescribeUserPoolCommandOutput } from '@aws-sdk/client-cognito-identity-provider';
 
 const defaultsSettings = {
   name: 'authTest',
@@ -35,10 +35,7 @@ describe('amplify auth with trigger', () => {
 
     const meta = getProjectMeta(projRoot);
     const userPoolId = Object.keys(meta.auth).map((key) => meta.auth[key])[0].output.UserPoolId;
-    let userPool = (await getUserPool(
-      userPoolId,
-      meta.providers.awscloudformation.Region,
-    )) as CognitoIdentityServiceProvider.DescribeUserPoolResponse;
+    let userPool = (await getUserPool(userPoolId, meta.providers.awscloudformation.Region)) as DescribeUserPoolCommandOutput;
 
     expect(userPool.UserPool).toBeDefined();
     expect(userPool.UserPool.LambdaConfig).toBeDefined();
@@ -50,10 +47,7 @@ describe('amplify auth with trigger', () => {
 
     await amplifyPushAuth(projRoot);
 
-    userPool = (await getUserPool(
-      userPoolId,
-      meta.providers.awscloudformation.Region,
-    )) as CognitoIdentityServiceProvider.DescribeUserPoolResponse;
+    userPool = (await getUserPool(userPoolId, meta.providers.awscloudformation.Region)) as DescribeUserPoolCommandOutput;
 
     expect(userPool.UserPool).toBeDefined();
     expect(userPool.UserPool.EmailVerificationSubject).toBe('New code');