feat: upgrade to cdk v2 #1074

corymhall · 2022-01-24T20:48:39Z

This PR upgrades delivlib to use CDK v2. It also migrates the tests to
use the assertions library.

BREAKING CHANGE: delivlib now requires cdk v2

re #1841

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

This PR upgrades delivlib to use CDK v2. It also migrates the tests to use the `assertions` library. BREAKING CHANGE: delivlib now requires cdk v2 re #1841

corymhall

Couple of explanations.

corymhall · 2022-01-24T20:52:55Z

lib/publishing.ts

@@ -161,7 +162,7 @@ export class PublishToNpmProject extends Construct implements IPublisher {
    const access = props.access ?? NpmAccess.PUBLIC;

    const shellable = new Shellable(this, 'Default', {
-      platform: new LinuxPlatform(cbuild.LinuxBuildImage.UBUNTU_14_04_NODEJS_10_1_0),
+      platform: new LinuxPlatform(cbuild.LinuxBuildImage.STANDARD_5_0),


Not sure if there are any unintended consequences of this update. STANDARD_5_0 has the tools (node/python, etc) installed already.

corymhall · 2022-01-24T20:55:22Z

lib/publishing/github/with-signing-key.sh

-        GPG_PASSPHRASE_FROM_STDIN="${GPG_PASSPHRASE_FROM_STDIN} --pinentry-mode loopback"
-    fi
-    export GPG_PASSPHRASE_FROM_STDIN
+    export GPG_PASSPHRASE_FROM_STDIN="--passphrase-fd 0 --pinentry-mode loopback"


I was getting the below error when running the integration tests and providing --pinentry-mode loopback fixed it. Not sure if it was just caused by differences between the build images or something else.

Running: /tmp/scriptdir/sign-files.sh /tmp/tmp.xdJbThDFY3/jsii-sample-1.5.9.zip Signing /tmp/tmp.xdJbThDFY3/jsii-sample-1.5.9.zip... gpg: signing failed: No such file or directory gpg: signing failed: No such file or directory

corymhall · 2022-01-24T20:56:33Z

lib/shellable.ts

@@ -258,7 +259,7 @@ export class Shellable extends Construct {
      path: props.scriptDirectory,
    });

-    this.outputArtifactName = `Artifact_${this.node.uniqueId}`;
+    this.outputArtifactName = `Artifact_${this.node.addr}`;


In our docs we say that node.addr is the replacement for node.uniqueId. See my other comment on the integration results for what effect his has.

corymhall · 2022-01-24T20:59:54Z

lib/__tests__/registry-sync/mirror-source.test.ts

-      const stack = new Stack();
+      const app = new App();
+      const stack = new Stack(app, 'Default', {
+        env: {


If we do not specify the environment now MirrorSource.fromDir will not be able to resolve the asset bucket name and line 226 (aws s3 cp s3:.* myrepository.zip) will contain a Token.

corymhall · 2022-01-24T21:00:25Z

lib/__tests__/registry-sync/mirror-source.test.ts

      const ecrRegistry = 'myregistry';
-      const source = MirrorSource.fromDirectory(path.join(__dirname, 'docker-asset'), 'myrepository');
+      const source = MirrorSource.fromDir(path.join(__dirname, 'docker-asset'), 'myrepository');


fromDirectory is deprecated.

corymhall · 2022-01-24T21:01:55Z

lib/__tests__/pipeline.test.ts

-            InputArtifacts: [{ Name: 'Artifact_TestStackPipelineSecondStep91726C11' }],
+          Match.objectLike({
+            ActionTypeId: { Category: 'Build', Owner: 'AWS', Provider: 'CodeBuild', Version: '1' },
+            InputArtifacts: [{ Name: 'Artifact_c81eddcbe9657bd312a728fb13df77bc09f9a519b4' }],


The artifact name change is what we get when we go from node.uniqueId => node.addr

corymhall · 2022-01-24T21:03:01Z

lib/__tests__/expected.yml

@@ -568,7 +234,7 @@ Resources:
                - Name: Artifact_Build_Build
              Name: TestHelloLinux
              OutputArtifacts:
-                - Name: Artifact_delivlibtestCodeCommitPipelineHelloLinux01786D9D
+                - Name: Artifact_c883e6647f907b1eb255846397acb348c18b48b3a2


The artifact name change is what we get when we go from node.uniqueId => node.addr

corymhall · 2022-01-24T21:04:14Z

lib/__tests__/chime-notifier.test.ts

-jest.mock('https');
-
-const mockHttpsWrite = jest.fn();
-(https as any).request = jest.fn((_url, _options, cb) => {


One of the dependency updates did not like (https as any)

corymhall · 2022-01-24T21:05:03Z

lib/__tests__/change-control-lambda/handler.test.ts

 jest.mock('../../change-control-lambda/disable-transition');
 jest.mock('../../change-control-lambda/time-window');

 const mockGetObject = jest.fn().mockName('AWS.S3.getObject');
-(AWS as any).S3 = jest.fn(() => ({ getObject: mockGetObject })).mockName('AWS.S3') as any;


One of the dependency updates did not like (AWS as any) so I updated the test.

corymhall · 2022-01-24T21:05:56Z

lib/__tests__/canary.test.ts

-              ],
-            ],
-          },
+          Value: '3d34b07ba871989d030649c646b3096ba7c78ca531897bcdb0670774d2f9d3e4.zip',


This is probably going to happen in aws-cdk when we start running tests for v2.

rix0rrr

I'm okay with it, but needs a major version bump

corymhall · 2022-01-27T16:44:58Z

I'm okay with it, but needs a major version bump

Shouldn't the major version bump happen automatically because of the BREAKING CHANGE?

github-actions · 2022-02-11T01:24:53Z

This pull request is now marked as stale because it hasn't seen activity for a while. Add a comment or it will be closed soon. If you wish to exclude this issue from being marked as stale, add the "backlog" label.

github-actions · 2022-02-13T01:25:20Z

Closing this pull request as it hasn't seen activity for a while. Please add a comment @mentioning a maintainer to reopen. If you wish to exclude this issue from being marked as stale, add the "backlog" label.

kaizencc · 2022-04-07T14:17:11Z

Whoops, this doesn't look like it should have gone stale. I agree the major version bump will happen automatically, because its a projen managed repo. I'm not exactly sure how projen does this, but I remember seeing somewhere that the BREAKING CHANGE tag has to happen at the end of the PR description. Not sure if that's a necessity or just convention.

@corymhall I'm happy to approve this if you take a quick look and make sure things are still up to snuff.

github-actions · 2022-04-22T01:30:46Z

This pull request is now marked as stale because it hasn't seen activity for a while. Add a comment or it will be closed soon. If you wish to exclude this issue from being marked as stale, add the "backlog" label.

corymhall added 6 commits January 24, 2022 15:10

feat: upgrade to cdk v2

d731127

This PR upgrades delivlib to use CDK v2. It also migrates the tests to use the `assertions` library. BREAKING CHANGE: delivlib now requires cdk v2 re #1841

removing some formatting diffs

384e051

pascal case custom resource properties

425c237

update projen version

df56a3f

gpg only works with --pinentry-mode lookback now

c5d657c

updating integration tests

3c74b9b

corymhall commented Jan 24, 2022

View reviewed changes

fixing integration results

5c1626b

corymhall requested a review from a team January 25, 2022 20:49

rix0rrr requested changes Jan 27, 2022

View reviewed changes

github-actions bot added the stale label Feb 11, 2022

github-actions bot closed this Feb 13, 2022

kaizencc reopened this Apr 7, 2022

kaizencc removed the stale label Apr 7, 2022

github-actions bot added the stale label Apr 22, 2022

Chriscbr removed the stale label Apr 22, 2022

rix0rrr approved these changes Apr 25, 2022

View reviewed changes

corymhall added 2 commits May 3, 2022 12:25

Merge remote-tracking branch 'upstream/main' into corymhall/v2

7661194

updating snapshot

8919216

mergify bot merged commit b252f01 into cdklabs:main May 3, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: upgrade to cdk v2 #1074

feat: upgrade to cdk v2 #1074

corymhall commented Jan 24, 2022

corymhall left a comment

corymhall Jan 24, 2022

corymhall Jan 24, 2022

corymhall Jan 24, 2022

corymhall Jan 24, 2022

corymhall Jan 24, 2022

corymhall Jan 24, 2022

corymhall Jan 24, 2022

corymhall Jan 24, 2022

corymhall Jan 24, 2022

corymhall Jan 24, 2022

rix0rrr left a comment

corymhall commented Jan 27, 2022

github-actions bot commented Feb 11, 2022

github-actions bot commented Feb 13, 2022

kaizencc commented Apr 7, 2022 •

edited

Loading

github-actions bot commented Apr 22, 2022

feat: upgrade to cdk v2 #1074

feat: upgrade to cdk v2 #1074

Conversation

corymhall commented Jan 24, 2022

corymhall left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rix0rrr left a comment

Choose a reason for hiding this comment

corymhall commented Jan 27, 2022

github-actions bot commented Feb 11, 2022

github-actions bot commented Feb 13, 2022

kaizencc commented Apr 7, 2022 • edited Loading

github-actions bot commented Apr 22, 2022

kaizencc commented Apr 7, 2022 •

edited

Loading