Root stack fix (#8717)

* fix: disable root stack update check * fix: root stack hash and helper package versions
aws-amplify · Nov 11, 2021 · 5063651 · 5063651
1 parent a0a657c
commit 5063651
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
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-ext15.0"
+      "@aws-amplify/cli-extensibility-helper": "1.0.1-ext15.0"
     },
     "devDependencies": {
       "typescript": "^4.2.4"

diff --git a/...rc/provider-utils/awscloudformation/auth-stack-builder/user-pool-group-stack-transform.ts b/...rc/provider-utils/awscloudformation/auth-stack-builder/user-pool-group-stack-transform.ts
@@ -237,7 +237,7 @@ export class AmplifyUserPoolGroupTransform extends AmplifyCategoryTransform {
       'build',
       cognitoStackFileName,
     );
-    writeCFNTemplate(template, cognitostackFilePath, {
+    await writeCFNTemplate(template, cognitostackFilePath, {
       templateFormat: CFNTemplateFormat.JSON,
     });
     // write parameters.json file

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-ext15.0"
+      "@aws-amplify/cli-extensibility-helper": "1.0.1-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-ext15.0"
+      "@aws-amplify/cli-extensibility-helper": "1.0.1-ext15.0"
     },
     "devDependencies": {
       "typescript": "^4.2.4"

diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/root-stack-status.ts b/packages/amplify-cli/src/extensions/amplify-helpers/root-stack-status.ts
@@ -2,6 +2,7 @@ import { pathManager } from 'amplify-cli-core';
 import { rootStackFileName } from 'amplify-provider-awscloudformation';
 import { hashElement, HashElementOptions } from 'folder-hash';
 import * as fs from 'fs-extra';
+import * as path from 'path';
 
 export function getHashForRootStack(dirPath, files?: string[]) {
   const options: HashElementOptions = {
@@ -19,10 +20,10 @@ export async function isRootStackModifiedSinceLastPush(hashFunction): Promise<bo
     const localBackendDir = pathManager.getRootStackBuildDirPath(projectPath!);
     const cloudBackendDir = pathManager.getCurrentCloudRootStackDirPath(projectPath!);
     if (fs.existsSync(localBackendDir)) {
-      const localDirHash = await hashFunction(localBackendDir, ['*.json']);
+      const localCfnBuffer = fs.readFileSync(path.join(localBackendDir, rootStackFileName));
       if (fs.existsSync(cloudBackendDir)) {
-        const cloudDirHash = await hashFunction(cloudBackendDir, ['*.json']);
-        return localDirHash !== cloudDirHash;
+        const cloudCfnBuffer = fs.readFileSync(path.join(cloudBackendDir, rootStackFileName));
+        return !localCfnBuffer.equals(cloudCfnBuffer);
       } else {
         return true;
       }

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-ext15.0"
+      "@aws-amplify/cli-extensibility-helper": "1.0.1-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
@@ -65,7 +65,7 @@ export class AmplifyRootStackTransform {
         sandbox: {},
       });
       try {
-        sandboxNode.run(overrideCode).overrideProps(this._rootTemplateObj);
+        sandboxNode.run(overrideCode).override(this._rootTemplateObj);
       } catch (err: $TSAny) {
         const error = new Error(`Skipping override due to ${err}${os.EOL}`);
         printer.error(`${error}`);
@@ -199,7 +199,7 @@ export class AmplifyRootStackTransform {
     const rootStackFileName = `root-cloudformation-stack.json`;
     const rootstackFilePath = path.join(pathManager.getBackendDirPath(), this._resourceName, 'build', rootStackFileName);
     // write CFN template
-    writeCFNTemplate(template, rootstackFilePath, {
+    await writeCFNTemplate(template, rootstackFilePath, {
       templateFormat: CFNTemplateFormat.JSON,
     });
   };