fix(assets): remove the original-path metadata (#17901)

Revert `aws:asset:original-path` to fix #17706
aws · Dec 8, 2021 · 2b759ca · 2b759ca
1 parent d5c249f
commit 2b759ca
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 24 deletions.
diff --git a/packages/@aws-cdk/aws-lambda/test/code.test.ts b/packages/@aws-cdk/aws-lambda/test/code.test.ts
@@ -74,7 +74,6 @@ describe('code', () => {
       expect(stack).toHaveResource('AWS::Lambda::Function', {
         Metadata: {
           [cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.9678c34eca93259d11f2d714177347afd66c50116e1e08996eff893d3ca81232',
-          [cxapi.ASSET_RESOURCE_METADATA_ORIGINAL_PATH_KEY]: location,
           [cxapi.ASSET_RESOURCE_METADATA_IS_BUNDLED_KEY]: false,
           [cxapi.ASSET_RESOURCE_METADATA_PROPERTY_KEY]: 'Code',
         },
@@ -464,9 +463,8 @@ describe('code', () => {
       stack.node.setContext(cxapi.ASSET_RESOURCE_METADATA_ENABLED_CONTEXT, true);
 
       // when
-      const FunctionCodepath = path.join(__dirname, 'docker-build-lambda');
       new lambda.Function(stack, 'Fn', {
-        code: lambda.Code.fromDockerBuild(FunctionCodepath),
+        code: lambda.Code.fromDockerBuild(path.join(__dirname, 'docker-build-lambda')),
         handler: 'index.handler',
         runtime: lambda.Runtime.NODEJS_12_X,
       });
@@ -475,7 +473,6 @@ describe('code', () => {
       expect(stack).toHaveResource('AWS::Lambda::Function', {
         Metadata: {
           [cxapi.ASSET_RESOURCE_METADATA_PATH_KEY]: 'asset.fbafdbb9ae8d1bae0def415b791a93c486d18ebc63270c748abecc3ac0ab9533',
-          [cxapi.ASSET_RESOURCE_METADATA_ORIGINAL_PATH_KEY]: FunctionCodepath,
           [cxapi.ASSET_RESOURCE_METADATA_IS_BUNDLED_KEY]: false,
           [cxapi.ASSET_RESOURCE_METADATA_PROPERTY_KEY]: 'Code',
         },

diff --git a/packages/@aws-cdk/aws-lambda/test/layers.test.ts b/packages/@aws-cdk/aws-lambda/test/layers.test.ts
@@ -74,16 +74,14 @@ describe('layers', () => {
     stack.node.setContext(cxapi.ASSET_RESOURCE_METADATA_ENABLED_CONTEXT, true);
 
     // WHEN
-    let layerCodePath = path.join(__dirname, 'layer-code');
     new lambda.LayerVersion(stack, 'layer', {
-      code: lambda.Code.fromAsset(layerCodePath),
+      code: lambda.Code.fromAsset(path.join(__dirname, 'layer-code')),
     });
 
     // THEN
     expect(canonicalizeTemplate(SynthUtils.toCloudFormation(stack))).toHaveResource('AWS::Lambda::LayerVersion', {
       Metadata: {
         'aws:asset:path': 'asset.Asset1Hash',
-        'aws:asset:original-path': layerCodePath,
         'aws:asset:is-bundled': false,
         'aws:asset:property': 'Content',
       },

diff --git a/packages/@aws-cdk/aws-logs/test/log-retention.test.ts b/packages/@aws-cdk/aws-logs/test/log-retention.test.ts
@@ -196,7 +196,6 @@ describe('log retention', () => {
     expect(stack).toHaveResource('AWS::Lambda::Function', {
       Metadata: {
         'aws:asset:path': assetLocation,
-        'aws:asset:original-path': assetLocation,
         'aws:asset:is-bundled': false,
         'aws:asset:property': 'Code',
       },

diff --git a/packages/@aws-cdk/aws-s3-assets/lib/asset.ts b/packages/@aws-cdk/aws-s3-assets/lib/asset.ts
@@ -120,14 +120,6 @@ export class Asset extends CoreConstruct implements cdk.IAsset {
 
   public readonly assetHash: string;
 
-  /**
-   * The original Asset Path before it got staged.
-   *
-   * If asset staging is disabled, this will be same value as assetPath.
-   * If asset staging is enabled, it will be the Asset original path before staging.
-   */
-  private readonly originalAssetPath: string;
-
   /**
    * Indicates if this asset got bundled before staged, or not.
    */
@@ -136,13 +128,12 @@ export class Asset extends CoreConstruct implements cdk.IAsset {
   constructor(scope: Construct, id: string, props: AssetProps) {
     super(scope, id);
 
-    this.originalAssetPath = path.resolve(props.path);
     this.isBundled = props.bundling != null;
 
     // stage the asset source (conditionally).
     const staging = new cdk.AssetStaging(this, 'Stage', {
       ...props,
-      sourcePath: this.originalAssetPath,
+      sourcePath: path.resolve(props.path),
       follow: props.followSymlinks ?? toSymlinkFollow(props.follow),
       assetHash: props.assetHash ?? props.sourceHash,
     });
@@ -207,7 +198,6 @@ export class Asset extends CoreConstruct implements cdk.IAsset {
     // points to a local path in order to enable local invocation of this function.
     resource.cfnOptions.metadata = resource.cfnOptions.metadata || { };
     resource.cfnOptions.metadata[cxapi.ASSET_RESOURCE_METADATA_PATH_KEY] = this.assetPath;
-    resource.cfnOptions.metadata[cxapi.ASSET_RESOURCE_METADATA_ORIGINAL_PATH_KEY] = this.originalAssetPath;
     resource.cfnOptions.metadata[cxapi.ASSET_RESOURCE_METADATA_IS_BUNDLED_KEY] = this.isBundled;
     resource.cfnOptions.metadata[cxapi.ASSET_RESOURCE_METADATA_PROPERTY_KEY] = resourceProperty;
   }

diff --git a/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts b/packages/@aws-cdk/aws-s3-assets/test/asset.test.ts
@@ -203,7 +203,6 @@ test('addResourceMetadata can be used to add CFN metadata to resources', () => {
   expect(stack).toHaveResource('My::Resource::Type', {
     Metadata: {
       'aws:asset:path': 'asset.6b84b87243a4a01c592d78e1fd3855c4bfef39328cd0a450cc97e81717fea2a2',
-      'aws:asset:original-path': location,
       'aws:asset:is-bundled': false,
       'aws:asset:property': 'PropName',
     },
@@ -224,7 +223,6 @@ test('asset metadata is only emitted if ASSET_RESOURCE_METADATA_ENABLED_CONTEXT
   expect(stack).not.toHaveResource('My::Resource::Type', {
     Metadata: {
       'aws:asset:path': SAMPLE_ASSET_DIR,
-      'aws:asset:original-path': SAMPLE_ASSET_DIR,
       'aws:asset:is-bundled': false,
       'aws:asset:property': 'PropName',
     },
@@ -355,7 +353,6 @@ describe('staging', () => {
     const template = SynthUtils.synthesize(stack).template;
     expect(template.Resources.MyResource.Metadata).toEqual({
       'aws:asset:path': 'asset.6b84b87243a4a01c592d78e1fd3855c4bfef39328cd0a450cc97e81717fea2a2',
-      'aws:asset:original-path': SAMPLE_ASSET_DIR,
       'aws:asset:is-bundled': false,
       'aws:asset:property': 'PropName',
     });
@@ -383,7 +380,6 @@ describe('staging', () => {
     const template = SynthUtils.synthesize(stack).template;
     expect(template.Resources.MyResource.Metadata).toEqual({
       'aws:asset:path': SAMPLE_ASSET_DIR,
-      'aws:asset:original-path': SAMPLE_ASSET_DIR,
       'aws:asset:is-bundled': false,
       'aws:asset:property': 'PropName',
     });

diff --git a/packages/@aws-cdk/cx-api/lib/assets.ts b/packages/@aws-cdk/cx-api/lib/assets.ts
@@ -15,7 +15,6 @@ export const ASSET_RESOURCE_METADATA_DOCKER_BUILD_ARGS_KEY = 'aws:asset:docker-b
 export const ASSET_RESOURCE_METADATA_DOCKER_BUILD_TARGET_KEY = 'aws:asset:docker-build-target';
 export const ASSET_RESOURCE_METADATA_PROPERTY_KEY = 'aws:asset:property';
 export const ASSET_RESOURCE_METADATA_IS_BUNDLED_KEY = 'aws:asset:is-bundled';
-export const ASSET_RESOURCE_METADATA_ORIGINAL_PATH_KEY = 'aws:asset:original-path';
 
 /**
  * Separator string that separates the prefix separator from the object key separator.