From 9b592a4c6388c2cac7b992727b95f25c9e51bed0 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Mon, 23 May 2022 15:37:09 +0200 Subject: [PATCH 01/11] docs(pipelines): explain how to retain symlinks (#20413) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../lib/codepipeline/codepipeline-source.ts | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/packages/@aws-cdk/pipelines/lib/codepipeline/codepipeline-source.ts b/packages/@aws-cdk/pipelines/lib/codepipeline/codepipeline-source.ts index ef5f7479c66b5..0fe05412d297a 100644 --- a/packages/@aws-cdk/pipelines/lib/codepipeline/codepipeline-source.ts +++ b/packages/@aws-cdk/pipelines/lib/codepipeline/codepipeline-source.ts @@ -38,6 +38,9 @@ export abstract class CodePipelineSource extends Step implements ICodePipelineAc * * * **repo** - to read the repository * * **admin:repo_hook** - if you plan to use webhooks (true by default) + * + * If you need access to symlinks or the repository history, use a source of type + * `connection` instead. */ public static gitHub(repoString: string, branch: string, props: GitHubSourceOptions = {}): CodePipelineSource { return new GitHubSource(repoString, branch, props); @@ -92,6 +95,9 @@ export abstract class CodePipelineSource extends Step implements ICodePipelineAc * }); * ``` * + * If you need access to symlinks or the repository history, be sure to set + * `codeBuildCloneOutput`. + * * @param repoString A string that encodes owner and repository separated by a slash (e.g. 'owner/repo'). * @param branch The branch to use. * @param props The source properties, including the connection ARN. @@ -105,6 +111,10 @@ export abstract class CodePipelineSource extends Step implements ICodePipelineAc /** * Returns a CodeCommit source. * + * If you need access to symlinks or the repository history, be sure to set + * `codeBuildCloneOutput`. + * + * * @param repository The CodeCommit repository. * @param branch The branch to use. * @param props The source properties. @@ -360,12 +370,12 @@ export interface ConnectionSourceOptions { // long URL in @see /** - * Whether the output should be the contents of the repository - * (which is the default), - * or a link that allows CodeBuild to clone the repository before building. + * If this is set, the next CodeBuild job clones the repository (instead of CodePipeline downloading the files). + * + * This provides access to repository history, and retains symlinks (symlinks would otherwise be + * removed by CodePipeline). * - * **Note**: if this option is true, - * then only CodeBuild actions can use the resulting {@link output}. + * **Note**: if this option is true, only CodeBuild jobs can use the output artifact. * * @default false * @see https://docs.aws.amazon.com/codepipeline/latest/userguide/action-reference-CodestarConnectionSource.html#action-reference-CodestarConnectionSource-config @@ -435,12 +445,12 @@ export interface CodeCommitSourceOptions { readonly eventRole?: iam.IRole; /** - * Whether the output should be the contents of the repository - * (which is the default), - * or a link that allows CodeBuild to clone the repository before building. + * If this is set, the next CodeBuild job clones the repository (instead of CodePipeline downloading the files). + * + * This provides access to repository history, and retains symlinks (symlinks would otherwise be + * removed by CodePipeline). * - * **Note**: if this option is true, - * then only CodeBuild actions can use the resulting {@link output}. + * **Note**: if this option is true, only CodeBuild jobs can use the output artifact. * * @default false * @see https://docs.aws.amazon.com/codepipeline/latest/userguide/action-reference-CodeCommit.html From e9cbda37070389e52824e6514e402b34ac493361 Mon Sep 17 00:00:00 2001 From: MayForBlue <60128296+MayForBlue@users.noreply.github.com> Date: Tue, 24 May 2022 00:36:06 +0900 Subject: [PATCH 02/11] chore(s3): fix indent in sample code (#20457) I found wrong indents in sample code and fix those. ---- ### All Submissions: * [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/@aws-cdk/aws-s3/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/@aws-cdk/aws-s3/README.md b/packages/@aws-cdk/aws-s3/README.md index ddf1f9a729d48..c2f87f1186a3c 100644 --- a/packages/@aws-cdk/aws-s3/README.md +++ b/packages/@aws-cdk/aws-s3/README.md @@ -522,7 +522,7 @@ by deploying with CDK version `1.126.0` or later **before** switching this value ```ts const bucket = new s3.Bucket(this, 'MyBucket', { - transferAcceleration: true, + transferAcceleration: true, }); ``` @@ -530,7 +530,7 @@ To access the bucket that is enabled for Transfer Acceleration, you must use a s ```ts const bucket = new s3.Bucket(this, 'MyBucket', { - transferAcceleration: true, + transferAcceleration: true, }); bucket.transferAccelerationUrlForObject('objectname'); ``` @@ -540,14 +540,14 @@ bucket.transferAccelerationUrlForObject('objectname'); [Intelligent Tiering](https://docs.aws.amazon.com/AmazonS3/latest/userguide/intelligent-tiering.html) can be configured to automatically move files to glacier: ```ts - new s3.Bucket(this, 'MyBucket', { - intelligentTieringConfigurations: [{ - name: 'foo', - prefix: 'folder/name', - archiveAccessTierTime: cdk.Duration.days(90), - deepArchiveAccessTierTime: cdk.Duration.days(180), - tags: [{key: 'tagname', value: 'tagvalue'}] - }], +new s3.Bucket(this, 'MyBucket', { + intelligentTieringConfigurations: [{ + name: 'foo', + prefix: 'folder/name', + archiveAccessTierTime: cdk.Duration.days(90), + deepArchiveAccessTierTime: cdk.Duration.days(180), + tags: [{key: 'tagname', value: 'tagvalue'}] + }], }); ``` From 0f52813bcf6a48c352f697004a899461dd06935d Mon Sep 17 00:00:00 2001 From: Cory Hall <43035978+corymhall@users.noreply.github.com> Date: Mon, 23 May 2022 12:40:17 -0400 Subject: [PATCH 03/11] fix(integ-tests): DeployAssert should be private (#20466) The `DeployAssert` construct is really an implementation detail that is only used when making assertions as part of integration tests. This PR makes the construct private and creates a public interface (`IDeployAssert`). This PR also: - Removes the scope swap since we no longer need to pass around `DeployAssert`. - Removes some unused code (ResultsCollector). ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../test/integ.destinations.ts | 4 +- .../aws-lambda/test/integ.bundling.ts | 4 +- .../test/eventbridge/integ.put-events.ts | 6 +- packages/@aws-cdk/integ-tests/README.md | 94 ++++++------ .../integ-tests/lib/assertions/common.ts | 5 +- .../lib/assertions/deploy-assert.ts | 128 ---------------- .../integ-tests/lib/assertions/index.ts | 4 +- .../lib/assertions/private/deploy-assert.ts | 76 ++++++++++ .../providers/lambda-handler/index.ts | 2 - .../providers/lambda-handler/results.ts | 12 -- .../providers/lambda-handler/types.ts | 22 --- .../integ-tests/lib/assertions/sdk.ts | 137 ++++++++++-------- .../integ-tests/lib/assertions/types.ts | 60 ++++++++ .../@aws-cdk/integ-tests/lib/test-case.ts | 20 ++- .../integ-tests/rosetta/default.ts-fixture | 1 - .../test/assertions/deploy-assert.test.ts | 21 +-- .../integ-tests/test/assertions/sdk.test.ts | 85 ++++------- 17 files changed, 330 insertions(+), 351 deletions(-) delete mode 100644 packages/@aws-cdk/integ-tests/lib/assertions/deploy-assert.ts create mode 100644 packages/@aws-cdk/integ-tests/lib/assertions/private/deploy-assert.ts delete mode 100644 packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/results.ts create mode 100644 packages/@aws-cdk/integ-tests/lib/assertions/types.ts diff --git a/packages/@aws-cdk/aws-lambda-destinations/test/integ.destinations.ts b/packages/@aws-cdk/aws-lambda-destinations/test/integ.destinations.ts index 61009f180e53d..5dd67661acbb8 100644 --- a/packages/@aws-cdk/aws-lambda-destinations/test/integ.destinations.ts +++ b/packages/@aws-cdk/aws-lambda-destinations/test/integ.destinations.ts @@ -73,13 +73,13 @@ const integ = new IntegTest(app, 'Destinations', { testCases: [stack], }); -integ.assert.invokeFunction({ +integ.assertions.invokeFunction({ functionName: stack.fn.functionName, invocationType: InvocationType.EVENT, payload: JSON.stringify({ status: 'OK' }), }); -const message = integ.assert.awsApiCall('SQS', 'receiveMessage', { +const message = integ.assertions.awsApiCall('SQS', 'receiveMessage', { QueueUrl: stack.queue.queueUrl, WaitTimeSeconds: 20, }); diff --git a/packages/@aws-cdk/aws-lambda/test/integ.bundling.ts b/packages/@aws-cdk/aws-lambda/test/integ.bundling.ts index 30e28c8ef5fe7..8549134ca9e5b 100644 --- a/packages/@aws-cdk/aws-lambda/test/integ.bundling.ts +++ b/packages/@aws-cdk/aws-lambda/test/integ.bundling.ts @@ -47,10 +47,10 @@ const integ = new IntegTest(app, 'Bundling', { stackUpdateWorkflow: false, }); -const invoke = integ.assert.invokeFunction({ +const invoke = integ.assertions.invokeFunction({ functionName: stack.functionName, }); -invoke.assert(ExpectedResult.objectLike({ +invoke.expect(ExpectedResult.objectLike({ Payload: '200', })); app.synth(); diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/eventbridge/integ.put-events.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/eventbridge/integ.put-events.ts index 1c6ee34a3341b..d72ecfb494415 100644 --- a/packages/@aws-cdk/aws-stepfunctions-tasks/test/eventbridge/integ.put-events.ts +++ b/packages/@aws-cdk/aws-stepfunctions-tasks/test/eventbridge/integ.put-events.ts @@ -46,17 +46,17 @@ const testCase = new IntegTest(app, 'PutEvents', { }); // Start an execution -const start = testCase.assert.awsApiCall('StepFunctions', 'startExecution', { +const start = testCase.assertions.awsApiCall('StepFunctions', 'startExecution', { stateMachineArn: sm.stateMachineArn, }); // describe the results of the execution -const describe = testCase.assert.awsApiCall('StepFunctions', 'describeExecution', { +const describe = testCase.assertions.awsApiCall('StepFunctions', 'describeExecution', { executionArn: start.getAttString('executionArn'), }); // assert the results -describe.assert(ExpectedResult.objectLike({ +describe.expect(ExpectedResult.objectLike({ status: 'SUCCEEDED', })); diff --git a/packages/@aws-cdk/integ-tests/README.md b/packages/@aws-cdk/integ-tests/README.md index 0e8fc9b1ca501..414f21e5a61fd 100644 --- a/packages/@aws-cdk/integ-tests/README.md +++ b/packages/@aws-cdk/integ-tests/README.md @@ -177,41 +177,50 @@ new IntegTest(app, 'Integ', { testCases: [stackUnderTest, testCaseWithAssets] }) This library also provides a utility to make assertions against the infrastructure that the integration test deploys. -The easiest way to do this is to create a `TestCase` and then access the `DeployAssert` that is automatically created. +There are two main scenarios in which assertions are created. + +- Part of an integration test using `integ-runner` + +In this case you would create an integration test using the `IntegTest` construct and then make assertions using the `assert` property. +You should **not** utilize the assertion constructs directly, but should instead use the `methods` on `IntegTest.assert`. ```ts declare const app: App; declare const stack: Stack; const integ = new IntegTest(app, 'Integ', { testCases: [stack] }); -integ.assert.awsApiCall('S3', 'getObject'); +integ.assertions.awsApiCall('S3', 'getObject'); ``` -### DeployAssert - -Assertions are created by using the `DeployAssert` construct. This construct creates it's own `Stack` separate from -any stacks that you create as part of your integration tests. This `Stack` is treated differently from other stacks -by the `integ-runner` tool. For example, this stack will not be diffed by the `integ-runner`. +- Part of a normal CDK deployment -Any assertions that you create should be created in the scope of `DeployAssert`. For example, +In this case you may be using assertions as part of a normal CDK deployment in order to make an assertion on the infrastructure +before the deployment is considered successful. In this case you can utilize the assertions constructs directly. ```ts -declare const app: App; +declare const myAppStack: Stack; -const assert = new DeployAssert(app); -new AwsApiCall(assert, 'GetObject', { +new AwsApiCall(myAppStack, 'GetObject', { service: 'S3', api: 'getObject', }); ``` +### DeployAssert + +Assertions are created by using the `DeployAssert` construct. This construct creates it's own `Stack` separate from +any stacks that you create as part of your integration tests. This `Stack` is treated differently from other stacks +by the `integ-runner` tool. For example, this stack will not be diffed by the `integ-runner`. + `DeployAssert` also provides utilities to register your own assertions. ```ts declare const myCustomResource: CustomResource; +declare const stack: Stack; declare const app: App; -const assert = new DeployAssert(app); -assert.assert( + +const integ = new IntegTest(app, 'Integ', { testCases: [stack] }); +integ.assertions.expect( 'CustomAssertion', ExpectedResult.objectLike({ foo: 'bar' }), ActualResult.fromCustomResource(myCustomResource, 'data'), @@ -228,12 +237,12 @@ AWS API call to receive some data. This library does this by utilizing CloudForm which means that CloudFormation will call out to a Lambda Function which will use the AWS JavaScript SDK to make the API call. -This can be done by using the class directory: +This can be done by using the class directory (in the case of a normal deployment): ```ts -declare const assert: DeployAssert; +declare const stack: Stack; -new AwsApiCall(assert, 'MyAssertion', { +new AwsApiCall(stack, 'MyAssertion', { service: 'SQS', api: 'receiveMessage', parameters: { @@ -242,12 +251,15 @@ new AwsApiCall(assert, 'MyAssertion', { }); ``` -Or by using the `awsApiCall` method on `DeployAssert`: +Or by using the `awsApiCall` method on `DeployAssert` (when writing integration tests): ```ts declare const app: App; -const assert = new DeployAssert(app); -assert.awsApiCall('SQS', 'receiveMessage', { +declare const stack: Stack; +const integ = new IntegTest(app, 'Integ', { + testCases: [stack], +}); +integ.assertions.awsApiCall('SQS', 'receiveMessage', { QueueUrl: 'url', }); ``` @@ -270,32 +282,29 @@ const integ = new IntegTest(app, 'Integ', { testCases: [stack], }); -integ.assert.invokeFunction({ +integ.assertions.invokeFunction({ functionName: fn.functionName, invocationType: InvocationType.EVENT, payload: JSON.stringify({ status: 'OK' }), }); -const message = integ.assert.awsApiCall('SQS', 'receiveMessage', { +const message = integ.assertions.awsApiCall('SQS', 'receiveMessage', { QueueUrl: queue.queueUrl, WaitTimeSeconds: 20, }); -new EqualsAssertion(integ.assert, 'ReceiveMessage', { - actual: ActualResult.fromAwsApiCall(message, 'Messages.0.Body'), - expected: ExpectedResult.objectLike({ - requestContext: { - condition: 'Success', - }, - requestPayload: { - status: 'OK', - }, - responseContext: { - statusCode: 200, - }, - responsePayload: 'success', - }), -}); +message.assertAtPath('Messages.0.Body', ExpectedResult.objectLike({ + requestContext: { + condition: 'Success', + }, + requestPayload: { + status: 'OK', + }, + responseContext: { + statusCode: 200, + }, + responsePayload: 'success', +})); ``` #### Match @@ -305,9 +314,8 @@ can be used to construct the `ExpectedResult`. ```ts declare const message: AwsApiCall; -declare const assert: DeployAssert; -message.assert(ExpectedResult.objectLike({ +message.expect(ExpectedResult.objectLike({ Messages: Match.arrayWith([ { Body: { @@ -336,10 +344,10 @@ const integ = new IntegTest(app, 'IntegTest', { testCases: [stack], }); -const invoke = integ.assert.invokeFunction({ +const invoke = integ.assertions.invokeFunction({ functionName: lambdaFunction.functionName, }); -invoke.assert(ExpectedResult.objectLike({ +invoke.expect(ExpectedResult.objectLike({ Payload: '200', })); ``` @@ -359,17 +367,17 @@ const testCase = new IntegTest(app, 'IntegTest', { }); // Start an execution -const start = testCase.assert.awsApiCall('StepFunctions', 'startExecution', { +const start = testCase.assertions.awsApiCall('StepFunctions', 'startExecution', { stateMachineArn: sm.stateMachineArn, }); // describe the results of the execution -const describe = testCase.assert.awsApiCall('StepFunctions', 'describeExecution', { +const describe = testCase.assertions.awsApiCall('StepFunctions', 'describeExecution', { executionArn: start.getAttString('executionArn'), }); // assert the results -describe.assert(ExpectedResult.objectLike({ +describe.expect(ExpectedResult.objectLike({ status: 'SUCCEEDED', })); ``` diff --git a/packages/@aws-cdk/integ-tests/lib/assertions/common.ts b/packages/@aws-cdk/integ-tests/lib/assertions/common.ts index 6e4fadf5a0388..6daa9e510133c 100644 --- a/packages/@aws-cdk/integ-tests/lib/assertions/common.ts +++ b/packages/@aws-cdk/integ-tests/lib/assertions/common.ts @@ -1,5 +1,6 @@ import { CustomResource } from '@aws-cdk/core'; -import { AwsApiCall } from './sdk'; +import { IAwsApiCall } from './sdk'; + /** * Represents the "actual" results to compare */ @@ -16,7 +17,7 @@ export abstract class ActualResult { /** * Get the actual results from a AwsApiCall */ - public static fromAwsApiCall(query: AwsApiCall, attribute: string): ActualResult { + public static fromAwsApiCall(query: IAwsApiCall, attribute: string): ActualResult { return { result: query.getAttString(attribute), }; diff --git a/packages/@aws-cdk/integ-tests/lib/assertions/deploy-assert.ts b/packages/@aws-cdk/integ-tests/lib/assertions/deploy-assert.ts deleted file mode 100644 index 24bbfd6789fbf..0000000000000 --- a/packages/@aws-cdk/integ-tests/lib/assertions/deploy-assert.ts +++ /dev/null @@ -1,128 +0,0 @@ -import { Stack } from '@aws-cdk/core'; -import { Construct, IConstruct, Node } from 'constructs'; -import { EqualsAssertion } from './assertions'; -import { ExpectedResult, ActualResult } from './common'; -import { md5hash } from './private/hash'; -import { AwsApiCall, LambdaInvokeFunction, LambdaInvokeFunctionProps } from './sdk'; - -const DEPLOY_ASSERT_SYMBOL = Symbol.for('@aws-cdk/integ-tests.DeployAssert'); - - -// keep this import separate from other imports to reduce chance for merge conflicts with v2-main -// eslint-disable-next-line no-duplicate-imports, import/order -import { Construct as CoreConstruct } from '@aws-cdk/core'; - -/** - * Options for DeployAssert - */ -export interface DeployAssertProps { } - -/** - * Construct that allows for registering a list of assertions - * that should be performed on a construct - */ -export class DeployAssert extends CoreConstruct { - - /** - * Returns whether the construct is a DeployAssert construct - */ - public static isDeployAssert(x: any): x is DeployAssert { - return x !== null && typeof(x) === 'object' && DEPLOY_ASSERT_SYMBOL in x; - } - - /** - * Finds a DeployAssert construct in the given scope - */ - public static of(construct: IConstruct): DeployAssert { - const scopes = Node.of(Node.of(construct).root).findAll(); - const deployAssert = scopes.find(s => DeployAssert.isDeployAssert(s)); - if (!deployAssert) { - throw new Error('No DeployAssert construct found in scopes'); - } - return deployAssert as DeployAssert; - } - - constructor(scope: Construct) { - /** - * Normally we would not want to do a scope swapparoo like this - * but in this case this it allows us to provide a better experience - * for the user. This allows DeployAssert to be created _not_ in the - * scope of a Stack. DeployAssert is treated like a Stack, but doesn't - * exose any of the stack functionality (the methods that the user sees - * are just DeployAssert methods and not any Stack methods). So you can do - * something like this, which you would not normally be allowed to do - * - * const deployAssert = new DeployAssert(app); - * new AwsApiCall(deployAssert, 'AwsApiCall', {...}); - */ - scope = new Stack(scope, 'DeployAssert'); - super(scope, 'Default'); - - Object.defineProperty(this, DEPLOY_ASSERT_SYMBOL, { value: true }); - } - - /** - * Query AWS using JavaScript SDK V2 API calls. This can be used to either - * trigger an action or to return a result that can then be asserted against - * an expected value - * - * @example - * declare const app: App; - * const assert = new DeployAssert(app); - * assert.awsApiCall('SQS', 'sendMessage', { - * QueueUrl: 'url', - * MessageBody: 'hello', - * }); - * const message = assert.awsApiCall('SQS', 'receiveMessage', { - * QueueUrl: 'url', - * }); - * message.assert(ExpectedResult.objectLike({ - * Messages: [{ Body: 'hello' }], - * })); - */ - public awsApiCall(service: string, api: string, parameters?: any): AwsApiCall { - return new AwsApiCall(this, `AwsApiCall${service}${api}`, { - api, - service, - parameters, - }); - } - - /** - * Invoke a lambda function and return the response which can be asserted - * - * @example - * declare const app: App; - * const assert = new DeployAssert(app); - * const invoke = assert.invokeFunction({ - * functionName: 'my-function', - * }); - * invoke.assert(ExpectedResult.objectLike({ - * Payload: '200', - * })); - */ - public invokeFunction(props: LambdaInvokeFunctionProps): LambdaInvokeFunction { - const hash = md5hash(Stack.of(this).resolve(props)); - return new LambdaInvokeFunction(this, `LambdaInvoke${hash}`, props); - } - - /** - * Assert that the ExpectedResult is equal - * to the ActualResult - * - * @example - * declare const deployAssert: DeployAssert; - * declare const apiCall: AwsApiCall; - * deployAssert.assert( - * 'invoke', - * ExpectedResult.objectLike({ Payload: 'OK' }), - * ActualResult.fromAwsApiCall(apiCall, 'Body'), - * ); - */ - public assert(id: string, expected: ExpectedResult, actual: ActualResult): void { - new EqualsAssertion(this, `EqualsAssertion${id}`, { - expected, - actual, - }); - } -} diff --git a/packages/@aws-cdk/integ-tests/lib/assertions/index.ts b/packages/@aws-cdk/integ-tests/lib/assertions/index.ts index 3a9defd954be9..6622ddabcb560 100644 --- a/packages/@aws-cdk/integ-tests/lib/assertions/index.ts +++ b/packages/@aws-cdk/integ-tests/lib/assertions/index.ts @@ -1,6 +1,6 @@ -export * from './assertions'; +export * from './types'; export * from './sdk'; -export * from './deploy-assert'; +export * from './assertions'; export * from './providers'; export * from './common'; export * from './match'; diff --git a/packages/@aws-cdk/integ-tests/lib/assertions/private/deploy-assert.ts b/packages/@aws-cdk/integ-tests/lib/assertions/private/deploy-assert.ts new file mode 100644 index 0000000000000..1ff091978e7c5 --- /dev/null +++ b/packages/@aws-cdk/integ-tests/lib/assertions/private/deploy-assert.ts @@ -0,0 +1,76 @@ +import { Stack } from '@aws-cdk/core'; +import { Construct, IConstruct, Node } from 'constructs'; +import { EqualsAssertion } from '../assertions'; +import { ExpectedResult, ActualResult } from '../common'; +import { md5hash } from '../private/hash'; +import { AwsApiCall, LambdaInvokeFunction, IAwsApiCall, LambdaInvokeFunctionProps } from '../sdk'; +import { IDeployAssert } from '../types'; + + +const DEPLOY_ASSERT_SYMBOL = Symbol.for('@aws-cdk/integ-tests.DeployAssert'); + + +// keep this import separate from other imports to reduce chance for merge conflicts with v2-main +// eslint-disable-next-line no-duplicate-imports, import/order +import { Construct as CoreConstruct } from '@aws-cdk/core'; + +/** + * Options for DeployAssert + */ +export interface DeployAssertProps { } + +/** + * Construct that allows for registering a list of assertions + * that should be performed on a construct + */ +export class DeployAssert extends CoreConstruct implements IDeployAssert { + + /** + * Returns whether the construct is a DeployAssert construct + */ + public static isDeployAssert(x: any): x is DeployAssert { + return x !== null && typeof(x) === 'object' && DEPLOY_ASSERT_SYMBOL in x; + } + + /** + * Finds a DeployAssert construct in the given scope + */ + public static of(construct: IConstruct): DeployAssert { + const scopes = Node.of(Node.of(construct).root).findAll(); + const deployAssert = scopes.find(s => DeployAssert.isDeployAssert(s)); + if (!deployAssert) { + throw new Error('No DeployAssert construct found in scopes'); + } + return deployAssert as DeployAssert; + } + + public scope: Stack; + + constructor(scope: Construct) { + super(scope, 'Default'); + + this.scope = new Stack(scope, 'DeployAssert'); + + Object.defineProperty(this, DEPLOY_ASSERT_SYMBOL, { value: true }); + } + + public awsApiCall(service: string, api: string, parameters?: any): IAwsApiCall { + return new AwsApiCall(this.scope, `AwsApiCall${service}${api}`, { + api, + service, + parameters, + }); + } + + public invokeFunction(props: LambdaInvokeFunctionProps): IAwsApiCall { + const hash = md5hash(this.scope.resolve(props)); + return new LambdaInvokeFunction(this.scope, `LambdaInvoke${hash}`, props); + } + + public expect(id: string, expected: ExpectedResult, actual: ActualResult): void { + new EqualsAssertion(this.scope, `EqualsAssertion${id}`, { + expected, + actual, + }); + } +} diff --git a/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/index.ts b/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/index.ts index 78a47c83be1ef..72ca3544cb66d 100644 --- a/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/index.ts +++ b/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/index.ts @@ -1,5 +1,4 @@ import { AssertionHandler } from './assertion'; -import { ResultsCollectionHandler } from './results'; import { AwsApiCallHandler } from './sdk'; import * as types from './types'; @@ -14,7 +13,6 @@ function createResourceHandler(event: AWSLambda.CloudFormationCustomResourceEven } switch (event.ResourceType) { case types.ASSERT_RESOURCE_TYPE: return new AssertionHandler(event, context); - case types.RESULTS_RESOURCE_TYPE: return new ResultsCollectionHandler(event, context); default: throw new Error(`Unsupported resource type "${event.ResourceType}`); } diff --git a/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/results.ts b/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/results.ts deleted file mode 100644 index 784ff68a05ab6..0000000000000 --- a/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/results.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { CustomResourceHandler } from './base'; -import { ResultsCollectionRequest, ResultsCollectionResult } from './types'; - -export class ResultsCollectionHandler extends CustomResourceHandler { - protected async processEvent(request: ResultsCollectionRequest): Promise { - const reduced: string = request.assertionResults.reduce((agg, result, idx) => { - const msg = result.status === 'pass' ? 'pass' : `fail - ${result.message}`; - return `${agg}\nTest${idx}: ${msg}`; - }, '').trim(); - return { message: reduced }; - } -} diff --git a/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/types.ts b/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/types.ts index ae9f545476dac..68bd63202afe8 100644 --- a/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/types.ts +++ b/packages/@aws-cdk/integ-tests/lib/assertions/providers/lambda-handler/types.ts @@ -2,7 +2,6 @@ // Kept in a separate file for sharing between the handler and the provider constructs. export const ASSERT_RESOURCE_TYPE = 'Custom::DeployAssert@AssertEquals'; -export const RESULTS_RESOURCE_TYPE = 'Custom::DeployAssert@ResultsCollection'; export const SDK_RESOURCE_TYPE_PREFIX = 'Custom::DeployAssert@SdkCall'; /** @@ -155,24 +154,3 @@ export interface AssertionResultData { */ readonly message?: string; } - -/** - * Represents a collection of assertion request results - */ -export interface ResultsCollectionRequest { - /** - * The results of all the assertions that have been - * registered - */ - readonly assertionResults: AssertionResultData[]; -} - -/** - * The result of a results request - */ -export interface ResultsCollectionResult { - /** - * A message containing the results of the assertion - */ - readonly message: string; -} diff --git a/packages/@aws-cdk/integ-tests/lib/assertions/sdk.ts b/packages/@aws-cdk/integ-tests/lib/assertions/sdk.ts index b176c13456f37..443554b5c38f7 100644 --- a/packages/@aws-cdk/integ-tests/lib/assertions/sdk.ts +++ b/packages/@aws-cdk/integ-tests/lib/assertions/sdk.ts @@ -4,10 +4,84 @@ import { EqualsAssertion } from './assertions'; import { ExpectedResult, ActualResult } from './common'; import { AssertionsProvider, SDK_RESOURCE_TYPE_PREFIX } from './providers'; +// keep this import separate from other imports to reduce chance for merge conflicts with v2-main +// eslint-disable-next-line no-duplicate-imports, import/order +import { IConstruct } from '@aws-cdk/core'; + // keep this import separate from other imports to reduce chance for merge conflicts with v2-main // eslint-disable-next-line no-duplicate-imports, import/order import { Construct as CoreConstruct } from '@aws-cdk/core'; +/** + * Interface for creating a custom resource that will perform + * an API call using the AWS SDK + */ +export interface IAwsApiCall extends IConstruct { + /** + * Returns the value of an attribute of the custom resource of an arbitrary + * type. Attributes are returned from the custom resource provider through the + * `Data` map where the key is the attribute name. + * + * @param attributeName the name of the attribute + * @returns a token for `Fn::GetAtt`. Use `Token.asXxx` to encode the returned `Reference` as a specific type or + * use the convenience `getAttString` for string attributes. + */ + getAtt(attributeName: string): Reference; + + /** + * Returns the value of an attribute of the custom resource of type string. + * Attributes are returned from the custom resource provider through the + * `Data` map where the key is the attribute name. + * + * @param attributeName the name of the attribute + * @returns a token for `Fn::GetAtt` encoded as a string. + */ + getAttString(attributeName: string): string; + + /** + * Assert that the ExpectedResult is equal + * to the result of the AwsApiCall + * + * @example + * declare const integ: IntegTest; + * const invoke = integ.assertions.invokeFunction({ + * functionName: 'my-func', + * }); + * invoke.expect(ExpectedResult.objectLike({ Payload: 'OK' })); + */ + expect(expected: ExpectedResult): void; + + /** + * Assert that the ExpectedResult is equal + * to the result of the AwsApiCall at the given path. + * + * For example the SQS.receiveMessage api response would look + * like: + * + * If you wanted to assert the value of `Body` you could do + * + * @example + * const actual = { + * Messages: [{ + * MessageId: '', + * ReceiptHandle: '', + * MD5OfBody: '', + * Body: 'hello', + * Attributes: {}, + * MD5OfMessageAttributes: {}, + * MessageAttributes: {} + * }] + * }; + * + * + * declare const integ: IntegTest; + * const message = integ.assertions.awsApiCall('SQS', 'receiveMessage'); + * + * message.assertAtPath('Messages.0.Body', ExpectedResult.stringLikeRegexp('hello')); + */ + assertAtPath(path: string, expected: ExpectedResult): void; +} + /** * Options to perform an AWS JavaScript V2 API call */ @@ -39,7 +113,7 @@ export interface AwsApiCallProps extends AwsApiCallOptions {} * Construct that creates a custom resource that will perform * a query using the AWS SDK */ -export class AwsApiCall extends CoreConstruct { +export class AwsApiCall extends CoreConstruct implements IAwsApiCall { private readonly sdkCallResource: CustomResource; private flattenResponse: string = 'false'; private readonly name: string; @@ -69,82 +143,23 @@ export class AwsApiCall extends CoreConstruct { this.sdkCallResource.node.addDependency(this.provider); } - /** - * Returns the value of an attribute of the custom resource of an arbitrary - * type. Attributes are returned from the custom resource provider through the - * `Data` map where the key is the attribute name. - * - * @param attributeName the name of the attribute - * @returns a token for `Fn::GetAtt`. Use `Token.asXxx` to encode the returned `Reference` as a specific type or - * use the convenience `getAttString` for string attributes. - */ public getAtt(attributeName: string): Reference { this.flattenResponse = 'true'; return this.sdkCallResource.getAtt(`apiCallResponse.${attributeName}`); } - /** - * Returns the value of an attribute of the custom resource of type string. - * Attributes are returned from the custom resource provider through the - * `Data` map where the key is the attribute name. - * - * @param attributeName the name of the attribute - * @returns a token for `Fn::GetAtt` encoded as a string. - */ public getAttString(attributeName: string): string { this.flattenResponse = 'true'; return this.sdkCallResource.getAttString(`apiCallResponse.${attributeName}`); } - /** - * Assert that the ExpectedResult is equal - * to the result of the AwsApiCall - * - * @example - * declare const assert: DeployAssert; - * const invoke = new LambdaInvokeFunction(assert, 'Invoke', { - * functionName: 'my-func', - * }); - * invoke.assert(ExpectedResult.objectLike({ Payload: 'OK' })); - */ - public assert(expected: ExpectedResult): void { + public expect(expected: ExpectedResult): void { new EqualsAssertion(this, `AssertEquals${this.name}`, { expected, actual: ActualResult.fromCustomResource(this.sdkCallResource, 'apiCallResponse'), }); } - /** - * Assert that the ExpectedResult is equal - * to the result of the AwsApiCall at the given path. - * - * For example the SQS.receiveMessage api response would look - * like: - * - * If you wanted to assert the value of `Body` you could do - * - * @example - * const actual = { - * Messages: [{ - * MessageId: '', - * ReceiptHandle: '', - * MD5OfBody: '', - * Body: 'hello', - * Attributes: {}, - * MD5OfMessageAttributes: {}, - * MessageAttributes: {} - * }] - * }; - * - * - * declare const assert: DeployAssert; - * const message = new AwsApiCall(assert, 'ReceiveMessage', { - * service: 'SQS', - * api: 'receiveMessage' - * }); - * - * message.assertAtPath('Messages.0.Body', ExpectedResult.stringLikeRegexp('hello')); - */ public assertAtPath(path: string, expected: ExpectedResult): void { new EqualsAssertion(this, `AssertEquals${this.name}`, { expected, diff --git a/packages/@aws-cdk/integ-tests/lib/assertions/types.ts b/packages/@aws-cdk/integ-tests/lib/assertions/types.ts new file mode 100644 index 0000000000000..7c5dd185aa058 --- /dev/null +++ b/packages/@aws-cdk/integ-tests/lib/assertions/types.ts @@ -0,0 +1,60 @@ +import { ExpectedResult, ActualResult } from './common'; +import { IAwsApiCall, LambdaInvokeFunctionProps } from './sdk'; + +/** + * Interface that allows for registering a list of assertions + * that should be performed on a construct. This is only necessary + * when writing integration tests. + */ +export interface IDeployAssert { + /** + * Query AWS using JavaScript SDK V2 API calls. This can be used to either + * trigger an action or to return a result that can then be asserted against + * an expected value + * + * @example + * declare const app: App; + * declare const integ: IntegTest; + * integ.assertions.awsApiCall('SQS', 'sendMessage', { + * QueueUrl: 'url', + * MessageBody: 'hello', + * }); + * const message = integ.assertions.awsApiCall('SQS', 'receiveMessage', { + * QueueUrl: 'url', + * }); + * message.expect(ExpectedResult.objectLike({ + * Messages: [{ Body: 'hello' }], + * })); + */ + awsApiCall(service: string, api: string, parameters?: any): IAwsApiCall; + + /** + * Invoke a lambda function and return the response which can be asserted + * + * @example + * declare const app: App; + * declare const integ: IntegTest; + * const invoke = integ.assertions.invokeFunction({ + * functionName: 'my-function', + * }); + * invoke.expect(ExpectedResult.objectLike({ + * Payload: '200', + * })); + */ + invokeFunction(props: LambdaInvokeFunctionProps): IAwsApiCall; + + /** + * Assert that the ExpectedResult is equal + * to the ActualResult + * + * @example + * declare const integ: IntegTest; + * declare const apiCall: AwsApiCall; + * integ.assertions.expect( + * 'invoke', + * ExpectedResult.objectLike({ Payload: 'OK' }), + * ActualResult.fromAwsApiCall(apiCall, 'Body'), + * ); + */ + expect(id: string, expected: ExpectedResult, actual: ActualResult): void; +} diff --git a/packages/@aws-cdk/integ-tests/lib/test-case.ts b/packages/@aws-cdk/integ-tests/lib/test-case.ts index de701bb63d24a..a2b7436481a89 100644 --- a/packages/@aws-cdk/integ-tests/lib/test-case.ts +++ b/packages/@aws-cdk/integ-tests/lib/test-case.ts @@ -1,7 +1,8 @@ import { IntegManifest, Manifest, TestCase, TestOptions } from '@aws-cdk/cloud-assembly-schema'; import { attachCustomSynthesis, Stack, ISynthesisSession, StackProps } from '@aws-cdk/core'; import { Construct } from 'constructs'; -import { DeployAssert } from './assertions'; +import { IDeployAssert } from './assertions'; +import { DeployAssert } from './assertions/private/deploy-assert'; import { IntegManifestSynthesizer } from './manifest-synthesizer'; const TEST_CASE_STACK_SYMBOL = Symbol.for('@aws-cdk/integ-tests.IntegTestCaseStack'); @@ -31,12 +32,15 @@ export class IntegTestCase extends CoreConstruct { /** * Make assertions on resources in this test case */ - public readonly assert: DeployAssert; + public readonly assertions: IDeployAssert; + + private readonly _assert: DeployAssert; constructor(scope: Construct, id: string, private readonly props: IntegTestCaseProps) { super(scope, id); - this.assert = new DeployAssert(this); + this._assert = new DeployAssert(this); + this.assertions = this._assert; } /** @@ -53,7 +57,7 @@ export class IntegTestCase extends CoreConstruct { private toTestCase(props: IntegTestCaseProps): TestCase { return { ...props, - assertionStack: Stack.of(this.assert).artifactId, + assertionStack: this._assert.scope.artifactId, stacks: props.stacks.map(s => s.artifactId), }; } @@ -83,7 +87,7 @@ export class IntegTestCaseStack extends Stack { /** * Make assertions on resources in this test case */ - public readonly assert: DeployAssert; + public readonly assertions: IDeployAssert; /** * The underlying IntegTestCase that is created @@ -97,7 +101,7 @@ export class IntegTestCaseStack extends Stack { Object.defineProperty(this, TEST_CASE_STACK_SYMBOL, { value: true }); // TODO: should we only have a single DeployAssert per test? - this.assert = new DeployAssert(this); + this.assertions = new DeployAssert(this); this._testCase = new IntegTestCase(this, `${id}TestCase`, { ...props, stacks: [this], @@ -124,7 +128,7 @@ export class IntegTest extends CoreConstruct { /** * Make assertions on resources in this test case */ - public readonly assert: DeployAssert; + public readonly assertions: IDeployAssert; private readonly testCases: IntegTestCase[]; constructor(scope: Construct, id: string, props: IntegTestProps) { super(scope, id); @@ -138,7 +142,7 @@ export class IntegTest extends CoreConstruct { cdkCommandOptions: props.cdkCommandOptions, stackUpdateWorkflow: props.stackUpdateWorkflow, }); - this.assert = defaultTestCase.assert; + this.assertions = defaultTestCase.assertions; this.testCases = [ defaultTestCase, diff --git a/packages/@aws-cdk/integ-tests/rosetta/default.ts-fixture b/packages/@aws-cdk/integ-tests/rosetta/default.ts-fixture index b9b4f3740b427..e85bf5884afdc 100644 --- a/packages/@aws-cdk/integ-tests/rosetta/default.ts-fixture +++ b/packages/@aws-cdk/integ-tests/rosetta/default.ts-fixture @@ -3,7 +3,6 @@ import { IntegTestCase, IntegTest, IntegTestCaseStack, - DeployAssert, AwsApiCall, EqualsAssertion, ActualResult, diff --git a/packages/@aws-cdk/integ-tests/test/assertions/deploy-assert.test.ts b/packages/@aws-cdk/integ-tests/test/assertions/deploy-assert.test.ts index 847086ed66f7a..5a287200e9fca 100644 --- a/packages/@aws-cdk/integ-tests/test/assertions/deploy-assert.test.ts +++ b/packages/@aws-cdk/integ-tests/test/assertions/deploy-assert.test.ts @@ -1,12 +1,13 @@ import { Template } from '@aws-cdk/assertions'; import { App, Stack } from '@aws-cdk/core'; -import { DeployAssert, LogType, InvocationType, ExpectedResult, ActualResult } from '../../lib/assertions'; +import { LogType, InvocationType, ExpectedResult, ActualResult } from '../../lib/assertions'; +import { DeployAssert } from '../../lib/assertions/private/deploy-assert'; describe('DeployAssert', () => { test('of', () => { const app = new App(); - const stack = new Stack(app); + const stack = new Stack(app, 'TestStack'); new DeployAssert(app); expect(() => { DeployAssert.of(stack); @@ -15,7 +16,7 @@ describe('DeployAssert', () => { test('throws if no DeployAssert', () => { const app = new App(); - const stack = new Stack(app); + const stack = new Stack(app, 'TestStack'); expect(() => { DeployAssert.of(stack); }).toThrow(/No DeployAssert construct found in scopes/); @@ -43,7 +44,7 @@ describe('DeployAssert', () => { }); // THEN - const template = Template.fromStack(Stack.of(deployAssert)); + const template = Template.fromStack(deployAssert.scope); template.hasResourceProperties('Custom::DeployAssert@SdkCallLambdainvoke', { service: 'Lambda', api: 'invoke', @@ -65,14 +66,14 @@ describe('DeployAssert', () => { const query = deplossert.awsApiCall('MyService', 'MyApi'); // WHEN - deplossert.assert( + deplossert.expect( 'MyAssertion', ExpectedResult.stringLikeRegexp('foo'), ActualResult.fromAwsApiCall(query, 'att'), ); // THEN - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.hasResourceProperties('Custom::DeployAssert@AssertEquals', { expected: JSON.stringify({ $StringLike: 'foo' }), actual: { @@ -91,14 +92,14 @@ describe('DeployAssert', () => { const query = deplossert.awsApiCall('MyService', 'MyApi'); // WHEN - deplossert.assert( + deplossert.expect( 'MyAssertion', ExpectedResult.objectLike({ foo: 'bar' }), ActualResult.fromAwsApiCall(query, 'att'), ); // THEN - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.hasResourceProperties('Custom::DeployAssert@AssertEquals', { expected: JSON.stringify({ $ObjectLike: { foo: 'bar' } }), actual: { @@ -122,7 +123,7 @@ describe('DeployAssert', () => { // THEN - Template.fromStack(Stack.of(deplossert)).hasResourceProperties('Custom::DeployAssert@SdkCallMyServiceMyApi', { + Template.fromStack(deplossert.scope).hasResourceProperties('Custom::DeployAssert@SdkCallMyServiceMyApi', { api: 'MyApi', service: 'MyService', }); @@ -139,7 +140,7 @@ describe('DeployAssert', () => { // THEN - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.resourceCountIs('AWS::Lambda::Function', 1); template.resourceCountIs('Custom::DeployAssert@SdkCallMyServiceMyApi1', 1); template.resourceCountIs('Custom::DeployAssert@SdkCallMyServiceMyApi2', 1); diff --git a/packages/@aws-cdk/integ-tests/test/assertions/sdk.test.ts b/packages/@aws-cdk/integ-tests/test/assertions/sdk.test.ts index 31f1bd5068a4b..d8d3d70ec1694 100644 --- a/packages/@aws-cdk/integ-tests/test/assertions/sdk.test.ts +++ b/packages/@aws-cdk/integ-tests/test/assertions/sdk.test.ts @@ -1,6 +1,7 @@ import { Template, Match } from '@aws-cdk/assertions'; -import { App, Stack, CfnOutput } from '@aws-cdk/core'; -import { DeployAssert, AwsApiCall, LambdaInvokeFunction, LogType, InvocationType, ExpectedResult } from '../../lib/assertions'; +import { App, CfnOutput } from '@aws-cdk/core'; +import { LogType, InvocationType, ExpectedResult } from '../../lib/assertions'; +import { DeployAssert } from '../../lib/assertions/private/deploy-assert'; describe('AwsApiCall', () => { test('default', () => { @@ -9,13 +10,10 @@ describe('AwsApiCall', () => { const deplossert = new DeployAssert(app); // WHEN - new AwsApiCall(deplossert, 'AwsApiCall', { - service: 'MyService', - api: 'MyApi', - }); + deplossert.awsApiCall('MyService', 'MyApi'); // THEN - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.resourceCountIs('AWS::Lambda::Function', 1); template.hasResourceProperties('Custom::DeployAssert@SdkCallMyServiceMyApi', { service: 'MyService', @@ -30,17 +28,13 @@ describe('AwsApiCall', () => { const deplossert = new DeployAssert(app); // WHEN - new AwsApiCall(deplossert, 'AwsApiCall', { - service: 'MyService', - api: 'MyApi', - parameters: { - param1: 'val1', - param2: 2, - }, + deplossert.awsApiCall('MyService', 'MyApi', { + param1: 'val1', + param2: 2, }); // THEN - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.resourceCountIs('AWS::Lambda::Function', 1); template.hasResourceProperties('Custom::DeployAssert@SdkCallMyServiceMyApi', { service: 'MyService', @@ -59,21 +53,18 @@ describe('AwsApiCall', () => { const deplossert = new DeployAssert(app); // WHEN - const query = new AwsApiCall(deplossert, 'AwsApiCall', { - service: 'MyService', - api: 'MyApi', - }); + const query = deplossert.awsApiCall('MyService', 'MyApi'); - new CfnOutput(deplossert, 'GetAttString', { + new CfnOutput(deplossert.scope, 'GetAttString', { value: query.getAttString('att'), }).overrideLogicalId('GetAtt'); // THEN - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.hasOutput('GetAtt', { Value: { 'Fn::GetAtt': [ - 'AwsApiCall', + 'AwsApiCallMyServiceMyApi', 'apiCallResponse.att', ], }, @@ -85,27 +76,25 @@ describe('AwsApiCall', () => { flattenResponse: 'true', }); }); + test('getAtt', () => { // GIVEN const app = new App(); const deplossert = new DeployAssert(app); // WHEN - const query = new AwsApiCall(deplossert, 'AwsApiCall', { - service: 'MyService', - api: 'MyApi', - }); + const query = deplossert.awsApiCall('MyService', 'MyApi'); - new CfnOutput(deplossert, 'GetAttString', { + new CfnOutput(deplossert.scope, 'GetAttString', { value: query.getAtt('att').toString(), }).overrideLogicalId('GetAtt'); // THEN - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.hasOutput('GetAtt', { Value: { 'Fn::GetAtt': [ - 'AwsApiCall', + 'AwsApiCallMyServiceMyApi', 'apiCallResponse.att', ], }, @@ -117,7 +106,6 @@ describe('AwsApiCall', () => { flattenResponse: 'true', }); }); - }); describe('assertEqual', () => { @@ -127,19 +115,16 @@ describe('AwsApiCall', () => { const deplossert = new DeployAssert(app); // WHEN - const query = new AwsApiCall(deplossert, 'AwsApiCall', { - service: 'MyService', - api: 'MyApi', - }); - query.assert(ExpectedResult.exact({ foo: 'bar' })); + const query = deplossert.awsApiCall('MyService', 'MyApi'); + query.expect(ExpectedResult.exact({ foo: 'bar' })); // THEN - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.hasResourceProperties('Custom::DeployAssert@AssertEquals', { expected: JSON.stringify({ $Exact: { foo: 'bar' } }), actual: { 'Fn::GetAtt': [ - 'AwsApiCall', + 'AwsApiCallMyServiceMyApi', 'apiCallResponse', ], }, @@ -152,19 +137,16 @@ describe('AwsApiCall', () => { const deplossert = new DeployAssert(app); // WHEN - const query = new AwsApiCall(deplossert, 'AwsApiCall', { - service: 'MyService', - api: 'MyApi', - }); - query.assert(ExpectedResult.objectLike({ foo: 'bar' })); + const query = deplossert.awsApiCall('MyService', 'MyApi'); + query.expect(ExpectedResult.objectLike({ foo: 'bar' })); // THEN - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.hasResourceProperties('Custom::DeployAssert@AssertEquals', { expected: JSON.stringify({ $ObjectLike: { foo: 'bar' } }), actual: { 'Fn::GetAtt': [ - 'AwsApiCall', + 'AwsApiCallMyServiceMyApi', 'apiCallResponse', ], }, @@ -177,19 +159,16 @@ describe('AwsApiCall', () => { const deplossert = new DeployAssert(app); // WHEN - const query = new AwsApiCall(deplossert, 'AwsApiCall', { - service: 'MyService', - api: 'MyApi', - }); - query.assert(ExpectedResult.exact('bar')); + const query = deplossert.awsApiCall('MyService', 'MyApi'); + query.expect(ExpectedResult.exact('bar')); // THEN - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.hasResourceProperties('Custom::DeployAssert@AssertEquals', { expected: JSON.stringify({ $Exact: 'bar' }), actual: { 'Fn::GetAtt': [ - 'AwsApiCall', + 'AwsApiCallMyServiceMyApi', 'apiCallResponse', ], }, @@ -203,14 +182,14 @@ describe('AwsApiCall', () => { const app = new App(); const deplossert = new DeployAssert(app); - new LambdaInvokeFunction(deplossert, 'Invoke', { + deplossert.invokeFunction({ functionName: 'my-func', logType: LogType.TAIL, payload: JSON.stringify({ key: 'val' }), invocationType: InvocationType.EVENT, }); - const template = Template.fromStack(Stack.of(deplossert)); + const template = Template.fromStack(deplossert.scope); template.hasResourceProperties('Custom::DeployAssert@SdkCallLambdainvoke', { service: 'Lambda', api: 'invoke', From dd4c2b5261e3eacdf2ad7eb655bc6b22a9702748 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Mon, 23 May 2022 19:23:11 +0200 Subject: [PATCH 04/11] chore: fix command to run integ tests (#20414) The instructions in `CONTRIBUTING.md`, telling users to run `test.sh`, started running the unit tests instead of the integ tests, since `npx` now `cd`s to the `package.json` directory (instead of running in the current directory). Fix by using `npx` to look up the location of `jest`, but running it in the current shell. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/aws-cdk/test/integ/common/jest-test.bash | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/aws-cdk/test/integ/common/jest-test.bash b/packages/aws-cdk/test/integ/common/jest-test.bash index 65ad889c2860a..b29ca90036d38 100755 --- a/packages/aws-cdk/test/integ/common/jest-test.bash +++ b/packages/aws-cdk/test/integ/common/jest-test.bash @@ -11,5 +11,8 @@ function invokeJest() { # This must --runInBand because parallelism is arranged for inside the tests # themselves and they must run in the same process in order to coordinate to # make sure no 2 tests use the same region at the same time. - npx jest --runInBand --verbose "$@" + # + # Jest is run in a weird way because npx started (NPM 8?) to change directory + # into 'package.json' root, which we don't want here. + $(npx which jest) --runInBand --verbose "$@" } From 1037b8c7f58ccd162491b49d75954c38d685d67f Mon Sep 17 00:00:00 2001 From: Jackie Wang <83792238+wanjacki@users.noreply.github.com> Date: Tue, 24 May 2022 03:21:49 -0400 Subject: [PATCH 05/11] feat(servicecatalog): ProductStackHistory can retain old ProductStack iterations (#20244) Adding enhancement to ProductStack to allow the specification of a VersioningStrategy. VersioningStrategy `RetainPreviousVersions` added to save previously deployed ProductStacks templates in a local context directory. These productVersions can then be easily be deployed using the stored templates. --- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../@aws-cdk/aws-servicecatalog/.gitignore | 1 + .../@aws-cdk/aws-servicecatalog/README.md | 100 ++++++++++++++ .../lib/cloudformation-template.ts | 4 +- .../@aws-cdk/aws-servicecatalog/lib/common.ts | 7 +- .../@aws-cdk/aws-servicecatalog/lib/index.ts | 1 + .../lib/product-stack-history.ts | 118 ++++++++++++++++ .../aws-servicecatalog/lib/product-stack.ts | 15 +++ .../aws-servicecatalog/test/integ.product.ts | 8 ++ .../test/portfolio.integ.snapshot/cdk.out | 2 +- .../test/portfolio.integ.snapshot/integ.json | 2 +- .../portfolio.integ.snapshot/manifest.json | 2 +- .../test/product.integ.snapshot/cdk.out | 2 +- ...integ-servicecatalog-product.template.json | 52 +++++++ .../test/product.integ.snapshot/integ.json | 2 +- ...opicProduct3B51CF591.product.template.json | 7 + .../test/product.integ.snapshot/manifest.json | 4 +- .../test/product.integ.snapshot/tree.json | 65 +++++++-- .../aws-servicecatalog/test/product.test.ts | 127 ++++++++++++++++++ 18 files changed, 499 insertions(+), 20 deletions(-) create mode 100644 packages/@aws-cdk/aws-servicecatalog/lib/product-stack-history.ts create mode 100644 packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integservicecatalogproductSNSTopicProduct3B51CF591.product.template.json diff --git a/packages/@aws-cdk/aws-servicecatalog/.gitignore b/packages/@aws-cdk/aws-servicecatalog/.gitignore index 6d05bba61dfa7..7c868a499059a 100644 --- a/packages/@aws-cdk/aws-servicecatalog/.gitignore +++ b/packages/@aws-cdk/aws-servicecatalog/.gitignore @@ -3,6 +3,7 @@ *.d.ts tsconfig.json node_modules +product-stack-snapshots *.generated.ts dist .jsii diff --git a/packages/@aws-cdk/aws-servicecatalog/README.md b/packages/@aws-cdk/aws-servicecatalog/README.md index b589408b01210..1d37e5deb615c 100644 --- a/packages/@aws-cdk/aws-servicecatalog/README.md +++ b/packages/@aws-cdk/aws-servicecatalog/README.md @@ -22,6 +22,7 @@ enables organizations to create and manage catalogs of products for their end us - [Product](#product) - [Creating a product from a local asset](#creating-a-product-from-local-asset) - [Creating a product from a stack](#creating-a-product-from-a-stack) + - [Creating a Product from a stack with a history of previous versions](#creating-a-product-from-a-stack-with-a-history-of-all-previous-versions) - [Adding a product to a portfolio](#adding-a-product-to-a-portfolio) - [TagOptions](#tag-options) - [Constraints](#constraints) @@ -184,6 +185,105 @@ const product = new servicecatalog.CloudFormationProduct(this, 'Product', { }); ``` +### Creating a Product from a stack with a history of previous versions + +The default behavior of Service Catalog is to overwrite each product version upon deployment. +This applies to Product Stacks as well, where only the latest changes to your Product Stack will +be deployed. +To keep a history of the revisions of a ProductStack available in Service Catalog, +you would need to define a ProductStack for each historical copy. + +You can instead create a `ProductStackHistory` to maintain snapshots of all previous versions. +The `ProductStackHistory` can be created by passing the base `productStack`, +a `currentVersionName` for your current version and a `locked` boolean. +The `locked` boolean which when set to true will prevent your `currentVersionName` +from being overwritten when there is an existing snapshot for that version. + +```ts +import * as s3 from '@aws-cdk/aws-s3'; +import * as cdk from '@aws-cdk/core'; + +class S3BucketProduct extends servicecatalog.ProductStack { + constructor(scope: cdk.Construct, id: string) { + super(scope, id); + + new s3.Bucket(this, 'BucketProduct'); + } +} + +const productStackHistory = new servicecatalog.ProductStackHistory(this, 'ProductStackHistory', { + productStack: new S3BucketProduct(this, 'S3BucketProduct'), + currentVersionName: 'v1', + currentVersionLocked: true +}); +``` + +We can deploy the current version `v1` by using `productStackHistory.currentVersion()` + +```ts +import * as s3 from '@aws-cdk/aws-s3'; +import * as cdk from '@aws-cdk/core'; + +class S3BucketProduct extends servicecatalog.ProductStack { + constructor(scope: cdk.Construct, id: string) { + super(scope, id); + + new s3.Bucket(this, 'BucketProductV2'); + } +} + +const productStackHistory = new servicecatalog.ProductStackHistory(this, 'ProductStackHistory', { + productStack: new S3BucketProduct(this, 'S3BucketProduct'), + currentVersionName: 'v2', + currentVersionLocked: true +}); + +const product = new servicecatalog.CloudFormationProduct(this, 'MyFirstProduct', { + productName: "My Product", + owner: "Product Owner", + productVersions: [ + productStackHistory.currentVersion(), + ], +}); +``` + +Using `ProductStackHistory` all deployed templates for the ProductStack will be written to disk, +so that they will still be available in the future as the definition of the `ProductStack` subclass changes over time. +**It is very important** that you commit these old versions to source control as these versions +determine whether a version has already been deployed and can also be deployed themselves. + +After using `ProductStackHistory` to deploy version `v1` of your `ProductStack`, we +make changes to the `ProductStack` and update the `currentVersionName` to `v2`. +We still want our `v1` version to still be deployed, so we reference it by calling `productStackHistory.versionFromSnapshot('v1')`. + +```ts +import * as s3 from '@aws-cdk/aws-s3'; +import * as cdk from '@aws-cdk/core'; + +class S3BucketProduct extends servicecatalog.ProductStack { + constructor(scope: cdk.Construct, id: string) { + super(scope, id); + + new s3.Bucket(this, 'BucketProductV2'); + } +} + +const productStackHistory = new servicecatalog.ProductStackHistory(this, 'ProductStackHistory', { + productStack: new S3BucketProduct(this, 'S3BucketProduct'), + currentVersionName: 'v2', + currentVersionLocked: true +}); + +const product = new servicecatalog.CloudFormationProduct(this, 'MyFirstProduct', { + productName: "My Product", + owner: "Product Owner", + productVersions: [ + productStackHistory.currentVersion(), + productStackHistory.versionFromSnapshot('v1') + ], +}); +``` + ### Adding a product to a portfolio You add products to a portfolio to organize and distribute your catalog at scale. Adding a product to a portfolio creates an association, diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/cloudformation-template.ts b/packages/@aws-cdk/aws-servicecatalog/lib/cloudformation-template.ts index 4086db6655fda..b9d3830807ff5 100644 --- a/packages/@aws-cdk/aws-servicecatalog/lib/cloudformation-template.ts +++ b/packages/@aws-cdk/aws-servicecatalog/lib/cloudformation-template.ts @@ -102,8 +102,8 @@ class CloudFormationAssetTemplate extends CloudFormationTemplate { */ class CloudFormationProductStackTemplate extends CloudFormationTemplate { /** - * @param stack A service catalog product stack. - */ + * @param productStack A service catalog product stack. + */ constructor(public readonly productStack: ProductStack) { super(); } diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/common.ts b/packages/@aws-cdk/aws-servicecatalog/lib/common.ts index 4f207be273867..50a921bac658b 100644 --- a/packages/@aws-cdk/aws-servicecatalog/lib/common.ts +++ b/packages/@aws-cdk/aws-servicecatalog/lib/common.ts @@ -1,3 +1,8 @@ +/** + * Constant for the default directory to store ProductStack snapshots. + */ +export const DEFAULT_PRODUCT_STACK_SNAPSHOT_DIRECTORY = 'product-stack-snapshots'; + /** * The language code. * Used for error and logging messages for end users. @@ -18,4 +23,4 @@ export enum MessageLanguage { * Chinese */ ZH = 'zh' -} \ No newline at end of file +} diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/index.ts b/packages/@aws-cdk/aws-servicecatalog/lib/index.ts index cc26e880fdd2e..334177bca33a2 100644 --- a/packages/@aws-cdk/aws-servicecatalog/lib/index.ts +++ b/packages/@aws-cdk/aws-servicecatalog/lib/index.ts @@ -4,6 +4,7 @@ export * from './cloudformation-template'; export * from './portfolio'; export * from './product'; export * from './product-stack'; +export * from './product-stack-history'; export * from './tag-options'; // AWS::ServiceCatalog CloudFormation Resources: diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/product-stack-history.ts b/packages/@aws-cdk/aws-servicecatalog/lib/product-stack-history.ts new file mode 100644 index 0000000000000..3fea4fea668d0 --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/lib/product-stack-history.ts @@ -0,0 +1,118 @@ +import * as fs from 'fs'; +import * as path from 'path'; +import { Names } from '@aws-cdk/core'; +import { Construct } from 'constructs'; +import { CloudFormationTemplate } from './cloudformation-template'; +import { DEFAULT_PRODUCT_STACK_SNAPSHOT_DIRECTORY } from './common'; +import { CloudFormationProductVersion } from './product'; +import { ProductStack } from './product-stack'; + +// keep this import separate from other imports to reduce chance for merge conflicts with v2-main +// eslint-disable-next-line no-duplicate-imports, import/order +import { Construct as CoreConstruct } from '@aws-cdk/core'; + +/** + * Properties for a ProductStackHistory. + */ +export interface ProductStackHistoryProps { + /** + * The ProductStack whose history will be retained as a snapshot + */ + readonly productStack: ProductStack; + + /** + * The current version name of the ProductStack. + */ + readonly currentVersionName: string; + + /** + * If this is set to true, the ProductStack will not be overwritten if a snapshot is found for the currentVersionName. + */ + readonly currentVersionLocked: boolean + + /** + * The description of the product version + * @default - No description provided + */ + readonly description?: string; + + /** + * Whether the specified product template will be validated by CloudFormation. + * If turned off, an invalid template configuration can be stored. + * @default true + */ + readonly validateTemplate?: boolean; + + /** + * The directory where template snapshots will be stored + * @default 'product-stack-snapshots' + */ + readonly directory?: string +} + +/** + * A Construct that contains a Service Catalog product stack with its previous deployments maintained. + */ +export class ProductStackHistory extends CoreConstruct { + private readonly props: ProductStackHistoryProps + constructor(scope: Construct, id: string, props: ProductStackHistoryProps) { + super(scope, id); + props.productStack._setParentProductStackHistory(this); + this.props = props; + } + + /** + * Retains product stack template as a snapshot when deployed and + * retrieves a CloudFormationProductVersion for the current product version. + */ + public currentVersion() : CloudFormationProductVersion { + return { + cloudFormationTemplate: CloudFormationTemplate.fromProductStack(this.props.productStack), + productVersionName: this.props.currentVersionName, + description: this.props.description, + }; + } + + /** + * Retrieves a CloudFormationProductVersion from a previously deployed productVersionName. + */ + public versionFromSnapshot(productVersionName: string) : CloudFormationProductVersion { + const productStackSnapshotDirectory = this.props.directory || DEFAULT_PRODUCT_STACK_SNAPSHOT_DIRECTORY; + const templateFileKey = `${Names.uniqueId(this)}.${this.props.productStack.artifactId}.${productVersionName}.product.template.json`; + const templateFilePath = path.join(productStackSnapshotDirectory, templateFileKey); + if (!fs.existsSync(templateFilePath)) { + throw new Error(`Template ${templateFileKey} cannot be found in ${productStackSnapshotDirectory}`); + } + return { + cloudFormationTemplate: CloudFormationTemplate.fromAsset(templateFilePath), + productVersionName: productVersionName, + description: this.props.description, + }; + } + + /** + * Writes current template generated from Product Stack to a snapshot directory. + * + * @internal + */ + public _writeTemplateToSnapshot(cfn: string) { + const productStackSnapshotDirectory = this.props.directory || DEFAULT_PRODUCT_STACK_SNAPSHOT_DIRECTORY; + if (!fs.existsSync(productStackSnapshotDirectory)) { + fs.mkdirSync(productStackSnapshotDirectory); + } + const templateFileKey = `${Names.uniqueId(this)}.${this.props.productStack.artifactId}.${this.props.currentVersionName}.product.template.json`; + const templateFilePath = path.join(productStackSnapshotDirectory, templateFileKey); + if (fs.existsSync(templateFilePath)) { + const previousCfn = fs.readFileSync(templateFilePath).toString(); + if (previousCfn !== cfn && this.props.currentVersionLocked) { + throw new Error(`Template has changed for ProductStack Version ${this.props.currentVersionName}. + ${this.props.currentVersionName} already exist in ${productStackSnapshotDirectory}. + Since locked has been set to ${this.props.currentVersionLocked}, + Either update the currentVersionName to deploy a new version or deploy the existing ProductStack snapshot. + If ${this.props.currentVersionName} was unintentionally synthesized and not deployed, + delete the corresponding version from ${productStackSnapshotDirectory} and redeploy.`); + } + } + fs.writeFileSync(templateFilePath, cfn); + } +} diff --git a/packages/@aws-cdk/aws-servicecatalog/lib/product-stack.ts b/packages/@aws-cdk/aws-servicecatalog/lib/product-stack.ts index b96224a8b2c60..5e6d1d64a15eb 100644 --- a/packages/@aws-cdk/aws-servicecatalog/lib/product-stack.ts +++ b/packages/@aws-cdk/aws-servicecatalog/lib/product-stack.ts @@ -3,6 +3,7 @@ import * as fs from 'fs'; import * as path from 'path'; import * as cdk from '@aws-cdk/core'; import { ProductStackSynthesizer } from './private/product-stack-synthesizer'; +import { ProductStackHistory } from './product-stack-history'; // keep this import separate from other imports to reduce chance for merge conflicts with v2-main // eslint-disable-next-line no-duplicate-imports, import/order @@ -19,6 +20,7 @@ import { Construct } from 'constructs'; */ export class ProductStack extends cdk.Stack { public readonly templateFile: string; + private _parentProductStackHistory?: ProductStackHistory; private _templateUrl?: string; private _parentStack: cdk.Stack; @@ -33,6 +35,15 @@ export class ProductStack extends cdk.Stack { this.templateFile = `${cdk.Names.uniqueId(this)}.product.template.json`; } + /** + * Set the parent product stack history + * + * @internal + */ + public _setParentProductStackHistory(parentProductStackHistory: ProductStackHistory) { + return this._parentProductStackHistory = parentProductStackHistory; + } + /** * Fetch the template URL. * @@ -60,6 +71,10 @@ export class ProductStack extends cdk.Stack { fileName: this.templateFile, }).httpUrl; + if (this._parentProductStackHistory) { + this._parentProductStackHistory._writeTemplateToSnapshot(cfn); + } + fs.writeFileSync(path.join(session.assembly.outdir, this.templateFile), cfn); } } diff --git a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.ts b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.ts index 22429b3ddbf83..1bd5d03ea260d 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/integ.product.ts +++ b/packages/@aws-cdk/aws-servicecatalog/test/integ.product.ts @@ -2,6 +2,7 @@ import * as path from 'path'; import * as sns from '@aws-cdk/aws-sns'; import * as cdk from '@aws-cdk/core'; import * as servicecatalog from '../lib'; +import { ProductStackHistory } from '../lib'; const app = new cdk.App(); const stack = new cdk.Stack(app, 'integ-servicecatalog-product'); @@ -14,6 +15,12 @@ class TestProductStack extends servicecatalog.ProductStack { } } +const productStackHistory = new ProductStackHistory(stack, 'ProductStackHistory', { + productStack: new TestProductStack(stack, 'SNSTopicProduct3'), + currentVersionName: 'v1', + currentVersionLocked: true, +}); + const product = new servicecatalog.CloudFormationProduct(stack, 'TestProduct', { productName: 'testProduct', owner: 'testOwner', @@ -35,6 +42,7 @@ const product = new servicecatalog.CloudFormationProduct(stack, 'TestProduct', { { cloudFormationTemplate: servicecatalog.CloudFormationTemplate.fromProductStack(new TestProductStack(stack, 'SNSTopicProduct2')), }, + productStackHistory.currentVersion(), ], }); diff --git a/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/cdk.out index 90bef2e09ad39..2efc89439fab8 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/cdk.out +++ b/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"18.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/integ.json b/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/integ.json index ab86cddb1a16a..09a045531f14f 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/integ.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/integ.json @@ -1,7 +1,7 @@ { "version": "18.0.0", "testCases": { - "aws-servicecatalog/test/integ.portfolio": { + "integ.portfolio": { "stacks": [ "integ-servicecatalog-portfolio" ], diff --git a/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/manifest.json index 881a78a773602..9abbe12a0c3aa 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/portfolio.integ.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "18.0.0", "artifacts": { "Tree": { "type": "cdk:tree", diff --git a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/cdk.out b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/cdk.out index 90bef2e09ad39..2efc89439fab8 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/cdk.out +++ b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"18.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integ-servicecatalog-product.template.json b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integ-servicecatalog-product.template.json index 9c84dac237948..11578cd12197b 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integ-servicecatalog-product.template.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integ-servicecatalog-product.template.json @@ -215,6 +215,58 @@ ] } } + }, + { + "DisableTemplateValidation": false, + "Info": { + "LoadTemplateFromURL": { + "Fn::Join": [ + "", + [ + "https://s3.", + { + "Ref": "AWS::Region" + }, + ".", + { + "Ref": "AWS::URLSuffix" + }, + "/", + { + "Ref": "AssetParametersdd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1fS3BucketB4751C98" + }, + "/", + { + "Fn::Select": [ + 0, + { + "Fn::Split": [ + "||", + { + "Ref": "AssetParametersdd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1fS3VersionKeyEB38C6F9" + } + ] + } + ] + }, + { + "Fn::Select": [ + 1, + { + "Fn::Split": [ + "||", + { + "Ref": "AssetParametersdd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1fS3VersionKeyEB38C6F9" + } + ] + } + ] + } + ] + ] + } + }, + "Name": "v1" } ] } diff --git a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integ.json b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integ.json index dea60ee2c2037..5403ef9e941d5 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integ.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integ.json @@ -1,7 +1,7 @@ { "version": "18.0.0", "testCases": { - "aws-servicecatalog/test/integ.product": { + "integ.product": { "stacks": [ "integ-servicecatalog-product" ], diff --git a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integservicecatalogproductSNSTopicProduct3B51CF591.product.template.json b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integservicecatalogproductSNSTopicProduct3B51CF591.product.template.json new file mode 100644 index 0000000000000..2f2f4704a22ad --- /dev/null +++ b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/integservicecatalogproductSNSTopicProduct3B51CF591.product.template.json @@ -0,0 +1,7 @@ +{ + "Resources": { + "TopicProductD757E287": { + "Type": "AWS::SNS::Topic" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/manifest.json b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/manifest.json index 42433db5fab13..c8d093eaf8a0c 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "18.0.0", "artifacts": { "Tree": { "type": "cdk:tree", @@ -43,7 +43,7 @@ { "type": "aws:cdk:asset", "data": { - "path": "integservicecatalogproductSNSTopicProduct1B8D03934.product.template.json", + "path": "integservicecatalogproductSNSTopicProduct3B51CF591.product.template.json", "id": "dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f", "packaging": "file", "sourceHash": "dd2d087eeb6ede1d2a9166639ccbde7bd1b10eef9ba2b4cb3d9855faa4fe8c1f", diff --git a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/tree.json b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/tree.json index 77bff059f780b..7916b0fe8b481 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/tree.json +++ b/packages/@aws-cdk/aws-servicecatalog/test/product.integ.snapshot/tree.json @@ -16,6 +16,46 @@ "id": "integ-servicecatalog-product", "path": "integ-servicecatalog-product", "children": { + "SNSTopicProduct3": { + "id": "SNSTopicProduct3", + "path": "integ-servicecatalog-product/SNSTopicProduct3", + "children": { + "TopicProduct": { + "id": "TopicProduct", + "path": "integ-servicecatalog-product/SNSTopicProduct3/TopicProduct", + "children": { + "Resource": { + "id": "Resource", + "path": "integ-servicecatalog-product/SNSTopicProduct3/TopicProduct/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::SNS::Topic", + "aws:cdk:cloudformation:props": {} + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-sns.CfnTopic", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-sns.Topic", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-servicecatalog.ProductStack", + "version": "0.0.0" + } + }, + "ProductStackHistory": { + "id": "ProductStackHistory", + "path": "integ-servicecatalog-product/ProductStackHistory", + "constructInfo": { + "fqn": "@aws-cdk/aws-servicecatalog.ProductStackHistory", + "version": "0.0.0" + } + }, "SNSTopicProduct1": { "id": "SNSTopicProduct1", "path": "integ-servicecatalog-product/SNSTopicProduct1", @@ -84,13 +124,13 @@ "id": "TestProduct", "path": "integ-servicecatalog-product/TestProduct", "children": { - "Template36f44329de2f": { - "id": "Template36f44329de2f", - "path": "integ-servicecatalog-product/TestProduct/Template36f44329de2f", + "Template70cd971a7303": { + "id": "Template70cd971a7303", + "path": "integ-servicecatalog-product/TestProduct/Template70cd971a7303", "children": { "Stage": { "id": "Stage", - "path": "integ-servicecatalog-product/TestProduct/Template36f44329de2f/Stage", + "path": "integ-servicecatalog-product/TestProduct/Template70cd971a7303/Stage", "constructInfo": { "fqn": "@aws-cdk/core.AssetStaging", "version": "0.0.0" @@ -98,7 +138,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-servicecatalog-product/TestProduct/Template36f44329de2f/AssetBucket", + "path": "integ-servicecatalog-product/TestProduct/Template70cd971a7303/AssetBucket", "constructInfo": { "fqn": "@aws-cdk/aws-s3.BucketBase", "version": "0.0.0" @@ -110,13 +150,13 @@ "version": "0.0.0" } }, - "Template3253587567ef": { - "id": "Template3253587567ef", - "path": "integ-servicecatalog-product/TestProduct/Template3253587567ef", + "Template3b1445e4244b": { + "id": "Template3b1445e4244b", + "path": "integ-servicecatalog-product/TestProduct/Template3b1445e4244b", "children": { "Stage": { "id": "Stage", - "path": "integ-servicecatalog-product/TestProduct/Template3253587567ef/Stage", + "path": "integ-servicecatalog-product/TestProduct/Template3b1445e4244b/Stage", "constructInfo": { "fqn": "@aws-cdk/core.AssetStaging", "version": "0.0.0" @@ -124,7 +164,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-servicecatalog-product/TestProduct/Template3253587567ef/AssetBucket", + "path": "integ-servicecatalog-product/TestProduct/Template3b1445e4244b/AssetBucket", "constructInfo": { "fqn": "@aws-cdk/aws-s3.BucketBase", "version": "0.0.0" @@ -260,6 +300,11 @@ { "disableTemplateValidation": false, "info": {} + }, + { + "name": "v1", + "disableTemplateValidation": false, + "info": {} } ] } diff --git a/packages/@aws-cdk/aws-servicecatalog/test/product.test.ts b/packages/@aws-cdk/aws-servicecatalog/test/product.test.ts index d27e18a1c3358..20cf4ef1f8fb9 100644 --- a/packages/@aws-cdk/aws-servicecatalog/test/product.test.ts +++ b/packages/@aws-cdk/aws-servicecatalog/test/product.test.ts @@ -1,8 +1,11 @@ +import * as fs from 'fs'; import * as path from 'path'; import { Match, Template } from '@aws-cdk/assertions'; import * as sns from '@aws-cdk/aws-sns'; import * as cdk from '@aws-cdk/core'; import * as servicecatalog from '../lib'; +import { DEFAULT_PRODUCT_STACK_SNAPSHOT_DIRECTORY } from '../lib'; +import { ProductStackHistory } from '../lib/product-stack-history'; /* eslint-disable quote-props */ describe('Product', () => { @@ -189,6 +192,130 @@ describe('Product', () => { expect(assembly.stacks[0].assets.length).toBe(1); }), + test('product test from product stack history', () => { + const productStack = new servicecatalog.ProductStack(stack, 'ProductStack'); + + const productStackHistory = new ProductStackHistory(stack, 'MyProductStackHistory', { + productStack: productStack, + currentVersionName: 'v1', + currentVersionLocked: false, + }); + + new sns.Topic(productStack, 'SNSTopicProductStack'); + + new servicecatalog.CloudFormationProduct(stack, 'MyProduct', { + productName: 'testProduct', + owner: 'testOwner', + productVersions: [ + productStackHistory.currentVersion(), + ], + }); + + const assembly = app.synth(); + expect(assembly.artifacts.length).toEqual(2); + expect(assembly.stacks[0].assets.length).toBe(1); + expect(assembly.stacks[0].assets[0].path).toEqual('ProductStack.product.template.json'); + + const expectedTemplateFileKey = 'MyProductStackHistory.ProductStack.v1.product.template.json'; + const snapshotExists = fs.existsSync(path.join(DEFAULT_PRODUCT_STACK_SNAPSHOT_DIRECTORY, expectedTemplateFileKey)); + expect(snapshotExists).toBe(true); + }), + + test('fails product test from product stack when template changes and locked', () => { + const productStack = new servicecatalog.ProductStack(stack, 'ProductStack'); + + const productStackHistory = new ProductStackHistory(stack, 'MyProductStackHistory', { + productStack: productStack, + currentVersionName: 'v1', + currentVersionLocked: true, + }); + + new sns.Topic(productStack, 'SNSTopicProductStack2'); + + new servicecatalog.CloudFormationProduct(stack, 'MyProduct', { + productName: 'testProduct', + owner: 'testOwner', + productVersions: [ + productStackHistory.currentVersion(), + ], + }); + expect(() => { + app.synth(); + }).toThrowError('Template has changed for ProductStack Version v1'); + }), + + test('product test from product stack history when template changes and unlocked', () => { + const productStack = new servicecatalog.ProductStack(stack, 'ProductStack'); + + const productStackHistory = new ProductStackHistory(stack, 'MyProductStackHistory', { + productStack: productStack, + currentVersionName: 'v1', + currentVersionLocked: false, + }); + + new sns.Topic(productStack, 'SNSTopicProductStack2'); + + new servicecatalog.CloudFormationProduct(stack, 'MyProduct', { + productName: 'testProduct', + owner: 'testOwner', + productVersions: [ + productStackHistory.currentVersion(), + ], + }); + + const assembly = app.synth(); + expect(assembly.artifacts.length).toEqual(2); + expect(assembly.stacks[0].assets.length).toBe(1); + expect(assembly.stacks[0].assets[0].path).toEqual('ProductStack.product.template.json'); + + const expectedTemplateFileKey = 'MyProductStackHistory.ProductStack.v1.product.template.json'; + const snapshotExists = fs.existsSync(path.join(DEFAULT_PRODUCT_STACK_SNAPSHOT_DIRECTORY, expectedTemplateFileKey)); + expect(snapshotExists).toBe(true); + }), + + test('product test from product stack history snapshot', () => { + const productStack = new servicecatalog.ProductStack(stack, 'ProductStack'); + + const productStackHistory = new ProductStackHistory(stack, 'MyProductStackHistory', { + productStack: productStack, + currentVersionName: 'v2', + currentVersionLocked: false, + }); + + new servicecatalog.CloudFormationProduct(stack, 'MyProduct', { + productName: 'testProduct', + owner: 'testOwner', + productVersions: [ + productStackHistory.versionFromSnapshot('v1'), + ], + }); + + const assembly = app.synth(); + expect(assembly.artifacts.length).toEqual(2); + expect(assembly.stacks[0].assets.length).toBe(2); + expect(assembly.stacks[0].assets[0].path).toEqual('asset.434625edc7e017d93f388b5f116c2ebcf11a38457cfb89a9b00d4e551c0bf731.json'); + }), + + test('fails product from product stack history snapshot not found', () => { + const productStack = new servicecatalog.ProductStack(stack, 'ProductStack'); + + const productStackHistory = new ProductStackHistory(stack, 'MyProductStackHistory', { + productStack: productStack, + currentVersionName: 'v2', + currentVersionLocked: false, + }); + + expect(() => { + new servicecatalog.CloudFormationProduct(stack, 'MyProduct', { + productName: 'testProduct', + owner: 'testOwner', + productVersions: [ + productStackHistory.versionFromSnapshot('v3'), + ], + }); + }).toThrowError('Template MyProductStackHistory.ProductStack.v3.product.template.json cannot be found in product-stack-snapshots'); + }), + test('product test from multiple sources', () => { new servicecatalog.CloudFormationProduct(stack, 'MyProduct', { productName: 'testProduct', From 0a49927e9e5bc250f339f664fa843fae2fab92ec Mon Sep 17 00:00:00 2001 From: Jacco Kulman Date: Tue, 24 May 2022 14:19:51 +0200 Subject: [PATCH 06/11] fix(core): NestedStack defaultChild is undefined (#20450) fixes #11221 ---- ### All Submissions: * [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/@aws-cdk/core/lib/nested-stack.ts | 1 + .../@aws-cdk/core/test/nested-stack.test.ts | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 packages/@aws-cdk/core/test/nested-stack.test.ts diff --git a/packages/@aws-cdk/core/lib/nested-stack.ts b/packages/@aws-cdk/core/lib/nested-stack.ts index e1248d69888aa..4859ae0894489 100644 --- a/packages/@aws-cdk/core/lib/nested-stack.ts +++ b/packages/@aws-cdk/core/lib/nested-stack.ts @@ -140,6 +140,7 @@ export class NestedStack extends Stack { this.resource.applyRemovalPolicy(props.removalPolicy ?? RemovalPolicy.DESTROY); this.nestedStackResource = this.resource; + this.node.defaultChild = this.resource; // context-aware stack name: if resolved from within this stack, return AWS::StackName // if resolved from the outer stack, use the { Ref } of the AWS::CloudFormation::Stack resource diff --git a/packages/@aws-cdk/core/test/nested-stack.test.ts b/packages/@aws-cdk/core/test/nested-stack.test.ts new file mode 100644 index 0000000000000..b1508e8bf148f --- /dev/null +++ b/packages/@aws-cdk/core/test/nested-stack.test.ts @@ -0,0 +1,25 @@ +import { + Stack, NestedStack, CfnStack, +} from '../lib'; +import { toCloudFormation } from './util'; + +describe('nested-stack', () => { + test('a nested-stack has a defaultChild', () => { + const stack = new Stack(); + var nestedStack = new NestedStack(stack, 'MyNestedStack'); + var cfn_nestedStack = (nestedStack.node.defaultChild) as CfnStack; + cfn_nestedStack.addPropertyOverride('TemplateURL', 'http://my-url.com'); + expect(toCloudFormation(stack)).toEqual({ + Resources: { + MyNestedStackNestedStackMyNestedStackNestedStackResource9C617903: { + DeletionPolicy: 'Delete', + Properties: { + TemplateURL: 'http://my-url.com', + }, + Type: 'AWS::CloudFormation::Stack', + UpdateReplacePolicy: 'Delete', + }, + }, + }); + }); +}); \ No newline at end of file From 85f4e29e0551d71dd5f2f588584785cbc1ae7b72 Mon Sep 17 00:00:00 2001 From: Steve Date: Tue, 24 May 2022 09:11:57 -0500 Subject: [PATCH 07/11] fix(lambda): Fix typo in public subnet warning (#20470) ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/@aws-cdk/aws-lambda/lib/function.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk/aws-lambda/lib/function.ts b/packages/@aws-cdk/aws-lambda/lib/function.ts index 68002c22c5b4b..8588aff8d9963 100644 --- a/packages/@aws-cdk/aws-lambda/lib/function.ts +++ b/packages/@aws-cdk/aws-lambda/lib/function.ts @@ -1115,7 +1115,7 @@ Environment variables can be marked for removal when used in Lambda@Edge by sett for (const subnetId of subnetIds) { if (publicSubnetIds.has(subnetId) && !allowPublicSubnet) { throw new Error('Lambda Functions in a public subnet can NOT access the internet. ' + - 'If you are aware of this limitation and would still like to place the function int a public subnet, set `allowPublicSubnet` to true'); + 'If you are aware of this limitation and would still like to place the function in a public subnet, set `allowPublicSubnet` to true'); } } From de027e28ce5c95e70fed8874e6531eabba24521c Mon Sep 17 00:00:00 2001 From: Gtofig Date: Tue, 24 May 2022 15:56:04 +0100 Subject: [PATCH 08/11] feat(lambda): validate function description length (#20476) closes #20475. ---- ### All Submissions: * [X] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/@aws-cdk/aws-lambda/lib/function.ts | 6 +++++ .../@aws-cdk/aws-lambda/test/function.test.ts | 25 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/packages/@aws-cdk/aws-lambda/lib/function.ts b/packages/@aws-cdk/aws-lambda/lib/function.ts index 8588aff8d9963..ba6ddcf414f82 100644 --- a/packages/@aws-cdk/aws-lambda/lib/function.ts +++ b/packages/@aws-cdk/aws-lambda/lib/function.ts @@ -668,6 +668,12 @@ export class Function extends FunctionBase { } } + if (props.description && !Token.isUnresolved(props.description)) { + if (props.description.length > 256) { + throw new Error(`Function description can not be longer than 256 characters but has ${props.description.length} characters.`); + } + } + const managedPolicies = new Array(); // the arn is in the form of - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole diff --git a/packages/@aws-cdk/aws-lambda/test/function.test.ts b/packages/@aws-cdk/aws-lambda/test/function.test.ts index 78f17b5f55394..187fa061b2e19 100644 --- a/packages/@aws-cdk/aws-lambda/test/function.test.ts +++ b/packages/@aws-cdk/aws-lambda/test/function.test.ts @@ -2648,6 +2648,31 @@ describe('function', () => { }).not.toThrow(); }); + test('Error when function description is longer than 256 chars', () => { + const stack = new cdk.Stack(); + expect(() => new lambda.Function(stack, 'MyFunction', { + code: lambda.Code.fromInline('foo'), + runtime: lambda.Runtime.NODEJS_14_X, + handler: 'index.handler', + description: 'a'.repeat(257), + })).toThrow(/Function description can not be longer than 256 characters/); + }); + + test('No error when function name is Tokenized and Unresolved', () => { + const stack = new cdk.Stack(); + expect(() => { + const realFunctionDescription = 'a'.repeat(257); + const tokenizedFunctionDescription = cdk.Token.asString(new cdk.Intrinsic(realFunctionDescription)); + + new lambda.Function(stack, 'foo', { + code: new lambda.InlineCode('foo'), + handler: 'index.handler', + runtime: lambda.Runtime.NODEJS_14_X, + description: tokenizedFunctionDescription, + }); + }).not.toThrow(); + }); + describe('FunctionUrl', () => { test('addFunctionUrl creates a function url with default options', () => { // GIVEN From f334060fca02e928bc4f5fdcfd45244060731d78 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Tue, 24 May 2022 17:40:16 +0200 Subject: [PATCH 09/11] fix(pipelines): too many CodeBuild steps inflate policy size (#20396) (This change has been split off from #20189 because that PR was growing too big) Collapse CodeBuild action Roles: each CodeBuild step used to create a fresh Role to run the CodeBuild action. Change to use one Role for all CodeBuild actions. This saves a lot of resources and policy space when using many CodeBuild steps, and doesn't appreciably change the security posture of the Pipeline (note: this is not about the Execution Role of the CodeBuild projects, this is about the Role assumed by the Pipeline to initiate execution of the Project). Relates to #19276, #19939, #19835. ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../@aws-cdk/aws-codepipeline/lib/pipeline.ts | 18 +- packages/@aws-cdk/aws-iam/lib/lazy-role.ts | 7 + packages/@aws-cdk/aws-iam/lib/principals.ts | 15 + .../aws-iam/lib/private/immutable-role.ts | 4 + packages/@aws-cdk/aws-iam/lib/role.ts | 20 + .../@aws-cdk/aws-iam/test/principals.test.ts | 10 + packages/@aws-cdk/aws-iam/test/role.test.ts | 24 + .../codepipeline/private/codebuild-factory.ts | 14 +- .../helpers-internal/pipeline-graph.test.ts | 1 - .../helpers-internal/pipeline-queries.test.ts | 1 - .../test/codepipeline/codebuild-step.test.ts | 7 +- .../test/codepipeline/codepipeline.test.ts | 39 +- .../test/compliance/basic-behavior.test.ts | 1 - .../PipelineStack.assets.json | 6 +- .../PipelineStack.template.json | 251 ++------ ...ipelineStackBetaStack1E6541489.assets.json | 2 +- .../assembly-PipelineStack-Beta/cdk.out | 2 +- .../assembly-PipelineStack-Beta/manifest.json | 84 +-- .../cdk.out | 2 +- .../integ.json | 4 +- .../manifest.json | 48 +- .../tree.json | 549 ++++-------------- .../PipelineStack.assets.json | 6 +- .../PipelineStack.template.json | 103 +--- ...ipelineStackBetaStack1E6541489.assets.json | 2 +- ...ipelineStackBetaStack2C79AD00A.assets.json | 2 +- .../assembly-PipelineStack-Beta/cdk.out | 2 +- .../assembly-PipelineStack-Beta/manifest.json | 198 +++---- ...pelineStackProd1Stack14013D698.assets.json | 2 +- ...pelineStackProd1Stack2F0681AFF.assets.json | 2 +- .../assembly-PipelineStack-Prod1/cdk.out | 2 +- .../manifest.json | 188 +++--- ...pelineStackProd2Stack1FD464162.assets.json | 2 +- ...pelineStackProd2Stack2176123EB.assets.json | 2 +- .../assembly-PipelineStack-Prod2/cdk.out | 2 +- .../manifest.json | 188 +++--- ...pelineStackProd3Stack1795F3D43.assets.json | 2 +- ...pelineStackProd3Stack2DFBBA0B2.assets.json | 2 +- .../assembly-PipelineStack-Prod3/cdk.out | 2 +- .../manifest.json | 188 +++--- ...pelineStackProd4Stack118F74ADB.assets.json | 2 +- ...pelineStackProd4Stack2E2CB4ED3.assets.json | 2 +- .../assembly-PipelineStack-Prod4/cdk.out | 2 +- .../manifest.json | 188 +++--- ...pelineStackProd5Stack1E7E4E4C6.assets.json | 2 +- ...pelineStackProd5Stack2C39BEE5B.assets.json | 2 +- .../assembly-PipelineStack-Prod5/cdk.out | 2 +- .../manifest.json | 188 +++--- ...pelineStackProd6Stack1E7C34314.assets.json | 2 +- ...pelineStackProd6Stack2BED1BBCE.assets.json | 2 +- .../assembly-PipelineStack-Prod6/cdk.out | 2 +- .../manifest.json | 188 +++--- .../test/newpipeline.integ.snapshot/cdk.out | 2 +- .../newpipeline.integ.snapshot/integ.json | 4 +- .../newpipeline.integ.snapshot/manifest.json | 24 +- .../test/newpipeline.integ.snapshot/tree.json | 321 ++++------ .../PipelineSecurityStack.assets.json | 2 +- ...curityCheckMySafeStack7A4F8E95.assets.json | 2 +- .../cdk.out | 2 +- .../manifest.json | 76 +-- ...leSecurityCheckMyStack0B9FE272.assets.json | 2 +- .../cdk.out | 2 +- .../manifest.json | 96 +-- ...NoSecurityCheckMyStack3484019E.assets.json | 2 +- .../cdk.out | 2 +- .../manifest.json | 100 ++-- ...ckPreProductionMyStackDCCBB4EA.assets.json | 2 +- .../cdk.out | 2 +- .../manifest.json | 100 ++-- ...eProductionMySafeStackC0D87904.assets.json | 2 +- .../cdk.out | 2 +- .../manifest.json | 76 +-- ...tackSingleStageMyStack29962269.assets.json | 2 +- .../cdk.out | 2 +- .../manifest.json | 96 +-- .../pipeline-security.integ.snapshot/cdk.out | 2 +- .../integ.json | 4 +- .../manifest.json | 7 +- .../PipelineStack.assets.json | 2 +- ...elineStackPreProdStack65A0AD1F.assets.json | 2 +- .../assembly-PipelineStack-PreProd/cdk.out | 2 +- .../manifest.json | 78 +-- .../cdk.out | 2 +- .../integ.json | 4 +- .../manifest.json | 7 +- .../PipelineStack.assets.json | 2 +- ...elineStackPreProdStack65A0AD1F.assets.json | 2 +- .../assembly-PipelineStack-PreProd/cdk.out | 2 +- .../manifest.json | 78 +-- .../cdk.out | 2 +- .../integ.json | 4 +- .../manifest.json | 7 +- .../VariablePipelineStack.assets.json | 6 +- .../VariablePipelineStack.template.json | 183 ++---- .../cdk.out | 2 +- .../integ.json | 4 +- .../manifest.json | 36 +- .../tree.json | 425 ++++---------- .../PipelineStack.assets.json | 2 +- ...elineStackPreProdStack65A0AD1F.assets.json | 2 +- .../assembly-PipelineStack-PreProd/cdk.out | 2 +- .../manifest.json | 78 +-- .../test/pipeline.integ.snapshot/cdk.out | 2 +- .../test/pipeline.integ.snapshot/integ.json | 4 +- .../pipeline.integ.snapshot/manifest.json | 7 +- .../pipelines/test/testhelpers/test-app.ts | 2 - 106 files changed, 1797 insertions(+), 2672 deletions(-) diff --git a/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts b/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts index 6d500b3147ef2..72c684dd7d06a 100644 --- a/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts +++ b/packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts @@ -365,6 +365,7 @@ export class Pipeline extends PipelineBase { private readonly crossAccountKeys: boolean; private readonly enableKeyRotation?: boolean; private readonly reuseCrossRegionSupportStacks: boolean; + private readonly codePipeline: CfnPipeline; constructor(scope: Construct, id: string, props: PipelineProps = {}) { super(scope, id, { @@ -426,7 +427,7 @@ export class Pipeline extends PipelineBase { assumedBy: new iam.ServicePrincipal('codepipeline.amazonaws.com'), }); - const codePipeline = new CfnPipeline(this, 'Resource', { + this.codePipeline = new CfnPipeline(this, 'Resource', { artifactStore: Lazy.any({ produce: () => this.renderArtifactStoreProperty() }), artifactStores: Lazy.any({ produce: () => this.renderArtifactStoresProperty() }), stages: Lazy.any({ produce: () => this.renderStages() }), @@ -437,11 +438,11 @@ export class Pipeline extends PipelineBase { }); // this will produce a DependsOn for both the role and the policy resources. - codePipeline.node.addDependency(this.role); + this.codePipeline.node.addDependency(this.role); this.artifactBucket.grantReadWrite(this.role); - this.pipelineName = this.getResourceNameAttribute(codePipeline.ref); - this.pipelineVersion = codePipeline.attrVersion; + this.pipelineName = this.getResourceNameAttribute(this.codePipeline.ref); + this.pipelineVersion = this.codePipeline.attrVersion; this.crossRegionBucketsPassed = !!props.crossRegionReplicationBuckets; for (const [region, replicationBucket] of Object.entries(props.crossRegionReplicationBuckets || {})) { @@ -724,13 +725,8 @@ export class Pipeline extends PipelineBase { } // the pipeline role needs assumeRole permissions to the action role - if (actionRole) { - this.role.addToPrincipalPolicy(new iam.PolicyStatement({ - actions: ['sts:AssumeRole'], - resources: [actionRole.roleArn], - })); - } - + const grant = actionRole?.grantAssumeRole(this.role); + grant?.applyBefore(this.codePipeline); return actionRole; } diff --git a/packages/@aws-cdk/aws-iam/lib/lazy-role.ts b/packages/@aws-cdk/aws-iam/lib/lazy-role.ts index f5973d663e399..0d23f01614e2e 100644 --- a/packages/@aws-cdk/aws-iam/lib/lazy-role.ts +++ b/packages/@aws-cdk/aws-iam/lib/lazy-role.ts @@ -119,6 +119,13 @@ export class LazyRole extends cdk.Resource implements IRole { return this.instantiate().grantPassRole(identity); } + /** + * Grant permissions to the given principal to assume this role. + */ + public grantAssumeRole(identity: IPrincipal): Grant { + return this.instantiate().grantAssumeRole(identity); + } + private instantiate(): Role { if (!this.role) { const role = new Role(this, 'Default', this.props); diff --git a/packages/@aws-cdk/aws-iam/lib/principals.ts b/packages/@aws-cdk/aws-iam/lib/principals.ts index 77dc3003a4ddf..d24d21ebd0b4b 100644 --- a/packages/@aws-cdk/aws-iam/lib/principals.ts +++ b/packages/@aws-cdk/aws-iam/lib/principals.ts @@ -429,6 +429,21 @@ export interface ServicePrincipalOpts { * An IAM principal that represents an AWS service (i.e. sqs.amazonaws.com). */ export class ServicePrincipal extends PrincipalBase { + /** + * Translate the given service principal name based on the region it's used in. + * + * For example, for Chinese regions this may (depending on whether that's necessary + * for the given service principal) append `.cn` to the name. + * + * The `region-info` module is used to obtain this information. + * + * @example + * const principalName = iam.ServicePrincipal.servicePrincipalName('ec2.amazonaws.com'); + */ + public static servicePrincipalName(service: string): string { + return new ServicePrincipalToken(service, {}).toString(); + } + /** * * @param service AWS service (i.e. sqs.amazonaws.com) diff --git a/packages/@aws-cdk/aws-iam/lib/private/immutable-role.ts b/packages/@aws-cdk/aws-iam/lib/private/immutable-role.ts index 663cc601da281..8d0b454ffb97d 100644 --- a/packages/@aws-cdk/aws-iam/lib/private/immutable-role.ts +++ b/packages/@aws-cdk/aws-iam/lib/private/immutable-role.ts @@ -67,4 +67,8 @@ export class ImmutableRole extends Resource implements IRole { public grantPassRole(grantee: IPrincipal): Grant { return this.role.grantPassRole(grantee); } + + public grantAssumeRole(identity: IPrincipal): Grant { + return this.role.grantAssumeRole(identity); + } } diff --git a/packages/@aws-cdk/aws-iam/lib/role.ts b/packages/@aws-cdk/aws-iam/lib/role.ts index f31d3834146a2..1e5965645d845 100644 --- a/packages/@aws-cdk/aws-iam/lib/role.ts +++ b/packages/@aws-cdk/aws-iam/lib/role.ts @@ -246,6 +246,13 @@ export class Role extends Resource implements IRole { return this.grant(identity, 'iam:PassRole'); } + /** + * Grant permissions to the given principal to pass this role. + */ + public grantAssumeRole(identity: IPrincipal): Grant { + return this.grant(identity, 'sts:AssumeRole'); + } + /** * Grant the actions defined in actions to the identity Principal on this resource. */ @@ -447,6 +454,14 @@ export class Role extends Resource implements IRole { return this.grant(identity, 'iam:PassRole'); } + /** + * Grant permissions to the given principal to assume this role. + */ + public grantAssumeRole(identity: IPrincipal) { + return this.grant(identity, 'sts:AssumeRole'); + } + + /** * Return a copy of this Role object whose Policies will not be updated * @@ -502,6 +517,11 @@ export interface IRole extends IIdentity { * Grant permissions to the given principal to pass this role. */ grantPassRole(grantee: IPrincipal): Grant; + + /** + * Grant permissions to the given principal to assume this role. + */ + grantAssumeRole(grantee: IPrincipal): Grant; } function createAssumeRolePolicy(principal: IPrincipal, externalIds: string[]) { diff --git a/packages/@aws-cdk/aws-iam/test/principals.test.ts b/packages/@aws-cdk/aws-iam/test/principals.test.ts index b5c936be58a2e..2a1f74e2c5056 100644 --- a/packages/@aws-cdk/aws-iam/test/principals.test.ts +++ b/packages/@aws-cdk/aws-iam/test/principals.test.ts @@ -294,6 +294,16 @@ test('AccountPrincipal can specify an organization', () => { }); }); +test('ServicePrincipalName returns just a string representing the principal', () => { + // GIVEN + const usEastStack = new Stack(undefined, undefined, { env: { region: 'us-east-1' } }); + const afSouthStack = new Stack(undefined, undefined, { env: { region: 'af-south-1' } }); + const principalName = iam.ServicePrincipal.servicePrincipalName('ssm.amazonaws.com'); + + expect(usEastStack.resolve(principalName)).toEqual('ssm.amazonaws.com'); + expect(afSouthStack.resolve(principalName)).toEqual('ssm.af-south-1.amazonaws.com'); +}); + test('Passing non-string as accountId parameter in AccountPrincipal constructor should throw error', () => { expect(() => new iam.AccountPrincipal(1234)).toThrowError('accountId should be of type string'); }); diff --git a/packages/@aws-cdk/aws-iam/test/role.test.ts b/packages/@aws-cdk/aws-iam/test/role.test.ts index 157dd0ef740e4..d0ddc3056d011 100644 --- a/packages/@aws-cdk/aws-iam/test/role.test.ts +++ b/packages/@aws-cdk/aws-iam/test/role.test.ts @@ -59,6 +59,30 @@ describe('IAM role', () => { }); }); + test('a role can grant AssumeRole permissions', () => { + // GIVEN + const stack = new Stack(); + const role = new Role(stack, 'Role', { assumedBy: new ServicePrincipal('henk.amazonaws.com') }); + const user = new User(stack, 'User'); + + // WHEN + role.grantAssumeRole(user); + + // THEN + Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', { + PolicyDocument: { + Statement: [ + { + Action: 'sts:AssumeRole', + Effect: 'Allow', + Resource: { 'Fn::GetAtt': ['Role1ABCC5F0', 'Arn'] }, + }, + ], + Version: '2012-10-17', + }, + }); + }); + testDeprecated('can supply externalId', () => { // GIVEN const stack = new Stack(); diff --git a/packages/@aws-cdk/pipelines/lib/codepipeline/private/codebuild-factory.ts b/packages/@aws-cdk/pipelines/lib/codepipeline/private/codebuild-factory.ts index 85697104e2cc4..64183a8d21f91 100644 --- a/packages/@aws-cdk/pipelines/lib/codepipeline/private/codebuild-factory.ts +++ b/packages/@aws-cdk/pipelines/lib/codepipeline/private/codebuild-factory.ts @@ -323,6 +323,18 @@ export class CodeBuildFactory implements ICodePipelineActionFactory { ? { _PROJECT_CONFIG_HASH: projectConfigHash } : {}; + + // Start all CodeBuild projects from a single (shared) Action Role, so that we don't have to generate an Action Role for each + // individual CodeBuild Project and blow out the pipeline policy size (and potentially # of resources in the stack). + const actionRoleCid = 'CodeBuildActionRole'; + const actionRole = this.props.actionRole + ?? options.pipeline.node.tryFindChild(actionRoleCid) as iam.IRole + ?? new iam.Role(options.pipeline, actionRoleCid, { + assumedBy: new iam.PrincipalWithConditions(new iam.AccountRootPrincipal(), { + Bool: { 'aws:ViaAWSService': iam.ServicePrincipal.servicePrincipalName('codepipeline.amazonaws.com') }, + }), + }); + stage.addAction(new codepipeline_actions.CodeBuildAction({ actionName: actionName, input: inputArtifact, @@ -330,8 +342,8 @@ export class CodeBuildFactory implements ICodePipelineActionFactory { outputs: outputArtifacts, project, runOrder: options.runOrder, - role: this.props.actionRole, variablesNamespace: options.variablesNamespace, + role: actionRole, // Inclusion of the hash here will lead to the pipeline structure for any changes // made the config of the underlying CodeBuild Project. diff --git a/packages/@aws-cdk/pipelines/test/blueprint/helpers-internal/pipeline-graph.test.ts b/packages/@aws-cdk/pipelines/test/blueprint/helpers-internal/pipeline-graph.test.ts index a933b4887cb97..e53775e84f382 100644 --- a/packages/@aws-cdk/pipelines/test/blueprint/helpers-internal/pipeline-graph.test.ts +++ b/packages/@aws-cdk/pipelines/test/blueprint/helpers-internal/pipeline-graph.test.ts @@ -1,5 +1,4 @@ /* eslint-disable import/no-extraneous-dependencies */ -import '@aws-cdk/assert-internal/jest'; import * as cdkp from '../../../lib'; import { ManualApprovalStep, Step } from '../../../lib'; import { Graph, GraphNode, PipelineGraph } from '../../../lib/helpers-internal'; diff --git a/packages/@aws-cdk/pipelines/test/blueprint/helpers-internal/pipeline-queries.test.ts b/packages/@aws-cdk/pipelines/test/blueprint/helpers-internal/pipeline-queries.test.ts index a859cf98d1bce..f452ff27e5b76 100644 --- a/packages/@aws-cdk/pipelines/test/blueprint/helpers-internal/pipeline-queries.test.ts +++ b/packages/@aws-cdk/pipelines/test/blueprint/helpers-internal/pipeline-queries.test.ts @@ -1,5 +1,4 @@ /* eslint-disable import/no-extraneous-dependencies */ -import '@aws-cdk/assert-internal/jest'; import * as cdkp from '../../../lib'; import { PipelineQueries } from '../../../lib/helpers-internal/pipeline-queries'; import { AppWithOutput, TestApp } from '../../testhelpers/test-app'; diff --git a/packages/@aws-cdk/pipelines/test/codepipeline/codebuild-step.test.ts b/packages/@aws-cdk/pipelines/test/codepipeline/codebuild-step.test.ts index ad3a5b3be9923..e89698dee1b3f 100644 --- a/packages/@aws-cdk/pipelines/test/codepipeline/codebuild-step.test.ts +++ b/packages/@aws-cdk/pipelines/test/codepipeline/codebuild-step.test.ts @@ -172,7 +172,8 @@ test('role passed it used for project and code build action', () => { }); // THEN - Template.fromStack(pipelineStack).hasResourceProperties('AWS::CodeBuild::Project', { + const tpl = Template.fromStack(pipelineStack); + tpl.hasResourceProperties('AWS::CodeBuild::Project', { ServiceRole: { 'Fn::GetAtt': [ 'ProjectRole5B707505', @@ -181,7 +182,7 @@ test('role passed it used for project and code build action', () => { }, }); - expect(pipelineStack).toHaveResourceLike('AWS::CodePipeline::Pipeline', { + tpl.hasResourceProperties('AWS::CodePipeline::Pipeline', { Stages: [ // source stage {}, @@ -203,6 +204,8 @@ test('role passed it used for project and code build action', () => { }, ], }, + // Self-update + {}, ], }); }); diff --git a/packages/@aws-cdk/pipelines/test/codepipeline/codepipeline.test.ts b/packages/@aws-cdk/pipelines/test/codepipeline/codepipeline.test.ts index 3c7a134a5118f..9f8c7ec5d0a6d 100644 --- a/packages/@aws-cdk/pipelines/test/codepipeline/codepipeline.test.ts +++ b/packages/@aws-cdk/pipelines/test/codepipeline/codepipeline.test.ts @@ -1,9 +1,10 @@ +import { Template } from '@aws-cdk/assertions'; import * as ccommit from '@aws-cdk/aws-codecommit'; import * as sqs from '@aws-cdk/aws-sqs'; import * as cdk from '@aws-cdk/core'; import { Construct } from 'constructs'; import * as cdkp from '../../lib'; -import { PIPELINE_ENV, TestApp } from '../testhelpers'; +import { PIPELINE_ENV, TestApp, ModernTestGitHubNpmPipeline } from '../testhelpers'; let app: TestApp; @@ -52,24 +53,48 @@ describe('CodePipeline support stack reuse', () => { const supportStackAArtifact = assembly.getStackByName(`PipelineStackA-support-${testStageEnv.region}`); const supportStackBArtifact = assembly.getStackByName(`PipelineStackB-support-${testStageEnv.region}`); - const supportStackATemplate = supportStackAArtifact.template; - expect(supportStackATemplate).toHaveResourceLike('AWS::S3::Bucket', { + const supportStackATemplate = Template.fromJSON(supportStackAArtifact.template); + supportStackATemplate.hasResourceProperties('AWS::S3::Bucket', { BucketName: 'pipelinestacka-support-useplicationbucket80db3753a0ebbf052279', }); - expect(supportStackATemplate).toHaveResourceLike('AWS::KMS::Alias', { + supportStackATemplate.hasResourceProperties('AWS::KMS::Alias', { AliasName: 'alias/pport-ustencryptionalias5cad45754e1ff088476b', }); - const supportStackBTemplate = supportStackBArtifact.template; - expect(supportStackBTemplate).toHaveResourceLike('AWS::S3::Bucket', { + const supportStackBTemplate = Template.fromJSON(supportStackBArtifact.template); + supportStackBTemplate.hasResourceProperties('AWS::S3::Bucket', { BucketName: 'pipelinestackb-support-useplicationbucket1d556ec7f959b336abf8', }); - expect(supportStackBTemplate).toHaveResourceLike('AWS::KMS::Alias', { + supportStackBTemplate.hasResourceProperties('AWS::KMS::Alias', { AliasName: 'alias/pport-ustencryptionalias668c7ffd0de17c9867b0', }); }); }); +test('CodeBuild action role has the right AssumeRolePolicyDocument', () => { + const pipelineStack = new cdk.Stack(app, 'PipelineStack', { env: PIPELINE_ENV }); + new ModernTestGitHubNpmPipeline(pipelineStack, 'Cdk'); + + const template = Template.fromStack(pipelineStack); + template.hasResourceProperties('AWS::IAM::Role', { + AssumeRolePolicyDocument: { + Statement: [ + { + Action: 'sts:AssumeRole', + Principal: { + AWS: { 'Fn::Join': ['', ['arn:', { Ref: 'AWS::Partition' }, ':iam::123pipeline:root']] }, + }, + Condition: { + Bool: { + 'aws:ViaAWSService': 'codepipeline.amazonaws.com', + }, + }, + }, + ], + }, + }); +}); + interface ReuseCodePipelineStackProps extends cdk.StackProps { reuseCrossRegionSupportStacks?: boolean; } diff --git a/packages/@aws-cdk/pipelines/test/compliance/basic-behavior.test.ts b/packages/@aws-cdk/pipelines/test/compliance/basic-behavior.test.ts index 85d7d5911dd0a..26a570d602f0d 100644 --- a/packages/@aws-cdk/pipelines/test/compliance/basic-behavior.test.ts +++ b/packages/@aws-cdk/pipelines/test/compliance/basic-behavior.test.ts @@ -2,7 +2,6 @@ import * as fs from 'fs'; import * as path from 'path'; import { Capture, Match, Template } from '@aws-cdk/assertions'; -import '@aws-cdk/assert-internal/jest'; import { Stack, Stage, StageProps, Tags } from '@aws-cdk/core'; import { Construct } from 'constructs'; import { behavior, LegacyTestGitHubNpmPipeline, OneStackApp, BucketStack, PIPELINE_ENV, TestApp, ModernTestGitHubNpmPipeline, stringLike } from '../testhelpers'; diff --git a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/PipelineStack.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/PipelineStack.assets.json index 393b864476ba3..5c93a89c9b234 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/PipelineStack.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/PipelineStack.assets.json @@ -1,7 +1,7 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { - "9220951fe280727c8695ca9cd06f929712e6c44319ad69591a87f7ce6a931b6b": { + "09ed6a107711fc77b4417fe759eedb1920ea48ea07d68490b9973255f017840d": { "source": { "path": "PipelineStack.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "9220951fe280727c8695ca9cd06f929712e6c44319ad69591a87f7ce6a931b6b.json", + "objectKey": "09ed6a107711fc77b4417fe759eedb1920ea48ea07d68490b9973255f017840d.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/PipelineStack.template.json b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/PipelineStack.template.json index e96014f838cc7..844dfd130bc23 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/PipelineStack.template.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/PipelineStack.template.json @@ -572,25 +572,7 @@ "Resource": [ { "Fn::GetAtt": [ - "PipelineAssetsFileAsset1CodePipelineActionRoleC0EC649A", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineAssetsFileAsset2CodePipelineActionRole06965A59", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -695,7 +677,7 @@ ], "RoleArn": { "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -727,7 +709,7 @@ "Name": "SelfMutate", "RoleArn": { "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -758,7 +740,7 @@ "Name": "FileAsset1", "RoleArn": { "Fn::GetAtt": [ - "PipelineAssetsFileAsset1CodePipelineActionRoleC0EC649A", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -784,7 +766,7 @@ "Name": "FileAsset2", "RoleArn": { "Fn::GetAtt": [ - "PipelineAssetsFileAsset2CodePipelineActionRole06965A59", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -1276,75 +1258,18 @@ ] } }, - "PipelineBuildSynthCodePipelineActionRole4E7A6C97": { + "PipelineCodeBuildActionRole226DB0CB": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { "Statement": [ { "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] + "Condition": { + "Bool": { + "aws:ViaAWSService": "codepipeline.amazonaws.com" } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineBuildSynthCdkBuildProject6BEFA8E6", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290", - "Roles": [ - { - "Ref": "PipelineBuildSynthCodePipelineActionRole4E7A6C97" - } - ] - } - }, - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", + }, "Effect": "Allow", "Principal": { "AWS": { @@ -1370,7 +1295,7 @@ } } }, - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleDefaultPolicyE626265B": { + "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE": { "Type": "AWS::IAM::Policy", "Properties": { "PolicyDocument": { @@ -1382,144 +1307,40 @@ "codebuild:StopBuild" ], "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutationDAA41400", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleDefaultPolicyE626265B", - "Roles": [ - { - "Ref": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF" - } - ] - } - }, - "PipelineAssetsFileAsset1CodePipelineActionRoleC0EC649A": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] + "Resource": [ + { + "Fn::GetAtt": [ + "PipelineAssetsFileAsset185A67CB4", + "Arn" ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "PipelineAssetsFileAsset1CodePipelineActionRoleDefaultPolicy5F0BE7E8": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineAssetsFileAsset185A67CB4", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "PipelineAssetsFileAsset1CodePipelineActionRoleDefaultPolicy5F0BE7E8", - "Roles": [ - { - "Ref": "PipelineAssetsFileAsset1CodePipelineActionRoleC0EC649A" - } - ] - } - }, - "PipelineAssetsFileAsset2CodePipelineActionRole06965A59": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] + }, + { + "Fn::GetAtt": [ + "PipelineAssetsFileAsset24D2D639B", + "Arn" + ] + }, + { + "Fn::GetAtt": [ + "PipelineBuildSynthCdkBuildProject6BEFA8E6", + "Arn" + ] + }, + { + "Fn::GetAtt": [ + "PipelineUpdatePipelineSelfMutationDAA41400", + "Arn" ] } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "PipelineAssetsFileAsset2CodePipelineActionRoleDefaultPolicy2399F4BC": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineAssetsFileAsset24D2D639B", - "Arn" - ] - } + ] } ], "Version": "2012-10-17" }, - "PolicyName": "PipelineAssetsFileAsset2CodePipelineActionRoleDefaultPolicy2399F4BC", + "PolicyName": "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE", "Roles": [ { - "Ref": "PipelineAssetsFileAsset2CodePipelineActionRole06965A59" + "Ref": "PipelineCodeBuildActionRole226DB0CB" } ] } diff --git a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack1E6541489.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack1E6541489.assets.json index 8df9d6da3b36a..e25b9d4982f70 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack1E6541489.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack1E6541489.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "8289faf53c7da377bb2b90615999171adef5e1d8f6b88810e5fef75e6ca09ba5": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/cdk.out b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/cdk.out +++ b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/manifest.json b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/manifest.json index b6a17f276092b..cd5690f829819 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/manifest.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/assembly-PipelineStack-Beta/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackBetaStack1E6541489.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "OtherQueue60B686DC", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:39:9)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:26:27)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:47:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:39:9)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:26:27)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:47:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,24 +57,24 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "CodePipeline.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:26:18)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:47:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "CodePipeline.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:26:18)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:47:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -85,24 +85,24 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "CodePipeline.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:26:18)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:47:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "CodePipeline.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:26:18)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline-with-vpc.js:47:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/cdk.out b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/cdk.out +++ b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/integ.json b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/integ.json index 6c6cc27ef5faa..a063567bf66ef 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/integ.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/integ.json @@ -1,7 +1,7 @@ { - "version": "18.0.0", + "version": "19.0.0", "testCases": { - "pipelines/test/integ.newpipeline-with-vpc": { + "integ.newpipeline-with-vpc": { "stacks": [ "PipelineStack" ], diff --git a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/manifest.json b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/manifest.json index aefe92158b7bf..40e28442a635e 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "assembly-PipelineStack-Beta": { "type": "cdk:cloud-assembly", @@ -30,7 +30,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9220951fe280727c8695ca9cd06f929712e6c44319ad69591a87f7ce6a931b6b.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/09ed6a107711fc77b4417fe759eedb1920ea48ea07d68490b9973255f017840d.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -250,52 +250,16 @@ "data": "PipelineBuildSynthCdkBuildProjectPolicyDocument4D16371A" } ], - "/PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/Resource": [ + "/PipelineStack/Pipeline/CodeBuildActionRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "PipelineBuildSynthCodePipelineActionRole4E7A6C97" + "data": "PipelineCodeBuildActionRole226DB0CB" } ], - "/PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/DefaultPolicy/Resource": [ + "/PipelineStack/Pipeline/CodeBuildActionRole/DefaultPolicy/Resource": [ { "type": "aws:cdk:logicalId", - "data": "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290" - } - ], - "/PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF" - } - ], - "/PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole/DefaultPolicy/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleDefaultPolicyE626265B" - } - ], - "/PipelineStack/Pipeline/Pipeline/Assets/FileAsset1/CodePipelineActionRole/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineAssetsFileAsset1CodePipelineActionRoleC0EC649A" - } - ], - "/PipelineStack/Pipeline/Pipeline/Assets/FileAsset1/CodePipelineActionRole/DefaultPolicy/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineAssetsFileAsset1CodePipelineActionRoleDefaultPolicy5F0BE7E8" - } - ], - "/PipelineStack/Pipeline/Pipeline/Assets/FileAsset2/CodePipelineActionRole/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineAssetsFileAsset2CodePipelineActionRole06965A59" - } - ], - "/PipelineStack/Pipeline/Pipeline/Assets/FileAsset2/CodePipelineActionRole/DefaultPolicy/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineAssetsFileAsset2CodePipelineActionRoleDefaultPolicy2399F4BC" + "data": "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE" } ], "/PipelineStack/Pipeline/UpdatePipeline/SelfMutation/Role/Resource": [ diff --git a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/tree.json b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/tree.json index ec4200c88a4d0..1c22126109f8a 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/tree.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline-with-vpc.integ.snapshot/tree.json @@ -909,25 +909,7 @@ "Resource": [ { "Fn::GetAtt": [ - "PipelineAssetsFileAsset1CodePipelineActionRoleC0EC649A", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineAssetsFileAsset2CodePipelineActionRole06965A59", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -1054,7 +1036,7 @@ "runOrder": 1, "roleArn": { "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] } @@ -1086,7 +1068,7 @@ "runOrder": 1, "roleArn": { "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] } @@ -1117,7 +1099,7 @@ "runOrder": 1, "roleArn": { "Fn::GetAtt": [ - "PipelineAssetsFileAsset1CodePipelineActionRoleC0EC649A", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] } @@ -1143,7 +1125,7 @@ "runOrder": 1, "roleArn": { "Fn::GetAtt": [ - "PipelineAssetsFileAsset2CodePipelineActionRole06965A59", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] } @@ -1756,104 +1738,6 @@ "fqn": "@aws-cdk/aws-codebuild.PipelineProject", "version": "0.0.0" } - }, - "CodePipelineActionRole": { - "id": "CodePipelineActionRole", - "path": "PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnRole", - "version": "0.0.0" - } - }, - "DefaultPolicy": { - "id": "DefaultPolicy", - "path": "PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/DefaultPolicy", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/DefaultPolicy/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Policy", - "aws:cdk:cloudformation:props": { - "policyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineBuildSynthCdkBuildProject6BEFA8E6", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "policyName": "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290", - "roles": [ - { - "Ref": "PipelineBuildSynthCodePipelineActionRole4E7A6C97" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnPolicy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Policy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Role", - "version": "0.0.0" - } } }, "constructInfo": { @@ -1874,106 +1758,6 @@ "SelfMutate": { "id": "SelfMutate", "path": "PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate", - "children": { - "CodePipelineActionRole": { - "id": "CodePipelineActionRole", - "path": "PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnRole", - "version": "0.0.0" - } - }, - "DefaultPolicy": { - "id": "DefaultPolicy", - "path": "PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole/DefaultPolicy", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole/DefaultPolicy/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Policy", - "aws:cdk:cloudformation:props": { - "policyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutationDAA41400", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "policyName": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleDefaultPolicyE626265B", - "roles": [ - { - "Ref": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnPolicy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Policy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Role", - "version": "0.0.0" - } - } - }, "constructInfo": { "fqn": "@aws-cdk/core.Construct", "version": "0.0.0" @@ -1992,106 +1776,6 @@ "FileAsset1": { "id": "FileAsset1", "path": "PipelineStack/Pipeline/Pipeline/Assets/FileAsset1", - "children": { - "CodePipelineActionRole": { - "id": "CodePipelineActionRole", - "path": "PipelineStack/Pipeline/Pipeline/Assets/FileAsset1/CodePipelineActionRole", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/Assets/FileAsset1/CodePipelineActionRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnRole", - "version": "0.0.0" - } - }, - "DefaultPolicy": { - "id": "DefaultPolicy", - "path": "PipelineStack/Pipeline/Pipeline/Assets/FileAsset1/CodePipelineActionRole/DefaultPolicy", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/Assets/FileAsset1/CodePipelineActionRole/DefaultPolicy/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Policy", - "aws:cdk:cloudformation:props": { - "policyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineAssetsFileAsset185A67CB4", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "policyName": "PipelineAssetsFileAsset1CodePipelineActionRoleDefaultPolicy5F0BE7E8", - "roles": [ - { - "Ref": "PipelineAssetsFileAsset1CodePipelineActionRoleC0EC649A" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnPolicy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Policy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Role", - "version": "0.0.0" - } - } - }, "constructInfo": { "fqn": "@aws-cdk/core.Construct", "version": "0.0.0" @@ -2100,106 +1784,6 @@ "FileAsset2": { "id": "FileAsset2", "path": "PipelineStack/Pipeline/Pipeline/Assets/FileAsset2", - "children": { - "CodePipelineActionRole": { - "id": "CodePipelineActionRole", - "path": "PipelineStack/Pipeline/Pipeline/Assets/FileAsset2/CodePipelineActionRole", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/Assets/FileAsset2/CodePipelineActionRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnRole", - "version": "0.0.0" - } - }, - "DefaultPolicy": { - "id": "DefaultPolicy", - "path": "PipelineStack/Pipeline/Pipeline/Assets/FileAsset2/CodePipelineActionRole/DefaultPolicy", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/Assets/FileAsset2/CodePipelineActionRole/DefaultPolicy/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Policy", - "aws:cdk:cloudformation:props": { - "policyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineAssetsFileAsset24D2D639B", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "policyName": "PipelineAssetsFileAsset2CodePipelineActionRoleDefaultPolicy2399F4BC", - "roles": [ - { - "Ref": "PipelineAssetsFileAsset2CodePipelineActionRole06965A59" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnPolicy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Policy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Role", - "version": "0.0.0" - } - } - }, "constructInfo": { "fqn": "@aws-cdk/core.Construct", "version": "0.0.0" @@ -2285,6 +1869,129 @@ "version": "0.0.0" } }, + "CodeBuildActionRole": { + "id": "CodeBuildActionRole", + "path": "PipelineStack/Pipeline/CodeBuildActionRole", + "children": { + "Resource": { + "id": "Resource", + "path": "PipelineStack/Pipeline/CodeBuildActionRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Condition": { + "Bool": { + "aws:ViaAWSService": "codepipeline.amazonaws.com" + } + }, + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + } + } + ], + "Version": "2012-10-17" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + }, + "DefaultPolicy": { + "id": "DefaultPolicy", + "path": "PipelineStack/Pipeline/CodeBuildActionRole/DefaultPolicy", + "children": { + "Resource": { + "id": "Resource", + "path": "PipelineStack/Pipeline/CodeBuildActionRole/DefaultPolicy/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Policy", + "aws:cdk:cloudformation:props": { + "policyDocument": { + "Statement": [ + { + "Action": [ + "codebuild:BatchGetBuilds", + "codebuild:StartBuild", + "codebuild:StopBuild" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::GetAtt": [ + "PipelineAssetsFileAsset185A67CB4", + "Arn" + ] + }, + { + "Fn::GetAtt": [ + "PipelineAssetsFileAsset24D2D639B", + "Arn" + ] + }, + { + "Fn::GetAtt": [ + "PipelineBuildSynthCdkBuildProject6BEFA8E6", + "Arn" + ] + }, + { + "Fn::GetAtt": [ + "PipelineUpdatePipelineSelfMutationDAA41400", + "Arn" + ] + } + ] + } + ], + "Version": "2012-10-17" + }, + "policyName": "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE", + "roles": [ + { + "Ref": "PipelineCodeBuildActionRole226DB0CB" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnPolicy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Policy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, "UpdatePipeline": { "id": "UpdatePipeline", "path": "PipelineStack/Pipeline/UpdatePipeline", diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/PipelineStack.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/PipelineStack.assets.json index 7b0839c423a9d..4396cc53ff0e2 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/PipelineStack.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/PipelineStack.assets.json @@ -1,7 +1,7 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { - "183f6e10493282167a0105043095c99d33f1b6c6f8078e66aa4fe89e6599f6e4": { + "7d2531c66d17cb894cbea6b47a7e239187e0d2af28927555c71267afdec36666": { "source": { "path": "PipelineStack.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "183f6e10493282167a0105043095c99d33f1b6c6f8078e66aa4fe89e6599f6e4.json", + "objectKey": "7d2531c66d17cb894cbea6b47a7e239187e0d2af28927555c71267afdec36666.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/PipelineStack.template.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/PipelineStack.template.json index e3892d54d2dea..b5afc2ad1a1a6 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/PipelineStack.template.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/PipelineStack.template.json @@ -189,13 +189,7 @@ "Resource": [ { "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -300,7 +294,7 @@ ], "RoleArn": { "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -332,7 +326,7 @@ "Name": "SelfMutate", "RoleArn": { "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -2066,13 +2060,18 @@ "EncryptionKey": "alias/aws/s3" } }, - "PipelineBuildSynthCodePipelineActionRole4E7A6C97": { + "PipelineCodeBuildActionRole226DB0CB": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { "Statement": [ { "Action": "sts:AssumeRole", + "Condition": { + "Bool": { + "aws:ViaAWSService": "codepipeline.amazonaws.com" + } + }, "Effect": "Allow", "Principal": { "AWS": { @@ -2098,7 +2097,7 @@ } } }, - "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290": { + "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE": { "Type": "AWS::IAM::Policy", "Properties": { "PolicyDocument": { @@ -2110,82 +2109,28 @@ "codebuild:StopBuild" ], "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineBuildSynthCdkBuildProject6BEFA8E6", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290", - "Roles": [ - { - "Ref": "PipelineBuildSynthCodePipelineActionRole4E7A6C97" - } - ] - } - }, - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] + "Resource": [ + { + "Fn::GetAtt": [ + "PipelineBuildSynthCdkBuildProject6BEFA8E6", + "Arn" + ] + }, + { + "Fn::GetAtt": [ + "PipelineUpdatePipelineSelfMutationDAA41400", + "Arn" ] } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleDefaultPolicyE626265B": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutationDAA41400", - "Arn" - ] - } + ] } ], "Version": "2012-10-17" }, - "PolicyName": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleDefaultPolicyE626265B", + "PolicyName": "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE", "Roles": [ { - "Ref": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF" + "Ref": "PipelineCodeBuildActionRole226DB0CB" } ] } diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack1E6541489.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack1E6541489.assets.json index 7b2db2c501b0d..ce0d773ef7cbc 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack1E6541489.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack1E6541489.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "91031b26c04588c38a59e3481d308182b5244c5f5a3af3ee05566e2f4f70ce65": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack2C79AD00A.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack2C79AD00A.assets.json index 797f65c65cb3e..74c41b8c770e2 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack2C79AD00A.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/PipelineStackBetaStack2C79AD00A.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "e3aa38ca82b00b776ad3834e9ee862d2e529d91c0f0b12fad846884e1e600326": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/cdk.out b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/cdk.out +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/manifest.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/manifest.json index 27c973cfba7ad..c9e17075c6fb1 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/manifest.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Beta/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackBetaStack1E6541489.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "Queue4A7E3555", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:27)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:27)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,23 +57,23 @@ "type": "aws:cdk:logicalId", "data": "ExportsOutputFnGetAttQueue4A7E3555Arn15A7202E", "trace": [ - "Stack.exportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack.js:726:13)", - "createImportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:138:39)", - "resolveValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:84:12)", - "Object.resolveReferences (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:25:30)", - "Object.prepareApp (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "CodePipeline.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:18)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "Stack.exportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack.js:726:13)", + "createImportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:138:39)", + "resolveValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:84:12)", + "Object.resolveReferences (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:25:30)", + "Object.prepareApp (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "CodePipeline.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:18)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -84,24 +84,24 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "CodePipeline.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:18)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "CodePipeline.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:18)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -112,24 +112,24 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "CodePipeline.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:18)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "CodePipeline.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:18)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -177,14 +177,14 @@ "type": "aws:cdk:logicalId", "data": "OtherQueue60B686DC", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:27)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:27)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -195,24 +195,24 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "CodePipeline.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:18)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "CodePipeline.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:18)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -223,24 +223,24 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "CodePipeline.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:18)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "CodePipeline.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/main/pipeline-base.js:69:46)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:21:18)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/PipelineStackProd1Stack14013D698.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/PipelineStackProd1Stack14013D698.assets.json index 2a937ec3d5c91..7310b40efcff0 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/PipelineStackProd1Stack14013D698.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/PipelineStackProd1Stack14013D698.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "774f0c3cec814003a4da7d6cab73aec82952a0cb52a221b3f94fae483d9922a3": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/PipelineStackProd1Stack2F0681AFF.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/PipelineStackProd1Stack2F0681AFF.assets.json index 5e853cf046246..54e289d23cb7d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/PipelineStackProd1Stack2F0681AFF.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/PipelineStackProd1Stack2F0681AFF.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "c1cb4eebe68ea920a89e618efa29c36ecc1aa0c6f6ef6b65559efe9c0bba4059": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/cdk.out b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/cdk.out +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/manifest.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/manifest.json index 0a57f0ce55a10..7c1fc393900ca 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/manifest.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod1/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackProd1Stack14013D698.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "Queue4A7E3555", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:24)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:24)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,22 +57,22 @@ "type": "aws:cdk:logicalId", "data": "ExportsOutputFnGetAttQueue4A7E3555Arn15A7202E", "trace": [ - "Stack.exportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack.js:726:13)", - "createImportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:138:39)", - "resolveValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:84:12)", - "Object.resolveReferences (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:25:30)", - "Object.prepareApp (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:15)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "Stack.exportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack.js:726:13)", + "createImportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:138:39)", + "resolveValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:84:12)", + "Object.resolveReferences (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:25:30)", + "Object.prepareApp (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:15)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,23 +83,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:15)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:15)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -110,23 +110,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:15)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:15)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -174,14 +174,14 @@ "type": "aws:cdk:logicalId", "data": "OtherQueue60B686DC", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:24)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:24)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -192,23 +192,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:15)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:15)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -219,23 +219,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:15)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:23:15)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/PipelineStackProd2Stack1FD464162.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/PipelineStackProd2Stack1FD464162.assets.json index 90f90dd3b58df..f3c447a6f763f 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/PipelineStackProd2Stack1FD464162.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/PipelineStackProd2Stack1FD464162.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "a595899a57366f015e986ac46c3da09fac75670ea0f4719de8defc67d731fa68": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/PipelineStackProd2Stack2176123EB.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/PipelineStackProd2Stack2176123EB.assets.json index 9b3b2b327c88d..80979c365c80e 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/PipelineStackProd2Stack2176123EB.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/PipelineStackProd2Stack2176123EB.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "364ee9a72c6c371a00c6e41438695af070848a2d625a4c953bfc4666e7ad5ae9": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/cdk.out b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/cdk.out +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/manifest.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/manifest.json index 3df672c217dcc..a13285b8e1236 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/manifest.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod2/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackProd2Stack1FD464162.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "Queue4A7E3555", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:24)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:24)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,22 +57,22 @@ "type": "aws:cdk:logicalId", "data": "ExportsOutputFnGetAttQueue4A7E3555Arn15A7202E", "trace": [ - "Stack.exportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack.js:726:13)", - "createImportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:138:39)", - "resolveValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:84:12)", - "Object.resolveReferences (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:25:30)", - "Object.prepareApp (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:15)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "Stack.exportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack.js:726:13)", + "createImportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:138:39)", + "resolveValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:84:12)", + "Object.resolveReferences (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:25:30)", + "Object.prepareApp (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:15)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,23 +83,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:15)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:15)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -110,23 +110,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:15)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:15)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -174,14 +174,14 @@ "type": "aws:cdk:logicalId", "data": "OtherQueue60B686DC", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:24)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:24)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -192,23 +192,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:15)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:15)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -219,23 +219,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:15)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:24:15)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/PipelineStackProd3Stack1795F3D43.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/PipelineStackProd3Stack1795F3D43.assets.json index bcbf790370fd7..8f92b89e36d72 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/PipelineStackProd3Stack1795F3D43.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/PipelineStackProd3Stack1795F3D43.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "e8c78794529aa32b354a78b7b979165b0cadd9d113a37f537d083f946c0e7bff": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/PipelineStackProd3Stack2DFBBA0B2.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/PipelineStackProd3Stack2DFBBA0B2.assets.json index 8b8fb5faed31b..029152c9faf26 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/PipelineStackProd3Stack2DFBBA0B2.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/PipelineStackProd3Stack2DFBBA0B2.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "9fee5ad34559e603d3fc184456935445ea09549b147d2cbc2acd8cf6b916dd99": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/cdk.out b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/cdk.out +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/manifest.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/manifest.json index 5d492cd3d338e..20628acd0bcb3 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/manifest.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod3/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackProd3Stack1795F3D43.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "Queue4A7E3555", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:25)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:25)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,22 +57,22 @@ "type": "aws:cdk:logicalId", "data": "ExportsOutputFnGetAttQueue4A7E3555Arn15A7202E", "trace": [ - "Stack.exportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack.js:726:13)", - "createImportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:138:39)", - "resolveValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:84:12)", - "Object.resolveReferences (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:25:30)", - "Object.prepareApp (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "Stack.exportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack.js:726:13)", + "createImportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:138:39)", + "resolveValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:84:12)", + "Object.resolveReferences (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:25:30)", + "Object.prepareApp (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,23 +83,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -110,23 +110,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -174,14 +174,14 @@ "type": "aws:cdk:logicalId", "data": "OtherQueue60B686DC", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:25)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:25)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -192,23 +192,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -219,23 +219,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:26:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/PipelineStackProd4Stack118F74ADB.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/PipelineStackProd4Stack118F74ADB.assets.json index a8c8cc072fd91..a3832913fa1ac 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/PipelineStackProd4Stack118F74ADB.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/PipelineStackProd4Stack118F74ADB.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "7e0ecf5ec563ed47798cfb17d4c3ce0e6c710c075fc53bf8cd15d8fb9a210f78": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/PipelineStackProd4Stack2E2CB4ED3.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/PipelineStackProd4Stack2E2CB4ED3.assets.json index 94a0db66c9e67..193a848974cf0 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/PipelineStackProd4Stack2E2CB4ED3.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/PipelineStackProd4Stack2E2CB4ED3.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "a9cddd81a8937cbadd9bf93c6fe07766501a7c137605bb09e6cfa322b2eb09fd": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/cdk.out b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/cdk.out +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/manifest.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/manifest.json index 680c4d9d50cb0..37db8d7faaccf 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/manifest.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod4/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackProd4Stack118F74ADB.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "Queue4A7E3555", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:25)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:25)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,22 +57,22 @@ "type": "aws:cdk:logicalId", "data": "ExportsOutputFnGetAttQueue4A7E3555Arn15A7202E", "trace": [ - "Stack.exportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack.js:726:13)", - "createImportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:138:39)", - "resolveValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:84:12)", - "Object.resolveReferences (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:25:30)", - "Object.prepareApp (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "Stack.exportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack.js:726:13)", + "createImportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:138:39)", + "resolveValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:84:12)", + "Object.resolveReferences (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:25:30)", + "Object.prepareApp (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,23 +83,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -110,23 +110,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -174,14 +174,14 @@ "type": "aws:cdk:logicalId", "data": "OtherQueue60B686DC", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:25)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:25)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -192,23 +192,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -219,23 +219,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:27:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/PipelineStackProd5Stack1E7E4E4C6.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/PipelineStackProd5Stack1E7E4E4C6.assets.json index 9f2fb95522c65..2aa185a343b91 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/PipelineStackProd5Stack1E7E4E4C6.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/PipelineStackProd5Stack1E7E4E4C6.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "1e0089d5c027ddec49745fce045925aff9342fbffdf989e4ae5263fd87ee50f7": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/PipelineStackProd5Stack2C39BEE5B.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/PipelineStackProd5Stack2C39BEE5B.assets.json index d60dadb01010e..d53dae70da14d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/PipelineStackProd5Stack2C39BEE5B.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/PipelineStackProd5Stack2C39BEE5B.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "48a94145722a5a14816cb87dce62fadba53a03b2c18e0fdfb5107ffabd5d7cd8": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/cdk.out b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/cdk.out +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/manifest.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/manifest.json index 4af4de6f3035e..8299d33516446 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/manifest.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod5/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackProd5Stack1E7E4E4C6.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "Queue4A7E3555", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:25)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:25)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,22 +57,22 @@ "type": "aws:cdk:logicalId", "data": "ExportsOutputFnGetAttQueue4A7E3555Arn15A7202E", "trace": [ - "Stack.exportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack.js:726:13)", - "createImportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:138:39)", - "resolveValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:84:12)", - "Object.resolveReferences (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:25:30)", - "Object.prepareApp (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "Stack.exportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack.js:726:13)", + "createImportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:138:39)", + "resolveValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:84:12)", + "Object.resolveReferences (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:25:30)", + "Object.prepareApp (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,23 +83,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -110,23 +110,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -174,14 +174,14 @@ "type": "aws:cdk:logicalId", "data": "OtherQueue60B686DC", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:25)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:25)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -192,23 +192,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -219,23 +219,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:28:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/PipelineStackProd6Stack1E7C34314.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/PipelineStackProd6Stack1E7C34314.assets.json index f12df8538e4c8..691704ff251e7 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/PipelineStackProd6Stack1E7C34314.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/PipelineStackProd6Stack1E7C34314.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "26d311d19506235a52c5d093cf5a8360110af6a2b713beda66b33ba3ee5bd813": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/PipelineStackProd6Stack2BED1BBCE.assets.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/PipelineStackProd6Stack2BED1BBCE.assets.json index 42eebf211758e..aab05a908c15d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/PipelineStackProd6Stack2BED1BBCE.assets.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/PipelineStackProd6Stack2BED1BBCE.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "8f3e16ae3f29a4a50d4ef13026a3bc879e039d80e9fffdefe19d40349ec6bb30": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/cdk.out b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/cdk.out +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/manifest.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/manifest.json index 41f7c8259e61c..a7f9d7495d923 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/manifest.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/assembly-PipelineStack-Prod6/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackProd6Stack1E7C34314.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "Queue4A7E3555", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:25)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:36:24)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:25)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,22 +57,22 @@ "type": "aws:cdk:logicalId", "data": "ExportsOutputFnGetAttQueue4A7E3555Arn15A7202E", "trace": [ - "Stack.exportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack.js:726:13)", - "createImportValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:138:39)", - "resolveValue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:84:12)", - "Object.resolveReferences (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/refs.js:25:30)", - "Object.prepareApp (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "Stack.exportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack.js:726:13)", + "createImportValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:138:39)", + "resolveValue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:84:12)", + "Object.resolveReferences (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/refs.js:25:30)", + "Object.prepareApp (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/prepare-app.js:30:12)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:21:19)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,23 +83,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -110,23 +110,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -174,14 +174,14 @@ "type": "aws:cdk:logicalId", "data": "OtherQueue60B686DC", "trace": [ - "new Queue (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", - "new AppStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:25)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Queue (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sqs/lib/queue.js:89:23)", + "new AppStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:38:9)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:25)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -192,23 +192,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -219,23 +219,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "AppStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "Function.fromStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", - "Wave.addStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", - "new PipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "AppStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "Function.fromStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/stage-deployment.js:44:48)", + "Wave.addStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/blueprint/wave.js:49:56)", + "new PipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:29:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.newpipeline.js:51:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/cdk.out b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/cdk.out +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/integ.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/integ.json index 68013087ee7e6..ac5bb7f3ffa6a 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/integ.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/integ.json @@ -1,7 +1,7 @@ { - "version": "18.0.0", + "version": "19.0.0", "testCases": { - "pipelines/test/integ.newpipeline": { + "integ.newpipeline": { "stacks": [ "PipelineStack" ], diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/manifest.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/manifest.json index f615fdca7e949..398545e73ef71 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "assembly-PipelineStack-Beta": { "type": "cdk:cloud-assembly", @@ -72,7 +72,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/183f6e10493282167a0105043095c99d33f1b6c6f8078e66aa4fe89e6599f6e4.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7d2531c66d17cb894cbea6b47a7e239187e0d2af28927555c71267afdec36666.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -142,28 +142,16 @@ "data": "PipelineBuildSynthCdkBuildProject6BEFA8E6" } ], - "/PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/Resource": [ + "/PipelineStack/Pipeline/CodeBuildActionRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "PipelineBuildSynthCodePipelineActionRole4E7A6C97" + "data": "PipelineCodeBuildActionRole226DB0CB" } ], - "/PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/DefaultPolicy/Resource": [ + "/PipelineStack/Pipeline/CodeBuildActionRole/DefaultPolicy/Resource": [ { "type": "aws:cdk:logicalId", - "data": "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290" - } - ], - "/PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF" - } - ], - "/PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole/DefaultPolicy/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleDefaultPolicyE626265B" + "data": "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE" } ], "/PipelineStack/Pipeline/UpdatePipeline/SelfMutation/Role/Resource": [ diff --git a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/tree.json b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/tree.json index 4eb13e9248c07..fee3e39d6014d 100644 --- a/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/tree.json +++ b/packages/@aws-cdk/pipelines/test/newpipeline.integ.snapshot/tree.json @@ -266,13 +266,7 @@ "Resource": [ { "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -399,7 +393,7 @@ "runOrder": 1, "roleArn": { "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] } @@ -431,7 +425,7 @@ "runOrder": 1, "roleArn": { "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] } @@ -2253,104 +2247,6 @@ "fqn": "@aws-cdk/aws-codebuild.PipelineProject", "version": "0.0.0" } - }, - "CodePipelineActionRole": { - "id": "CodePipelineActionRole", - "path": "PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnRole", - "version": "0.0.0" - } - }, - "DefaultPolicy": { - "id": "DefaultPolicy", - "path": "PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/DefaultPolicy", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/DefaultPolicy/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Policy", - "aws:cdk:cloudformation:props": { - "policyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineBuildSynthCdkBuildProject6BEFA8E6", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "policyName": "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290", - "roles": [ - { - "Ref": "PipelineBuildSynthCodePipelineActionRole4E7A6C97" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnPolicy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Policy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Role", - "version": "0.0.0" - } } }, "constructInfo": { @@ -2371,106 +2267,6 @@ "SelfMutate": { "id": "SelfMutate", "path": "PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate", - "children": { - "CodePipelineActionRole": { - "id": "CodePipelineActionRole", - "path": "PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnRole", - "version": "0.0.0" - } - }, - "DefaultPolicy": { - "id": "DefaultPolicy", - "path": "PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole/DefaultPolicy", - "children": { - "Resource": { - "id": "Resource", - "path": "PipelineStack/Pipeline/Pipeline/UpdatePipeline/SelfMutate/CodePipelineActionRole/DefaultPolicy/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Policy", - "aws:cdk:cloudformation:props": { - "policyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineUpdatePipelineSelfMutationDAA41400", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "policyName": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleDefaultPolicyE626265B", - "roles": [ - { - "Ref": "PipelineUpdatePipelineSelfMutateCodePipelineActionRoleD6D4E5CF" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnPolicy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Policy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Role", - "version": "0.0.0" - } - } - }, "constructInfo": { "fqn": "@aws-cdk/core.Construct", "version": "0.0.0" @@ -2784,6 +2580,117 @@ "version": "0.0.0" } }, + "CodeBuildActionRole": { + "id": "CodeBuildActionRole", + "path": "PipelineStack/Pipeline/CodeBuildActionRole", + "children": { + "Resource": { + "id": "Resource", + "path": "PipelineStack/Pipeline/CodeBuildActionRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Condition": { + "Bool": { + "aws:ViaAWSService": "codepipeline.amazonaws.com" + } + }, + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + } + } + ], + "Version": "2012-10-17" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + }, + "DefaultPolicy": { + "id": "DefaultPolicy", + "path": "PipelineStack/Pipeline/CodeBuildActionRole/DefaultPolicy", + "children": { + "Resource": { + "id": "Resource", + "path": "PipelineStack/Pipeline/CodeBuildActionRole/DefaultPolicy/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Policy", + "aws:cdk:cloudformation:props": { + "policyDocument": { + "Statement": [ + { + "Action": [ + "codebuild:BatchGetBuilds", + "codebuild:StartBuild", + "codebuild:StopBuild" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::GetAtt": [ + "PipelineBuildSynthCdkBuildProject6BEFA8E6", + "Arn" + ] + }, + { + "Fn::GetAtt": [ + "PipelineUpdatePipelineSelfMutationDAA41400", + "Arn" + ] + } + ] + } + ], + "Version": "2012-10-17" + }, + "policyName": "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE", + "roles": [ + { + "Ref": "PipelineCodeBuildActionRole226DB0CB" + } + ] + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnPolicy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Policy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.Role", + "version": "0.0.0" + } + }, "UpdatePipeline": { "id": "UpdatePipeline", "path": "PipelineStack/Pipeline/UpdatePipeline", diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/PipelineSecurityStack.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/PipelineSecurityStack.assets.json index 9cdf0a061b66a..51e29bfe539e3 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/PipelineSecurityStack.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/PipelineSecurityStack.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/PipelineSecurityStackDisableSecurityCheckMySafeStack7A4F8E95.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/PipelineSecurityStackDisableSecurityCheckMySafeStack7A4F8E95.assets.json index 047b76ec12bd2..902e896744c5e 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/PipelineSecurityStackDisableSecurityCheckMySafeStack7A4F8E95.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/PipelineSecurityStackDisableSecurityCheckMySafeStack7A4F8E95.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "438cc177ec016e131365f2b864849c84dcb371e8e7ed718c21cc27d6569faf50": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/manifest.json index ceb9af4a0d565..5b4adf9b96740 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-DisableSecurityCheck/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineSecurityStackDisableSecurityCheckMySafeStack7A4F8E95.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "MySafeTopicCC243D11", "trace": [ - "new Topic (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", - "new MySafeStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:25:9)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:71:31)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Topic (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", + "new MySafeStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:25:9)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:71:31)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,22 +57,22 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MySafeStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:71:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MySafeStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:71:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,22 +83,22 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MySafeStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:71:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MySafeStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:71:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/PipelineSecurityStackEnableSecurityCheckMyStack0B9FE272.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/PipelineSecurityStackEnableSecurityCheckMyStack0B9FE272.assets.json index 1bf23f3168e01..c6080d7089c98 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/PipelineSecurityStackEnableSecurityCheckMyStack0B9FE272.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/PipelineSecurityStackEnableSecurityCheckMyStack0B9FE272.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "ffc5fc9cc4b8adb9a7f48881c59bb3fd49df23a11ccdd37bec21c8ca47cbf298": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/manifest.json index cf84a457bfb49..539bf035cc83e 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-EnableSecurityCheck/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineSecurityStackEnableSecurityCheckMyStack0B9FE272.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "TopicBFC7AF6E", "trace": [ - "new Topic (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:17:23)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:73:31)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Topic (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:17:23)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:73:31)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,17 +57,17 @@ "type": "aws:cdk:logicalId", "data": "TopicPolicyA1747468", "trace": [ - "new TopicPolicy (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/policy.js:48:9)", - "Topic.addToResourcePolicy (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic-base.js:53:27)", - "Function.addToPrincipalOrResource (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-iam/lib/grant.js:76:49)", - "Topic.grantPublish (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic-base.js:71:26)", - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:18:15)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:73:31)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new TopicPolicy (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/policy.js:48:9)", + "Topic.addToResourcePolicy (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic-base.js:53:27)", + "Function.addToPrincipalOrResource (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-iam/lib/grant.js:76:49)", + "Topic.grantPublish (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic-base.js:71:26)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:18:15)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:73:31)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -78,22 +78,22 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:73:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:73:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -104,22 +104,22 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:73:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:73:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/PipelineSecurityStackNoSecurityCheckMyStack3484019E.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/PipelineSecurityStackNoSecurityCheckMyStack3484019E.assets.json index 8d930391f1cdf..d7b0975c80ad4 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/PipelineSecurityStackNoSecurityCheckMyStack3484019E.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/PipelineSecurityStackNoSecurityCheckMyStack3484019E.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "ffc5fc9cc4b8adb9a7f48881c59bb3fd49df23a11ccdd37bec21c8ca47cbf298": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/manifest.json index 08bff8e645d08..b02eaab104292 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-NoSecurityCheck/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineSecurityStackNoSecurityCheckMyStack3484019E.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "TopicBFC7AF6E", "trace": [ - "new Topic (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:17:23)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:72:53)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Topic (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:17:23)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:72:53)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,17 +57,17 @@ "type": "aws:cdk:logicalId", "data": "TopicPolicyA1747468", "trace": [ - "new TopicPolicy (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/policy.js:48:9)", - "Topic.addToResourcePolicy (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic-base.js:53:27)", - "Function.addToPrincipalOrResource (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-iam/lib/grant.js:76:49)", - "Topic.grantPublish (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic-base.js:71:26)", - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:18:15)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:72:53)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new TopicPolicy (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/policy.js:48:9)", + "Topic.addToResourcePolicy (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic-base.js:53:27)", + "Function.addToPrincipalOrResource (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-iam/lib/grant.js:76:49)", + "Topic.grantPublish (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic-base.js:71:26)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:18:15)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:72:53)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -78,23 +78,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "CdkPipeline.addApplicationStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:72:33)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "CdkPipeline.addApplicationStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:72:33)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -105,23 +105,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "CdkPipeline.addApplicationStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:72:33)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "CdkPipeline.addApplicationStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:72:33)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/PipelineSecurityStackPreProductionMyStackDCCBB4EA.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/PipelineSecurityStackPreProductionMyStackDCCBB4EA.assets.json index 5f2f4e0e7ccc3..4dde3780adb7b 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/PipelineSecurityStackPreProductionMyStackDCCBB4EA.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/PipelineSecurityStackPreProductionMyStackDCCBB4EA.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "ffc5fc9cc4b8adb9a7f48881c59bb3fd49df23a11ccdd37bec21c8ca47cbf298": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/manifest.json index d86a30b52cff7..6cec2e71bb555 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-PreProduction/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineSecurityStackPreProductionMyStackDCCBB4EA.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "TopicBFC7AF6E", "trace": [ - "new Topic (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:17:23)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:69:53)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Topic (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:17:23)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:69:53)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,17 +57,17 @@ "type": "aws:cdk:logicalId", "data": "TopicPolicyA1747468", "trace": [ - "new TopicPolicy (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/policy.js:48:9)", - "Topic.addToResourcePolicy (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic-base.js:53:27)", - "Function.addToPrincipalOrResource (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-iam/lib/grant.js:76:49)", - "Topic.grantPublish (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic-base.js:71:26)", - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:18:15)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:69:53)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new TopicPolicy (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/policy.js:48:9)", + "Topic.addToResourcePolicy (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic-base.js:53:27)", + "Function.addToPrincipalOrResource (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-iam/lib/grant.js:76:49)", + "Topic.grantPublish (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic-base.js:71:26)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:18:15)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:69:53)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -78,23 +78,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "CdkPipeline.addApplicationStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:69:33)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "CdkPipeline.addApplicationStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:69:33)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -105,23 +105,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "CdkPipeline.addApplicationStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:69:33)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "CdkPipeline.addApplicationStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:69:33)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/PipelineSecurityStackSafeProductionMySafeStackC0D87904.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/PipelineSecurityStackSafeProductionMySafeStackC0D87904.assets.json index b25e8ddc50839..8a4a5a132dfa3 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/PipelineSecurityStackSafeProductionMySafeStackC0D87904.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/PipelineSecurityStackSafeProductionMySafeStackC0D87904.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "438cc177ec016e131365f2b864849c84dcb371e8e7ed718c21cc27d6569faf50": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/manifest.json index 0de490c439dff..e75336c3c55c1 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SafeProduction/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineSecurityStackSafeProductionMySafeStackC0D87904.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "MySafeTopicCC243D11", "trace": [ - "new Topic (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", - "new MySafeStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:25:9)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:70:31)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Topic (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", + "new MySafeStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:25:9)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:70:31)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,22 +57,22 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MySafeStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:70:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MySafeStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:70:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,22 +83,22 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MySafeStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:70:16)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MySafeStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:70:16)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/PipelineSecurityStackSingleStageMyStack29962269.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/PipelineSecurityStackSingleStageMyStack29962269.assets.json index 071635766e645..4f38ba62e7fcb 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/PipelineSecurityStackSingleStageMyStack29962269.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/PipelineSecurityStackSingleStageMyStack29962269.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "ffc5fc9cc4b8adb9a7f48881c59bb3fd49df23a11ccdd37bec21c8ca47cbf298": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/manifest.json index f1fb38a4302c1..55a190cf6131e 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/assembly-PipelineSecurityStack-SingleStage/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineSecurityStackSingleStageMyStack29962269.assets": { "type": "cdk:asset-manifest", @@ -39,14 +39,14 @@ "type": "aws:cdk:logicalId", "data": "TopicBFC7AF6E", "trace": [ - "new Topic (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:17:23)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:68:40)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new Topic (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic.js:43:26)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:17:23)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:68:40)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -57,17 +57,17 @@ "type": "aws:cdk:logicalId", "data": "TopicPolicyA1747468", "trace": [ - "new TopicPolicy (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/policy.js:48:9)", - "Topic.addToResourcePolicy (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic-base.js:53:27)", - "Function.addToPrincipalOrResource (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-iam/lib/grant.js:76:49)", - "Topic.grantPublish (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/aws-sns/lib/topic-base.js:71:26)", - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:18:15)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:68:40)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new TopicPolicy (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/policy.js:48:9)", + "Topic.addToResourcePolicy (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic-base.js:53:27)", + "Function.addToPrincipalOrResource (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-iam/lib/grant.js:76:49)", + "Topic.grantPublish (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/aws-sns/lib/topic-base.js:71:26)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:18:15)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:68:40)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -78,22 +78,22 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:68:25)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:68:25)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -104,22 +104,22 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "new TestCdkStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:68:25)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "new TestCdkStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:68:25)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-security.js:82:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/integ.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/integ.json index 5ed9de577fe33..f33d73d752a00 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/integ.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/integ.json @@ -1,7 +1,7 @@ { - "version": "18.0.0", + "version": "19.0.0", "testCases": { - "pipelines/test/integ.pipeline-security": { + "integ.pipeline-security": { "stacks": [ "PipelineSecurityStack" ], diff --git a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/manifest.json index 4e61b11979a31..b58d0a1909794 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "assembly-PipelineSecurityStack-SingleStage": { "type": "cdk:cloud-assembly", @@ -120,7 +120,10 @@ "/PipelineSecurityStack/TestPipeline/Pipeline/ArtifactsBucketEncryptionKeyAlias/Resource": [ { "type": "aws:cdk:logicalId", - "data": "TestPipelineArtifactsBucketEncryptionKeyAliasE8D86DD3" + "data": "TestPipelineArtifactsBucketEncryptionKeyAliasE8D86DD3", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/PipelineSecurityStack/TestPipeline/Pipeline/ArtifactsBucket/Resource": [ diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/PipelineStack.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/PipelineStack.assets.json index 5e77b6d6681ed..626c4a3c16eb1 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/PipelineStack.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/PipelineStack.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json index 31a1a3afe0196..562c28154d029 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "8289faf53c7da377bb2b90615999171adef5e1d8f6b88810e5fef75e6ca09ba5": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json index 56021f7d60fdb..fecba78eaef25 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackPreProdStack65A0AD1F.assets": { "type": "cdk:asset-manifest", @@ -39,13 +39,13 @@ "type": "aws:cdk:logicalId", "data": "Resource", "trace": [ - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:21:9)", - "new CdkpipelinesDemoPipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:64:52)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:80:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:21:9)", + "new CdkpipelinesDemoPipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:64:52)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:80:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -56,23 +56,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "CdkPipeline.addApplicationStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", - "new CdkpipelinesDemoPipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:64:32)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:80:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "CdkPipeline.addApplicationStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", + "new CdkpipelinesDemoPipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:64:32)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:80:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,23 +83,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "CdkPipeline.addApplicationStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", - "new CdkpipelinesDemoPipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:64:32)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:80:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "CdkPipeline.addApplicationStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", + "new CdkpipelinesDemoPipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:64:32)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets-single-upload.js:80:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/integ.json b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/integ.json index 83d144c98769f..af59e79ea4c00 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/integ.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/integ.json @@ -1,7 +1,7 @@ { - "version": "18.0.0", + "version": "19.0.0", "testCases": { - "pipelines/test/integ.pipeline-with-assets-single-upload": { + "integ.pipeline-with-assets-single-upload": { "stacks": [ "PipelineStack" ], diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/manifest.json index 89940a88c550b..5180e89ee7bae 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets-single-upload.integ.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "assembly-PipelineStack-PreProd": { "type": "cdk:cloud-assembly", @@ -85,7 +85,10 @@ "/PipelineStack/Pipeline/Pipeline/ArtifactsBucketEncryptionKeyAlias/Resource": [ { "type": "aws:cdk:logicalId", - "data": "PipelineArtifactsBucketEncryptionKeyAlias94A07392" + "data": "PipelineArtifactsBucketEncryptionKeyAlias94A07392", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/PipelineStack/Pipeline/Pipeline/ArtifactsBucket/Resource": [ diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/PipelineStack.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/PipelineStack.assets.json index 4fba11bc5cc86..0becd14db7290 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/PipelineStack.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/PipelineStack.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json index 31a1a3afe0196..562c28154d029 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "8289faf53c7da377bb2b90615999171adef5e1d8f6b88810e5fef75e6ca09ba5": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json index e7a11f2b09264..6b87f4da77400 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackPreProdStack65A0AD1F.assets": { "type": "cdk:asset-manifest", @@ -39,13 +39,13 @@ "type": "aws:cdk:logicalId", "data": "Resource", "trace": [ - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:21:9)", - "new CdkpipelinesDemoPipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:63:52)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:79:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:21:9)", + "new CdkpipelinesDemoPipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:63:52)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:79:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -56,23 +56,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "CdkPipeline.addApplicationStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", - "new CdkpipelinesDemoPipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:63:32)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:79:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "CdkPipeline.addApplicationStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", + "new CdkpipelinesDemoPipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:63:32)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:79:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,23 +83,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "CdkPipeline.addApplicationStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", - "new CdkpipelinesDemoPipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:63:32)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:79:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "CdkPipeline.addApplicationStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", + "new CdkpipelinesDemoPipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:63:32)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline-with-assets.js:79:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/integ.json b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/integ.json index 3c3def17f9b9a..8da66bc0edee0 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/integ.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/integ.json @@ -1,7 +1,7 @@ { - "version": "18.0.0", + "version": "19.0.0", "testCases": { - "pipelines/test/integ.pipeline-with-assets": { + "integ.pipeline-with-assets": { "stacks": [ "PipelineStack" ], diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/manifest.json index 958bae96fd7fd..5ebd1cbc3f460 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-assets.integ.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "assembly-PipelineStack-PreProd": { "type": "cdk:cloud-assembly", @@ -85,7 +85,10 @@ "/PipelineStack/Pipeline/Pipeline/ArtifactsBucketEncryptionKeyAlias/Resource": [ { "type": "aws:cdk:logicalId", - "data": "PipelineArtifactsBucketEncryptionKeyAlias94A07392" + "data": "PipelineArtifactsBucketEncryptionKeyAlias94A07392", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/PipelineStack/Pipeline/Pipeline/ArtifactsBucket/Resource": [ diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.assets.json b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.assets.json index 8c97f56b2fa80..7cc7f4f9b751a 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824": { "source": { @@ -14,7 +14,7 @@ } } }, - "3ac400a129ca4ea923a9fa3b178b5d656733b3c112a1445f2912b9f853750916": { + "49e7268ede6fabefaa4847d726245aa848d2db7ece3df48abde1c640f0c195ce": { "source": { "path": "VariablePipelineStack.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "3ac400a129ca4ea923a9fa3b178b5d656733b3c112a1445f2912b9f853750916.json", + "objectKey": "49e7268ede6fabefaa4847d726245aa848d2db7ece3df48abde1c640f0c195ce.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.template.json b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.template.json index 1e1a3b5c14ce1..1594d533904ac 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.template.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/VariablePipelineStack.template.json @@ -275,19 +275,7 @@ "Resource": [ { "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineMyWaveConsumeCodePipelineActionRole7FAA4EFA", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineMyWaveProduceCodePipelineActionRoleE0DCE9D3", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -381,7 +369,7 @@ ], "RoleArn": { "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -413,7 +401,7 @@ "Namespace": "MyWave@Produce", "RoleArn": { "Fn::GetAtt": [ - "PipelineMyWaveProduceCodePipelineActionRoleE0DCE9D3", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -440,7 +428,7 @@ "Name": "Consume", "RoleArn": { "Fn::GetAtt": [ - "PipelineMyWaveConsumeCodePipelineActionRole7FAA4EFA", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -766,68 +754,6 @@ "EncryptionKey": "alias/aws/s3" } }, - "PipelineBuildSynthCodePipelineActionRole4E7A6C97": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineBuildSynthCdkBuildProject6BEFA8E6", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290", - "Roles": [ - { - "Ref": "PipelineBuildSynthCodePipelineActionRole4E7A6C97" - } - ] - } - }, "PipelineMyWaveProduceRole24E3565D": { "Type": "AWS::IAM::Role", "Properties": { @@ -1012,68 +938,6 @@ "EncryptionKey": "alias/aws/s3" } }, - "PipelineMyWaveProduceCodePipelineActionRoleE0DCE9D3": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "PipelineMyWaveProduceCodePipelineActionRoleDefaultPolicy34DCB79A": { - "Type": "AWS::IAM::Policy", - "Properties": { - "PolicyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineMyWaveProduce884410D6", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "PolicyName": "PipelineMyWaveProduceCodePipelineActionRoleDefaultPolicy34DCB79A", - "Roles": [ - { - "Ref": "PipelineMyWaveProduceCodePipelineActionRoleE0DCE9D3" - } - ] - } - }, "PipelineMyWaveConsumeRole2A96FF33": { "Type": "AWS::IAM::Role", "Properties": { @@ -1258,13 +1122,18 @@ "EncryptionKey": "alias/aws/s3" } }, - "PipelineMyWaveConsumeCodePipelineActionRole7FAA4EFA": { + "PipelineCodeBuildActionRole226DB0CB": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { "Statement": [ { "Action": "sts:AssumeRole", + "Condition": { + "Bool": { + "aws:ViaAWSService": "codepipeline.amazonaws.com" + } + }, "Effect": "Allow", "Principal": { "AWS": { @@ -1290,7 +1159,7 @@ } } }, - "PipelineMyWaveConsumeCodePipelineActionRoleDefaultPolicy3666898A": { + "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE": { "Type": "AWS::IAM::Policy", "Properties": { "PolicyDocument": { @@ -1302,20 +1171,34 @@ "codebuild:StopBuild" ], "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineMyWaveConsumeC5D5CCD7", - "Arn" - ] - } + "Resource": [ + { + "Fn::GetAtt": [ + "PipelineBuildSynthCdkBuildProject6BEFA8E6", + "Arn" + ] + }, + { + "Fn::GetAtt": [ + "PipelineMyWaveConsumeC5D5CCD7", + "Arn" + ] + }, + { + "Fn::GetAtt": [ + "PipelineMyWaveProduce884410D6", + "Arn" + ] + } + ] } ], "Version": "2012-10-17" }, - "PolicyName": "PipelineMyWaveConsumeCodePipelineActionRoleDefaultPolicy3666898A", + "PolicyName": "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE", "Roles": [ { - "Ref": "PipelineMyWaveConsumeCodePipelineActionRole7FAA4EFA" + "Ref": "PipelineCodeBuildActionRole226DB0CB" } ] } diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/integ.json b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/integ.json index 8d9ed5e791d57..171a0ca700733 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/integ.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/integ.json @@ -1,7 +1,7 @@ { - "version": "18.0.0", + "version": "19.0.0", "testCases": { - "pipelines/test/integ.pipeline-with-variables": { + "integ.pipeline-with-variables": { "stacks": [ "VariablePipelineStack" ], diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/manifest.json index bca3a119644f5..7b0ab23e41745 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "Tree": { "type": "cdk:tree", @@ -23,7 +23,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/3ac400a129ca4ea923a9fa3b178b5d656733b3c112a1445f2912b9f853750916.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/49e7268ede6fabefaa4847d726245aa848d2db7ece3df48abde1c640f0c195ce.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -129,18 +129,6 @@ "data": "PipelineBuildSynthCdkBuildProject6BEFA8E6" } ], - "/VariablePipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineBuildSynthCodePipelineActionRole4E7A6C97" - } - ], - "/VariablePipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/DefaultPolicy/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290" - } - ], "/VariablePipelineStack/Pipeline/Pipeline/MyWave/Produce/Produce/Role/Resource": [ { "type": "aws:cdk:logicalId", @@ -159,18 +147,6 @@ "data": "PipelineMyWaveProduce884410D6" } ], - "/VariablePipelineStack/Pipeline/Pipeline/MyWave/Produce/CodePipelineActionRole/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineMyWaveProduceCodePipelineActionRoleE0DCE9D3" - } - ], - "/VariablePipelineStack/Pipeline/Pipeline/MyWave/Produce/CodePipelineActionRole/DefaultPolicy/Resource": [ - { - "type": "aws:cdk:logicalId", - "data": "PipelineMyWaveProduceCodePipelineActionRoleDefaultPolicy34DCB79A" - } - ], "/VariablePipelineStack/Pipeline/Pipeline/MyWave/Consume/Consume/Role/Resource": [ { "type": "aws:cdk:logicalId", @@ -189,16 +165,16 @@ "data": "PipelineMyWaveConsumeC5D5CCD7" } ], - "/VariablePipelineStack/Pipeline/Pipeline/MyWave/Consume/CodePipelineActionRole/Resource": [ + "/VariablePipelineStack/Pipeline/CodeBuildActionRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "PipelineMyWaveConsumeCodePipelineActionRole7FAA4EFA" + "data": "PipelineCodeBuildActionRole226DB0CB" } ], - "/VariablePipelineStack/Pipeline/Pipeline/MyWave/Consume/CodePipelineActionRole/DefaultPolicy/Resource": [ + "/VariablePipelineStack/Pipeline/CodeBuildActionRole/DefaultPolicy/Resource": [ { "type": "aws:cdk:logicalId", - "data": "PipelineMyWaveConsumeCodePipelineActionRoleDefaultPolicy3666898A" + "data": "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE" } ], "/VariablePipelineStack/BootstrapVersion": [ diff --git a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/tree.json b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/tree.json index 6717aa86f1e87..cd41094d2491b 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/tree.json +++ b/packages/@aws-cdk/pipelines/test/pipeline-with-variables.integ.snapshot/tree.json @@ -361,19 +361,7 @@ "Resource": [ { "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineMyWaveConsumeCodePipelineActionRole7FAA4EFA", - "Arn" - ] - }, - { - "Fn::GetAtt": [ - "PipelineMyWaveProduceCodePipelineActionRoleE0DCE9D3", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -489,7 +477,7 @@ "runOrder": 1, "roleArn": { "Fn::GetAtt": [ - "PipelineBuildSynthCodePipelineActionRole4E7A6C97", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] } @@ -520,7 +508,7 @@ "runOrder": 1, "roleArn": { "Fn::GetAtt": [ - "PipelineMyWaveProduceCodePipelineActionRoleE0DCE9D3", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] }, @@ -548,7 +536,7 @@ "runOrder": 2, "roleArn": { "Fn::GetAtt": [ - "PipelineMyWaveConsumeCodePipelineActionRole7FAA4EFA", + "PipelineCodeBuildActionRole226DB0CB", "Arn" ] } @@ -990,104 +978,6 @@ "fqn": "@aws-cdk/aws-codebuild.PipelineProject", "version": "0.0.0" } - }, - "CodePipelineActionRole": { - "id": "CodePipelineActionRole", - "path": "VariablePipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole", - "children": { - "Resource": { - "id": "Resource", - "path": "VariablePipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnRole", - "version": "0.0.0" - } - }, - "DefaultPolicy": { - "id": "DefaultPolicy", - "path": "VariablePipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/DefaultPolicy", - "children": { - "Resource": { - "id": "Resource", - "path": "VariablePipelineStack/Pipeline/Pipeline/Build/Synth/CodePipelineActionRole/DefaultPolicy/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Policy", - "aws:cdk:cloudformation:props": { - "policyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineBuildSynthCdkBuildProject6BEFA8E6", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "policyName": "PipelineBuildSynthCodePipelineActionRoleDefaultPolicy92C90290", - "roles": [ - { - "Ref": "PipelineBuildSynthCodePipelineActionRole4E7A6C97" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnPolicy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Policy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Role", - "version": "0.0.0" - } } }, "constructInfo": { @@ -1346,104 +1236,6 @@ "fqn": "@aws-cdk/aws-codebuild.PipelineProject", "version": "0.0.0" } - }, - "CodePipelineActionRole": { - "id": "CodePipelineActionRole", - "path": "VariablePipelineStack/Pipeline/Pipeline/MyWave/Produce/CodePipelineActionRole", - "children": { - "Resource": { - "id": "Resource", - "path": "VariablePipelineStack/Pipeline/Pipeline/MyWave/Produce/CodePipelineActionRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnRole", - "version": "0.0.0" - } - }, - "DefaultPolicy": { - "id": "DefaultPolicy", - "path": "VariablePipelineStack/Pipeline/Pipeline/MyWave/Produce/CodePipelineActionRole/DefaultPolicy", - "children": { - "Resource": { - "id": "Resource", - "path": "VariablePipelineStack/Pipeline/Pipeline/MyWave/Produce/CodePipelineActionRole/DefaultPolicy/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Policy", - "aws:cdk:cloudformation:props": { - "policyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineMyWaveProduce884410D6", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "policyName": "PipelineMyWaveProduceCodePipelineActionRoleDefaultPolicy34DCB79A", - "roles": [ - { - "Ref": "PipelineMyWaveProduceCodePipelineActionRoleE0DCE9D3" - } - ] - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnPolicy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Policy", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Role", - "version": "0.0.0" - } } }, "constructInfo": { @@ -1692,120 +1484,139 @@ "fqn": "@aws-cdk/aws-codebuild.PipelineProject", "version": "0.0.0" } - }, - "CodePipelineActionRole": { - "id": "CodePipelineActionRole", - "path": "VariablePipelineStack/Pipeline/Pipeline/MyWave/Consume/CodePipelineActionRole", - "children": { - "Resource": { - "id": "Resource", - "path": "VariablePipelineStack/Pipeline/Pipeline/MyWave/Consume/CodePipelineActionRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "AWS": { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::", - { - "Ref": "AWS::AccountId" - }, - ":root" - ] - ] - } - } - } - ], - "Version": "2012-10-17" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnRole", - "version": "0.0.0" + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Construct", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/core.Construct", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-codepipeline.Pipeline", + "version": "0.0.0" + } + }, + "CodeBuildActionRole": { + "id": "CodeBuildActionRole", + "path": "VariablePipelineStack/Pipeline/CodeBuildActionRole", + "children": { + "Resource": { + "id": "Resource", + "path": "VariablePipelineStack/Pipeline/CodeBuildActionRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Condition": { + "Bool": { + "aws:ViaAWSService": "codepipeline.amazonaws.com" } }, - "DefaultPolicy": { - "id": "DefaultPolicy", - "path": "VariablePipelineStack/Pipeline/Pipeline/MyWave/Consume/CodePipelineActionRole/DefaultPolicy", - "children": { - "Resource": { - "id": "Resource", - "path": "VariablePipelineStack/Pipeline/Pipeline/MyWave/Consume/CodePipelineActionRole/DefaultPolicy/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Policy", - "aws:cdk:cloudformation:props": { - "policyDocument": { - "Statement": [ - { - "Action": [ - "codebuild:BatchGetBuilds", - "codebuild:StartBuild", - "codebuild:StopBuild" - ], - "Effect": "Allow", - "Resource": { - "Fn::GetAtt": [ - "PipelineMyWaveConsumeC5D5CCD7", - "Arn" - ] - } - } - ], - "Version": "2012-10-17" - }, - "policyName": "PipelineMyWaveConsumeCodePipelineActionRoleDefaultPolicy3666898A", - "roles": [ - { - "Ref": "PipelineMyWaveConsumeCodePipelineActionRole7FAA4EFA" - } - ] - } + "Effect": "Allow", + "Principal": { + "AWS": { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":iam::", + { + "Ref": "AWS::AccountId" + }, + ":root" + ] + ] + } + } + } + ], + "Version": "2012-10-17" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-iam.CfnRole", + "version": "0.0.0" + } + }, + "DefaultPolicy": { + "id": "DefaultPolicy", + "path": "VariablePipelineStack/Pipeline/CodeBuildActionRole/DefaultPolicy", + "children": { + "Resource": { + "id": "Resource", + "path": "VariablePipelineStack/Pipeline/CodeBuildActionRole/DefaultPolicy/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Policy", + "aws:cdk:cloudformation:props": { + "policyDocument": { + "Statement": [ + { + "Action": [ + "codebuild:BatchGetBuilds", + "codebuild:StartBuild", + "codebuild:StopBuild" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::GetAtt": [ + "PipelineBuildSynthCdkBuildProject6BEFA8E6", + "Arn" + ] }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.CfnPolicy", - "version": "0.0.0" + { + "Fn::GetAtt": [ + "PipelineMyWaveConsumeC5D5CCD7", + "Arn" + ] + }, + { + "Fn::GetAtt": [ + "PipelineMyWaveProduce884410D6", + "Arn" + ] } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Policy", - "version": "0.0.0" + ] } - } + ], + "Version": "2012-10-17" }, - "constructInfo": { - "fqn": "@aws-cdk/aws-iam.Role", - "version": "0.0.0" - } + "policyName": "PipelineCodeBuildActionRoleDefaultPolicy1D62A6FE", + "roles": [ + { + "Ref": "PipelineCodeBuildActionRole226DB0CB" + } + ] } }, "constructInfo": { - "fqn": "@aws-cdk/core.Construct", + "fqn": "@aws-cdk/aws-iam.CfnPolicy", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/core.Construct", + "fqn": "@aws-cdk/aws-iam.Policy", "version": "0.0.0" } } }, "constructInfo": { - "fqn": "@aws-cdk/aws-codepipeline.Pipeline", + "fqn": "@aws-cdk/aws-iam.Role", "version": "0.0.0" } } diff --git a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/PipelineStack.assets.json b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/PipelineStack.assets.json index fe1be11ea834f..cbcd49989d5b4 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/PipelineStack.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/PipelineStack.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "be270bbdebe0851c887569796e3997437cca54ce86893ed94788500448e92824": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json index 5dabfd1084da5..d84b8064190a8 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json +++ b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/PipelineStackPreProdStack65A0AD1F.assets.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "files": { "17b50ab4e61e5c19d1e2d14ccc136d8c1ae3b77a4236035ac6ac6273619764a4": { "source": { diff --git a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json index 0dd229b474861..8352c587716e4 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/assembly-PipelineStack-PreProd/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "PipelineStackPreProdStack65A0AD1F.assets": { "type": "cdk:asset-manifest", @@ -39,13 +39,13 @@ "type": "aws:cdk:logicalId", "data": "Resource", "trace": [ - "new MyStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline.js:13:9)", - "new CdkpipelinesDemoPipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline.js:55:52)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline.js:71:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "new MyStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline.js:13:9)", + "new CdkpipelinesDemoPipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline.js:55:52)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline.js:71:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -56,23 +56,23 @@ "type": "aws:cdk:logicalId", "data": "BootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "CdkPipeline.addApplicationStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", - "new CdkpipelinesDemoPipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline.js:55:32)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline.js:71:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:285:19)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "CdkPipeline.addApplicationStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", + "new CdkpipelinesDemoPipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline.js:55:32)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline.js:71:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] @@ -83,23 +83,23 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion", "trace": [ - "addBootstrapVersionRule (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", - "DefaultStackSynthesizer.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", - "/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", - "visit (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", - "synthesizeTree (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", - "Object.synthesize (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", - "MyStage.synth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/core/lib/stage.js:105:41)", - "Object.pipelineSynth (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", - "CdkStage.addApplication (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", - "CdkPipeline.addApplicationStage (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", - "new CdkpipelinesDemoPipelineStack (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline.js:55:32)", - "Object. (/home/hallcor/work/aws-cdk/fix-snapshots/packages/@aws-cdk/pipelines/test/integ.pipeline.js:71:1)", - "Module._compile (node:internal/modules/cjs/loader:1103:14)", - "Object.Module._extensions..js (node:internal/modules/cjs/loader:1155:10)", + "addBootstrapVersionRule (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:293:5)", + "DefaultStackSynthesizer.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stack-synthesizers/default-synthesizer.js:175:13)", + "/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:155:35", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:200:9)", + "visit (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:197:9)", + "synthesizeTree (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:148:5)", + "Object.synthesize (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/private/synthesis.js:33:5)", + "MyStage.synth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/core/lib/stage.js:105:41)", + "Object.pipelineSynth (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/private/construct-internals.js:25:18)", + "CdkStage.addApplication (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/stage.js:82:43)", + "CdkPipeline.addApplicationStage (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/lib/legacy/pipeline.js:206:15)", + "new CdkpipelinesDemoPipelineStack (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline.js:55:32)", + "Object. (/Users/huijbers/Workspaces/PublicCDK/aws-cdk4/packages/@aws-cdk/pipelines/test/integ.pipeline.js:71:1)", + "Module._compile (node:internal/modules/cjs/loader:1105:14)", + "Module._extensions..js (node:internal/modules/cjs/loader:1159:10)", "Module.load (node:internal/modules/cjs/loader:981:32)", - "Function.Module._load (node:internal/modules/cjs/loader:822:12)", + "Module._load (node:internal/modules/cjs/loader:827:12)", "Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:77:12)", "node:internal/main/run_main_module:17:47" ] diff --git a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/cdk.out b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/cdk.out index 90bef2e09ad39..ccdfc1ff96a9d 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/cdk.out +++ b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/cdk.out @@ -1 +1 @@ -{"version":"17.0.0"} \ No newline at end of file +{"version":"19.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/integ.json b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/integ.json index 1cc2514952143..263790b6d173f 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/integ.json +++ b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/integ.json @@ -1,7 +1,7 @@ { - "version": "18.0.0", + "version": "19.0.0", "testCases": { - "pipelines/test/integ.pipeline": { + "integ.pipeline": { "stacks": [ "PipelineStack" ], diff --git a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/manifest.json b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/manifest.json index 6975a4e1763ea..dbe1cd434f15b 100644 --- a/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/manifest.json +++ b/packages/@aws-cdk/pipelines/test/pipeline.integ.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "17.0.0", + "version": "19.0.0", "artifacts": { "assembly-PipelineStack-PreProd": { "type": "cdk:cloud-assembly", @@ -85,7 +85,10 @@ "/PipelineStack/Pipeline/Pipeline/ArtifactsBucketEncryptionKeyAlias/Resource": [ { "type": "aws:cdk:logicalId", - "data": "PipelineArtifactsBucketEncryptionKeyAlias94A07392" + "data": "PipelineArtifactsBucketEncryptionKeyAlias94A07392", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_REPLACE" + ] } ], "/PipelineStack/Pipeline/Pipeline/ArtifactsBucket/Resource": [ diff --git a/packages/@aws-cdk/pipelines/test/testhelpers/test-app.ts b/packages/@aws-cdk/pipelines/test/testhelpers/test-app.ts index a534866d19b47..24e29b2625929 100644 --- a/packages/@aws-cdk/pipelines/test/testhelpers/test-app.ts +++ b/packages/@aws-cdk/pipelines/test/testhelpers/test-app.ts @@ -1,5 +1,3 @@ -/* eslint-disable import/no-extraneous-dependencies */ -import '@aws-cdk/assert-internal/jest'; import * as fs from 'fs'; import * as path from 'path'; import * as ecr_assets from '@aws-cdk/aws-ecr-assets'; From 23690e40b1604839f99da8b8f96168dda8679c47 Mon Sep 17 00:00:00 2001 From: Joshua Weber <57131123+daschaa@users.noreply.github.com> Date: Wed, 25 May 2022 02:26:17 +0200 Subject: [PATCH 10/11] feat(s3): adds objectSizeGreaterThan property for s3 lifecycle rule (#20425) Fixes (first half) of #20372. This implements the `objectSizeGreaterThan` property for a S3 lifecycle rule. ---- ### All Submissions: * [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [x] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [x] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/@aws-cdk/aws-s3/README.md | 1 + packages/@aws-cdk/aws-s3/lib/bucket.ts | 1 + packages/@aws-cdk/aws-s3/lib/rule.ts | 31 ++++++++++++------- .../@aws-cdk/aws-s3/test/integ.lifecycle.ts | 11 +++++-- .../aws-cdk-s3.template.json | 4 +++ packages/@aws-cdk/aws-s3/test/rules.test.ts | 22 +++++++++++++ 6 files changed, 55 insertions(+), 15 deletions(-) diff --git a/packages/@aws-cdk/aws-s3/README.md b/packages/@aws-cdk/aws-s3/README.md index c2f87f1186a3c..988b360c01d3c 100644 --- a/packages/@aws-cdk/aws-s3/README.md +++ b/packages/@aws-cdk/aws-s3/README.md @@ -576,6 +576,7 @@ const bucket = new s3.Bucket(this, 'MyBucket', { // the properties below are optional noncurrentVersionsToRetain: 123, }], + objectSizeGreaterThan: 500, prefix: 'prefix', transitions: [{ storageClass: s3.StorageClass.GLACIER, diff --git a/packages/@aws-cdk/aws-s3/lib/bucket.ts b/packages/@aws-cdk/aws-s3/lib/bucket.ts index c1d73f54a0313..d51d79165f61c 100644 --- a/packages/@aws-cdk/aws-s3/lib/bucket.ts +++ b/packages/@aws-cdk/aws-s3/lib/bucket.ts @@ -1923,6 +1923,7 @@ export class Bucket extends BucketBase { })), expiredObjectDeleteMarker: rule.expiredObjectDeleteMarker, tagFilters: self.parseTagFilters(rule.tagFilters), + objectSizeGreaterThan: rule.objectSizeGreaterThan, }; return x; diff --git a/packages/@aws-cdk/aws-s3/lib/rule.ts b/packages/@aws-cdk/aws-s3/lib/rule.ts index 9baf32efb9779..b79af075ed848 100644 --- a/packages/@aws-cdk/aws-s3/lib/rule.ts +++ b/packages/@aws-cdk/aws-s3/lib/rule.ts @@ -24,7 +24,7 @@ export interface LifecycleRule { * When Amazon S3 aborts a multipart upload, it deletes all parts * associated with the multipart upload. * - * @default Incomplete uploads are never aborted + * @default - Incomplete uploads are never aborted */ readonly abortIncompleteMultipartUploadAfter?: Duration; @@ -37,7 +37,7 @@ export interface LifecycleRule { * time unit for both properties (either in days or by date). The * expiration time must also be later than the transition time. * - * @default No expiration date + * @default - No expiration date */ readonly expirationDate?: Date; @@ -48,7 +48,7 @@ export interface LifecycleRule { * time unit for both properties (either in days or by date). The * expiration time must also be later than the transition time. * - * @default No expiration timeout + * @default - No expiration timeout */ readonly expiration?: Duration; @@ -62,7 +62,7 @@ export interface LifecycleRule { * and expiration time, the expiration time must be later than the * transition time. * - * @default No noncurrent version expiration + * @default - No noncurrent version expiration */ readonly noncurrentVersionExpiration?: Duration; @@ -72,7 +72,7 @@ export interface LifecycleRule { * If there are this many more noncurrent versions, * Amazon S3 permanently deletes them. * - * @default No noncurrent versions to retain + * @default - No noncurrent versions to retain */ readonly noncurrentVersionsToRetain?: number; @@ -93,21 +93,21 @@ export interface LifecycleRule { * time unit for both properties (either in days or by date). The * expiration time must also be later than the transition time. * - * @default No transition rules + * @default - No transition rules */ readonly transitions?: Transition[]; /** * Object key prefix that identifies one or more objects to which this rule applies. * - * @default Rule applies to all objects + * @default - Rule applies to all objects */ readonly prefix?: string; /** * The TagFilter property type specifies tags to use to identify a subset of objects for an Amazon S3 bucket. * - * @default Rule applies to all objects + * @default - Rule applies to all objects */ readonly tagFilters?: {[tag: string]: any}; @@ -118,6 +118,13 @@ export interface LifecycleRule { * @default false */ readonly expiredObjectDeleteMarker?: boolean; + + /** + * Specifies the minimum object size in bytes for this rule to apply to. + * + * @default - No rule + */ + readonly objectSizeGreaterThan?: number; } /** @@ -134,14 +141,14 @@ export interface Transition { * * The date value must be in ISO 8601 format. The time is always midnight UTC. * - * @default No transition date. + * @default - No transition date. */ readonly transitionDate?: Date; /** * Indicates the number of days after creation when objects are transitioned to the specified storage class. * - * @default No transition count. + * @default - No transition count. */ readonly transitionAfter?: Duration; } @@ -158,14 +165,14 @@ export interface NoncurrentVersionTransition { /** * Indicates the number of days after creation when objects are transitioned to the specified storage class. * - * @default No transition count. + * @default - No transition count. */ readonly transitionAfter: Duration; /** * Indicates the number of noncurrent version objects to be retained. Can be up to 100 noncurrent versions retained. * - * @default No noncurrent version retained. + * @default - No noncurrent version retained. */ readonly noncurrentVersionsToRetain?: number; } diff --git a/packages/@aws-cdk/aws-s3/test/integ.lifecycle.ts b/packages/@aws-cdk/aws-s3/test/integ.lifecycle.ts index 05fe7bbf32ee2..0fe92eda9a7eb 100644 --- a/packages/@aws-cdk/aws-s3/test/integ.lifecycle.ts +++ b/packages/@aws-cdk/aws-s3/test/integ.lifecycle.ts @@ -7,9 +7,14 @@ const stack = new Stack(app, 'aws-cdk-s3'); // Test a lifecycle rule with an expiration DATE new Bucket(stack, 'MyBucket', { - lifecycleRules: [{ - expirationDate: new Date('2019-10-01'), - }], + lifecycleRules: [ + { + expirationDate: new Date('2019-10-01'), + }, + { + objectSizeGreaterThan: 500, + }, + ], removalPolicy: RemovalPolicy.DESTROY, }); diff --git a/packages/@aws-cdk/aws-s3/test/lifecycle.integ.snapshot/aws-cdk-s3.template.json b/packages/@aws-cdk/aws-s3/test/lifecycle.integ.snapshot/aws-cdk-s3.template.json index 239ff4567e498..df2d4d718d3cf 100644 --- a/packages/@aws-cdk/aws-s3/test/lifecycle.integ.snapshot/aws-cdk-s3.template.json +++ b/packages/@aws-cdk/aws-s3/test/lifecycle.integ.snapshot/aws-cdk-s3.template.json @@ -8,6 +8,10 @@ { "ExpirationDate": "2019-10-01T00:00:00", "Status": "Enabled" + }, + { + "ObjectSizeGreaterThan": "500", + "Status": "Enabled" } ] } diff --git a/packages/@aws-cdk/aws-s3/test/rules.test.ts b/packages/@aws-cdk/aws-s3/test/rules.test.ts index 8432e35e67bc5..5be1225ebc4d1 100644 --- a/packages/@aws-cdk/aws-s3/test/rules.test.ts +++ b/packages/@aws-cdk/aws-s3/test/rules.test.ts @@ -291,4 +291,26 @@ describe('rules', () => { }, }); }); + + test('Bucket with objectSizeGreaterThan', () => { + // GIVEN + const stack = new Stack(); + + // WHEN + new Bucket(stack, 'Bucket', { + lifecycleRules: [{ + objectSizeGreaterThan: 0, + }], + }); + + // THEN + Template.fromStack(stack).hasResourceProperties('AWS::S3::Bucket', { + LifecycleConfiguration: { + Rules: [{ + ObjectSizeGreaterThan: 0, + Status: 'Enabled', + }], + }, + }); + }); }); From 5d2501b8453499a2e8c789f7be8d3c51b513bccc Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Wed, 25 May 2022 02:47:11 -0700 Subject: [PATCH 11/11] docs(cfnspec): update CloudFormation documentation (#20488) --- .../spec-source/cfn-docs/cfn-docs.json | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json b/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json index addfabcb2aef8..77519b7245d71 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json +++ b/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json @@ -5939,7 +5939,7 @@ "properties": { "ComputeEnvironmentName": "The name for your compute environment. It can be up to 128 letters long. It can contain uppercase and lowercase letters, numbers, hyphens (-), and underscores (_).", "ComputeResources": "The ComputeResources property type specifies details of the compute resources managed by the compute environment. This parameter is required for managed compute environments. For more information, see [Compute Environments](https://docs.aws.amazon.com/batch/latest/userguide/compute_environments.html) in the ** .", - "ReplaceComputeEnvironment": "Specifies whether the compute environment should be replaced if an update is made that requires replacing the instances in the compute environment. The default value is `true` . To enable more properties to be updated, set this property to `false` . When changing the value of this property to `false` , no other properties should be changed at the same time. If other properties are changed at the same time, and the change needs to be rolled back but it can't, it's possible for the stack to go into the `UPDATE_ROLLBACK_FAILED` state. You can't update a stack that is in the `UPDATE_ROLLBACK_FAILED` state. However, if you can continue to roll it back, you can return the stack to its original settings and then try to update it again. For more information, see [Continue rolling back an update](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-continueupdaterollback.html) in the *AWS CloudFormation User Guide* .\n\nThe properties that can't be changed without replacing the compute environment are in the [`ComputeResources`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html) property type: [`AllocationStrategy`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-allocationstrategy) , [`BidPercentage`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-bidpercentage) , [`Ec2Configuration`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-ec2configuration) , [`Ec2KeyPair`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-ec2keypair) , [`Ec2KeyPair`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-ec2keypair) , [`ImageId`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-imageid) , [`InstanceRole`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-instancerole) , [`InstanceTypes`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-instancetypes) , [`LaunchTemplate`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-launchtemplate) , [`MaxvCpus`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-maxvcpus) , [`MinvCpus`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-minvcpus) , [`PlacementGroup`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-placementgroup) , [`SecurityGroupIds`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-securitygroupids) , [`Subnets`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-subnets) , [](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-tags) , [`Type`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-type) , and [`UpdateToLatestImageVersion`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-updatetolatestimageversion) .", + "ReplaceComputeEnvironment": "Specifies whether the compute environment should be replaced if an update is made that requires replacing the instances in the compute environment. The default value is `true` . To enable more properties to be updated, set this property to `false` . When changing the value of this property to `false` , no other properties should be changed at the same time. If other properties are changed at the same time, and the change needs to be rolled back but it can't, it's possible for the stack to go into the `UPDATE_ROLLBACK_FAILED` state. You can't update a stack that is in the `UPDATE_ROLLBACK_FAILED` state. However, if you can continue to roll it back, you can return the stack to its original settings and then try to update it again. For more information, see [Continue rolling back an update](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-continueupdaterollback.html) in the *AWS CloudFormation User Guide* .\n\nThe properties that can't be changed without replacing the compute environment are in the [`ComputeResources`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html) property type: [`AllocationStrategy`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-allocationstrategy) , [`BidPercentage`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-bidpercentage) , [`Ec2Configuration`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-ec2configuration) , [`Ec2KeyPair`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-ec2keypair) , [`Ec2KeyPair`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-ec2keypair) , [`ImageId`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-imageid) , [`InstanceRole`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-instancerole) , [`InstanceTypes`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-instancetypes) , [`LaunchTemplate`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-launchtemplate) , [`MaxvCpus`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-maxvcpus) , [`MinvCpus`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-minvcpus) , [`PlacementGroup`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-placementgroup) , [`SecurityGroupIds`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-securitygroupids) , [`Subnets`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-subnets) , [Tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-tags) , [`Type`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-type) , and [`UpdateToLatestImageVersion`](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-updatetolatestimageversion) .", "ServiceRole": "The full Amazon Resource Name (ARN) of the IAM role that allows AWS Batch to make calls to other AWS services on your behalf. For more information, see [AWS Batch service IAM role](https://docs.aws.amazon.com/batch/latest/userguide/service_IAM_role.html) in the *AWS Batch User Guide* .\n\n> If your account already created the AWS Batch service-linked role, that role is used by default for your compute environment unless you specify a different role here. If the AWS Batch service-linked role doesn't exist in your account, and no role is specified here, the service attempts to create the AWS Batch service-linked role in your account. \n\nIf your specified role has a path other than `/` , then you must specify either the full role ARN (recommended) or prefix the role name with the path. For example, if a role with the name `bar` has a path of `/foo/` then you would specify `/foo/bar` as the role name. For more information, see [Friendly names and paths](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html#identifiers-friendly-names) in the *IAM User Guide* .\n\n> Depending on how you created your AWS Batch service role, its ARN might contain the `service-role` path prefix. When you only specify the name of the service role, AWS Batch assumes that your ARN doesn't use the `service-role` path prefix. Because of this, we recommend that you specify the full ARN of your service role when you create compute environments.", "State": "The state of the compute environment. If the state is `ENABLED` , then the compute environment accepts jobs from a queue and can scale out automatically based on queues.\n\nIf the state is `ENABLED` , then the AWS Batch scheduler can attempt to place jobs from an associated job queue on the compute resources within the environment. If the compute environment is managed, then it can scale its instances out or in automatically, based on the job queue demand.\n\nIf the state is `DISABLED` , then the AWS Batch scheduler doesn't attempt to place jobs within the environment. Jobs in a `STARTING` or `RUNNING` state continue to progress normally. Managed compute environments in the `DISABLED` state don't scale out. However, they scale in to `minvCpus` value after instances become idle.", "Tags": "The tags applied to the compute environment.", @@ -18136,7 +18136,7 @@ "Description": "A description for the endpoint.", "EventBuses": "The event buses being used by the endpoint.\n\n*Exactly* : `2`", "Name": "The name of the endpoint.", - "ReplicationConfig": "Whether event replication was enabled or disabled for this endpoint.", + "ReplicationConfig": "Whether event replication was enabled or disabled for this endpoint. The default state is `ENABLED` which means you must supply a `RoleArn` . If you don't have a `RoleArn` or you don't want event replication enabled, set the state to `DISABLED` .", "RoleArn": "The ARN of the role used by event replication for the endpoint.", "RoutingConfig": "The routing configuration of the endpoint." } @@ -42389,7 +42389,7 @@ }, "AWS::WAFv2::RuleGroup.ByteMatchStatement": { "attributes": {}, - "description": "A rule statement that defines a string match search for AWS WAF to apply to web requests. The byte match statement provides the bytes to search for, the location in requests that you want AWS WAF to search, and other settings. The bytes to search for are typically a string that corresponds with ASCII characters. In the AWS WAF console and the developer guide, this is refered to as a string match statement.", + "description": "A rule statement that defines a string match search for AWS WAF to apply to web requests. The byte match statement provides the bytes to search for, the location in requests that you want AWS WAF to search, and other settings. The bytes to search for are typically a string that corresponds with ASCII characters. In the AWS WAF console and the developer guide, this is called a string match statement.", "properties": { "FieldToMatch": "The part of the web request that you want AWS WAF to inspect.", "PositionalConstraint": "The area within the portion of the web request that you want AWS WAF to search for `SearchString` . Valid values include the following:\n\n*CONTAINS*\n\nThe specified part of the web request must include the value of `SearchString` , but the location doesn't matter.\n\n*CONTAINS_WORD*\n\nThe specified part of the web request must include the value of `SearchString` , and `SearchString` must contain only alphanumeric characters or underscore (A-Z, a-z, 0-9, or _). In addition, `SearchString` must be a word, which means that both of the following are true:\n\n- `SearchString` is at the beginning of the specified part of the web request or is preceded by a character other than an alphanumeric character or underscore (_). Examples include the value of a header and `;BadBot` .\n- `SearchString` is at the end of the specified part of the web request or is followed by a character other than an alphanumeric character or underscore (_), for example, `BadBot;` and `-BadBot;` .\n\n*EXACTLY*\n\nThe value of the specified part of the web request must exactly match the value of `SearchString` .\n\n*STARTS_WITH*\n\nThe value of `SearchString` must appear at the beginning of the specified part of the web request.\n\n*ENDS_WITH*\n\nThe value of `SearchString` must appear at the end of the specified part of the web request.", @@ -42561,7 +42561,7 @@ }, "AWS::WAFv2::RuleGroup.RateBasedStatement": { "attributes": {}, - "description": "A rate-based rule tracks the rate of requests for each originating IP address, and triggers the rule action when the rate exceeds a limit that you specify on the number of requests in any 5-minute time span. You can use this to put a temporary block on requests from an IP address that is sending excessive requests.\n\nAWS WAF tracks and manages web requests separately for each instance of a rate-based rule that you use. For example, if you provide the same rate-based rule settings in two web ACLs, each of the two rule statements represents a separate instance of the rate-based rule and gets its own tracking and management by AWS WAF . If you define a rate-based rule inside a rule group, and then use that rule group in multiple places, each use creates a separate instance of the rate-based rule that gets its own tracking and management by AWS WAF .\n\nWhen the rule action triggers, AWS WAF blocks additional requests from the IP address until the request rate falls below the limit.\n\nYou can optionally nest another statement inside the rate-based statement, to narrow the scope of the rule so that it only counts requests that match the nested statement. For example, based on recent requests that you have seen from an attacker, you might create a rate-based rule with a nested AND rule statement that contains the following nested statements:\n\n- An IP match statement with an IP set that specified the address 192.0.2.44.\n- A string match statement that searches in the User-Agent header for the string BadBot.\n\nIn this rate-based rule, you also define a rate limit. For this example, the rate limit is 1,000. Requests that meet both of the conditions in the statements are counted. If the count exceeds 1,000 requests per five minutes, the rule action triggers. Requests that do not meet both conditions are not counted towards the rate limit and are not affected by this rule.\n\nYou cannot nest a `RateBasedStatement` inside another statement, for example inside a `NotStatement` or `OrStatement` . You can define a `RateBasedStatement` inside a web ACL and inside a rule group.", + "description": "A rate-based rule tracks the rate of requests for each originating IP address, and triggers the rule action when the rate exceeds a limit that you specify on the number of requests in any 5-minute time span. You can use this to put a temporary block on requests from an IP address that is sending excessive requests.\n\nAWS WAF tracks and manages web requests separately for each instance of a rate-based rule that you use. For example, if you provide the same rate-based rule settings in two web ACLs, each of the two rule statements represents a separate instance of the rate-based rule and gets its own tracking and management by AWS WAF . If you define a rate-based rule inside a rule group, and then use that rule group in multiple places, each use creates a separate instance of the rate-based rule that gets its own tracking and management by AWS WAF .\n\nWhen the rule action triggers, AWS WAF blocks additional requests from the IP address until the request rate falls below the limit.\n\nYou can optionally nest another statement inside the rate-based statement, to narrow the scope of the rule so that it only counts requests that match the nested statement. For example, based on recent requests that you have seen from an attacker, you might create a rate-based rule with a nested AND rule statement that contains the following nested statements:\n\n- An IP match statement with an IP set that specified the address 192.0.2.44.\n- A string match statement that searches in the User-Agent header for the string BadBot.\n\nIn this rate-based rule, you also define a rate limit. For this example, the rate limit is 1,000. Requests that meet the criteria of both of the nested statements are counted. If the count exceeds 1,000 requests per five minutes, the rule action triggers. Requests that do not meet the criteria of both of the nested statements are not counted towards the rate limit and are not affected by this rule.\n\nYou cannot nest a `RateBasedStatement` inside another statement, for example inside a `NotStatement` or `OrStatement` . You can define a `RateBasedStatement` inside a web ACL and inside a rule group.", "properties": { "AggregateKeyType": "Setting that indicates how to aggregate the request counts. The options are the following:\n\n- IP - Aggregate the request counts on the IP address from the web request origin.\n- FORWARDED_IP - Aggregate the request counts on the first IP address in an HTTP header. If you use this, configure the `ForwardedIPConfig` , to specify the header to use.", "ForwardedIPConfig": "The configuration for inspecting IP addresses in an HTTP header that you specify, instead of using the IP address that's reported by the web request origin. Commonly, this is the X-Forwarded-For (XFF) header, but you can specify any header name.\n\n> If the specified header isn't present in the request, AWS WAF doesn't apply the rule to the web request at all. \n\nThis is required if `AggregateKeyType` is set to `FORWARDED_IP` .", @@ -42612,7 +42612,7 @@ }, "AWS::WAFv2::RuleGroup.SizeConstraintStatement": { "attributes": {}, - "description": "A rule statement that compares a number of bytes against the size of a request component, using a comparison operator, such as greater than (>) or less than (<). For example, you can use a size constraint statement to look for query strings that are longer than 100 bytes.\n\nIf you configure AWS WAF to inspect the request body, AWS WAF inspects only the first 8192 bytes (8 KB). If the request body for your web requests never exceeds 8192 bytes, you can create a size constraint condition and block requests that have a request body greater than 8192 bytes.\n\nIf you choose URI for the value of Part of the request to filter on, the slash (/) in the URI counts as one character. For example, the URI `/logo.jpg` is nine characters long.", + "description": "A rule statement that compares a number of bytes against the size of a request component, using a comparison operator, such as greater than (>) or less than (<). For example, you can use a size constraint statement to look for query strings that are longer than 100 bytes.\n\nIf you configure AWS WAF to inspect the request body, AWS WAF inspects only the first 8192 bytes (8 KB). If the request body for your web requests never exceeds 8192 bytes, you could use a size constraint statement to block requests that have a request body greater than 8192 bytes.\n\nIf you choose URI for the value of Part of the request to filter on, the slash (/) in the URI counts as one character. For example, the URI `/logo.jpg` is nine characters long.", "properties": { "ComparisonOperator": "The operator to use to compare the request part to the size setting.", "FieldToMatch": "The part of the web request that you want AWS WAF to inspect.", @@ -42622,7 +42622,7 @@ }, "AWS::WAFv2::RuleGroup.SqliMatchStatement": { "attributes": {}, - "description": "Attackers sometimes insert malicious SQL code into web requests in an effort to extract data from your database. To allow or block web requests that appear to contain malicious SQL code, create one or more SQL injection match conditions. An SQL injection match condition identifies the part of web requests, such as the URI or the query string, that you want AWS WAF to inspect. Later in the process, when you create a web ACL, you specify whether to allow or block requests that appear to contain malicious SQL code.", + "description": "A rule statement that inspects for malicious SQL code. Attackers insert malicious SQL code into web requests to do things like modify your database or extract data from it.", "properties": { "FieldToMatch": "The part of the web request that you want AWS WAF to inspect.", "TextTransformations": "Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. If you specify one or more transformations in a rule statement, AWS WAF performs all transformations on the content of the request component identified by `FieldToMatch` , starting from the lowest priority setting, before inspecting the content for a match." @@ -42633,18 +42633,18 @@ "description": "The processing guidance for a rule, used by AWS WAF to determine whether a web request matches the rule.", "properties": { "AndStatement": "A logical rule statement used to combine other rule statements with AND logic. You provide more than one `Statement` within the `AndStatement` .", - "ByteMatchStatement": "A rule statement that defines a string match search for AWS WAF to apply to web requests. The byte match statement provides the bytes to search for, the location in requests that you want AWS WAF to search, and other settings. The bytes to search for are typically a string that corresponds with ASCII characters. In the AWS WAF console and the developer guide, this is refered to as a string match statement.", + "ByteMatchStatement": "A rule statement that defines a string match search for AWS WAF to apply to web requests. The byte match statement provides the bytes to search for, the location in requests that you want AWS WAF to search, and other settings. The bytes to search for are typically a string that corresponds with ASCII characters. In the AWS WAF console and the developer guide, this is called a string match statement.", "GeoMatchStatement": "A rule statement used to identify web requests based on country of origin.", "IPSetReferenceStatement": "A rule statement used to detect web requests coming from particular IP addresses or address ranges. To use this, create an `IPSet` that specifies the addresses you want to detect, then use the ARN of that set in this statement.\n\nEach IP set rule statement references an IP set. You create and maintain the set independent of your rules. This allows you to use the single set in multiple rules. When you update the referenced set, AWS WAF automatically updates all rules that reference it.", "LabelMatchStatement": "A rule statement that defines a string match search against labels that have been added to the web request by rules that have already run in the web ACL.\n\nThe label match statement provides the label or namespace string to search for. The label string can represent a part or all of the fully qualified label name that had been added to the web request. Fully qualified labels have a prefix, optional namespaces, and label name. The prefix identifies the rule group or web ACL context of the rule that added the label. If you do not provide the fully qualified name in your label match string, AWS WAF performs the search for labels that were added in the same context as the label match statement.", "NotStatement": "A logical rule statement used to negate the results of another rule statement. You provide one `Statement` within the `NotStatement` .", "OrStatement": "A logical rule statement used to combine other rule statements with OR logic. You provide more than one `Statement` within the `OrStatement` .", - "RateBasedStatement": "A rate-based rule tracks the rate of requests for each originating IP address, and triggers the rule action when the rate exceeds a limit that you specify on the number of requests in any 5-minute time span. You can use this to put a temporary block on requests from an IP address that is sending excessive requests.\n\nAWS WAF tracks and manages web requests separately for each instance of a rate-based rule that you use. For example, if you provide the same rate-based rule settings in two web ACLs, each of the two rule statements represents a separate instance of the rate-based rule and gets its own tracking and management by AWS WAF . If you define a rate-based rule inside a rule group, and then use that rule group in multiple places, each use creates a separate instance of the rate-based rule that gets its own tracking and management by AWS WAF .\n\nWhen the rule action triggers, AWS WAF blocks additional requests from the IP address until the request rate falls below the limit.\n\nYou can optionally nest another statement inside the rate-based statement, to narrow the scope of the rule so that it only counts requests that match the nested statement. For example, based on recent requests that you have seen from an attacker, you might create a rate-based rule with a nested AND rule statement that contains the following nested statements:\n\n- An IP match statement with an IP set that specified the address 192.0.2.44.\n- A string match statement that searches in the User-Agent header for the string BadBot.\n\nIn this rate-based rule, you also define a rate limit. For this example, the rate limit is 1,000. Requests that meet both of the conditions in the statements are counted. If the count exceeds 1,000 requests per five minutes, the rule action triggers. Requests that do not meet both conditions are not counted towards the rate limit and are not affected by this rule.\n\nYou cannot nest a `RateBasedStatement` inside another statement, for example inside a `NotStatement` or `OrStatement` . You can define a `RateBasedStatement` inside a web ACL and inside a rule group.", + "RateBasedStatement": "A rate-based rule tracks the rate of requests for each originating IP address, and triggers the rule action when the rate exceeds a limit that you specify on the number of requests in any 5-minute time span. You can use this to put a temporary block on requests from an IP address that is sending excessive requests.\n\nAWS WAF tracks and manages web requests separately for each instance of a rate-based rule that you use. For example, if you provide the same rate-based rule settings in two web ACLs, each of the two rule statements represents a separate instance of the rate-based rule and gets its own tracking and management by AWS WAF . If you define a rate-based rule inside a rule group, and then use that rule group in multiple places, each use creates a separate instance of the rate-based rule that gets its own tracking and management by AWS WAF .\n\nWhen the rule action triggers, AWS WAF blocks additional requests from the IP address until the request rate falls below the limit.\n\nYou can optionally nest another statement inside the rate-based statement, to narrow the scope of the rule so that it only counts requests that match the nested statement. For example, based on recent requests that you have seen from an attacker, you might create a rate-based rule with a nested AND rule statement that contains the following nested statements:\n\n- An IP match statement with an IP set that specified the address 192.0.2.44.\n- A string match statement that searches in the User-Agent header for the string BadBot.\n\nIn this rate-based rule, you also define a rate limit. For this example, the rate limit is 1,000. Requests that meet the criteria of both of the nested statements are counted. If the count exceeds 1,000 requests per five minutes, the rule action triggers. Requests that do not meet the criteria of both of the nested statements are not counted towards the rate limit and are not affected by this rule.\n\nYou cannot nest a `RateBasedStatement` inside another statement, for example inside a `NotStatement` or `OrStatement` . You can define a `RateBasedStatement` inside a web ACL and inside a rule group.", "RegexMatchStatement": "A rule statement used to search web request components for a match against a single regular expression.", "RegexPatternSetReferenceStatement": "A rule statement used to search web request components for matches with regular expressions. To use this, create a `RegexPatternSet` that specifies the expressions that you want to detect, then use the ARN of that set in this statement. A web request matches the pattern set rule statement if the request component matches any of the patterns in the set.\n\nEach regex pattern set rule statement references a regex pattern set. You create and maintain the set independent of your rules. This allows you to use the single set in multiple rules. When you update the referenced set, AWS WAF automatically updates all rules that reference it.", - "SizeConstraintStatement": "A rule statement that compares a number of bytes against the size of a request component, using a comparison operator, such as greater than (>) or less than (<). For example, you can use a size constraint statement to look for query strings that are longer than 100 bytes.\n\nIf you configure AWS WAF to inspect the request body, AWS WAF inspects only the first 8192 bytes (8 KB). If the request body for your web requests never exceeds 8192 bytes, you can create a size constraint condition and block requests that have a request body greater than 8192 bytes.\n\nIf you choose URI for the value of Part of the request to filter on, the slash (/) in the URI counts as one character. For example, the URI `/logo.jpg` is nine characters long.", - "SqliMatchStatement": "Attackers sometimes insert malicious SQL code into web requests in an effort to extract data from your database. To allow or block web requests that appear to contain malicious SQL code, create one or more SQL injection match conditions. An SQL injection match condition identifies the part of web requests, such as the URI or the query string, that you want AWS WAF to inspect. Later in the process, when you create a web ACL, you specify whether to allow or block requests that appear to contain malicious SQL code.", - "XssMatchStatement": "A rule statement that defines a cross-site scripting (XSS) match search for AWS WAF to apply to web requests. XSS attacks are those where the attacker uses vulnerabilities in a benign website as a vehicle to inject malicious client-site scripts into other legitimate web browsers. The XSS match statement provides the location in requests that you want AWS WAF to search and text transformations to use on the search area before AWS WAF searches for character sequences that are likely to be malicious strings." + "SizeConstraintStatement": "A rule statement that compares a number of bytes against the size of a request component, using a comparison operator, such as greater than (>) or less than (<). For example, you can use a size constraint statement to look for query strings that are longer than 100 bytes.\n\nIf you configure AWS WAF to inspect the request body, AWS WAF inspects only the first 8192 bytes (8 KB). If the request body for your web requests never exceeds 8192 bytes, you could use a size constraint statement to block requests that have a request body greater than 8192 bytes.\n\nIf you choose URI for the value of Part of the request to filter on, the slash (/) in the URI counts as one character. For example, the URI `/logo.jpg` is nine characters long.", + "SqliMatchStatement": "A rule statement that inspects for malicious SQL code. Attackers insert malicious SQL code into web requests to do things like modify your database or extract data from it.", + "XssMatchStatement": "A rule statement that inspects for cross-site scripting (XSS) attacks. In XSS attacks, the attacker uses vulnerabilities in a benign website as a vehicle to inject malicious client-site scripts into other legitimate web browsers." } }, "AWS::WAFv2::RuleGroup.TextTransformation": { @@ -42666,7 +42666,7 @@ }, "AWS::WAFv2::RuleGroup.XssMatchStatement": { "attributes": {}, - "description": "A rule statement that defines a cross-site scripting (XSS) match search for AWS WAF to apply to web requests. XSS attacks are those where the attacker uses vulnerabilities in a benign website as a vehicle to inject malicious client-site scripts into other legitimate web browsers. The XSS match statement provides the location in requests that you want AWS WAF to search and text transformations to use on the search area before AWS WAF searches for character sequences that are likely to be malicious strings.", + "description": "A rule statement that inspects for cross-site scripting (XSS) attacks. In XSS attacks, the attacker uses vulnerabilities in a benign website as a vehicle to inject malicious client-site scripts into other legitimate web browsers.", "properties": { "FieldToMatch": "The part of the web request that you want AWS WAF to inspect.", "TextTransformations": "Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. If you specify one or more transformations in a rule statement, AWS WAF performs all transformations on the content of the request component identified by `FieldToMatch` , starting from the lowest priority setting, before inspecting the content for a match." @@ -42723,7 +42723,7 @@ }, "AWS::WAFv2::WebACL.ByteMatchStatement": { "attributes": {}, - "description": "A rule statement that defines a string match search for AWS WAF to apply to web requests. The byte match statement provides the bytes to search for, the location in requests that you want AWS WAF to search, and other settings. The bytes to search for are typically a string that corresponds with ASCII characters. In the AWS WAF console and the developer guide, this is refered to as a string match statement.", + "description": "A rule statement that defines a string match search for AWS WAF to apply to web requests. The byte match statement provides the bytes to search for, the location in requests that you want AWS WAF to search, and other settings. The bytes to search for are typically a string that corresponds with ASCII characters. In the AWS WAF console and the developer guide, this is called a string match statement.", "properties": { "FieldToMatch": "The part of the web request that you want AWS WAF to inspect.", "PositionalConstraint": "The area within the portion of the web request that you want AWS WAF to search for `SearchString` . Valid values include the following:\n\n*CONTAINS*\n\nThe specified part of the web request must include the value of `SearchString` , but the location doesn't matter.\n\n*CONTAINS_WORD*\n\nThe specified part of the web request must include the value of `SearchString` , and `SearchString` must contain only alphanumeric characters or underscore (A-Z, a-z, 0-9, or _). In addition, `SearchString` must be a word, which means that both of the following are true:\n\n- `SearchString` is at the beginning of the specified part of the web request or is preceded by a character other than an alphanumeric character or underscore (_). Examples include the value of a header and `;BadBot` .\n- `SearchString` is at the end of the specified part of the web request or is followed by a character other than an alphanumeric character or underscore (_), for example, `BadBot;` and `-BadBot;` .\n\n*EXACTLY*\n\nThe value of the specified part of the web request must exactly match the value of `SearchString` .\n\n*STARTS_WITH*\n\nThe value of `SearchString` must appear at the beginning of the specified part of the web request.\n\n*ENDS_WITH*\n\nThe value of `SearchString` must appear at the end of the specified part of the web request.", @@ -42978,7 +42978,7 @@ }, "AWS::WAFv2::WebACL.RateBasedStatement": { "attributes": {}, - "description": "A rate-based rule tracks the rate of requests for each originating IP address, and triggers the rule action when the rate exceeds a limit that you specify on the number of requests in any 5-minute time span. You can use this to put a temporary block on requests from an IP address that is sending excessive requests.\n\nAWS WAF tracks and manages web requests separately for each instance of a rate-based rule that you use. For example, if you provide the same rate-based rule settings in two web ACLs, each of the two rule statements represents a separate instance of the rate-based rule and gets its own tracking and management by AWS WAF . If you define a rate-based rule inside a rule group, and then use that rule group in multiple places, each use creates a separate instance of the rate-based rule that gets its own tracking and management by AWS WAF .\n\nWhen the rule action triggers, AWS WAF blocks additional requests from the IP address until the request rate falls below the limit.\n\nYou can optionally nest another statement inside the rate-based statement, to narrow the scope of the rule so that it only counts requests that match the nested statement. For example, based on recent requests that you have seen from an attacker, you might create a rate-based rule with a nested AND rule statement that contains the following nested statements:\n\n- An IP match statement with an IP set that specified the address 192.0.2.44.\n- A string match statement that searches in the User-Agent header for the string BadBot.\n\nIn this rate-based rule, you also define a rate limit. For this example, the rate limit is 1,000. Requests that meet both of the conditions in the statements are counted. If the count exceeds 1,000 requests per five minutes, the rule action triggers. Requests that do not meet both conditions are not counted towards the rate limit and are not affected by this rule.\n\nYou cannot nest a `RateBasedStatement` inside another statement, for example inside a `NotStatement` or `OrStatement` . You can define a `RateBasedStatement` inside a web ACL and inside a rule group.", + "description": "A rate-based rule tracks the rate of requests for each originating IP address, and triggers the rule action when the rate exceeds a limit that you specify on the number of requests in any 5-minute time span. You can use this to put a temporary block on requests from an IP address that is sending excessive requests.\n\nAWS WAF tracks and manages web requests separately for each instance of a rate-based rule that you use. For example, if you provide the same rate-based rule settings in two web ACLs, each of the two rule statements represents a separate instance of the rate-based rule and gets its own tracking and management by AWS WAF . If you define a rate-based rule inside a rule group, and then use that rule group in multiple places, each use creates a separate instance of the rate-based rule that gets its own tracking and management by AWS WAF .\n\nWhen the rule action triggers, AWS WAF blocks additional requests from the IP address until the request rate falls below the limit.\n\nYou can optionally nest another statement inside the rate-based statement, to narrow the scope of the rule so that it only counts requests that match the nested statement. For example, based on recent requests that you have seen from an attacker, you might create a rate-based rule with a nested AND rule statement that contains the following nested statements:\n\n- An IP match statement with an IP set that specified the address 192.0.2.44.\n- A string match statement that searches in the User-Agent header for the string BadBot.\n\nIn this rate-based rule, you also define a rate limit. For this example, the rate limit is 1,000. Requests that meet the criteria of both of the nested statements are counted. If the count exceeds 1,000 requests per five minutes, the rule action triggers. Requests that do not meet the criteria of both of the nested statements are not counted towards the rate limit and are not affected by this rule.\n\nYou cannot nest a `RateBasedStatement` inside another statement, for example inside a `NotStatement` or `OrStatement` . You can define a `RateBasedStatement` inside a web ACL and inside a rule group.", "properties": { "AggregateKeyType": "Setting that indicates how to aggregate the request counts. The options are the following:\n\n- IP - Aggregate the request counts on the IP address from the web request origin.\n- FORWARDED_IP - Aggregate the request counts on the first IP address in an HTTP header. If you use this, configure the `ForwardedIPConfig` , to specify the header to use.", "ForwardedIPConfig": "The configuration for inspecting IP addresses in an HTTP header that you specify, instead of using the IP address that's reported by the web request origin. Commonly, this is the X-Forwarded-For (XFF) header, but you can specify any header name.\n\n> If the specified header isn't present in the request, AWS WAF doesn't apply the rule to the web request at all. \n\nThis is required if `AggregateKeyType` is set to `FORWARDED_IP` .", @@ -43038,7 +43038,7 @@ }, "AWS::WAFv2::WebACL.SizeConstraintStatement": { "attributes": {}, - "description": "A rule statement that compares a number of bytes against the size of a request component, using a comparison operator, such as greater than (>) or less than (<). For example, you can use a size constraint statement to look for query strings that are longer than 100 bytes.\n\nIf you configure AWS WAF to inspect the request body, AWS WAF inspects only the first 8192 bytes (8 KB). If the request body for your web requests never exceeds 8192 bytes, you can create a size constraint condition and block requests that have a request body greater than 8192 bytes.\n\nIf you choose URI for the value of Part of the request to filter on, the slash (/) in the URI counts as one character. For example, the URI `/logo.jpg` is nine characters long.", + "description": "A rule statement that compares a number of bytes against the size of a request component, using a comparison operator, such as greater than (>) or less than (<). For example, you can use a size constraint statement to look for query strings that are longer than 100 bytes.\n\nIf you configure AWS WAF to inspect the request body, AWS WAF inspects only the first 8192 bytes (8 KB). If the request body for your web requests never exceeds 8192 bytes, you could use a size constraint statement to block requests that have a request body greater than 8192 bytes.\n\nIf you choose URI for the value of Part of the request to filter on, the slash (/) in the URI counts as one character. For example, the URI `/logo.jpg` is nine characters long.", "properties": { "ComparisonOperator": "The operator to use to compare the request part to the size setting.", "FieldToMatch": "The part of the web request that you want AWS WAF to inspect.", @@ -43048,7 +43048,7 @@ }, "AWS::WAFv2::WebACL.SqliMatchStatement": { "attributes": {}, - "description": "Attackers sometimes insert malicious SQL code into web requests in an effort to extract data from your database. To allow or block web requests that appear to contain malicious SQL code, create one or more SQL injection match conditions. An SQL injection match condition identifies the part of web requests, such as the URI or the query string, that you want AWS WAF to inspect. Later in the process, when you create a web ACL, you specify whether to allow or block requests that appear to contain malicious SQL code.", + "description": "A rule statement that inspects for malicious SQL code. Attackers insert malicious SQL code into web requests to do things like modify your database or extract data from it.", "properties": { "FieldToMatch": "The part of the web request that you want AWS WAF to inspect.", "TextTransformations": "Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. If you specify one or more transformations in a rule statement, AWS WAF performs all transformations on the content of the request component identified by `FieldToMatch` , starting from the lowest priority setting, before inspecting the content for a match." @@ -43059,20 +43059,20 @@ "description": "The processing guidance for a rule, used by AWS WAF to determine whether a web request matches the rule.", "properties": { "AndStatement": "A logical rule statement used to combine other rule statements with AND logic. You provide more than one `Statement` within the `AndStatement` .", - "ByteMatchStatement": "A rule statement that defines a string match search for AWS WAF to apply to web requests. The byte match statement provides the bytes to search for, the location in requests that you want AWS WAF to search, and other settings. The bytes to search for are typically a string that corresponds with ASCII characters. In the AWS WAF console and the developer guide, this is refered to as a string match statement.", + "ByteMatchStatement": "A rule statement that defines a string match search for AWS WAF to apply to web requests. The byte match statement provides the bytes to search for, the location in requests that you want AWS WAF to search, and other settings. The bytes to search for are typically a string that corresponds with ASCII characters. In the AWS WAF console and the developer guide, this is called a string match statement.", "GeoMatchStatement": "A rule statement used to identify web requests based on country of origin.", "IPSetReferenceStatement": "A rule statement used to detect web requests coming from particular IP addresses or address ranges. To use this, create an `IPSet` that specifies the addresses you want to detect, then use the ARN of that set in this statement.\n\nEach IP set rule statement references an IP set. You create and maintain the set independent of your rules. This allows you to use the single set in multiple rules. When you update the referenced set, AWS WAF automatically updates all rules that reference it.", "LabelMatchStatement": "A rule statement that defines a string match search against labels that have been added to the web request by rules that have already run in the web ACL.\n\nThe label match statement provides the label or namespace string to search for. The label string can represent a part or all of the fully qualified label name that had been added to the web request. Fully qualified labels have a prefix, optional namespaces, and label name. The prefix identifies the rule group or web ACL context of the rule that added the label. If you do not provide the fully qualified name in your label match string, AWS WAF performs the search for labels that were added in the same context as the label match statement.", "ManagedRuleGroupStatement": "A rule statement used to run the rules that are defined in a managed rule group. To use this, provide the vendor name and the name of the rule group in this statement.\n\nYou cannot nest a `ManagedRuleGroupStatement` , for example for use inside a `NotStatement` or `OrStatement` . It can only be referenced as a top-level statement within a rule.", "NotStatement": "A logical rule statement used to negate the results of another rule statement. You provide one `Statement` within the `NotStatement` .", "OrStatement": "A logical rule statement used to combine other rule statements with OR logic. You provide more than one `Statement` within the `OrStatement` .", - "RateBasedStatement": "A rate-based rule tracks the rate of requests for each originating IP address, and triggers the rule action when the rate exceeds a limit that you specify on the number of requests in any 5-minute time span. You can use this to put a temporary block on requests from an IP address that is sending excessive requests.\n\nAWS WAF tracks and manages web requests separately for each instance of a rate-based rule that you use. For example, if you provide the same rate-based rule settings in two web ACLs, each of the two rule statements represents a separate instance of the rate-based rule and gets its own tracking and management by AWS WAF . If you define a rate-based rule inside a rule group, and then use that rule group in multiple places, each use creates a separate instance of the rate-based rule that gets its own tracking and management by AWS WAF .\n\nWhen the rule action triggers, AWS WAF blocks additional requests from the IP address until the request rate falls below the limit.\n\nYou can optionally nest another statement inside the rate-based statement, to narrow the scope of the rule so that it only counts requests that match the nested statement. For example, based on recent requests that you have seen from an attacker, you might create a rate-based rule with a nested AND rule statement that contains the following nested statements:\n\n- An IP match statement with an IP set that specified the address 192.0.2.44.\n- A string match statement that searches in the User-Agent header for the string BadBot.\n\nIn this rate-based rule, you also define a rate limit. For this example, the rate limit is 1,000. Requests that meet both of the conditions in the statements are counted. If the count exceeds 1,000 requests per five minutes, the rule action triggers. Requests that do not meet both conditions are not counted towards the rate limit and are not affected by this rule.\n\nYou cannot nest a `RateBasedStatement` inside another statement, for example inside a `NotStatement` or `OrStatement` . You can define a `RateBasedStatement` inside a web ACL and inside a rule group.", + "RateBasedStatement": "A rate-based rule tracks the rate of requests for each originating IP address, and triggers the rule action when the rate exceeds a limit that you specify on the number of requests in any 5-minute time span. You can use this to put a temporary block on requests from an IP address that is sending excessive requests.\n\nAWS WAF tracks and manages web requests separately for each instance of a rate-based rule that you use. For example, if you provide the same rate-based rule settings in two web ACLs, each of the two rule statements represents a separate instance of the rate-based rule and gets its own tracking and management by AWS WAF . If you define a rate-based rule inside a rule group, and then use that rule group in multiple places, each use creates a separate instance of the rate-based rule that gets its own tracking and management by AWS WAF .\n\nWhen the rule action triggers, AWS WAF blocks additional requests from the IP address until the request rate falls below the limit.\n\nYou can optionally nest another statement inside the rate-based statement, to narrow the scope of the rule so that it only counts requests that match the nested statement. For example, based on recent requests that you have seen from an attacker, you might create a rate-based rule with a nested AND rule statement that contains the following nested statements:\n\n- An IP match statement with an IP set that specified the address 192.0.2.44.\n- A string match statement that searches in the User-Agent header for the string BadBot.\n\nIn this rate-based rule, you also define a rate limit. For this example, the rate limit is 1,000. Requests that meet the criteria of both of the nested statements are counted. If the count exceeds 1,000 requests per five minutes, the rule action triggers. Requests that do not meet the criteria of both of the nested statements are not counted towards the rate limit and are not affected by this rule.\n\nYou cannot nest a `RateBasedStatement` inside another statement, for example inside a `NotStatement` or `OrStatement` . You can define a `RateBasedStatement` inside a web ACL and inside a rule group.", "RegexMatchStatement": "A rule statement used to search web request components for a match against a single regular expression.", "RegexPatternSetReferenceStatement": "A rule statement used to search web request components for matches with regular expressions. To use this, create a `RegexPatternSet` that specifies the expressions that you want to detect, then use the ARN of that set in this statement. A web request matches the pattern set rule statement if the request component matches any of the patterns in the set.\n\nEach regex pattern set rule statement references a regex pattern set. You create and maintain the set independent of your rules. This allows you to use the single set in multiple rules. When you update the referenced set, AWS WAF automatically updates all rules that reference it.", "RuleGroupReferenceStatement": "A rule statement used to run the rules that are defined in a `RuleGroup` . To use this, create a rule group with your rules, then provide the ARN of the rule group in this statement.\n\nYou cannot nest a `RuleGroupReferenceStatement` , for example for use inside a `NotStatement` or `OrStatement` . You can only use a rule group reference statement at the top level inside a web ACL.", - "SizeConstraintStatement": "A rule statement that compares a number of bytes against the size of a request component, using a comparison operator, such as greater than (>) or less than (<). For example, you can use a size constraint statement to look for query strings that are longer than 100 bytes.\n\nIf you configure AWS WAF to inspect the request body, AWS WAF inspects only the first 8192 bytes (8 KB). If the request body for your web requests never exceeds 8192 bytes, you can create a size constraint condition and block requests that have a request body greater than 8192 bytes.\n\nIf you choose URI for the value of Part of the request to filter on, the slash (/) in the URI counts as one character. For example, the URI `/logo.jpg` is nine characters long.", - "SqliMatchStatement": "Attackers sometimes insert malicious SQL code into web requests in an effort to extract data from your database. To allow or block web requests that appear to contain malicious SQL code, create one or more SQL injection match conditions. An SQL injection match condition identifies the part of web requests, such as the URI or the query string, that you want AWS WAF to inspect. Later in the process, when you create a web ACL, you specify whether to allow or block requests that appear to contain malicious SQL code.", - "XssMatchStatement": "A rule statement that defines a cross-site scripting (XSS) match search for AWS WAF to apply to web requests. XSS attacks are those where the attacker uses vulnerabilities in a benign website as a vehicle to inject malicious client-site scripts into other legitimate web browsers. The XSS match statement provides the location in requests that you want AWS WAF to search and text transformations to use on the search area before AWS WAF searches for character sequences that are likely to be malicious strings." + "SizeConstraintStatement": "A rule statement that compares a number of bytes against the size of a request component, using a comparison operator, such as greater than (>) or less than (<). For example, you can use a size constraint statement to look for query strings that are longer than 100 bytes.\n\nIf you configure AWS WAF to inspect the request body, AWS WAF inspects only the first 8192 bytes (8 KB). If the request body for your web requests never exceeds 8192 bytes, you could use a size constraint statement to block requests that have a request body greater than 8192 bytes.\n\nIf you choose URI for the value of Part of the request to filter on, the slash (/) in the URI counts as one character. For example, the URI `/logo.jpg` is nine characters long.", + "SqliMatchStatement": "A rule statement that inspects for malicious SQL code. Attackers insert malicious SQL code into web requests to do things like modify your database or extract data from it.", + "XssMatchStatement": "A rule statement that inspects for cross-site scripting (XSS) attacks. In XSS attacks, the attacker uses vulnerabilities in a benign website as a vehicle to inject malicious client-site scripts into other legitimate web browsers." } }, "AWS::WAFv2::WebACL.TextTransformation": { @@ -43094,7 +43094,7 @@ }, "AWS::WAFv2::WebACL.XssMatchStatement": { "attributes": {}, - "description": "A rule statement that defines a cross-site scripting (XSS) match search for AWS WAF to apply to web requests. XSS attacks are those where the attacker uses vulnerabilities in a benign website as a vehicle to inject malicious client-site scripts into other legitimate web browsers. The XSS match statement provides the location in requests that you want AWS WAF to search and text transformations to use on the search area before AWS WAF searches for character sequences that are likely to be malicious strings.", + "description": "A rule statement that inspects for cross-site scripting (XSS) attacks. In XSS attacks, the attacker uses vulnerabilities in a benign website as a vehicle to inject malicious client-site scripts into other legitimate web browsers.", "properties": { "FieldToMatch": "The part of the web request that you want AWS WAF to inspect.", "TextTransformations": "Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. If you specify one or more transformations in a rule statement, AWS WAF performs all transformations on the content of the request component identified by `FieldToMatch` , starting from the lowest priority setting, before inspecting the content for a match."