Consolidate types headless (#8698)

* fix: consolidate types and auto migrate

* fix: changed package name to extensiblity

* fix: address comments

.eslintrc.js

@@ -323,7 +323,7 @@ module.exports = {
     '/packages/amplify-graphql-*transformer*/lib',
     '/packages/amplify-provider-awscloudformation/lib',
     '/packages/amplify-console-integration-tests/lib',
-    '/packages/amplify-cli-overrides-helper/lib',
+    '/packages/amplify-cli-extensibility-helper/lib',
     '/packages/amplify-category-auth/resources/auth-custom-resource',
     '/packages/amplify-category-custom/lib',
     '/packages/amplify-category-custom/resources',

.gitignore

@@ -69,5 +69,5 @@ packages/**/reports/junit/*
 test.out.log
 *.tsbuildinfo
 packages/amplify-graphiql-explorer/.eslintcache
-packages/amplify-cli-overrides-helper/lib
+packages/amplify-cli-extensibility-helper/lib
 

packages/amplify-category-auth/package.json

@@ -43,7 +43,8 @@
     "ora": "^4.0.3",
     "promise-sequential": "^1.1.1",
     "uuid": "^3.4.0",
-    "vm2": "^3.9.3"
+    "vm2": "^3.9.3",
+    "@aws-amplify/cli-extensibility-helper": "1.0.0"
   },
   "devDependencies": {
     "rimraf": "^3.0.2"

packages/amplify-category-auth/resources/overrides-resource/override.ts

@@ -1,3 +1,3 @@
-import { AmplifyAuthCognitoStackTemplate } from '@aws-amplify/cli-overrides-helper';
+import { AmplifyAuthCognitoStackTemplate } from '@aws-amplify/cli-extensibility-helper';
 
 export function override(resources: AmplifyAuthCognitoStackTemplate) {}

packages/amplify-category-auth/resources/overrides-resource/package.json

@@ -8,7 +8,7 @@
       "test": "echo \"Error: no test specified\" && exit 1"
     },
     "dependencies": {
-      "@aws-amplify/cli-overrides-helper": "1.1.0-ext11.0"
+      "@aws-amplify/cli-extensibility-helper": "1.1.0-ext15.0"
     },
     "devDependencies": {
       "typescript": "^4.2.4"

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

@@ -85,6 +85,9 @@ describe('auth update: ', () => {
     usageData: {
       emitError: jest.fn(),
     },
+    input: {
+      options: {},
+    },
   } as unknown as $TSContext;
   const dependencies = ['analytics', 'api', 'function', 'storage'];
 

packages/amplify-category-auth/src/index.js

@@ -24,8 +24,6 @@ const { AuthParameters } = require('./provider-utils/awscloudformation/import/ty
 const { getSupportedServices } = require('./provider-utils/supported-services');
 const { generateAuthStackTemplate } = require('./provider-utils/awscloudformation/utils/generate-auth-stack-template');
 const { AmplifyAuthTransform, AmplifyUserPoolGroupTransform } = require('./provider-utils/awscloudformation/auth-stack-builder');
-const { AmplifyAuthCognitoStackTemplate } = require('./provider-utils/awscloudformation/auth-stack-builder/types');
-
 const {
   doesConfigurationIncludeSMS,
   loadResourceParameters,
@@ -534,5 +532,4 @@ module.exports = {
   AmplifyAuthTransform,
   AmplifyUserPoolGroupTransform,
   transformCategoryStack,
-  AmplifyAuthCognitoStackTemplate,
 };

packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts

@@ -3,7 +3,7 @@ import * as s3 from '@aws-cdk/aws-s3';
 import * as iam from '@aws-cdk/aws-iam';
 import * as cognito from '@aws-cdk/aws-cognito';
 import * as lambda from '@aws-cdk/aws-lambda';
-import { AmplifyAuthCognitoStackTemplate } from './types';
+import { AmplifyAuthCognitoStackTemplate } from '@aws-amplify/cli-extensibility-helper';
 import { CognitoStackOptions } from '../service-walkthrough-types/cognito-user-input-types';
 import _ from 'lodash';
 import {

packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-user-pool-group-stack-builder.ts

@@ -2,7 +2,7 @@ import * as cdk from '@aws-cdk/core';
 import * as iam from '@aws-cdk/aws-iam';
 import * as lambda from '@aws-cdk/aws-lambda';
 import { CfnUserPoolGroup } from '@aws-cdk/aws-cognito';
-import { AmplifyUserPoolGroupStackTemplate } from './types';
+import { AmplifyUserPoolGroupStackTemplate } from '@aws-amplify/cli-extensibility-helper';
 import { AmplifyUserPoolGroupStackOptions } from './user-pool-group-stack-transform';
 import { AmplifyStackTemplate } from 'amplify-cli-core';
 import * as fs from 'fs-extra';

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

@@ -2,4 +2,3 @@ export { AmplifyAuthCognitoStack } from './auth-cognito-stack-builder';
 export { AmplifyAuthTransform } from './auth-stack-transform';
 export { AmplifyUserPoolGroupStack } from './auth-user-pool-group-stack-builder';
 export { AmplifyUserPoolGroupTransform } from './user-pool-group-stack-transform';
-export { AmplifyAuthCognitoStackTemplate, AmplifyUserPoolGroupStackTemplate } from './types';

packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/migrate-override-resource.ts

@@ -18,7 +18,7 @@ import {
 } from '../service-walkthrough-types/awsCognito-user-input-types';
 
 export const migrateResourceToSupportOverride = async (resourceName: string) => {
-  printer.info('Starting Migration Process');
+  printer.debug('Starting Migration Process');
   /**
    * backup resource folder
    * get parameters.json
@@ -48,7 +48,7 @@ export const migrateResourceToSupportOverride = async (resourceName: string) =>
     const cliInputs = mapParametersJsonToCliInputs(parameters!);
     const cliInputsPath = path.join(authresourceDirPath, 'cli-inputs.json');
     JSONUtilities.writeJson(cliInputsPath, cliInputs);
-    printer.success('Migration is Successful');
+    printer.debug('Migration is Successful');
   } catch (e) {
     printer.error('There was an error migrating your project.');
     rollback(authresourceDirPath, backupAuthResourceFolder!);

packages/amplify-category-storage/package.json

@@ -41,7 +41,8 @@
     "lodash": "^4.17.21",
     "promise-sequential": "^1.1.1",
     "uuid": "^8.3.2",
-    "vm2": "^3.9.3"
+    "vm2": "^3.9.3",
+    "@aws-amplify/cli-extensibility-helper": "1.0.0"
   },
   "devDependencies": {
     "aws-sdk": "^2.963.0",

packages/amplify-category-storage/resources/overrides-resource/DynamoDB/override.ts

@@ -1,3 +1,3 @@
-import { AmplifyDDBResourceTemplate } from '@aws-amplify/cli-overrides-helper';
+import { AmplifyDDBResourceTemplate } from '@aws-amplify/cli-extensibility-helper';
 
 export function override(resources: AmplifyDDBResourceTemplate) {}

packages/amplify-category-storage/resources/overrides-resource/DynamoDB/package.json

@@ -8,7 +8,7 @@
       "test": "echo \"Error: no test specified\" && exit 1"
     },
     "dependencies": {
-      "@aws-amplify/cli-overrides-helper": "1.1.0-ext11.0"
+      "@aws-amplify/cli-extensibility-helper": "1.1.0-ext15.0"
 
     },
     "devDependencies": {

packages/amplify-category-storage/resources/overrides-resource/S3/override.ts

@@ -1,3 +1,3 @@
-import { AmplifyS3ResourceTemplate } from '@aws-amplify/cli-overrides-helper';
+import { AmplifyS3ResourceTemplate } from '@aws-amplify/cli-extensibility-helper';
 
 export function override(resources: AmplifyS3ResourceTemplate) {}

packages/amplify-category-storage/resources/overrides-resource/S3/package.json

@@ -8,7 +8,7 @@
       "test": "echo \"Error: no test specified\" && exit 1"
     },
     "dependencies": {
-      "@aws-amplify/cli-overrides-helper": "1.1.0-ext11.0"
+      "@aws-amplify/cli-extensibility-helper": "1.1.0-ext15.0"
     },
     "devDependencies": {
       "typescript": "^4.2.4"

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

@@ -27,6 +27,9 @@ describe('add ddb walkthrough tests', () => {
           };
         },
       },
+      input: {
+        options: {},
+      },
     } as unknown as $TSContext;
   });
 
@@ -126,6 +129,9 @@ describe('update ddb walkthrough tests', () => {
           };
         },
       },
+      input: {
+        options: {},
+      },
     } as unknown as $TSContext;
   });