From 9ddfe9d7fb66450c4edd643e85b6105e0dd7a55c Mon Sep 17 00:00:00 2001
From: Daniel Neilson <neilsd@amazon.com>
Date: Mon, 29 Mar 2021 19:42:49 +0000
Subject: [PATCH] fix(core): Move mountable's asset to scope of target

We're unable to update the mountable's scripts without a full tear-down of all consuming stacks.
This moves the assets to the target's stack instead of the Mountable's stack to avoid exports in
cross-stack usage.

BREAKING CHANGE: Stacks set up like our examples will see an error regarding being unable to
 delete an export in use when deploying a stack update. To bypass, use cdk deploy's -e option
 to deploy each stack upstream of the Mountable's stack before updating the Mountable's stack. e.g.
- cdk deploy -e ComputeTier; cdk deploy -e ServiceTier; cdk deploy -e StorageTier
---
 packages/aws-rfdk/lib/core/lib/mountable-ebs.ts        | 6 +++---
 packages/aws-rfdk/lib/core/lib/mountable-efs.ts        | 7 ++++---
 packages/aws-rfdk/lib/core/lib/mountable-filesystem.ts | 5 ++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/aws-rfdk/lib/core/lib/mountable-ebs.ts b/packages/aws-rfdk/lib/core/lib/mountable-ebs.ts
index c85a548d5..a42c67482 100644
--- a/packages/aws-rfdk/lib/core/lib/mountable-ebs.ts
+++ b/packages/aws-rfdk/lib/core/lib/mountable-ebs.ts
@@ -126,7 +126,7 @@ export class MountableBlockVolume implements IMountableLinuxFilesystem {
 
     this.grantRequiredPermissions(target);
 
-    const mountScriptAsset = this.mountAssetSingleton();
+    const mountScriptAsset = this.mountAssetSingleton(target);
     mountScriptAsset.grantRead(target.grantPrincipal);
     const mountScriptZip: string = target.userData.addS3DownloadCommand({
       bucket: mountScriptAsset.bucket,
@@ -189,8 +189,8 @@ export class MountableBlockVolume implements IMountableLinuxFilesystem {
   /**
    * Fetch the Asset singleton for the Volume mounting scripts, or generate it if needed.
    */
-  protected mountAssetSingleton(): Asset {
-    const stack = Stack.of(this.scope);
+  protected mountAssetSingleton(scope: IConstruct): Asset {
+    const stack = Stack.of(scope);
     const uuid = '01ca4aa6-d440-4f83-84d8-80a5a21fd0e3';
     const uniqueId = 'MountableBlockVolumeAsset' + uuid.replace(/[-]/g, '');
     return (stack.node.tryFindChild(uniqueId) as Asset) ?? new Asset(stack, uniqueId, {
diff --git a/packages/aws-rfdk/lib/core/lib/mountable-efs.ts b/packages/aws-rfdk/lib/core/lib/mountable-efs.ts
index fd4723d70..9c50bf748 100644
--- a/packages/aws-rfdk/lib/core/lib/mountable-efs.ts
+++ b/packages/aws-rfdk/lib/core/lib/mountable-efs.ts
@@ -18,6 +18,7 @@ import {
 } from '@aws-cdk/aws-s3-assets';
 import {
   Construct,
+  IConstruct,
   IResolvable,
   Stack,
   isResolvableObject,
@@ -136,7 +137,7 @@ export class MountableEfs implements IMountableLinuxFilesystem {
 
     target.connections.allowTo(this.props.filesystem, this.props.filesystem.connections.defaultPort as Port);
 
-    const mountScriptAsset = this.mountAssetSingleton();
+    const mountScriptAsset = this.mountAssetSingleton(target);
     mountScriptAsset.grantRead(target.grantPrincipal);
     const mountScript: string = target.userData.addS3DownloadCommand({
       bucket: mountScriptAsset.bucket,
@@ -214,8 +215,8 @@ export class MountableEfs implements IMountableLinuxFilesystem {
   /**
    * Fetch the Asset singleton for the EFS mounting scripts, or generate it if needed.
    */
-  protected mountAssetSingleton(): Asset {
-    const stack = Stack.of(this.scope);
+  protected mountAssetSingleton(scope: IConstruct): Asset {
+    const stack = Stack.of(scope);
     const uuid = '2b31c419-5b0b-4bb8-99ad-5b2575b2c06b';
     const uniqueId = 'MountableEfsAsset' + uuid.replace(/[-]/g, '');
     return (stack.node.tryFindChild(uniqueId) as Asset) ?? new Asset(stack, uniqueId, {
diff --git a/packages/aws-rfdk/lib/core/lib/mountable-filesystem.ts b/packages/aws-rfdk/lib/core/lib/mountable-filesystem.ts
index ba4f45439..e5e6fb70d 100644
--- a/packages/aws-rfdk/lib/core/lib/mountable-filesystem.ts
+++ b/packages/aws-rfdk/lib/core/lib/mountable-filesystem.ts
@@ -6,6 +6,9 @@
 import {
   IConnectable,
 } from '@aws-cdk/aws-ec2';
+import {
+  IConstruct,
+} from '@aws-cdk/core';
 
 import { IScriptHost } from './script-assets';
 
@@ -14,7 +17,7 @@ import { IScriptHost } from './script-assets';
  * {@link https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-ec2.Instance.html|EC2 Instance}
  * or an {@link https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-autoscaling.AutoScalingGroup.html|EC2 Auto Scaling Group}
  */
-export interface IMountingInstance extends IConnectable, IScriptHost {
+export interface IMountingInstance extends IConnectable, IConstruct, IScriptHost {
 }
 
 /**