test: enable more linter rules in tests (#13027)

* chore: consistent return

* chore: no-var

* chore: no useless catch

* chore: prefer const

.eslintrc.js

@@ -114,14 +114,14 @@ module.exports = {
         '@typescript-eslint/no-inferrable-types': 'off',
         '@typescript-eslint/no-non-null-assertion': 'off',
         '@typescript-eslint/no-unused-vars': 'off',
-        'consistent-return': 'off',
+        'consistent-return': 'error',
         'import/no-extraneous-dependencies': 'off',
         'no-constant-condition': 'off',
         'no-restricted-syntax': 'off',
-        'no-useless-catch': 'off',
+        'no-useless-catch': 'error',
         'no-useless-escape': 'off',
-        'no-var': 'off',
-        'prefer-const': 'off',
+        'no-var': 'error',
+        'prefer-const': 'error',
         'spellcheck/spell-checker': 'off',
       },
     },

packages/amplify-appsync-simulator/src/__tests__/__helpers__/appsync-client.ts

@@ -94,7 +94,7 @@ export async function appSyncClient<ResponseDataType = unknown, VarsType = Recor
             if (body.errors?.length) {
               return reject(new Error(`GraphQL request error(s): ${JSON.stringify(body.errors)}`));
             }
-            resolve(body.data);
+            return resolve(body.data);
           })
           .once('error', (err) => reject(err));
       },

packages/amplify-appsync-simulator/src/__tests__/server/websocket-subscription.test.ts

