feat(lambda-layer-awscli): Dynamically load asset for AwsCliLayer, with bundled fallback

package.json

@@ -115,6 +115,8 @@
       "@aws-cdk/core/minimatch/**",
       "@aws-cdk/cx-api/semver",
       "@aws-cdk/cx-api/semver/**",
+      "@aws-cdk/lambda-layer-awscli/semver",
+      "@aws-cdk/lambda-layer-awscli/semver/**",
       "@aws-cdk/pipelines/aws-sdk",
       "@aws-cdk/pipelines/aws-sdk/**",
       "@aws-cdk/yaml-cfn/yaml",

packages/@aws-cdk/cx-api/lib/directories.ts

@@ -0,0 +1,25 @@
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+
+/**
+ * Return a location that will be used as the CDK home directory.
+ * Currently the only thing that is placed here is the cache.
+ *
+ * First try to use the users home directory (i.e. /home/someuser/),
+ * but if that directory does not exist for some reason create a tmp directory.
+ *
+ * Typically it wouldn't make sense to create a one time use tmp directory for
+ * the purpose of creating a cache, but since this only applies to users that do
+ * not have a home directory (some CI systems?) this should be fine.
+ */
+export function cdkHomeDir() {
+  const tmpDir = fs.realpathSync(os.tmpdir());
+  let home;
+  try {
+    home = path.join((os.userInfo().homedir ?? os.homedir()).trim(), '.cdk');
+  } catch {}
+  return process.env.CDK_HOME
+    ? path.resolve(process.env.CDK_HOME)
+    : home || fs.mkdtempSync(path.join(tmpDir, '.cdk')).trim();
+}

packages/@aws-cdk/cx-api/lib/index.ts

@@ -20,3 +20,4 @@ export * from './metadata';
 export * from './features';
 export * from './placeholders';
 export * from './app';
+export * from './directories';

packages/@aws-cdk/lambda-layer-awscli/README.md

