Merge branch 'main' into fix/cdk-import-template-path

packages/@aws-cdk-testing/cli-integ/lib/aws.ts

@@ -20,6 +20,7 @@ export class AwsClients {
  public readonly ecr: AwsCaller<AWS.ECR>;
  public readonly ecs: AwsCaller<AWS.ECS>;
  public readonly sso: AwsCaller<AWS.SSO>;
+ public readonly ssm: AwsCaller<AWS.SSM>;
  public readonly sns: AwsCaller<AWS.SNS>;
  public readonly iam: AwsCaller<AWS.IAM>;
  public readonly lambda: AwsCaller<AWS.Lambda>;
@@ -39,6 +40,7 @@ export class AwsClients {
  this.ecs = makeAwsCaller(AWS.ECS, this.config);
  this.sso = makeAwsCaller(AWS.SSO, this.config);
  this.sns = makeAwsCaller(AWS.SNS, this.config);
+ this.ssm = makeAwsCaller(AWS.SSM, this.config);
  this.iam = makeAwsCaller(AWS.IAM, this.config);
  this.lambda = makeAwsCaller(AWS.Lambda, this.config);
  this.sts = makeAwsCaller(AWS.STS, this.config);

packages/@aws-cdk-testing/cli-integ/resources/cdk-apps/app/app.js

@@ -126,6 +126,22 @@ class SsoInstanceAccessControlConfig extends Stack {
  }
 }
 
+class DiffFromChangeSetStack extends Stack {
+ constructor(scope, id) {
+ super(scope, id);
+
+ const queueNameFromParameter = ssm.StringParameter.valueForStringParameter(this, 'for-queue-name-defined-by-ssm-param');
+ new sqs.Queue(this, "DiffFromChangeSetQueue", {
+ queueName: queueNameFromParameter,
+ })
+
+ new ssm.StringParameter(this, 'DiffFromChangeSetSSMParam', {
+ parameterName: 'DiffFromChangeSetSSMParamName',
+ stringValue: queueNameFromParameter,
+ });
+ }
+}
+
 class ListMultipleDependentStack extends Stack {
  constructor(scope, id) {
  super(scope, id);
@@ -685,6 +701,8 @@ switch (stackSet) {
 
  const failed = new FailedStack(app, `${stackPrefix}-failed`)
 
+ new DiffFromChangeSetStack(app, `${stackPrefix}-queue-name-defined-by-ssm-param`)
+
  // A stack that depends on the failed stack -- used to test that '-e' does not deploy the failing stack
  const dependsOnFailed = new OutputsStack(app, `${stackPrefix}-depends-on-failed`);
  dependsOnFailed.addDependency(failed);

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

@@ -944,6 +944,50 @@ integTest('cdk diff --quiet does not print \'There were no differences\' message
  expect(diff).not.toContain('There were no differences');
 }));
 
+integTest('cdk diff picks up changes that are only present in changeset', withDefaultFixture(async (fixture) => {
+ // GIVEN
+ await fixture.aws.ssm('putParameter', {
+ Name: 'for-queue-name-defined-by-ssm-param',
+ Value: randomString(),
+ Type: 'String',
+ Overwrite: true,
+ });
+
+ try {
+ await fixture.cdkDeploy('queue-name-defined-by-ssm-param');
+
+ // WHEN
+ // We want to change the ssm value. Then the CFN changeset will detect that the queue will be changed upon deploy.
+ await fixture.aws.ssm('putParameter', {
+ Name: 'for-queue-name-defined-by-ssm-param',
+ Value: randomString(),
+ Type: 'String',
+ Overwrite: true,
+ });
+
+ const diff = await fixture.cdk(['diff', fixture.fullStackName('queue-name-defined-by-ssm-param')]);
+
+ // THEN
+ const normalizedPlainTextOutput = diff.replace(/\x1B\[[0-?]*[ -/]*[@-~]/g, '') // remove all color and formatting (bolding, italic, etc)
+ .replace(/ /g, '') // remove all spaces
+ .replace(/\n/g, '') // remove all new lines
+ .replace(/\d+/g, ''); // remove all digits
+
+ const normalizedExpectedOutput = `
+ Resources
+ [~] AWS::SQS::Queue DiffFromChangeSetQueue DiffFromChangeSetQueue06622C07 replace
+ └─ [~] QueueName (requires replacement)
+ [~] AWS::SSM::Parameter DiffFromChangeSetSSMParam DiffFromChangeSetSSMParam92A9A723
+ └─ [~] Value`
+ .replace(/ /g, '')
+ .replace(/\n/g, '')
+ .replace(/\d+/g, '');
+ expect(normalizedPlainTextOutput).toContain(normalizedExpectedOutput);
+ } finally {
+ await fixture.cdkDestroy('queue-name-defined-by-ssm-param');
+ }
+}));
+
 integTest('deploy stack with docker asset', withDefaultFixture(async (fixture) => {
  await fixture.cdkDeploy('docker');
 }));