From 3c4616ac13800c3de68df3ea1da39adf22f96924 Mon Sep 17 00:00:00 2001
From: Akshay <akshayupadhyay3@gmail.com>
Date: Mon, 8 Nov 2021 14:47:54 -0800
Subject: [PATCH 1/2] fix: hooks + hosting e2e

---
 .../src/override-manager/index.ts                        | 3 ++-
 .../src/override-manager/transform-resource.ts           | 9 +++++++--
 .../src/push-resources.ts                                | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/amplify-provider-awscloudformation/src/override-manager/index.ts b/packages/amplify-provider-awscloudformation/src/override-manager/index.ts
index d69fa3dd4b2..a7a1354c362 100644
--- a/packages/amplify-provider-awscloudformation/src/override-manager/index.ts
+++ b/packages/amplify-provider-awscloudformation/src/override-manager/index.ts
@@ -6,7 +6,8 @@ export * from './transform-resource';
 export const transformRootStack = async (context: $TSContext): Promise<Template> => {
   try {
     const resourceName = 'awscloudformation';
-    return new AmplifyRootStackTransform(resourceName).transform(context);
+    const rootStack = new AmplifyRootStackTransform(resourceName);
+    return await rootStack.transform(context);
   } catch (error) {
     throw new Error(error);
   }
diff --git a/packages/amplify-provider-awscloudformation/src/override-manager/transform-resource.ts b/packages/amplify-provider-awscloudformation/src/override-manager/transform-resource.ts
index c369c4f1732..3f38933fb80 100644
--- a/packages/amplify-provider-awscloudformation/src/override-manager/transform-resource.ts
+++ b/packages/amplify-provider-awscloudformation/src/override-manager/transform-resource.ts
@@ -1,6 +1,11 @@
-import { $TSContext, FeatureFlags, IAmplifyResource } from 'amplify-cli-core';
+import { $TSContext, FeatureFlags, IAmplifyResource, JSONUtilities, pathManager } from 'amplify-cli-core';
 import { printer } from 'amplify-prompts';
 import { transformRootStack } from '.';
+import * as fs from 'fs-extra';
+import { prePushCfnTemplateModifier } from '../pre-push-cfn-processor/pre-push-cfn-modifier';
+import * as path from 'path';
+import { rootStackFileName } from '../push-resources';
+import { storeRootStackTemplate } from '../initializer';
 /**
  *
  * @param context
@@ -21,7 +26,7 @@ export async function transformResourceWithOverrides(context: $TSContext, resour
       }
     } else {
       if (FeatureFlags.getBoolean('overrides.project')) {
-        await transformRootStack(context);
+        storeRootStackTemplate(context);
       }
     }
   } catch (err) {
diff --git a/packages/amplify-provider-awscloudformation/src/push-resources.ts b/packages/amplify-provider-awscloudformation/src/push-resources.ts
index 5090fd4f9c5..06994d65aae 100644
--- a/packages/amplify-provider-awscloudformation/src/push-resources.ts
+++ b/packages/amplify-provider-awscloudformation/src/push-resources.ts
@@ -710,8 +710,8 @@ async function updateCloudFormationNestedStack(
   const backEndDir = pathManager.getBackendDirPath();
   const projectRoot = pathManager.findProjectRoot();
   const rootStackFilePath = path.join(pathManager.getRootStackBuildDirPath(projectRoot), rootStackFileName);
-  // deploy new nested stack to disk
-  JSONUtilities.writeJson(rootStackFilePath, nestedStack);
+  // deploy preprocess nested stack to disk
+  storeRootStackTemplate(context, nestedStack);
   const transformedStackPath = await preProcessCFNTemplate(rootStackFilePath);
   const cfnItem = await new Cloudformation(context, generateUserAgentAction(resourcesToBeCreated, resourcesToBeUpdated));
   const providerDirectory = path.normalize(path.join(backEndDir, providerName));
@@ -1185,7 +1185,7 @@ export async function generateAndUploadRootStack(context: $TSContext, destinatio
   const projectDetails = context.amplify.getProjectDetails();
   const nestedStack = await formNestedStack(context, projectDetails);
 
-  JSONUtilities.writeJson(destinationPath, nestedStack);
+  storeRootStackTemplate(context, nestedStack);
 
   // upload the nested stack
   const s3Client = await S3.getInstance(context);

From 05677059bf2c954a38c32e8ba34effa7cd392c65 Mon Sep 17 00:00:00 2001
From: Akshay <akshayupadhyay3@gmail.com>
Date: Mon, 8 Nov 2021 15:10:52 -0800
Subject: [PATCH 2/2] fix: address comments

---
 .../src/override-manager/transform-resource.ts              | 4 ++--
 .../src/push-resources.ts                                   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/amplify-provider-awscloudformation/src/override-manager/transform-resource.ts b/packages/amplify-provider-awscloudformation/src/override-manager/transform-resource.ts
index 3f38933fb80..baa40b60ceb 100644
--- a/packages/amplify-provider-awscloudformation/src/override-manager/transform-resource.ts
+++ b/packages/amplify-provider-awscloudformation/src/override-manager/transform-resource.ts
@@ -20,13 +20,13 @@ export async function transformResourceWithOverrides(context: $TSContext, resour
     if (resource) {
       const { transformCategoryStack } = await import(`@aws-amplify/amplify-category-${resource.category}`);
       if (transformCategoryStack) {
-        return transformCategoryStack(context, resource);
+        return await transformCategoryStack(context, resource);
       } else {
         printer.info('Overrides functionality is not impleented for this category');
       }
     } else {
       if (FeatureFlags.getBoolean('overrides.project')) {
-        storeRootStackTemplate(context);
+        await storeRootStackTemplate(context);
       }
     }
   } catch (err) {
diff --git a/packages/amplify-provider-awscloudformation/src/push-resources.ts b/packages/amplify-provider-awscloudformation/src/push-resources.ts
index 06994d65aae..68900c8f4f8 100644
--- a/packages/amplify-provider-awscloudformation/src/push-resources.ts
+++ b/packages/amplify-provider-awscloudformation/src/push-resources.ts
@@ -289,7 +289,7 @@ export async function run(context: $TSContext, resourceDefinition: $TSObject, re
         try {
           await updateCloudFormationNestedStack(context, nestedStack, resourcesToBeCreated, resourcesToBeUpdated);
           if (FeatureFlags.getBoolean('Overrides.project')) {
-            storeRootStackTemplate(context, nestedStack);
+            await storeRootStackTemplate(context, nestedStack);
             // if the only root stack updates, function is called with empty resources . this fn copies amplifyMeta and backend Config to #current-cloud-backend
             context.amplify.updateamplifyMetaAfterPush([]);
           }
@@ -711,7 +711,7 @@ async function updateCloudFormationNestedStack(
   const projectRoot = pathManager.findProjectRoot();
   const rootStackFilePath = path.join(pathManager.getRootStackBuildDirPath(projectRoot), rootStackFileName);
   // deploy preprocess nested stack to disk
-  storeRootStackTemplate(context, nestedStack);
+  await storeRootStackTemplate(context, nestedStack);
   const transformedStackPath = await preProcessCFNTemplate(rootStackFilePath);
   const cfnItem = await new Cloudformation(context, generateUserAgentAction(resourcesToBeCreated, resourcesToBeUpdated));
   const providerDirectory = path.normalize(path.join(backEndDir, providerName));
@@ -1185,7 +1185,7 @@ export async function generateAndUploadRootStack(context: $TSContext, destinatio
   const projectDetails = context.amplify.getProjectDetails();
   const nestedStack = await formNestedStack(context, projectDetails);
 
-  storeRootStackTemplate(context, nestedStack);
+  await storeRootStackTemplate(context, nestedStack);
 
   // upload the nested stack
   const s3Client = await S3.getInstance(context);