@aws-cdk/toolkit-lib 1.10.3 → 1.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build-info.json +2 -2
- package/lib/api/aws-auth/base-credentials.d.ts +11 -0
- package/lib/api/aws-auth/base-credentials.js +6 -3
- package/lib/api/cloudformation/template-body-parameter.d.ts +20 -0
- package/lib/api/cloudformation/template-body-parameter.js +37 -10
- package/lib/api/index.d.ts +1 -0
- package/lib/api/index.js +2 -1
- package/lib/api/network-detector/index.d.ts +2 -0
- package/lib/api/network-detector/index.js +18 -0
- package/lib/api/network-detector/network-detector.d.ts +16 -0
- package/lib/api/network-detector/network-detector.js +87 -0
- package/lib/api/notices/web-data-source.js +7 -1
- package/package.json +3 -3
package/build-info.json
CHANGED
|
@@ -86,6 +86,17 @@ export interface AwsCliCompatibleOptions {
|
|
|
86
86
|
* @default - Use environment variable if set.
|
|
87
87
|
*/
|
|
88
88
|
readonly profile?: string;
|
|
89
|
+
/**
|
|
90
|
+
* Use a different default region than the one in the profile
|
|
91
|
+
*
|
|
92
|
+
* If not supplied the environment variable AWS_REGION will be used, or
|
|
93
|
+
* whatever region is set in the indicated profile in `~/.aws/config`.
|
|
94
|
+
* If no region is set in the profile the region in `[default]` will
|
|
95
|
+
* be used.
|
|
96
|
+
*
|
|
97
|
+
* @default - Use region from `~/.aws/config`.
|
|
98
|
+
*/
|
|
99
|
+
readonly defaultRegion?: string;
|
|
89
100
|
}
|
|
90
101
|
export interface CustomBaseCredentialsOption {
|
|
91
102
|
/**
|
|
@@ -40,10 +40,13 @@ class BaseCredentials {
|
|
|
40
40
|
*/
|
|
41
41
|
static awsCliCompatible(options = {}) {
|
|
42
42
|
return new class {
|
|
43
|
-
sdkBaseConfig(ioHost, clientConfig) {
|
|
43
|
+
async sdkBaseConfig(ioHost, clientConfig) {
|
|
44
44
|
const ioHelper = private_1.IoHelper.fromActionAwareIoHost(ioHost);
|
|
45
45
|
const awsCli = new awscli_compatible_1.AwsCliCompatible(ioHelper, clientConfig.requestHandler ?? {}, new sdk_logger_1.IoHostSdkLogger(ioHelper));
|
|
46
|
-
|
|
46
|
+
const ret = await awsCli.baseConfig(options.profile);
|
|
47
|
+
return options.defaultRegion
|
|
48
|
+
? { ...ret, defaultRegion: options.defaultRegion }
|
|
49
|
+
: ret;
|
|
47
50
|
}
|
|
48
51
|
toString() {
|
|
49
52
|
return `BaseCredentials.awsCliCompatible(${JSON.stringify(options)})`;
|
|
@@ -76,4 +79,4 @@ class BaseCredentials {
|
|
|
76
79
|
}
|
|
77
80
|
}
|
|
78
81
|
exports.BaseCredentials = BaseCredentials;
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"base-credentials.js","sourceRoot":"","sources":["base-credentials.ts"],"names":[],"mappings":";;;AAGA,2DAAuD;AACvD,+DAAkE;AAElE,6CAA+C;AAC/C,2CAAyC;AAkDzC,MAAa,eAAe;IAC1B;;;;;;;;;OASG;IACI,MAAM,CAAC,IAAI;QAChB,OAAO,IAAI;YACF,KAAK,CAAC,aAAa;gBACxB,OAAO;oBACL,kBAAkB,EAAE,GAAG,EAAE;wBACvB,MAAM,IAAI,mCAAmB,CAAC,wDAAwD,CAAC,CAAC;oBAC1F,CAAC;iBACF,CAAC;YACJ,CAAC;YAEM,QAAQ;gBACb,OAAO,wBAAwB,CAAC;YAClC,CAAC;SACF,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACI,MAAM,CAAC,gBAAgB,CAAC,UAAmC,EAAE;QAClE,OAAO,IAAI;YACF,KAAK,CAAC,aAAa,CAAC,MAA0B,EAAE,YAAiC;gBACtF,MAAM,QAAQ,GAAG,kBAAQ,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;gBACxD,MAAM,MAAM,GAAG,IAAI,oCAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,cAAc,IAAI,EAAE,EAAE,IAAI,4BAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAEhH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACrD,OAAO,OAAO,CAAC,aAAa;oBAC1B,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE;oBAClD,CAAC,CAAC,GAAG,CAAC;YACV,CAAC;YAEM,QAAQ;gBACb,OAAO,oCAAoC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC;YACxE,CAAC;SACF,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACI,MAAM,CAAC,MAAM,CAAC,OAAoC;QACvD,OAAO,IAAI;YACF,aAAa;gBAClB,OAAO,OAAO,CAAC,OAAO,CAAC;oBACrB,kBAAkB,EAAE,OAAO,CAAC,QAAQ;oBACpC,aAAa,EAAE,OAAO,CAAC,MAAM;iBAC9B,CAAC,CAAC;YACL,CAAC;YAEM,QAAQ;gBACb,OAAO,0BAA0B,IAAI,CAAC,SAAS,CAAC;oBAC9C,GAAG,OAAO;oBACV,QAAQ,EAAE,KAAK;iBAChB,CAAC,GAAG,CAAC;YACR,CAAC;SACF,CAAC;IACJ,CAAC;CACF;AA9ED,0CA8EC","sourcesContent":["import type * as http from 'node:http';\nimport type * as https from 'node:https';\nimport type { SDKv3CompatibleCredentialProvider } from '@aws-cdk/cli-plugin-contract';\nimport { AwsCliCompatible } from './awscli-compatible';\nimport { AuthenticationError } from '../../toolkit/toolkit-error';\nimport type { IActionAwareIoHost } from '../io';\nimport { IoHostSdkLogger } from './sdk-logger';\nimport { IoHelper } from '../io/private';\n\n/**\n * Settings for the request handle\n */\nexport interface RequestHandlerSettings {\n  /**\n   * The maximum time in milliseconds that the connection phase of a request\n   * may take before the connection attempt is abandoned.\n   *\n   * Defaults to 0, which disables the timeout.\n   */\n  connectionTimeout?: number;\n  /**\n   * The number of milliseconds a request can take before automatically being terminated.\n   * Defaults to 0, which disables the timeout.\n   */\n  requestTimeout?: number;\n  /**\n   * An http.Agent to be used\n   */\n  httpAgent?: http.Agent;\n  /**\n   * An https.Agent to be used\n   */\n  httpsAgent?: https.Agent;\n}\n\n/**\n * An SDK config that\n */\nexport interface SdkBaseConfig {\n  /**\n   * The credential provider to use for SDK calls.\n   */\n  readonly credentialProvider: SDKv3CompatibleCredentialProvider;\n  /**\n   * The default region to use for SDK calls.\n   */\n  readonly defaultRegion?: string;\n}\n\nexport interface SdkBaseClientConfig {\n  requestHandler?: RequestHandlerSettings;\n}\n\nexport interface IBaseCredentialsProvider {\n  sdkBaseConfig(ioHost: IActionAwareIoHost, clientConfig: SdkBaseClientConfig): Promise<SdkBaseConfig>;\n}\n\nexport class BaseCredentials {\n  /**\n   * Use no base credentials\n   *\n   * There will be no current account and no current region during synthesis. To\n   * successfully deploy with this set of base credentials:\n   *\n   * - The CDK app must provide concrete accounts and regions during synthesis\n   * - Credential plugins must be installed to provide credentials for those\n   *   accounts.\n   */\n  public static none(): IBaseCredentialsProvider {\n    return new class implements IBaseCredentialsProvider {\n      public async sdkBaseConfig() {\n        return {\n          credentialProvider: () => {\n            throw new AuthenticationError('No credentials available due to BaseCredentials.none()');\n          },\n        };\n      }\n\n      public toString() {\n        return 'BaseCredentials.none()';\n      }\n    };\n  }\n\n  /**\n   * Obtain base credentials and base region the same way the AWS CLI would\n   *\n   * Credentials and region will be read from the environment first, falling back\n   * to INI files or other sources if available.\n   *\n   * The profile name is configurable.\n   */\n  public static awsCliCompatible(options: AwsCliCompatibleOptions = {}): IBaseCredentialsProvider {\n    return new class implements IBaseCredentialsProvider {\n      public async sdkBaseConfig(ioHost: IActionAwareIoHost, clientConfig: SdkBaseClientConfig) {\n        const ioHelper = IoHelper.fromActionAwareIoHost(ioHost);\n        const awsCli = new AwsCliCompatible(ioHelper, clientConfig.requestHandler ?? {}, new IoHostSdkLogger(ioHelper));\n\n        const ret = await awsCli.baseConfig(options.profile);\n        return options.defaultRegion\n          ? { ...ret, defaultRegion: options.defaultRegion }\n          : ret;\n      }\n\n      public toString() {\n        return `BaseCredentials.awsCliCompatible(${JSON.stringify(options)})`;\n      }\n    };\n  }\n\n  /**\n   * Use a custom SDK identity provider for the base credentials\n   *\n   * If your provider uses STS calls to obtain base credentials, you must make\n   * sure to also configure the necessary HTTP options (like proxy and user\n   * agent) and the region on the STS client directly; the toolkit code cannot\n   * do this for you.\n   */\n  public static custom(options: CustomBaseCredentialsOption): IBaseCredentialsProvider {\n    return new class implements IBaseCredentialsProvider {\n      public sdkBaseConfig(): Promise<SdkBaseConfig> {\n        return Promise.resolve({\n          credentialProvider: options.provider,\n          defaultRegion: options.region,\n        });\n      }\n\n      public toString() {\n        return `BaseCredentials.custom(${JSON.stringify({\n          ...options,\n          provider: '...',\n        })})`;\n      }\n    };\n  }\n}\n\nexport interface AwsCliCompatibleOptions {\n  /**\n   * The profile to read from `~/.aws/credentials`.\n   *\n   * If not supplied the environment variable AWS_PROFILE will be used.\n   *\n   * @default - Use environment variable if set.\n   */\n  readonly profile?: string;\n\n  /**\n   * Use a different default region than the one in the profile\n   *\n   * If not supplied the environment variable AWS_REGION will be used, or\n   * whatever region is set in the indicated profile in `~/.aws/config`.\n   * If no region is set in the profile the region in `[default]` will\n   * be used.\n   *\n   * @default - Use region from `~/.aws/config`.\n   */\n  readonly defaultRegion?: string;\n}\n\nexport interface CustomBaseCredentialsOption {\n  /**\n   * The credentials provider to use to obtain base credentials\n   *\n   * If your provider uses STS calls to obtain base credentials, you must make\n   * sure to also configure the necessary HTTP options (like proxy and user\n   * agent) on the STS client directly; the toolkit code cannot do this for you.\n   */\n  readonly provider: SDKv3CompatibleCredentialProvider;\n\n  /**\n   * The default region to synthesize for\n   *\n   * CDK applications can override this region. NOTE: this region will *not*\n   * affect any STS calls made by the given provider, if any. You need to configure\n   * your credential provider separately.\n   *\n   * @default 'us-east-1'\n   */\n  readonly region?: string;\n}\n"]}
|
|
@@ -20,4 +20,24 @@ export type TemplateBodyParameter = {
|
|
|
20
20
|
* @param toolkitInfo - information about the toolkit stack
|
|
21
21
|
*/
|
|
22
22
|
export declare function makeBodyParameter(ioHelper: IoHelper, stack: CloudFormationStackArtifact, resolvedEnvironment: Environment, assetManifest: AssetManifestBuilder, resources: EnvironmentResources, overrideTemplate?: any): Promise<TemplateBodyParameter>;
|
|
23
|
+
/**
|
|
24
|
+
* Format an S3 URL in the manifest for use with CloudFormation
|
|
25
|
+
*
|
|
26
|
+
* Replaces environment placeholders (which this field may contain),
|
|
27
|
+
* and reformats s3://.../... urls into S3 REST URLs (which CloudFormation
|
|
28
|
+
* expects).
|
|
29
|
+
*
|
|
30
|
+
* We need to return the official region- and partition-specific URL for AWS S3
|
|
31
|
+
* here, so we use the SDK's information about endpoints. At the same time, the
|
|
32
|
+
* SDK allows overriding this URL by setting an environment variable
|
|
33
|
+
* (specifically $AWS_ENDPOINT_URL_S3) but we want to *not* honor that, because
|
|
34
|
+
* there's a 99.9% chance this URL will not be routable from AWS CloudFormation.
|
|
35
|
+
*
|
|
36
|
+
* To allow for the off chance that someone is running this tool against a
|
|
37
|
+
* custom build of CloudFormation that does need a specific S3 endpoint passed
|
|
38
|
+
* to it, we'll introduce a new environment variable that we'll respect instead:
|
|
39
|
+
*
|
|
40
|
+
* AWS_ENDPOINT_URL_S3_FOR_CLOUDFORMATION
|
|
41
|
+
*/
|
|
42
|
+
export declare function restUrlFromManifest(url: string, environment: Environment): Promise<string>;
|
|
23
43
|
//# sourceMappingURL=template-body-parameter.d.ts.map
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.makeBodyParameter = makeBodyParameter;
|
|
4
|
+
exports.restUrlFromManifest = restUrlFromManifest;
|
|
4
5
|
const fs = require("node:fs/promises");
|
|
5
6
|
const path = require("node:path");
|
|
6
7
|
const util = require("node:util");
|
|
@@ -67,7 +68,19 @@ async function makeBodyParameter(ioHelper, stack, resolvedEnvironment, assetMani
|
|
|
67
68
|
*
|
|
68
69
|
* Replaces environment placeholders (which this field may contain),
|
|
69
70
|
* and reformats s3://.../... urls into S3 REST URLs (which CloudFormation
|
|
70
|
-
* expects)
|
|
71
|
+
* expects).
|
|
72
|
+
*
|
|
73
|
+
* We need to return the official region- and partition-specific URL for AWS S3
|
|
74
|
+
* here, so we use the SDK's information about endpoints. At the same time, the
|
|
75
|
+
* SDK allows overriding this URL by setting an environment variable
|
|
76
|
+
* (specifically $AWS_ENDPOINT_URL_S3) but we want to *not* honor that, because
|
|
77
|
+
* there's a 99.9% chance this URL will not be routable from AWS CloudFormation.
|
|
78
|
+
*
|
|
79
|
+
* To allow for the off chance that someone is running this tool against a
|
|
80
|
+
* custom build of CloudFormation that does need a specific S3 endpoint passed
|
|
81
|
+
* to it, we'll introduce a new environment variable that we'll respect instead:
|
|
82
|
+
*
|
|
83
|
+
* AWS_ENDPOINT_URL_S3_FOR_CLOUDFORMATION
|
|
71
84
|
*/
|
|
72
85
|
async function restUrlFromManifest(url, environment) {
|
|
73
86
|
const doNotUseMarker = '**DONOTUSE**';
|
|
@@ -91,13 +104,27 @@ async function restUrlFromManifest(url, environment) {
|
|
|
91
104
|
// got an 's3://bucket/object' URL instead. Construct the rest API URL here.
|
|
92
105
|
const bucketName = s3Url[1];
|
|
93
106
|
const objectKey = s3Url[2];
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
107
|
+
const originalOverrideS3Endpoint = process.env.AWS_ENDPOINT_URL_S3;
|
|
108
|
+
setEnv('AWS_ENDPOINT_URL_S3', process.env.AWS_ENDPOINT_URL_S3_FOR_CLOUDFORMATION);
|
|
109
|
+
try {
|
|
110
|
+
// SDK v3 no longer allows for getting endpoints from only region.
|
|
111
|
+
// A command and client config must now be provided.
|
|
112
|
+
const s3 = new client_s3_1.S3Client({ region });
|
|
113
|
+
const endpoint = await (0, middleware_endpoint_1.getEndpointFromInstructions)({}, client_s3_1.HeadObjectCommand, {
|
|
114
|
+
...s3.config,
|
|
115
|
+
});
|
|
116
|
+
return `${endpoint.url.origin}/${bucketName}/${objectKey}`;
|
|
117
|
+
}
|
|
118
|
+
finally {
|
|
119
|
+
setEnv('AWS_ENDPOINT_URL_S3', originalOverrideS3Endpoint);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
function setEnv(name, value) {
|
|
123
|
+
if (value) {
|
|
124
|
+
process.env[name] = value;
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
delete process.env[name];
|
|
128
|
+
}
|
|
102
129
|
}
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"template-body-parameter.js","sourceRoot":"","sources":["template-body-parameter.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'node:fs/promises';\nimport * as path from 'node:path';\nimport * as util from 'node:util';\nimport { type CloudFormationStackArtifact, type Environment, EnvironmentPlaceholders } from '@aws-cdk/cx-api';\nimport { HeadObjectCommand, S3Client } from '@aws-sdk/client-s3';\nimport { getEndpointFromInstructions } from '@smithy/middleware-endpoint';\nimport * as chalk from 'chalk';\nimport { ToolkitError } from '../../toolkit/toolkit-error';\nimport { contentHash, toYAML } from '../../util';\nimport type { AssetManifestBuilder } from '../deployments';\nimport type { EnvironmentResources } from '../environment';\nimport type { IoHelper } from '../io/private';\n\nexport type TemplateBodyParameter = {\n  TemplateBody?: string;\n  TemplateURL?: string;\n};\n\nconst LARGE_TEMPLATE_SIZE_KB = 50;\n\n/**\n * Prepares the body parameter for +CreateChangeSet+.\n *\n * If the template is small enough to be inlined into the API call, just return\n * it immediately.\n *\n * Otherwise, add it to the asset manifest to get uploaded to the staging\n * bucket and return its coordinates. If there is no staging bucket, an error\n * is thrown.\n *\n * @param stack     - the synthesized stack that provides the CloudFormation template\n * @param toolkitInfo - information about the toolkit stack\n */\nexport async function makeBodyParameter(\n  ioHelper: IoHelper,\n  stack: CloudFormationStackArtifact,\n  resolvedEnvironment: Environment,\n  assetManifest: AssetManifestBuilder,\n  resources: EnvironmentResources,\n  overrideTemplate?: any,\n): Promise<TemplateBodyParameter> {\n  // If the template has already been uploaded to S3, just use it from there.\n  if (stack.stackTemplateAssetObjectUrl && !overrideTemplate) {\n    return {\n      TemplateURL: await restUrlFromManifest(stack.stackTemplateAssetObjectUrl, resolvedEnvironment),\n    };\n  }\n\n  // Otherwise, pass via API call (if small) or upload here (if large)\n  const templateJson = toYAML(overrideTemplate ?? stack.template);\n\n  if (templateJson.length <= LARGE_TEMPLATE_SIZE_KB * 1024) {\n    return { TemplateBody: templateJson };\n  }\n\n  const toolkitInfo = await resources.lookupToolkit();\n  if (!toolkitInfo.found) {\n    await ioHelper.defaults.error(\n      util.format(\n        `The template for stack \"${stack.displayName}\" is ${Math.round(templateJson.length / 1024)}KiB. ` +\n        `Templates larger than ${LARGE_TEMPLATE_SIZE_KB}KiB must be uploaded to S3.\\n` +\n        'Run the following command in order to setup an S3 bucket in this environment, and then re-deploy:\\n\\n',\n        chalk.blue(`\\t$ cdk bootstrap ${resolvedEnvironment.name}\\n`),\n      ),\n    );\n\n    throw new ToolkitError('Template too large to deploy (\"cdk bootstrap\" is required)');\n  }\n\n  const templateHash = contentHash(templateJson);\n  const key = `cdk/${stack.id}/${templateHash}.yml`;\n\n  let templateFile = stack.templateFile;\n  if (overrideTemplate) {\n    // Add a variant of this template\n    templateFile = `${stack.templateFile}-${templateHash}.yaml`;\n    const templateFilePath = path.join(stack.assembly.directory, templateFile);\n    await fs.writeFile(templateFilePath, templateJson, { encoding: 'utf-8' });\n  }\n\n  assetManifest.addFileAsset(\n    templateHash,\n    {\n      path: templateFile,\n    },\n    {\n      bucketName: toolkitInfo.bucketName,\n      objectKey: key,\n    },\n  );\n\n  const templateURL = `${toolkitInfo.bucketUrl}/${key}`;\n  await ioHelper.defaults.debug(`Storing template in S3 at: ${templateURL}`);\n  return { TemplateURL: templateURL };\n}\n\n/**\n * Format an S3 URL in the manifest for use with CloudFormation\n *\n * Replaces environment placeholders (which this field may contain),\n * and reformats s3://.../... urls into S3 REST URLs (which CloudFormation\n * expects)\n */\nasync function restUrlFromManifest(url: string, environment: Environment): Promise<string> {\n  const doNotUseMarker = '**DONOTUSE**';\n  const region = environment.region;\n  // This URL may contain placeholders, so still substitute those.\n  url = EnvironmentPlaceholders.replace(url, {\n    accountId: environment.account,\n    region,\n    partition: doNotUseMarker,\n  });\n\n  // Yes, this is extremely crude, but we don't actually need this so I'm not inclined to spend\n  // a lot of effort trying to thread the right value to this location.\n  if (url.indexOf(doNotUseMarker) > -1) {\n    throw new ToolkitError(\"Cannot use '${AWS::Partition}' in the 'stackTemplateAssetObjectUrl' field\");\n  }\n\n  const s3Url = url.match(/s3:\\/\\/([^/]+)\\/(.*)$/);\n  if (!s3Url) {\n    return url;\n  }\n\n  // We need to pass an 'https://s3.REGION.amazonaws.com[.cn]/bucket/object' URL to CloudFormation, but we\n  // got an 's3://bucket/object' URL instead. Construct the rest API URL here.\n  const bucketName = s3Url[1];\n  const objectKey = s3Url[2];\n\n  // SDK v3 no longer allows for getting endpoints from only region.\n  // A command and client config must now be provided.\n  const s3 = new S3Client({ region });\n  const endpoint = await getEndpointFromInstructions({}, HeadObjectCommand, {\n    ...s3.config,\n  });\n  endpoint.url.hostname;\n\n  return `${endpoint.url.origin}/${bucketName}/${objectKey}`;\n}\n"]}
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"template-body-parameter.js","sourceRoot":"","sources":["template-body-parameter.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'node:fs/promises';\nimport * as path from 'node:path';\nimport * as util from 'node:util';\nimport { type CloudFormationStackArtifact, type Environment, EnvironmentPlaceholders } from '@aws-cdk/cx-api';\nimport { HeadObjectCommand, S3Client } from '@aws-sdk/client-s3';\nimport { getEndpointFromInstructions } from '@smithy/middleware-endpoint';\nimport * as chalk from 'chalk';\nimport { ToolkitError } from '../../toolkit/toolkit-error';\nimport { contentHash, toYAML } from '../../util';\nimport type { AssetManifestBuilder } from '../deployments';\nimport type { EnvironmentResources } from '../environment';\nimport type { IoHelper } from '../io/private';\n\nexport type TemplateBodyParameter = {\n  TemplateBody?: string;\n  TemplateURL?: string;\n};\n\nconst LARGE_TEMPLATE_SIZE_KB = 50;\n\n/**\n * Prepares the body parameter for +CreateChangeSet+.\n *\n * If the template is small enough to be inlined into the API call, just return\n * it immediately.\n *\n * Otherwise, add it to the asset manifest to get uploaded to the staging\n * bucket and return its coordinates. If there is no staging bucket, an error\n * is thrown.\n *\n * @param stack     - the synthesized stack that provides the CloudFormation template\n * @param toolkitInfo - information about the toolkit stack\n */\nexport async function makeBodyParameter(\n  ioHelper: IoHelper,\n  stack: CloudFormationStackArtifact,\n  resolvedEnvironment: Environment,\n  assetManifest: AssetManifestBuilder,\n  resources: EnvironmentResources,\n  overrideTemplate?: any,\n): Promise<TemplateBodyParameter> {\n  // If the template has already been uploaded to S3, just use it from there.\n  if (stack.stackTemplateAssetObjectUrl && !overrideTemplate) {\n    return {\n      TemplateURL: await restUrlFromManifest(stack.stackTemplateAssetObjectUrl, resolvedEnvironment),\n    };\n  }\n\n  // Otherwise, pass via API call (if small) or upload here (if large)\n  const templateJson = toYAML(overrideTemplate ?? stack.template);\n\n  if (templateJson.length <= LARGE_TEMPLATE_SIZE_KB * 1024) {\n    return { TemplateBody: templateJson };\n  }\n\n  const toolkitInfo = await resources.lookupToolkit();\n  if (!toolkitInfo.found) {\n    await ioHelper.defaults.error(\n      util.format(\n        `The template for stack \"${stack.displayName}\" is ${Math.round(templateJson.length / 1024)}KiB. ` +\n        `Templates larger than ${LARGE_TEMPLATE_SIZE_KB}KiB must be uploaded to S3.\\n` +\n        'Run the following command in order to setup an S3 bucket in this environment, and then re-deploy:\\n\\n',\n        chalk.blue(`\\t$ cdk bootstrap ${resolvedEnvironment.name}\\n`),\n      ),\n    );\n\n    throw new ToolkitError('Template too large to deploy (\"cdk bootstrap\" is required)');\n  }\n\n  const templateHash = contentHash(templateJson);\n  const key = `cdk/${stack.id}/${templateHash}.yml`;\n\n  let templateFile = stack.templateFile;\n  if (overrideTemplate) {\n    // Add a variant of this template\n    templateFile = `${stack.templateFile}-${templateHash}.yaml`;\n    const templateFilePath = path.join(stack.assembly.directory, templateFile);\n    await fs.writeFile(templateFilePath, templateJson, { encoding: 'utf-8' });\n  }\n\n  assetManifest.addFileAsset(\n    templateHash,\n    {\n      path: templateFile,\n    },\n    {\n      bucketName: toolkitInfo.bucketName,\n      objectKey: key,\n    },\n  );\n\n  const templateURL = `${toolkitInfo.bucketUrl}/${key}`;\n  await ioHelper.defaults.debug(`Storing template in S3 at: ${templateURL}`);\n  return { TemplateURL: templateURL };\n}\n\n/**\n * Format an S3 URL in the manifest for use with CloudFormation\n *\n * Replaces environment placeholders (which this field may contain),\n * and reformats s3://.../... urls into S3 REST URLs (which CloudFormation\n * expects).\n *\n * We need to return the official region- and partition-specific URL for AWS S3\n * here, so we use the SDK's information about endpoints. At the same time, the\n * SDK allows overriding this URL by setting an environment variable\n * (specifically $AWS_ENDPOINT_URL_S3) but we want to *not* honor that, because\n * there's a 99.9% chance this URL will not be routable from AWS CloudFormation.\n *\n * To allow for the off chance that someone is running this tool against a\n * custom build of CloudFormation that does need a specific S3 endpoint passed\n * to it, we'll introduce a new environment variable that we'll respect instead:\n *\n *  AWS_ENDPOINT_URL_S3_FOR_CLOUDFORMATION\n */\nexport async function restUrlFromManifest(url: string, environment: Environment): Promise<string> {\n  const doNotUseMarker = '**DONOTUSE**';\n  const region = environment.region;\n  // This URL may contain placeholders, so still substitute those.\n  url = EnvironmentPlaceholders.replace(url, {\n    accountId: environment.account,\n    region,\n    partition: doNotUseMarker,\n  });\n\n  // Yes, this is extremely crude, but we don't actually need this so I'm not inclined to spend\n  // a lot of effort trying to thread the right value to this location.\n  if (url.indexOf(doNotUseMarker) > -1) {\n    throw new ToolkitError(\"Cannot use '${AWS::Partition}' in the 'stackTemplateAssetObjectUrl' field\");\n  }\n\n  const s3Url = url.match(/s3:\\/\\/([^/]+)\\/(.*)$/);\n  if (!s3Url) {\n    return url;\n  }\n\n  // We need to pass an 'https://s3.REGION.amazonaws.com[.cn]/bucket/object' URL to CloudFormation, but we\n  // got an 's3://bucket/object' URL instead. Construct the rest API URL here.\n  const bucketName = s3Url[1];\n  const objectKey = s3Url[2];\n\n  const originalOverrideS3Endpoint = process.env.AWS_ENDPOINT_URL_S3;\n  setEnv('AWS_ENDPOINT_URL_S3', process.env.AWS_ENDPOINT_URL_S3_FOR_CLOUDFORMATION);\n  try {\n    // SDK v3 no longer allows for getting endpoints from only region.\n    // A command and client config must now be provided.\n    const s3 = new S3Client({ region });\n    const endpoint = await getEndpointFromInstructions({}, HeadObjectCommand, {\n      ...s3.config,\n    });\n\n    return `${endpoint.url.origin}/${bucketName}/${objectKey}`;\n  } finally {\n    setEnv('AWS_ENDPOINT_URL_S3', originalOverrideS3Endpoint);\n  }\n}\n\nfunction setEnv(name: string, value: string | undefined) {\n  if (value) {\n    process.env[name] = value;\n  } else {\n    delete process.env[name];\n  }\n}\n"]}
|
package/lib/api/index.d.ts
CHANGED
package/lib/api/index.js
CHANGED
|
@@ -26,6 +26,7 @@ __exportStar(require("./garbage-collection"), exports);
|
|
|
26
26
|
__exportStar(require("./hotswap"), exports);
|
|
27
27
|
__exportStar(require("./io"), exports);
|
|
28
28
|
__exportStar(require("./logs-monitor"), exports);
|
|
29
|
+
__exportStar(require("./network-detector"), exports);
|
|
29
30
|
__exportStar(require("./notices"), exports);
|
|
30
31
|
__exportStar(require("./plugin"), exports);
|
|
31
32
|
__exportStar(require("./refactoring"), exports);
|
|
@@ -38,4 +39,4 @@ __exportStar(require("./work-graph"), exports);
|
|
|
38
39
|
__exportStar(require("./tree"), exports);
|
|
39
40
|
__exportStar(require("./tags"), exports);
|
|
40
41
|
__exportStar(require("./drift"), exports);
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkNBQTJCO0FBQzNCLDhDQUE0QjtBQUM1QixtREFBaUM7QUFDakMsbURBQWlDO0FBQ2pDLDRDQUEwQjtBQUMxQixnREFBOEI7QUFDOUIseUNBQXVCO0FBQ3ZCLGdEQUE4QjtBQUM5Qix1REFBcUM7QUFDckMsNENBQTBCO0FBQzFCLHVDQUFxQjtBQUNyQixpREFBK0I7QUFDL0IscURBQW1DO0FBQ25DLDRDQUEwQjtBQUMxQiwyQ0FBeUI7QUFDekIsZ0RBQThCO0FBQzlCLG9EQUFrQztBQUNsQywyQ0FBeUI7QUFDekIsNkNBQTJCO0FBQzNCLGlEQUErQjtBQUMvQixpREFBK0I7QUFDL0IsK0NBQTZCO0FBQzdCLHlDQUF1QjtBQUN2Qix5Q0FBdUI7QUFDdkIsMENBQXdCIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSAnLi9hd3MtYXV0aCc7XG5leHBvcnQgKiBmcm9tICcuL2Jvb3RzdHJhcCc7XG5leHBvcnQgKiBmcm9tICcuL2Nsb3VkLWFzc2VtYmx5JztcbmV4cG9ydCAqIGZyb20gJy4vY2xvdWRmb3JtYXRpb24nO1xuZXhwb3J0ICogZnJvbSAnLi9jb250ZXh0JztcbmV4cG9ydCAqIGZyb20gJy4vZGVwbG95bWVudHMnO1xuZXhwb3J0ICogZnJvbSAnLi9kaWZmJztcbmV4cG9ydCAqIGZyb20gJy4vZW52aXJvbm1lbnQnO1xuZXhwb3J0ICogZnJvbSAnLi9nYXJiYWdlLWNvbGxlY3Rpb24nO1xuZXhwb3J0ICogZnJvbSAnLi9ob3Rzd2FwJztcbmV4cG9ydCAqIGZyb20gJy4vaW8nO1xuZXhwb3J0ICogZnJvbSAnLi9sb2dzLW1vbml0b3InO1xuZXhwb3J0ICogZnJvbSAnLi9uZXR3b3JrLWRldGVjdG9yJztcbmV4cG9ydCAqIGZyb20gJy4vbm90aWNlcyc7XG5leHBvcnQgKiBmcm9tICcuL3BsdWdpbic7XG5leHBvcnQgKiBmcm9tICcuL3JlZmFjdG9yaW5nJztcbmV4cG9ydCAqIGZyb20gJy4vcmVzb3VyY2UtaW1wb3J0JztcbmV4cG9ydCAqIGZyb20gJy4vcndsb2NrJztcbmV4cG9ydCAqIGZyb20gJy4vc2V0dGluZ3MnO1xuZXhwb3J0ICogZnJvbSAnLi9zdGFjay1ldmVudHMnO1xuZXhwb3J0ICogZnJvbSAnLi90b29sa2l0LWluZm8nO1xuZXhwb3J0ICogZnJvbSAnLi93b3JrLWdyYXBoJztcbmV4cG9ydCAqIGZyb20gJy4vdHJlZSc7XG5leHBvcnQgKiBmcm9tICcuL3RhZ3MnO1xuZXhwb3J0ICogZnJvbSAnLi9kcmlmdCc7XG4iXX0=
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./network-detector"), exports);
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscURBQW1DIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSAnLi9uZXR3b3JrLWRldGVjdG9yJztcbiJdfQ==
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import * as https from 'node:https';
|
|
2
|
+
/**
|
|
3
|
+
* Detects internet connectivity by making a lightweight request to the notices endpoint
|
|
4
|
+
*/
|
|
5
|
+
export declare class NetworkDetector {
|
|
6
|
+
/**
|
|
7
|
+
* Check if internet connectivity is available
|
|
8
|
+
*/
|
|
9
|
+
static hasConnectivity(agent?: https.Agent): Promise<boolean>;
|
|
10
|
+
private static readonly TIMEOUT;
|
|
11
|
+
private static readonly URL;
|
|
12
|
+
private static load;
|
|
13
|
+
private static save;
|
|
14
|
+
private static ping;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=network-detector.d.ts.map
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NetworkDetector = void 0;
|
|
4
|
+
const https = require("node:https");
|
|
5
|
+
const path = require("path");
|
|
6
|
+
const fs = require("fs-extra");
|
|
7
|
+
const util_1 = require("../../util");
|
|
8
|
+
const TIME_TO_LIVE_SUCCESS = 60 * 60 * 1000; // 1 hour
|
|
9
|
+
const CACHE_FILE_PATH = path.join((0, util_1.cdkCacheDir)(), 'connection.json');
|
|
10
|
+
/**
|
|
11
|
+
* Detects internet connectivity by making a lightweight request to the notices endpoint
|
|
12
|
+
*/
|
|
13
|
+
class NetworkDetector {
|
|
14
|
+
/**
|
|
15
|
+
* Check if internet connectivity is available
|
|
16
|
+
*/
|
|
17
|
+
static async hasConnectivity(agent) {
|
|
18
|
+
const cachedData = await this.load();
|
|
19
|
+
const expiration = cachedData.expiration ?? 0;
|
|
20
|
+
if (Date.now() > expiration) {
|
|
21
|
+
try {
|
|
22
|
+
const connected = await this.ping(agent);
|
|
23
|
+
const updatedData = {
|
|
24
|
+
expiration: Date.now() + TIME_TO_LIVE_SUCCESS,
|
|
25
|
+
hasConnectivity: connected,
|
|
26
|
+
};
|
|
27
|
+
await this.save(updatedData);
|
|
28
|
+
return connected;
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
return cachedData.hasConnectivity;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
// We are observing lots of timeouts when running in a massively parallel
|
|
39
|
+
// integration test environment, so wait for a longer timeout there.
|
|
40
|
+
//
|
|
41
|
+
// In production, have a short timeout to not hold up the user experience.
|
|
42
|
+
static TIMEOUT = process.env.TESTING_CDK ? 30_000 : 3_000;
|
|
43
|
+
static URL = 'https://cli.cdk.dev-tools.aws.dev/notices.json';
|
|
44
|
+
static async load() {
|
|
45
|
+
const defaultValue = {
|
|
46
|
+
expiration: 0,
|
|
47
|
+
hasConnectivity: false,
|
|
48
|
+
};
|
|
49
|
+
try {
|
|
50
|
+
return fs.existsSync(CACHE_FILE_PATH)
|
|
51
|
+
? await fs.readJSON(CACHE_FILE_PATH)
|
|
52
|
+
: defaultValue;
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
return defaultValue;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
static async save(cached) {
|
|
59
|
+
try {
|
|
60
|
+
await fs.ensureFile(CACHE_FILE_PATH);
|
|
61
|
+
await fs.writeJSON(CACHE_FILE_PATH, cached);
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
// Silently ignore cache save errors
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
static ping(agent) {
|
|
68
|
+
const options = {
|
|
69
|
+
method: 'HEAD',
|
|
70
|
+
agent: agent,
|
|
71
|
+
timeout: this.TIMEOUT,
|
|
72
|
+
};
|
|
73
|
+
return new Promise((resolve) => {
|
|
74
|
+
const req = https.request(NetworkDetector.URL, options, (res) => {
|
|
75
|
+
resolve(res.statusCode !== undefined && res.statusCode < 500);
|
|
76
|
+
});
|
|
77
|
+
req.on('error', () => resolve(false));
|
|
78
|
+
req.on('timeout', () => {
|
|
79
|
+
req.destroy();
|
|
80
|
+
resolve(false);
|
|
81
|
+
});
|
|
82
|
+
req.end();
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
exports.NetworkDetector = NetworkDetector;
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29yay1kZXRlY3Rvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIm5ldHdvcmstZGV0ZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsb0NBQW9DO0FBRXBDLDZCQUE2QjtBQUM3QiwrQkFBK0I7QUFDL0IscUNBQXlDO0FBT3pDLE1BQU0sb0JBQW9CLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQyxTQUFTO0FBQ3RELE1BQU0sZUFBZSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBQSxrQkFBVyxHQUFFLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztBQUVwRTs7R0FFRztBQUNILE1BQWEsZUFBZTtJQUMxQjs7T0FFRztJQUNJLE1BQU0sQ0FBQyxLQUFLLENBQUMsZUFBZSxDQUFDLEtBQW1CO1FBQ3JELE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3JDLE1BQU0sVUFBVSxHQUFHLFVBQVUsQ0FBQyxVQUFVLElBQUksQ0FBQyxDQUFDO1FBRTlDLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLFVBQVUsRUFBRSxDQUFDO1lBQzVCLElBQUksQ0FBQztnQkFDSCxNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQ3pDLE1BQU0sV0FBVyxHQUFHO29CQUNsQixVQUFVLEVBQUUsSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLG9CQUFvQjtvQkFDN0MsZUFBZSxFQUFFLFNBQVM7aUJBQzNCLENBQUM7Z0JBQ0YsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO2dCQUM3QixPQUFPLFNBQVMsQ0FBQztZQUNuQixDQUFDO1lBQUMsTUFBTSxDQUFDO2dCQUNQLE9BQU8sS0FBSyxDQUFDO1lBQ2YsQ0FBQztRQUNILENBQUM7YUFBTSxDQUFDO1lBQ04sT0FBTyxVQUFVLENBQUMsZUFBZSxDQUFDO1FBQ3BDLENBQUM7SUFDSCxDQUFDO0lBRUQseUVBQXlFO0lBQ3pFLG9FQUFvRTtJQUNwRSxFQUFFO0lBQ0YsMEVBQTBFO0lBQ2xFLE1BQU0sQ0FBVSxPQUFPLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO0lBQ25FLE1BQU0sQ0FBVSxHQUFHLEdBQUcsZ0RBQWdELENBQUM7SUFFdkUsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJO1FBQ3ZCLE1BQU0sWUFBWSxHQUFHO1lBQ25CLFVBQVUsRUFBRSxDQUFDO1lBQ2IsZUFBZSxFQUFFLEtBQUs7U0FDdkIsQ0FBQztRQUVGLElBQUksQ0FBQztZQUNILE9BQU8sRUFBRSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUM7Z0JBQ25DLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsZUFBZSxDQUF1QjtnQkFDMUQsQ0FBQyxDQUFDLFlBQVksQ0FBQztRQUNuQixDQUFDO1FBQUMsTUFBTSxDQUFDO1lBQ1AsT0FBTyxZQUFZLENBQUM7UUFDdEIsQ0FBQztJQUNILENBQUM7SUFFTyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxNQUEwQjtRQUNsRCxJQUFJLENBQUM7WUFDSCxNQUFNLEVBQUUsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLENBQUM7WUFDckMsTUFBTSxFQUFFLENBQUMsU0FBUyxDQUFDLGVBQWUsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUM5QyxDQUFDO1FBQUMsTUFBTSxDQUFDO1lBQ1Asb0NBQW9DO1FBQ3RDLENBQUM7SUFDSCxDQUFDO0lBRU8sTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFtQjtRQUNyQyxNQUFNLE9BQU8sR0FBbUI7WUFDOUIsTUFBTSxFQUFFLE1BQU07WUFDZCxLQUFLLEVBQUUsS0FBSztZQUNaLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztTQUN0QixDQUFDO1FBRUYsT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFO1lBQzdCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQ3ZCLGVBQWUsQ0FBQyxHQUFHLEVBQ25CLE9BQU8sRUFDUCxDQUFDLEdBQUcsRUFBRSxFQUFFO2dCQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxLQUFLLFNBQVMsSUFBSSxHQUFHLENBQUMsVUFBVSxHQUFHLEdBQUcsQ0FBQyxDQUFDO1lBQ2hFLENBQUMsQ0FDRixDQUFDO1lBQ0YsR0FBRyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDdEMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxTQUFTLEVBQUUsR0FBRyxFQUFFO2dCQUNyQixHQUFHLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ2QsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ2pCLENBQUMsQ0FBQyxDQUFDO1lBRUgsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ1osQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDOztBQS9FSCwwQ0FnRkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBodHRwcyBmcm9tICdub2RlOmh0dHBzJztcbmltcG9ydCB0eXBlIHsgUmVxdWVzdE9wdGlvbnMgfSBmcm9tICdub2RlOmh0dHBzJztcbmltcG9ydCAqIGFzIHBhdGggZnJvbSAncGF0aCc7XG5pbXBvcnQgKiBhcyBmcyBmcm9tICdmcy1leHRyYSc7XG5pbXBvcnQgeyBjZGtDYWNoZURpciB9IGZyb20gJy4uLy4uL3V0aWwnO1xuXG5pbnRlcmZhY2UgQ2FjaGVkQ29ubmVjdGl2aXR5IHtcbiAgZXhwaXJhdGlvbjogbnVtYmVyO1xuICBoYXNDb25uZWN0aXZpdHk6IGJvb2xlYW47XG59XG5cbmNvbnN0IFRJTUVfVE9fTElWRV9TVUNDRVNTID0gNjAgKiA2MCAqIDEwMDA7IC8vIDEgaG91clxuY29uc3QgQ0FDSEVfRklMRV9QQVRIID0gcGF0aC5qb2luKGNka0NhY2hlRGlyKCksICdjb25uZWN0aW9uLmpzb24nKTtcblxuLyoqXG4gKiBEZXRlY3RzIGludGVybmV0IGNvbm5lY3Rpdml0eSBieSBtYWtpbmcgYSBsaWdodHdlaWdodCByZXF1ZXN0IHRvIHRoZSBub3RpY2VzIGVuZHBvaW50XG4gKi9cbmV4cG9ydCBjbGFzcyBOZXR3b3JrRGV0ZWN0b3Ige1xuICAvKipcbiAgICogQ2hlY2sgaWYgaW50ZXJuZXQgY29ubmVjdGl2aXR5IGlzIGF2YWlsYWJsZVxuICAgKi9cbiAgcHVibGljIHN0YXRpYyBhc3luYyBoYXNDb25uZWN0aXZpdHkoYWdlbnQ/OiBodHRwcy5BZ2VudCk6IFByb21pc2U8Ym9vbGVhbj4ge1xuICAgIGNvbnN0IGNhY2hlZERhdGEgPSBhd2FpdCB0aGlzLmxvYWQoKTtcbiAgICBjb25zdCBleHBpcmF0aW9uID0gY2FjaGVkRGF0YS5leHBpcmF0aW9uID8/IDA7XG5cbiAgICBpZiAoRGF0ZS5ub3coKSA+IGV4cGlyYXRpb24pIHtcbiAgICAgIHRyeSB7XG4gICAgICAgIGNvbnN0IGNvbm5lY3RlZCA9IGF3YWl0IHRoaXMucGluZyhhZ2VudCk7XG4gICAgICAgIGNvbnN0IHVwZGF0ZWREYXRhID0ge1xuICAgICAgICAgIGV4cGlyYXRpb246IERhdGUubm93KCkgKyBUSU1FX1RPX0xJVkVfU1VDQ0VTUyxcbiAgICAgICAgICBoYXNDb25uZWN0aXZpdHk6IGNvbm5lY3RlZCxcbiAgICAgICAgfTtcbiAgICAgICAgYXdhaXQgdGhpcy5zYXZlKHVwZGF0ZWREYXRhKTtcbiAgICAgICAgcmV0dXJuIGNvbm5lY3RlZDtcbiAgICAgIH0gY2F0Y2gge1xuICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgICB9XG4gICAgfSBlbHNlIHtcbiAgICAgIHJldHVybiBjYWNoZWREYXRhLmhhc0Nvbm5lY3Rpdml0eTtcbiAgICB9XG4gIH1cblxuICAvLyBXZSBhcmUgb2JzZXJ2aW5nIGxvdHMgb2YgdGltZW91dHMgd2hlbiBydW5uaW5nIGluIGEgbWFzc2l2ZWx5IHBhcmFsbGVsXG4gIC8vIGludGVncmF0aW9uIHRlc3QgZW52aXJvbm1lbnQsIHNvIHdhaXQgZm9yIGEgbG9uZ2VyIHRpbWVvdXQgdGhlcmUuXG4gIC8vXG4gIC8vIEluIHByb2R1Y3Rpb24sIGhhdmUgYSBzaG9ydCB0aW1lb3V0IHRvIG5vdCBob2xkIHVwIHRoZSB1c2VyIGV4cGVyaWVuY2UuXG4gIHByaXZhdGUgc3RhdGljIHJlYWRvbmx5IFRJTUVPVVQgPSBwcm9jZXNzLmVudi5URVNUSU5HX0NESyA/IDMwXzAwMCA6IDNfMDAwO1xuICBwcml2YXRlIHN0YXRpYyByZWFkb25seSBVUkwgPSAnaHR0cHM6Ly9jbGkuY2RrLmRldi10b29scy5hd3MuZGV2L25vdGljZXMuanNvbic7XG5cbiAgcHJpdmF0ZSBzdGF0aWMgYXN5bmMgbG9hZCgpOiBQcm9taXNlPENhY2hlZENvbm5lY3Rpdml0eT4ge1xuICAgIGNvbnN0IGRlZmF1bHRWYWx1ZSA9IHtcbiAgICAgIGV4cGlyYXRpb246IDAsXG4gICAgICBoYXNDb25uZWN0aXZpdHk6IGZhbHNlLFxuICAgIH07XG5cbiAgICB0cnkge1xuICAgICAgcmV0dXJuIGZzLmV4aXN0c1N5bmMoQ0FDSEVfRklMRV9QQVRIKVxuICAgICAgICA/IGF3YWl0IGZzLnJlYWRKU09OKENBQ0hFX0ZJTEVfUEFUSCkgYXMgQ2FjaGVkQ29ubmVjdGl2aXR5XG4gICAgICAgIDogZGVmYXVsdFZhbHVlO1xuICAgIH0gY2F0Y2gge1xuICAgICAgcmV0dXJuIGRlZmF1bHRWYWx1ZTtcbiAgICB9XG4gIH1cblxuICBwcml2YXRlIHN0YXRpYyBhc3luYyBzYXZlKGNhY2hlZDogQ2FjaGVkQ29ubmVjdGl2aXR5KTogUHJvbWlzZTx2b2lkPiB7XG4gICAgdHJ5IHtcbiAgICAgIGF3YWl0IGZzLmVuc3VyZUZpbGUoQ0FDSEVfRklMRV9QQVRIKTtcbiAgICAgIGF3YWl0IGZzLndyaXRlSlNPTihDQUNIRV9GSUxFX1BBVEgsIGNhY2hlZCk7XG4gICAgfSBjYXRjaCB7XG4gICAgICAvLyBTaWxlbnRseSBpZ25vcmUgY2FjaGUgc2F2ZSBlcnJvcnNcbiAgICB9XG4gIH1cblxuICBwcml2YXRlIHN0YXRpYyBwaW5nKGFnZW50PzogaHR0cHMuQWdlbnQpOiBQcm9taXNlPGJvb2xlYW4+IHtcbiAgICBjb25zdCBvcHRpb25zOiBSZXF1ZXN0T3B0aW9ucyA9IHtcbiAgICAgIG1ldGhvZDogJ0hFQUQnLFxuICAgICAgYWdlbnQ6IGFnZW50LFxuICAgICAgdGltZW91dDogdGhpcy5USU1FT1VULFxuICAgIH07XG5cbiAgICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUpID0+IHtcbiAgICAgIGNvbnN0IHJlcSA9IGh0dHBzLnJlcXVlc3QoXG4gICAgICAgIE5ldHdvcmtEZXRlY3Rvci5VUkwsXG4gICAgICAgIG9wdGlvbnMsXG4gICAgICAgIChyZXMpID0+IHtcbiAgICAgICAgICByZXNvbHZlKHJlcy5zdGF0dXNDb2RlICE9PSB1bmRlZmluZWQgJiYgcmVzLnN0YXR1c0NvZGUgPCA1MDApO1xuICAgICAgICB9LFxuICAgICAgKTtcbiAgICAgIHJlcS5vbignZXJyb3InLCAoKSA9PiByZXNvbHZlKGZhbHNlKSk7XG4gICAgICByZXEub24oJ3RpbWVvdXQnLCAoKSA9PiB7XG4gICAgICAgIHJlcS5kZXN0cm95KCk7XG4gICAgICAgIHJlc29sdmUoZmFsc2UpO1xuICAgICAgfSk7XG5cbiAgICAgIHJlcS5lbmQoKTtcbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -4,6 +4,7 @@ exports.WebsiteNoticeDataSource = exports.WebsiteNoticeDataSourceProps = void 0;
|
|
|
4
4
|
const https = require("node:https");
|
|
5
5
|
const toolkit_error_1 = require("../../toolkit/toolkit-error");
|
|
6
6
|
const util_1 = require("../../util");
|
|
7
|
+
const network_detector_1 = require("../network-detector/network-detector");
|
|
7
8
|
/**
|
|
8
9
|
* A data source that fetches notices from the CDK notices data source
|
|
9
10
|
*/
|
|
@@ -41,6 +42,11 @@ class WebsiteNoticeDataSource {
|
|
|
41
42
|
this.url = props.url ?? 'https://cli.cdk.dev-tools.aws.dev/notices.json';
|
|
42
43
|
}
|
|
43
44
|
async fetch() {
|
|
45
|
+
// Check connectivity before attempting network request
|
|
46
|
+
const hasConnectivity = await network_detector_1.NetworkDetector.hasConnectivity(this.agent);
|
|
47
|
+
if (!hasConnectivity) {
|
|
48
|
+
throw new toolkit_error_1.ToolkitError('No internet connectivity detected');
|
|
49
|
+
}
|
|
44
50
|
// We are observing lots of timeouts when running in a massively parallel
|
|
45
51
|
// integration test environment, so wait for a longer timeout there.
|
|
46
52
|
//
|
|
@@ -98,4 +104,4 @@ class WebsiteNoticeDataSource {
|
|
|
98
104
|
}
|
|
99
105
|
}
|
|
100
106
|
exports.WebsiteNoticeDataSource = WebsiteNoticeDataSource;
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"web-data-source.js","sourceRoot":"","sources":["web-data-source.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ClientRequest } from 'node:http';\nimport type { RequestOptions } from 'node:https';\nimport * as https from 'node:https';\nimport type { Notice, NoticeDataSource } from './types';\nimport { ToolkitError } from '../../toolkit/toolkit-error';\nimport { formatErrorMessage, humanHttpStatusError, humanNetworkError } from '../../util';\nimport type { IoHelper } from '../io/private';\nimport { NetworkDetector } from '../network-detector/network-detector';\n\n/**\n * A data source that fetches notices from the CDK notices data source\n */\nexport class WebsiteNoticeDataSourceProps {\n  /**\n   * The URL to load notices from.\n   *\n   * Note this must be a valid JSON document in the CDK notices data schema.\n   *\n   * @see https://github.com/cdklabs/aws-cdk-notices\n   *\n   * @default - Official CDK notices\n   */\n  readonly url?: string | URL;\n\n  /**\n   * The agent responsible for making the network requests.\n   *\n   * Use this so set up a proxy connection.\n   *\n   * @default - Uses the shared global node agent\n   */\n  readonly agent?: https.Agent;\n}\n\nexport class WebsiteNoticeDataSource implements NoticeDataSource {\n  /**\n   * The URL notices are loaded from.\n   */\n  public readonly url: any;\n\n  private readonly agent?: https.Agent;\n\n  constructor(private readonly ioHelper: IoHelper, props: WebsiteNoticeDataSourceProps = {}) {\n    this.agent = props.agent;\n    this.url = props.url ?? 'https://cli.cdk.dev-tools.aws.dev/notices.json';\n  }\n\n  async fetch(): Promise<Notice[]> {\n    // Check connectivity before attempting network request\n    const hasConnectivity = await NetworkDetector.hasConnectivity(this.agent);\n    if (!hasConnectivity) {\n      throw new ToolkitError('No internet connectivity detected');\n    }\n\n    // We are observing lots of timeouts when running in a massively parallel\n    // integration test environment, so wait for a longer timeout there.\n    //\n    // In production, have a short timeout to not hold up the user experience.\n    const timeout = process.env.TESTING_CDK ? 30_000 : 3_000;\n\n    const options: RequestOptions = {\n      agent: this.agent,\n    };\n\n    const notices = await new Promise<Notice[]>((resolve, reject) => {\n      let req: ClientRequest | undefined;\n\n      let timer = setTimeout(() => {\n        if (req) {\n          req.destroy(new ToolkitError('Request timed out'));\n        }\n      }, timeout);\n\n      timer.unref();\n\n      try {\n        req = https.get(\n          this.url,\n          options,\n          res => {\n            if (res.statusCode === 200) {\n              res.setEncoding('utf8');\n              let rawData = '';\n              res.on('data', (chunk) => {\n                rawData += chunk;\n              });\n              res.on('end', () => {\n                try {\n                  const data = JSON.parse(rawData).notices as Notice[];\n                  if (!data) {\n                    throw new ToolkitError(\"'notices' key is missing from received data\");\n                  }\n                  resolve(data ?? []);\n                } catch (e: any) {\n                  reject(ToolkitError.withCause(`Parse error: ${formatErrorMessage(e)}`, e));\n                }\n              });\n              res.on('error', e => {\n                reject(ToolkitError.withCause(formatErrorMessage(e), e));\n              });\n            } else {\n              reject(new ToolkitError(`${humanHttpStatusError(res.statusCode!)} (Status code: ${res.statusCode})`));\n            }\n          },\n        );\n        req.on('error', e => {\n          reject(ToolkitError.withCause(humanNetworkError(e), e));\n        });\n      } catch (e: any) {\n        reject(ToolkitError.withCause(formatErrorMessage(e), e));\n      }\n    });\n\n    await this.ioHelper.defaults.debug('Notices refreshed');\n    return notices;\n  }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
},
|
|
80
80
|
"dependencies": {
|
|
81
81
|
"@aws-cdk/cdk-assets-lib": "^1",
|
|
82
|
-
"@aws-cdk/cloud-assembly-schema": ">=48.
|
|
82
|
+
"@aws-cdk/cloud-assembly-schema": ">=48.20.0",
|
|
83
83
|
"@aws-cdk/cloudformation-diff": "^2",
|
|
84
84
|
"@aws-cdk/cx-api": "^2",
|
|
85
85
|
"@aws-sdk/client-appsync": "^3",
|
|
@@ -114,7 +114,7 @@
|
|
|
114
114
|
"chokidar": "^3",
|
|
115
115
|
"fast-deep-equal": "^3.1.3",
|
|
116
116
|
"fs-extra": "^9",
|
|
117
|
-
"glob": "^11.0
|
|
117
|
+
"glob": "^11.1.0",
|
|
118
118
|
"minimatch": "10.0.3",
|
|
119
119
|
"p-limit": "^3",
|
|
120
120
|
"semver": "^7.7.2",
|
|
@@ -136,7 +136,7 @@
|
|
|
136
136
|
"publishConfig": {
|
|
137
137
|
"access": "public"
|
|
138
138
|
},
|
|
139
|
-
"version": "1.
|
|
139
|
+
"version": "1.11.0",
|
|
140
140
|
"types": "lib/index.d.ts",
|
|
141
141
|
"exports": {
|
|
142
142
|
".": {
|