Merge branch 'main' into michaelcummings12/chore-rds-postgres-16-3-su…

…pport

CHANGELOG.v2.alpha.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.142.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.142.0-alpha.0...v2.142.1-alpha.0) (2024-05-17)
+
 ## [2.142.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.141.0-alpha.0...v2.142.0-alpha.0) (2024-05-15)
 
 

CHANGELOG.v2.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.142.1](https://github.com/aws/aws-cdk/compare/v2.142.0...v2.142.1) (2024-05-17)
+
+
+### Reverts
+
+* fix(diff): properties from ChangeSet diff were ignored ([#30243](https://github.com/aws/aws-cdk/issues/30243)) ([3748472](https://github.com/aws/aws-cdk/commit/37484726f235013ec0e71cefb9e1fc35caf12e74))
+
 ## [2.142.0](https://github.com/aws/aws-cdk/compare/v2.141.0...v2.142.0) (2024-05-15)
 
 

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

@@ -20,7 +20,6 @@ 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>;
@@ -40,7 +39,6 @@ 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/package.json

@@ -30,12 +30,12 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-cdk/cdk-build-tools": "0.0.0",
-    "@aws-cdk/pkglint": "0.0.0",
+    "@types/semver": "^7.5.8",
+    "@types/yargs": "^15.0.19",
     "@types/fs-extra": "^9.0.13",
     "@types/glob": "^7.2.0",
     "@types/npm": "^7.19.3",
-    "@types/semver": "^7.5.8",
-    "@types/yargs": "^15.0.19"
+    "@aws-cdk/pkglint": "0.0.0"
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
@@ -72,4 +72,4 @@
   "publishConfig": {
     "tag": "latest"
   }
-}
+}

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

@@ -126,22 +126,6 @@ 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);
@@ -701,8 +685,6 @@ 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/resources/cli-regression-patches/v2.142.0/NOTES.md

@@ -0,0 +1 @@
+This patch brings the [fix](https://github.com/aws/aws-cdk/issues/30241) into the regression suite.

packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.142.0/skip-tests.txt

@@ -0,0 +1,4 @@
+# Skipping the test to fix issue https://github.com/aws/aws-cdk/issues/30241. 
+# cli-integ tests failing for the old tests with the new cli changes for diff stacks.
+
+cdk diff picks up changes that are only present in changeset

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

@@ -944,50 +944,6 @@ 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');
 }));