@@ -25,3 +25,20 @@ fn.addLayers(new AwsCliLayer(this, 'AwsCliLayer'));
 ```
 
 The CLI will be installed under `/opt/awscli/aws`.
+
+## Troubleshooting
+
+### WARNING! [ACTION REQUIRED] Your CDK application is using ${this.constructor.name}. Add a dependency on ${AwsCliLayer.assetPackageName}, or the equivalent in your language, to remove this warning
+
+If you see the above message when synthesizing your CDK app, this is because we
+have introduced a change to dynamically load the Asset construct used by
+AwsCliLayer at runtime. This message appears when the dynamic loading fails due
+to restrictions in your environment, and it falls back to using an Asset bundled
+in aws-cdk-lib. We plan to remove this fallback, and at that time your
+application may be broken. To prevent this, add an explicit dependency on
+@aws-cdk/asset-awscli-v1, or the equivalent in your language. If you experience
+any issues, please reach out to us by commenting on
+https://github.com/aws/aws-cdk/issues/22470.
+
+TODO:
+Add language-specific instructions.

packages/@aws-cdk/lambda-layer-awscli/jest.config.js

@@ -1,2 +1,9 @@
 const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
-module.exports = baseConfig;
+module.exports = {
+  ...baseConfig,
+  coverageThreshold: {
+    global: {
+      branches: 60,
+    },
+  },
+};

packages/@aws-cdk/lambda-layer-awscli/layer/pre-build.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Copy files from the @aws-cdk/asset-awscli-v1 devDependency into
+# this package, so that they will be included in the released package.
+
+# Set bash to exit the script immediately on any error (e) and if any unset (u)
+# variable is referenced.
+set -eu
+
+dir=$(node -pe 'path.resolve(require.resolve("@aws-cdk/asset-awscli-v1"), "../..")')
+
+cp $dir/layer/requirements.txt ./layer
+cp $dir/lib/layer.zip ./lib
+
+target_version=$(node -pe 'require("@aws-cdk/asset-awscli-v1/package.json").version')
+echo "export const TARGET_VERSION = '${target_version}';" > lib/asset-package-version.ts

packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt

@@ -1 +1 @@
-awscli==1.25.70
+awscli==1.25.46

packages/@aws-cdk/lambda-layer-awscli/lib/asset-package-version.ts

@@ -0,0 +1 @@
+export const TARGET_VERSION = '2.0.0';

packages/@aws-cdk/lambda-layer-awscli/lib/awscli-layer.ts

@@ -1,19 +1,71 @@
+/* eslint-disable no-console */
 import * as path from 'path';
 import * as lambda from '@aws-cdk/aws-lambda';
-import { FileSystem } from '@aws-cdk/core';
+import { Annotations, FileSystem } from '@aws-cdk/core';
+import { debugModeEnabled } from '@aws-cdk/core/lib/debug';
 import { Construct } from 'constructs';
+import { TARGET_VERSION } from './asset-package-version';
+import { installAndLoadPackage, _downloadPackage, _tryLoadPackage } from './private/package-loading-functions';
 
 /**
  * An AWS Lambda layer that includes the AWS CLI.
  */
 export class AwsCliLayer extends lambda.LayerVersion {
+
+  private static readonly assetPackageName: string = '@aws-cdk/asset-awscli-v1';
+  private static readonly assetPackageNpmTarPrefix: string = 'aws-cdk-asset-awscli-v1-';
+
   constructor(scope: Construct, id: string) {
-    super(scope, id, {
-      code: lambda.Code.fromAsset(path.join(__dirname, 'layer.zip'), {
+    const logs: string[] = [];
+    let fallback = false;
+
+    let assetPackage = _tryLoadPackage(AwsCliLayer.assetPackageName, TARGET_VERSION, logs);
+
+    if (!assetPackage) {
+      const downloadPath = _downloadPackage(AwsCliLayer.assetPackageName, AwsCliLayer.assetPackageNpmTarPrefix, TARGET_VERSION, logs);
+      if (downloadPath) {
+        assetPackage = installAndLoadPackage(AwsCliLayer.assetPackageName, downloadPath, logs);
+      }
+    }
+
+    let code;
+    if (assetPackage) {
+      // ask for feedback here
+      if (!assetPackage.AwsCliAsset) {
+        logs.push(`ERROR: loaded ${AwsCliLayer.assetPackageName}, but AwsCliAsset is undefined in the module.`);
+      } else {
+        const asset = new assetPackage.AwsCliAsset(scope, `${id}-asset`);
+        code = lambda.Code.fromBucket(asset.bucket, asset.s3ObjectKey);
+      }
+    }
+
+    if (!code) {
+      fallback = true;
+      logs.push(`Unable to load ${AwsCliLayer.assetPackageName}. Falling back to use layer.zip bundled with aws-cdk-lib`);
+      code = lambda.Code.fromAsset(path.join(__dirname, 'layer.zip'), {
         // we hash the layer directory (it contains the tools versions and Dockerfile) because hashing the zip is non-deterministic
         assetHash: FileSystem.fingerprint(path.join(__dirname, '../layer')),
-      }),
+      });
+    }
+
+    super(scope, id, {
+      code: code,
       description: '/opt/awscli/aws',
     });
+    console.log(logs.join('\n'));
+
+    if (debugModeEnabled()) {
+      Annotations.of(this).addInfo(logs.join('\n'));
+    }
+
+    if (fallback) {
+      Annotations.of(this).addWarning(`[ACTION REQUIRED] Your CDK application is using ${this.constructor.name}. Add a dependency on ${AwsCliLayer.assetPackageName}, or the equivalent in your language, to remove this warning. See https://github.com/aws/aws-cdk/issues/22470 for more information.`);
+      new Notice(this, 'cli-notice');
+    }
   }
 }
+
+/**
+ * An empty construct that can be added to the tree as a marker for the CLI Notices
+ */
+class Notice extends Construct {}

packages/@aws-cdk/lambda-layer-awscli/lib/private/package-loading-functions.ts

