fix(assets): parallel docker image publishing fails on macOS

[misterjoshua]

Changes container image publishing so that publishing doesn't re-run docker logins for the same repository and so logins are run one at a time.

Fixes #20116

---

All Submissions:

• Have you followed the guidelines in our Contributing guide?

Adding new Unconventional Dependencies:

• This PR adds new unconventional dependencies following the process described here

New Features

• Have you added the new feature to an integration test?
  • 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

[gitpod-io]

[mitchlloyd]

I'd like to help by testing against my app since I can consistently get a failure with the current version of CDK. However, I'm having a heck of a time trying to test against the CDK source. I ran

scripts/foreach.sh yarn install --frozen-lockfile
scripts/foreach.sh yarn build
# from my project root
../../aws/aws-cdk/link-all.sh

But then I'm getting stuck with the fact that the built aws-cdk-lib requires a peerDependency on constructs 3.x while my app (and current CDK version) is using 10.x. Attempting to downgrade to 3.x in my app doesn't seem to be working as Construct has no public methods. Attempting to upgrade to 10.x in the cdk libraries doesn't seem to work because I end up with type conflicts between <my-project>/node_modules/aws-cdk-lib/core/lib/construct-compat).IConstruct and <my-project>/node_modules/constructs/lib/construct").IConstruct.

Any idea how to work around this 3.x/10.x mismatch?

[misterjoshua]

I'd like to help by testing against my app since I can consistently get a failure with the current version of CDK. However, I'm having a heck of a time trying to test against the CDK source. I ran

scripts/foreach.sh yarn install --frozen-lockfile
scripts/foreach.sh yarn build
# from my project root
../../aws/aws-cdk/link-all.sh

But then I'm getting stuck with the fact that the built aws-cdk-lib requires a peerDependency on constructs 3.x while my app (and current CDK version) is using 10.x. Attempting to downgrade to 3.x in my app doesn't seem to be working as Construct has no public methods. Attempting to upgrade to 10.x in the cdk libraries doesn't seem to work because I end up with type conflicts between <my-project>/node_modules/aws-cdk-lib/core/lib/construct-compat).IConstruct and <my-project>/node_modules/constructs/lib/construct").IConstruct.

Any idea how to work around this 3.x/10.x mismatch?

I usually go like this to link cdk:

yarn --immutable
cd packages/aws-cdk
../../scripts/buildup
yarn link

Then in my project I just type yarn link aws-cdk. After this, you can go yarn cdk --version in your project and it should show version 0.0.0.

[mitchlloyd]

Thanks for the detail instructions @misterjoshua. Relying on yarn link worked a lot better than what I was digging up from the internal CDK documentation.

I can confirm that this fixes the issue I saw in my application when I switch to the aws-cdk library from this PR.

---

I updated to 2.21.1 and added a dummy COPY command in 2 of my Docker files to bust the cache and get all new ECS task definitions.

I got this error:

[66%] fail: docker login --username <redacted> --password-stdin <redacted> exited with error code 1: Error saving credentials: error storing credentials - err: exit status 1, out: `error storing credentials - err: exit status 1, out: `The specified item already exists in the keychain.``

Checkout fix-multi-login branch and run

yarn --immutable
cd packages/aws-cdk
../../scripts/buildup
yarn link

In my project

yarn link aws-cdk
yarn cdk --version # => 0.0.0 (build f3fd3d3)

Then my CDK deployment worked as expected.

[misterjoshua]

@pahud Hey. This PR could use a little review. Are you still running that community reviewer program?

[brianfrantz]

@misterjoshua @mitchlloyd Sorry. Only today got to a place where I could test this. Running cdk from this branch worked as expected. Running cdk version 2.23.0 (build 50444aa) still returns "The specified item already exists in the keychain."

Best I can tell, this fix will solve our issue.

[rix0rrr]

Couldn't this be return res ? What's the value of the added then ?

[misterjoshua]

Good spotting this. I've removed it - it was a leftover from some hand testing I was doing.

[misterjoshua]

@rix0rrr I've made the change you suggested to the critical section function. Please let me know if you'd like any more changes to this PR. Thanks

[rix0rrr]

Looks good, thanks for addressing this!

[mergify]

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

[aws-cdk-automation]

AWS CodeBuild CI Report

• CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
• Commit ID: 4d3f234
• Result: SUCCEEDED
• Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

[mergify]

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).