@@ -119,7 +119,7 @@ describe('websocket subscription', () => {
 
   describe('onSubscribe', () => {
     let subsServer: AppSyncSimulatorSubscriptionServer;
-    let asyncIterator = new PubSub().asyncIterator('onMessage');
+    const asyncIterator = new PubSub().asyncIterator('onMessage');
     const tokenString = 'token-here';
     const jwt = { iss: 'some issuer' };
     const doc = parse(/* GraphQL */ `

packages/amplify-appsync-simulator/src/__tests__/utils/graphql-runner/subscription.test.ts

@@ -18,8 +18,8 @@ describe('runSubscription', () => {
   `);
   let schema: GraphQLSchema;
 
-  let subscriptionResolver = jest.fn();
-  let subscriptionSubscribe = jest.fn();
+  const subscriptionResolver = jest.fn();
+  const subscriptionSubscribe = jest.fn();
 
   const executionContext: AppSyncGraphQLExecutionContext = {
     headers: { 'x-api-key': 'da-fake-key' },

packages/amplify-appsync-simulator/src/__tests__/velocity/util/list-utils.test.ts

@@ -7,7 +7,7 @@ import { AmplifyAppSyncSimulatorAuthenticationType } from '../../../type-definit
 
 const stubInfo = {} as unknown;
 export const mockInfo = stubInfo as GraphQLResolveInfo;
-var util;
+let util;
 
 beforeEach(() => {
   const executionContext: AppSyncGraphQLExecutionContext = {

packages/amplify-appsync-simulator/src/__tests__/velocity/util/math.test.ts

@@ -5,7 +5,7 @@ import { AmplifyAppSyncSimulatorAuthenticationType } from '../../../type-definit
 
 const stubInfo = {} as unknown;
 export const mockInfo = stubInfo as GraphQLResolveInfo;
-var util;
+let util;
 
 beforeEach(() => {
   const executionContext: AppSyncGraphQLExecutionContext = {

packages/amplify-appsync-simulator/src/__tests__/velocity/util/str.test.ts

@@ -5,7 +5,7 @@ import { AppSyncGraphQLExecutionContext } from '../../../utils/graphql-runner';
 
 const stubInfo = {} as unknown;
 export const mockInfo = stubInfo as GraphQLResolveInfo;
-var util;
+let util;
 
 beforeEach(() => {
   const executionContext: AppSyncGraphQLExecutionContext = {

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

@@ -29,7 +29,7 @@ const pluginInstance = {
 const getOAuthObjectFromCognitoMock = getOAuthObjectFromCognito as jest.MockedFunction<typeof getOAuthObjectFromCognito>;
 
 // mock context
-let mockContext = {
+const mockContext = {
   amplify: {
     getProjectConfig: jest.fn().mockReturnValue({
       projectName: 'authHeadless',

packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/utils/auth-defaults-appliers.test.ts

@@ -24,9 +24,7 @@ jest.mock('@aws-amplify/amplify-cli-core', () => {
     ...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
     FeatureFlags: {
       getBoolean: jest.fn().mockImplementation((name, defaultValue) => {
-        if (name === 'auth.enableCaseInsensitivity') {
-          return true;
-        }
+        return name === 'auth.enableCaseInsensitivity';
       }),
       getNumber: jest.fn(),
       getObject: jest.fn(),

packages/amplify-category-custom/src/__tests__/commands/update.test.ts

@@ -8,7 +8,7 @@ jest.mock('../../walkthroughs/cloudformation-walkthrough');
 jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('@aws-amplify/amplify-prompts');
 
-let mockAmplifyMeta = {
+const mockAmplifyMeta = {
   custom: {
     mockcdkresourcename: {
       service: CDK_SERVICE_NAME,

packages/amplify-category-custom/src/__tests__/walkthroughts/cdk-walkthrough.test.ts

@@ -22,7 +22,7 @@ pathManager.getBackendDirPath = jest.fn().mockReturnValue('mockTargetDir');
 (JSONUtilities.writeJson = jest.fn()), (JSONUtilities.readJson = jest.fn());
 
 const buildCustomResources_mock = buildCustomResources as jest.MockedFunction<typeof buildCustomResources>;
-let customResourceNameQuestion_mock = customResourceNameQuestion as jest.MockedFunction<typeof customResourceNameQuestion>;
+const customResourceNameQuestion_mock = customResourceNameQuestion as jest.MockedFunction<typeof customResourceNameQuestion>;
 customResourceNameQuestion_mock.mockResolvedValue('customresoourcename');
 
 describe('addCDKWalkthrough scenarios', () => {

packages/amplify-category-custom/src/__tests__/walkthroughts/cloudformation-walkthrough.test.ts

@@ -19,7 +19,7 @@ jest.mock('fs-extra', () => ({
 
 pathManager.getBackendDirPath = jest.fn().mockReturnValue('mockTargetDir');
 
-let customResourceNameQuestion_mock = customResourceNameQuestion as jest.MockedFunction<typeof customResourceNameQuestion>;
+const customResourceNameQuestion_mock = customResourceNameQuestion as jest.MockedFunction<typeof customResourceNameQuestion>;
 customResourceNameQuestion_mock.mockResolvedValue('customresoourcename');
 
 describe('addCFNWalkthrough scenarios', () => {

packages/amplify-category-function/src/__tests__/provider-utils/awscloudformation/utils/lambda-layer-cloud-formation-template.test.ts

@@ -114,7 +114,7 @@ describe('test layer CFN generation functions', () => {
   });
 
   it('should generate the expected CFN for an existing LL version and new version with complex permissions', () => {
-    let permissions: LayerPermission[] = [
+    const permissions: LayerPermission[] = [
       { type: PermissionEnum.Private },
       { type: PermissionEnum.AwsAccounts, accounts: ['123456789012', '098765432112'] },
       { type: PermissionEnum.AwsOrg, orgs: ['o-123456789012', 'o-098765432112'] },
@@ -129,7 +129,7 @@ describe('test layer CFN generation functions', () => {
 
   it('should generate the expected CFN for an existing LL version and new version with public permission', () => {
     // Public should override other permissions
-    let permissions: LayerPermission[] = [
+    const permissions: LayerPermission[] = [
       { type: PermissionEnum.Private },
       { type: PermissionEnum.AwsAccounts, accounts: ['123456789012', '098765432112'] },
       { type: PermissionEnum.AwsOrg, orgs: ['o-123456789012', 'o-098765432112'] },

packages/amplify-category-hosting/__tests__/index.test.js

@@ -32,8 +32,8 @@ describe('index', () => {
   const ANOTHERSERVICE = 'AnotherHostingService';
 
   const mockAvailableServices = [];
-  let mockDisabledServices = [];
-  let mockEnabledServices = [];
+  const mockDisabledServices = [];
+  const mockEnabledServices = [];
 
   const mockAnswers = {
     selectedServices: [],

packages/amplify-category-storage/src/__tests__/provider-utils/awscloudformation/service-walkthroughs/dynamoDb-walkthrough.test.ts

@@ -141,7 +141,7 @@ describe('update ddb walkthrough tests', () => {
   });
 
   it('updateWalkthrough() test to add gsi', async () => {
-    let mockAmplifyMeta = {
+    const mockAmplifyMeta = {
       storage: {
         mockresourcename: {
           service: 'DynamoDB',

packages/amplify-category-storage/src/__tests__/provider-utils/awscloudformation/service-walkthroughs/s3-walkthrough.test.ts

@@ -94,7 +94,7 @@ describe('add s3 walkthrough tests', () => {
 
     stateManager.getMeta = jest.fn().mockReturnValue(S3MockDataBuilder.mockAmplifyMeta);
 
-    let options = {};
+    const options = {};
     const returnedResourcename = await addWalkthrough(mockContext, S3MockDataBuilder.mockFilePath, mockContext, options);
 
     expect(returnedResourcename).toEqual(S3MockDataBuilder.mockResourceName);
@@ -126,7 +126,7 @@ describe('add s3 walkthrough tests', () => {
 
     stateManager.getMeta = jest.fn().mockReturnValue(S3MockDataBuilder.mockAmplifyMeta);
 
-    let options = {};
+    const options = {};
     const returnedResourcename = await addWalkthrough(mockContext, S3MockDataBuilder.mockFilePath, mockContext, options);
 
     expect(returnedResourcename).toEqual(S3MockDataBuilder.mockResourceName);
@@ -160,7 +160,7 @@ describe('add s3 walkthrough tests', () => {
 
     stateManager.getMeta = jest.fn().mockReturnValue(S3MockDataBuilder.mockAmplifyMeta);
 
-    let options = {};
+    const options = {};
     const returnedResourcename = await addWalkthrough(mockContext, S3MockDataBuilder.mockFilePath, mockContext, options);
 
     expect(returnedResourcename).toEqual(S3MockDataBuilder.mockResourceName);
@@ -202,7 +202,7 @@ describe('add s3 walkthrough tests', () => {
 
     stateManager.getMeta = jest.fn().mockReturnValue(S3MockDataBuilder.mockAmplifyMeta);
 
-    let options = {};
+    const options = {};
     const returnedResourcename = await addWalkthrough(mockContext, S3MockDataBuilder.mockFilePath, mockContext, options);
 
     expect(returnedResourcename).toEqual(S3MockDataBuilder.mockResourceName);

packages/amplify-cli-core/src/__tests__/help.test.ts

@@ -148,42 +148,42 @@ describe('amplify help functions: ', () => {
   ];
 
   it('lookup valid command (init) and expect not null', () => {
-    let initCommandInfo = lookUpCommand(mockCommandsInfo, 'init');
+    const initCommandInfo = lookUpCommand(mockCommandsInfo, 'init');
     expect(initCommandInfo).not.toBeUndefined();
   });
 
   it('lookup invalid command and expect null', () => {
-    let invalidCommandInfo = lookUpCommand(mockCommandsInfo, 'invalidcommand');
+    const invalidCommandInfo = lookUpCommand(mockCommandsInfo, 'invalidcommand');
     expect(invalidCommandInfo).toBeUndefined();
   });
 
   it('lookup valid command (init) and expect correct command name', () => {
-    let initCommandInfo = lookUpCommand(mockCommandsInfo, 'init');
+    const initCommandInfo = lookUpCommand(mockCommandsInfo, 'init');
     expect(initCommandInfo!.command).toBe('init');
   });
 
   it('lookup valid command (configure) and expect correct command name', () => {
-    let initCommandInfo = lookUpCommand(mockCommandsInfo, 'configure');
+    const initCommandInfo = lookUpCommand(mockCommandsInfo, 'configure');
     expect(initCommandInfo!.command).toBe('configure');
   });
 
   it('lookup valid subcommand (configure project) and expect not null', () => {
-    let configureProjectSubCommandInfo = lookUpSubcommand(mockCommandsInfo, 'configure', 'project');
+    const configureProjectSubCommandInfo = lookUpSubcommand(mockCommandsInfo, 'configure', 'project');
     expect(configureProjectSubCommandInfo).not.toBeUndefined();
   });
 
   it('lookup invalid subcommand and expect null', () => {
-    let invalidSubCommandInfo = lookUpSubcommand(mockCommandsInfo, 'invalidcommand', 'invalidsubcommand');
+    const invalidSubCommandInfo = lookUpSubcommand(mockCommandsInfo, 'invalidcommand', 'invalidsubcommand');
     expect(invalidSubCommandInfo).toBeUndefined();
   });
 
   it('lookup valid subcommand (configure project) and expect correct subcommand name', () => {
-    let configureProjectSubCommandInfo = lookUpSubcommand(mockCommandsInfo, 'configure', 'project');
+    const configureProjectSubCommandInfo = lookUpSubcommand(mockCommandsInfo, 'configure', 'project');
     expect(configureProjectSubCommandInfo!.subCommand).toBe('project');
   });
 
   it('lookup valid subcommand (configure hosting) correct subcommand name', () => {
-    let configureHostingSubCommandInfo = lookUpSubcommand(mockCommandsInfo, 'configure', 'hosting');
+    const configureHostingSubCommandInfo = lookUpSubcommand(mockCommandsInfo, 'configure', 'hosting');
     expect(configureHostingSubCommandInfo!.subCommand).toBe('hosting');
   });
 
@@ -195,7 +195,7 @@ describe('amplify help functions: ', () => {
       plugin: 'core',
       subCommands: ['configure'],
     };
-    let specifiedCommands = parseHelpCommands(configureInput, mockCommandsInfo);
+    const specifiedCommands = parseHelpCommands(configureInput, mockCommandsInfo);
     expect(specifiedCommands.command).toBe('configure');
     expect(specifiedCommands.subCommand).toBe('');
   });
@@ -208,14 +208,13 @@ describe('amplify help functions: ', () => {
       options: { help: true, yes: false },
       subCommands: ['mock', 'function'],
     };
-    let specifiedCommands = parseHelpCommands(mockFunctionInput, mockCommandsInfo);
+    const specifiedCommands = parseHelpCommands(mockFunctionInput, mockCommandsInfo);
     expect(specifiedCommands.command).toBe('mock');
     expect(specifiedCommands.subCommand).toBe('function');
   });
 
   it('run help invalid command', () => {
-    let mockContext: $TSContext;
-    mockContext = {
+    const mockContext = {
       input: {
         argv: ['node', 'amplify', 'invalid', 'command', '-h'],
         command: 'help',
@@ -230,9 +229,7 @@ describe('amplify help functions: ', () => {
   });
 
   it('run help command (mock)', () => {
-    let mockContext: $TSContext;
-
-    mockContext = {
+    const mockContext = {
       print: {
         info: jest.fn(),
       },
@@ -249,9 +246,7 @@ describe('amplify help functions: ', () => {
   });
 
   it('run help subcommand (mock function)', () => {
-    let mockContext: $TSContext;
-
-    mockContext = {
+    const mockContext = {
       print: {
         info: jest.fn(),
       },

packages/amplify-cli-core/src/__tests__/hooks/hooksExecutor.test.ts

@@ -43,6 +43,7 @@ jest.mock('which', () => ({
     if (runtimeName === 'python3') return pathToPython3Runtime;
     if (runtimeName === 'python') return pathToPythonRuntime;
     if (runtimeName === 'node') return pathToNodeRuntime;
+    throw new Error('unknown runtime');
   }),
 }));
 jest.mock('fs-extra', () => {

packages/amplify-cli/src/__tests__/commands/uninstall.pkg.test.ts

@@ -13,7 +13,7 @@ execa_mock.command.mockResolvedValue({} as any);
 jest.mock('fs-extra');
 const fs_mock = fs as jest.Mocked<typeof fs>;
 
-let userConfirmation = true;
+const userConfirmation = true;
 const context_stub = {
   amplify: {
     confirmPrompt: async () => userConfirmation,

packages/amplify-console-integration-tests/__tests__/consoleHosting.test.ts

@@ -42,18 +42,14 @@ describe('amplify console add hosting', () => {
 
   // Manual tests
   it('add / publish / configure/ serve /remove hosting for manual deployment should succeed', async () => {
-    try {
-      await addManualHosting(projRoot);
-      expect(fs.existsSync(path.join(projRoot, 'amplify', 'backend', 'hosting', 'amplifyhosting'))).toBe(true);
-      const type = loadTypeFromTeamProviderInfo(projRoot, ORIGINAL_ENV);
-      expect(type).toBe(TYPE_MANUAL);
-      npmInstall(projRoot);
-      await amplifyPublish(projRoot);
-      await removeHosting(projRoot);
-      await amplifyPush(projRoot);
-    } catch (err) {
-      throw err;
-    }
+    await addManualHosting(projRoot);
+    expect(fs.existsSync(path.join(projRoot, 'amplify', 'backend', 'hosting', 'amplifyhosting'))).toBe(true);
+    const type = loadTypeFromTeamProviderInfo(projRoot, ORIGINAL_ENV);
+    expect(type).toBe(TYPE_MANUAL);
+    npmInstall(projRoot);
+    await amplifyPublish(projRoot);
+    await removeHosting(projRoot);
+    await amplifyPush(projRoot);
   });
 
   it('when hosting is enabled, add new env should be able to deploy frontend successfully', async () => {

packages/amplify-console-integration-tests/__tests__/pullAndInit.test.ts

@@ -134,7 +134,7 @@ describe('amplify console build', () => {
     const originalProjectDirPath = await util.createNewProjectDir('console-original');
     await headlessInit(originalProjectDirPath, amplifyParam, providersParam, codegenParam);
     expect(checkAmplifyFolderStructure(originalProjectDirPath)).toBeTruthy();
-    let originalTeamProviderInfo = getTeamProviderInfo(originalProjectDirPath);
+    const originalTeamProviderInfo = getTeamProviderInfo(originalProjectDirPath);
     expect(originalTeamProviderInfo).toBeDefined();
     expect(originalTeamProviderInfo['devteama']).toBeDefined();
 
@@ -153,7 +153,7 @@ describe('amplify console build', () => {
     };
     await headlessInit(clonedProjectDirPath, amplifyParam, providersParam, codegenParam);
     expect(checkAmplifyFolderStructure(clonedProjectDirPath)).toBeTruthy();
-    let clonedTeamProviderInfo = getTeamProviderInfo(clonedProjectDirPath);
+    const clonedTeamProviderInfo = getTeamProviderInfo(clonedProjectDirPath);
     expect(clonedTeamProviderInfo).toBeDefined();
     expect(clonedTeamProviderInfo['devteamb']).toBeDefined();
 

packages/amplify-e2e-core/failed-test-reporter.js

@@ -20,7 +20,7 @@ class FailedTestNameReporter {
   getFailedTestRegEx(results) {
     let failedTestNames = [];
     if (results.testResults) {
-      for (let result of results.testResults) {
+      for (const result of results.testResults) {
         failedTestNames = [...failedTestNames, ...this.getFailedTestRegEx(result)];
       }
     } else if (results.status === 'failed') {

packages/amplify-e2e-core/src/nexpect-reporter.js

@@ -96,8 +96,8 @@ class AmplifyCLIExecutionReporter {
                 }),
               );
             }
-            let sanitizedSections = [];
-            for (let section of commandAndParams) {
+            const sanitizedSections = [];
+            for (const section of commandAndParams) {
               // this ensures only alphanumeric values are in the file name
               sanitizedSections.push(section.replace(/[^a-z0-9]/gi, '_').toLowerCase());
             }

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

@@ -3,7 +3,7 @@ const awsS3Client = new AWS.S3();
 const bucketEnvVar = '{{bucketEnvVar}}'; // This value is replaced from test
 
 exports.handler = async () => {
-  let listObjects = await awsS3Client
+  const listObjects = await awsS3Client
     .listObjectsV2({
       Bucket: process.env[bucketEnvVar],
     })

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

@@ -105,7 +105,7 @@ describe('auth import identity pool and userpool', () => {
     await initJSProjectWithProfile(projectRoot, projectSettings);
     await importIdentityPoolAndUserPool(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
 
-    let projectDetails = getAuthProjectDetails(projectRoot);
+    const projectDetails = getAuthProjectDetails(projectRoot);
 
     expectAuthProjectDetailsMatch(projectDetails, ogProjectDetails);