@@ -0,0 +1,90 @@
+import * as childproc from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as cxapi from '@aws-cdk/cx-api';
+import * as semver from 'semver';
+
+export function _tryLoadPackage(packageName: string, targetVersion: string, logs: string[]): any {
+  let availableVersion;
+  let assetPackagePath;
+  try {
+    assetPackagePath = require.resolve(`${packageName}`);
+  } catch (e) {
+    logs.push(`require.resolve('${packageName}') failed`);
+    const eAsError = e as Error;
+    if (eAsError?.stack) {
+      logs.push(eAsError.stack);
+    }
+    return;
+  }
+  availableVersion = requireWrapper(path.join(assetPackagePath, '../../package.json'), logs).version;
+
+  if (semver.satisfies(availableVersion, targetVersion)) {
+    logs.push(`${packageName} already installed with correct version: ${availableVersion}.`);
+    const result = requireWrapper(packageName, logs);
+    if (result) {
+      logs.push(`Successfully loaded ${packageName} from pre-installed packages.`);
+      return result;
+    }
+  } else {
+    logs.push(`${packageName} already installed with incorrect version: ${availableVersion}. Target version was: ${targetVersion}.`);
+  }
+}
+
+export function _downloadPackage(packageName: string, packageNpmTarPrefix: string, targetVersion: string, logs: string[]): string | undefined {
+  const cdkHomeDir = cxapi.cdkHomeDir();
+  const downloadDir = path.join(cdkHomeDir, 'npm-cache');
+  const downloadPath = path.join(downloadDir, `${packageNpmTarPrefix}${targetVersion}.tgz`);
+
+  if (fs.existsSync(downloadPath)) {
+    logs.push(`Using package archive already available at location: ${downloadPath}`);
+    return downloadPath;
+  }
+  logs.push(`Downloading package using npm pack to: ${downloadDir}`);
+  fs.mkdirSync(downloadDir);
+  childproc.execSync(`npm pack ${packageName}@${targetVersion} -q`, {
+    cwd: downloadDir,
+  });
+  if (fs.existsSync(downloadPath)) {
+    logs.push('Successfully downloaded using npm pack.');
+    return downloadPath;
+  }
+
+  logs.push('Failed to download using npm pack.');
+  return undefined;
+}
+
+export function requireWrapper(id: string, logs: string[]): any {
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const result = require(id);
+    if (result) {
+      logs.push(`require('${id}') succeeded.`);
+    }
+    return result;
+  } catch (e) {
+    logs.push(`require('${id}') failed.`);
+    const eAsError = e as Error;
+    if (eAsError?.stack) {
+      logs.push(eAsError.stack);
+    }
+  }
+}
+
+export function installAndLoadPackage(packageName: string, from: string, logs: string[]): any {
+  const installDir = findInstallDir();
+  if (!installDir) {
+    logs.push('Unable to find an install directory. require.main.paths[0] is undefined.');
+    return;
+  }
+  logs.push(`Installing from: ${from} to: ${installDir}`);
+  childproc.execSync(`npm install ${from} --no-save --prefix ${installDir} -q`);
+  return requireWrapper(path.join(installDir, 'node_modules', packageName, 'lib/index.js'), logs);
+}
+
+export function findInstallDir(): string | undefined {
+  if (!require.main?.paths) {
+    return undefined;
+  }
+  return require.main.paths[0];
+}

packages/@aws-cdk/lambda-layer-awscli/package.json

@@ -71,25 +71,32 @@
     "organization": true
   },
   "license": "Apache-2.0",
+  "bundledDependencies": [
+    "semver"
+  ],
   "devDependencies": {
     "@aws-cdk/assertions": "0.0.0",
     "@aws-cdk/custom-resources": "0.0.0",
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/integ-runner": "0.0.0",
     "@aws-cdk/integ-tests": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
+    "@aws-cdk/asset-awscli-v1": "2.0.0",
     "@types/jest": "^27.5.2",
     "jest": "^27.5.1"
   },
   "dependencies": {
     "@aws-cdk/aws-lambda": "0.0.0",
     "@aws-cdk/core": "0.0.0",
-    "constructs": "^10.0.0"
+    "@aws-cdk/cx-api": "0.0.0",
+    "constructs": "^10.0.0",
+    "semver": "^7.3.8"
   },
   "homepage": "https://github.com/aws/aws-cdk",
   "peerDependencies": {
     "@aws-cdk/aws-lambda": "0.0.0",
     "@aws-cdk/core": "0.0.0",
+    "@aws-cdk/cx-api": "0.0.0",
     "constructs": "^10.0.0"
   },
   "engines": {
@@ -102,7 +109,7 @@
   },
   "cdk-build": {
     "pre": [
-      "layer/build.sh"
+      "layer/pre-build.sh"
     ],
     "env": {
       "AWSLINT_BASE_CONSTRUCT": true
@@ -120,5 +127,10 @@
   "publishConfig": {
     "tag": "latest"
   },
+  "awslint": {
+    "exclude": [
+      "props-physical-name:@aws-cdk/lambda-layer-awscli.AwsCliLayerProps"
+    ]
+  },
   "private": true
 }