fix: address comments

aws-amplify · Nov 7, 2021 · 019bb16 · 019bb16
1 parent 49abc16
commit 019bb16
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 39 deletions.
diff --git a/.../amplify-category-api/resources/awscloudformation/overrides-resource/Appsync/package.json b/.../amplify-category-api/resources/awscloudformation/overrides-resource/Appsync/package.json
diff --git a/packages/amplify-category-auth/resources/overrides-resource/package.json b/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-extensibility-helper": "1.1.0-ext11.0"
+      "@aws-amplify/cli-extensibility-helper": "1.1.0-ext15.0"
     },
     "devDependencies": {
       "typescript": "^4.2.4"

diff --git a/packages/amplify-category-storage/resources/overrides-resource/DynamoDB/package.json b/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-extensibility-helper": "1.1.0-ext11.0"
+      "@aws-amplify/cli-extensibility-helper": "1.1.0-ext15.0"
 
     },
     "devDependencies": {

diff --git a/packages/amplify-category-storage/resources/overrides-resource/S3/package.json b/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-extensibility-helper": "1.1.0-ext11.0"
+      "@aws-amplify/cli-extensibility-helper": "1.1.0-ext15.0"
     },
     "devDependencies": {
       "typescript": "^4.2.4"

diff --git a/packages/amplify-category-storage/src/index.ts b/packages/amplify-category-storage/src/index.ts
@@ -25,15 +25,7 @@ import {
   headlessRemoveStorage,
   headlessUpdateStorage,
 } from './provider-utils/awscloudformation/storage-configuration-helpers';
-export { AmplifyDDBResourceTemplate, AmplifyS3ResourceTemplate } from '@aws-amplify/cli-extensibility-helper';
 export { categoryName as category } from './constants';
-export { AmplifyDDBResourceTemplate, AmplifyS3ResourceTemplate } from './provider-utils/awscloudformation/cdk-stack-builder/types';
-import { getAllDefaults } from './provider-utils/awscloudformation/default-values/s3-defaults';
-import {
-  S3AccessType,
-  S3PermissionType,
-  S3UserInputs,
-} from './provider-utils/awscloudformation/service-walkthrough-types/s3-user-input-types';
 export {
   S3UserInputs,
   S3UserInputTriggerFunctionParams,
@@ -44,9 +36,9 @@ export {
   s3CreateStorageResource,
   s3GetResourceName,
   s3GetUserInput,
+  s3RegisterAdminTrigger,
   s3RemoveAdminLambdaTrigger,
   s3RemoveStorageLambdaTrigger,
-  s3RegisterAdminTrigger,
 } from './provider-utils/awscloudformation/service-walkthroughs/s3-resource-api';
 
 export async function s3GetBucketUserInputDefault(project: $TSAny, shortId: string, accessType: S3AccessType): Promise<S3UserInputs> {

diff --git a/packages/amplify-provider-awscloudformation/resources/overrides-resource/package.json b/packages/amplify-provider-awscloudformation/resources/overrides-resource/package.json
@@ -8,7 +8,7 @@
       "test": "echo \"Error: no test specified\" && exit 1"
     },
     "dependencies": {
-      "@aws-amplify/cli-extensibility-helper": "1.1.0-ext11.0"
+      "@aws-amplify/cli-extensibility-helper": "1.1.0-ext15.0"
     },
     "devDependencies": {
       "typescript": "^4.2.4"

diff --git a/packages/amplify-provider-awscloudformation/src/root-stack-builder/root-stack-transform.ts b/packages/amplify-provider-awscloudformation/src/root-stack-builder/root-stack-transform.ts
@@ -1,15 +1,14 @@
-import { AmplifyRootStackTemplate } from '@aws-amplify/cli-extensibility-helper';
-import { $TSContext, CFNTemplateFormat, Template, pathManager, writeCFNTemplate, buildOverrideDir, $TSAny } from 'amplify-cli-core';
-import { AmplifyRootStack, AmplifyRootStackOutputs } from './root-stack-builder';
-import { RootStackSythesizer } from './stack-synthesizer';
-import { App } from '@aws-cdk/core';
 import * as cdk from '@aws-cdk/core';
-import * as path from 'path';
+import { App } from '@aws-cdk/core';
+import { $TSAny, $TSContext, buildOverrideDir, CFNTemplateFormat, pathManager, Template, writeCFNTemplate } from 'amplify-cli-core';
 import * as amplifyPrinter from 'amplify-prompts';
+import { printer } from 'amplify-prompts';
 import * as fs from 'fs-extra';
 import os from 'os';
+import * as path from 'path';
 import * as vm from 'vm2';
-import { printer } from 'amplify-prompts';
+import { AmplifyRootStack, AmplifyRootStackOutputs } from './root-stack-builder';
+import { RootStackSythesizer } from './stack-synthesizer';
 
 export class AmplifyRootStackTransform {
   private app: App | undefined;