Revert "chore: cleanup stale resources in CodeBuild (#12779)" (#12853)

This reverts commit de98654.

codebuild_specs/cleanup_resources.yml

@@ -4,9 +4,4 @@ env:
 phases:
   build:
     commands:
-      - cd ./scripts
-      - npm install -g ts-node
-      - npm install aws-sdk
-      - ts-node ./wait-for-all-codebuild.ts $CODEBUILD_RESOLVED_SOURCE_VERSION ../$WAIT_FOR_IDS_FILE_PATH AmplifyCLI-E2E-Testing
-      - cd ..
-      - source ./shared-scripts.sh && _cleanUpResources
+      - echo cleanup running

codebuild_specs/e2e_workflow.yml

@@ -149,11 +149,3 @@ batch:
       debug-session: true
       depend-on:
         - upload_pkg_binaries
-    - identifier: cleanup_resources
-      buildspec: codebuild_specs/cleanup_resources.yml
-      env:
-        compute-type: BUILD_GENERAL1_LARGE
-        variables:
-          WAIT_FOR_IDS_FILE_PATH: ./codebuild_specs/wait_for_ids_local.json
-      depend-on:
-        - upload_pkg_binaries

packages/amplify-e2e-core/src/cli-test-environment.js

@@ -29,7 +29,7 @@ class CLIEnvironment extends NodeEnvironment {
       return this.testName;
     };
 
-    this.global.getDescribeBlocks = () => {
+    this.global.getDescibeBlocks = () => {
       return this.describeBlocks.filter((b) => b !== 'ROOT_DESCRIBE_BLOCK');
     };
 

packages/amplify-e2e-core/src/init/initProjectHelper.ts

@@ -3,7 +3,7 @@
 /* eslint-disable func-style */
 import { EOL } from 'os';
 import { v4 as uuid } from 'uuid';
-import { nspawn as spawn, getCLIPath, singleSelect, addCICleanupTags } from '..';
+import { nspawn as spawn, getCLIPath, singleSelect, addCircleCITags } from '..';
 import { KEY_DOWN_ARROW } from '../utils';
 import { amplifyRegions } from '../configure';
 
@@ -39,7 +39,7 @@ export function initJSProjectWithProfile(cwd: string, settings?: Partial<typeof
     };
   }
 
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   const cliArgs = ['init'];
   const providerConfigSpecified = !!s.providerConfig && typeof s.providerConfig === 'object';
@@ -98,7 +98,7 @@ export function initJSProjectWithProfile(cwd: string, settings?: Partial<typeof
 export function initAndroidProjectWithProfile(cwd: string, settings: Partial<typeof defaultSettings>): Promise<void> {
   const s = { ...defaultSettings, ...settings };
 
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   let env;
 
@@ -135,7 +135,7 @@ export function initAndroidProjectWithProfile(cwd: string, settings: Partial<typ
       .wait(/Try "amplify add api" to create a backend API and then "amplify (push|publish)" to deploy everything/)
       .run((err: Error) => {
         if (!err) {
-          addCICleanupTags(cwd);
+          addCircleCITags(cwd);
 
           resolve();
         } else {
@@ -154,7 +154,7 @@ export function createRandomName(): string {
 export function initIosProjectWithProfile(cwd: string, settings: Record<string, unknown>): Promise<void> {
   const s = { ...defaultSettings, ...settings };
 
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   let env;
 
@@ -189,7 +189,7 @@ export function initIosProjectWithProfile(cwd: string, settings: Record<string,
       .wait(/Try "amplify add api" to create a backend API and then "amplify (push|publish)" to deploy everything/)
       .run((err: Error) => {
         if (!err) {
-          addCICleanupTags(cwd);
+          addCircleCITags(cwd);
 
           resolve();
         } else {
@@ -202,7 +202,7 @@ export function initIosProjectWithProfile(cwd: string, settings: Record<string,
 export function initFlutterProjectWithProfile(cwd: string, settings: Record<string, unknown>): Promise<void> {
   const s = { ...defaultSettings, ...settings };
 
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   return new Promise((resolve, reject) => {
     const chain = spawn(getCLIPath(), ['init'], { cwd, stripColors: true })
@@ -245,7 +245,7 @@ export function initProjectWithAccessKey(
 ): Promise<void> {
   const s = { ...defaultSettings, ...settings };
 
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   return new Promise((resolve, reject) => {
     const chain = spawn(getCLIPath(), ['init'], {
@@ -303,7 +303,7 @@ export function initProjectWithAccessKey(
 }
 
 export function initNewEnvWithAccessKey(cwd: string, s: { envName: string; accessKeyId: string; secretAccessKey: string }): Promise<void> {
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   return new Promise((resolve, reject) => {
     const chain = spawn(getCLIPath(), ['init'], {
@@ -341,7 +341,7 @@ export function initNewEnvWithAccessKey(cwd: string, s: { envName: string; acces
 }
 
 export function initNewEnvWithProfile(cwd: string, s: { envName: string }): Promise<void> {
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   return new Promise((resolve, reject) => {
     spawn(getCLIPath(), ['init'], {
@@ -372,7 +372,7 @@ export function initNewEnvWithProfile(cwd: string, s: { envName: string }): Prom
 }
 
 export function updatedInitNewEnvWithProfile(cwd: string, s: { envName: string }): Promise<void> {
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   return new Promise((resolve, reject) => {
     spawn(getCLIPath(), ['init'], {
@@ -409,7 +409,7 @@ export function amplifyInitSandbox(cwd: string, settings: Record<string, unknown
     };
   }
 
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   return new Promise((resolve, reject) => {
     spawn(getCLIPath(), ['init'], { cwd, stripColors: true, env })

packages/amplify-e2e-core/src/utils/add-circleci-tags.ts

@@ -0,0 +1,55 @@
+import { stateManager } from '@aws-amplify/amplify-cli-core';
+
+declare global {
+  /* eslint-disable @typescript-eslint/no-namespace */
+  namespace NodeJS {
+    interface Global {
+      getTestName?: () => string;
+      getHookName?: () => string;
+      getDescibeBlocks?: () => string[];
+    }
+  }
+  /* eslint-enable */
+}
+
+export const addCircleCITags = (projectPath: string): void => {
+  if (process.env && process.env['CIRCLECI']) {
+    const tags = stateManager.getProjectTags(projectPath);
+
+    const addTagIfNotExist = (key: string, value: string): void => {
+      if (!tags.find((t) => t.Key === key)) {
+        tags.push({
+          Key: key,
+          Value: value,
+        });
+      }
+    };
+
+    addTagIfNotExist('circleci', sanitizeTagValue(process.env['CIRCLECI'] || 'N/A'));
+    addTagIfNotExist('circleci:branch', sanitizeTagValue(process.env['CIRCLE_BRANCH'] || 'N/A'));
+    addTagIfNotExist('circleci:sha1', sanitizeTagValue(process.env['CIRCLE_SHA1'] || 'N/A'));
+    addTagIfNotExist('circleci:workflow_id', sanitizeTagValue(process.env['CIRCLE_WORKFLOW_ID'] || 'N/A'));
+    addTagIfNotExist('circleci:build_id', sanitizeTagValue(process.env['CIRCLE_BUILD_NUM'] || 'N/A'));
+    addTagIfNotExist('circleci:build_url', sanitizeTagValue(process.env['CIRCLE_BUILD_URL'] || 'N/A'));
+    addTagIfNotExist('circleci:job', sanitizeTagValue(process.env['CIRCLE_JOB'] || 'N/A'));
+    addTagIfNotExist('circleci:create_time', new Date().toISOString());
+    // exposed by custom CLI test environment
+    if (global.getTestName) {
+      addTagIfNotExist('jest:test_name', sanitizeTagValue(global.getTestName().substr(0, 255) || 'N/A'));
+    }
+    if (global.getHookName) {
+      addTagIfNotExist('jest:hook_name', sanitizeTagValue(global.getHookName().substr(0, 255) || 'N/A'));
+    }
+    if (global.getDescibeBlocks) {
+      global.getDescibeBlocks().forEach((blockName, i) => {
+        addTagIfNotExist(`jest:describe_${i + 1}`, sanitizeTagValue(blockName.substr(0, 255) || 'N/A'));
+      });
+    }
+
+    stateManager.setProjectFileTags(projectPath, tags);
+  }
+};
+
+export function sanitizeTagValue(value: string): string {
+  return value.replace(/[^ a-z0-9_.:/=+\-@]/gi, '');
+}

packages/amplify-e2e-core/src/utils/index.ts

@@ -7,7 +7,7 @@ import execa from 'execa';
 import { v4 as uuid } from 'uuid';
 import { getLayerDirectoryName, LayerDirectoryType } from '..';
 
-export * from './add-ci-cleanup-tags';
+export * from './add-circleci-tags';
 export * from './api';
 export * from './appsync';
 export * from './envVars';

packages/amplify-e2e-core/src/utils/pinpoint.ts

@@ -1,7 +1,7 @@
 import { Pinpoint } from 'aws-sdk';
 import _ from 'lodash';
 import { EOL } from 'os';
-import { getCLIPath, nspawn as spawn, singleSelect, amplifyRegions, addCICleanupTags, KEY_DOWN_ARROW } from '..';
+import { getCLIPath, nspawn as spawn, singleSelect, amplifyRegions, addCircleCITags, KEY_DOWN_ARROW } from '..';
 
 const settings = {
   name: EOL,
@@ -57,7 +57,7 @@ export async function pinpointAppExist(pinpointProjectId: string, region: string
  * initializes a project to test pinpoint
  */
 export function initProjectForPinpoint(cwd: string): Promise<void> {
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   return new Promise((resolve, reject) => {
     const chain = spawn(getCLIPath(), ['init'], {

packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts

@@ -149,7 +149,7 @@ const STALE_DURATION_MS = 2 * 60 * 60 * 1000; // 2 hours in milliseconds
  */
 const handleExpiredTokenException = (): void => {
   console.log('Token expired. Exiting...');
-  process.exit(1);
+  process.exit();
 };
 
 /**

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

@@ -1,5 +1,5 @@
 import path from 'path';
-import { nspawn as spawn, getCLIPath, singleSelect, amplifyRegions, addCICleanupTags, KEY_DOWN_ARROW } from '@aws-amplify/amplify-e2e-core';
+import { nspawn as spawn, getCLIPath, singleSelect, amplifyRegions, addCircleCITags, KEY_DOWN_ARROW } from '@aws-amplify/amplify-e2e-core';
 import fs from 'fs-extra';
 import os from 'os';
 
@@ -41,7 +41,7 @@ export async function initWithoutCredentialFileAndNoNewUserSetup(projRoot) {
 }
 
 async function initWorkflow(cwd: string, settings: { accessKeyId: string; secretAccessKey: string; region: string }): Promise<void> {
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   return new Promise((resolve, reject) => {
     const chain = spawn(getCLIPath(), ['init'], {

packages/amplify-migration-tests/src/migration-helpers-v10/init.ts

@@ -1,4 +1,4 @@
-import { addCICleanupTags, getCLIPath, nspawn as spawn } from '@aws-amplify/amplify-e2e-core';
+import { addCircleCITags, getCLIPath, nspawn as spawn } from '@aws-amplify/amplify-e2e-core';
 import { EOL } from 'os';
 
 const defaultSettings = {
@@ -32,7 +32,7 @@ export function initJSProjectWithProfileV10(cwd: string, settings?: Partial<type
     };
   }
 
-  addCICleanupTags(cwd);
+  addCircleCITags(cwd);
 
   const cliArgs = ['init'];
   const providerConfigSpecified = !!s.providerConfig && typeof s.providerConfig === 'object';