feat(core): customize bundling output packaging #13076

jogold · 2021-02-16T09:18:22Z

If the bundling output contains a single archive file (zip or jar), upload it
as-is to S3 without zipping it.

Allow to customize this behavior with bundling.packaging:

ALWAYS_ZIP: The bundling output will always be zipped and uploaded to S3.
NEVER_ZIP: The bundling output will not be zipped. Bundling will fail if
the bundling output doesn't contain a single file.
AUTO: If the bundling output contains a single archive file (zip or jar) it
will not be zipped. Otherwise it will be zipped.

Closes #10776
Closes #12651

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

gitpod-io · 2021-02-16T09:18:24Z

jogold · 2021-02-16T15:45:42Z

@eladb if you're going to take this one, this is ready for review.

eladb

@rix0rrr take a look also please.

packages/@aws-cdk/aws-s3-assets/README.md

packages/@aws-cdk/core/lib/asset-staging.ts

packages/@aws-cdk/core/lib/bundling.ts

Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>

packages/@aws-cdk/aws-s3-assets/README.md

packages/@aws-cdk/core/lib/asset-staging.ts

packages/@aws-cdk/core/lib/bundling.ts

mergify · 2021-02-17T15:18:27Z

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).

Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>

Pull request has been modified.

Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>

eladb

Minor

packages/@aws-cdk/core/lib/bundling.ts

Pull request has been modified.

iliapolo · 2021-02-17T18:41:12Z

Nice, this also addresses #12651

mergify · 2021-02-17T18:47:56Z

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 · 2021-02-17T19:19:40Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
Commit ID: 14a0ad1
Result: SUCCEEDED
Build Logs (available for 30 days)

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

mergify · 2021-02-17T19:20:04Z

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).

If the bundling output contains a single archive file (zip or jar), upload it as-is to S3 without zipping it. Allow to customize this behavior with `bundling.packaging`: * `ALWAYS_ZIP`: The bundling output will always be zipped and uploaded to S3. * `NEVER_ZIP`: The bundling output will not be zipped. Bundling will fail if the bundling output doesn't contain a single file. * `AUTO`: If the bundling output contains a single archive file (zip or jar) it will not be zipped. Otherwise it will be zipped. Closes aws#10776 Closes aws#12651 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

NetaNir · 2021-02-19T05:18:11Z

Im fairly convinced this change is the root cause of #13131. The new code ignores already zipped files and tries to re zip them, which is throwing an error.

cc @jogold

NetaNir · 2021-02-19T05:28:34Z

Give the large impact Im going to revert this change and release a patch.

eladb · 2021-02-19T06:42:13Z

Please revert and we will look into it next week.

This commit reverts two recent changes to the asset system (#12258 and ##13076) which introduced a regression in 1.90.0. Fixes #13131

This commit reverts two recent changes to the asset system (#12258 and ##13076) which introduced a regression in 1.90.0. Fixes #13131 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

If the bundling output contains a single archive file (zip or jar), upload it as-is to S3 without zipping it. Allow to customize this behavior with `bundling.packaging`: * `ALWAYS_ZIP`: The bundling output will always be zipped and uploaded to S3. * `NEVER_ZIP`: The bundling output will not be zipped. Bundling will fail if the bundling output doesn't contain a single file. * `AUTO`: If the bundling output contains a single archive file (zip or jar) it will not be zipped. Otherwise it will be zipped. Closes #10776 Closes #12651 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

This commit reverts two recent changes to the asset system (#12258 and ##13076) which introduced a regression in 1.90.0. Fixes #13131 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

Redo of #13076 after #13131. The fix is [`7b3d829` (#13152)](7b3d829). If the bundling output contains a single archive file (zip or jar), upload it as-is to S3 without zipping it. Allow to customize this behavior with `bundling.outputType`: * `NOT_ARCHIVED`: The bundling output will always be zipped and uploaded to S3. * `ARCHIVED`: The bundling output will not be zipped. Bundling will fail if the bundling output doesn't contain a single archive file. * `AUTO_DISCOVER`: If the bundling output contains a single archive file (zip or jar) it will not be zipped. Otherwise it will be zipped. This is the default. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

feat(core): custom archive with bundling

cb9dba6

github-actions bot assigned rix0rrr Feb 16, 2021

github-actions bot added the @aws-cdk/core Related to core CDK functionality label Feb 16, 2021

jogold mentioned this pull request Feb 16, 2021

[lambda] lambda.Code.FromAsset Golang bundling permission denied at execution #10776

Closed

jogold added 3 commits February 16, 2021 14:30

BundlePackaging

0f45127

tests

7f25960

README

b445941

jogold changed the title ~~feat(core): custom archive with bundling~~ feat(core): customize bundling output packaging Feb 16, 2021

jogold and others added 2 commits February 16, 2021 16:37

JSDoc

a504e8b

Merge branch 'master' into single-archive

fc7d262

jogold marked this pull request as ready for review February 16, 2021 15:38

minor

2b0a1fe

eladb reviewed Feb 17, 2021

View reviewed changes

jogold and others added 4 commits February 17, 2021 09:50

Update packages/@aws-cdk/aws-s3-assets/README.md

10e4354

Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>

Update packages/@aws-cdk/aws-s3-assets/README.md

6586cbc

Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>

BundlingOutput

777a405

move to function

63f2ff8

jogold requested a review from eladb February 17, 2021 13:35

eladb previously approved these changes Feb 17, 2021

View reviewed changes

jogold and others added 2 commits February 17, 2021 16:27

Update packages/@aws-cdk/aws-s3-assets/README.md

823f417

Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>

Update packages/@aws-cdk/core/lib/bundling.ts

e6c60d1

Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>

jogold and others added 4 commits February 17, 2021 16:29

Update packages/@aws-cdk/core/lib/bundling.ts

576d76f

Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>

Update packages/@aws-cdk/core/lib/bundling.ts

617f4dc

Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>

refactor determineBundledAsset

e0828b2

JSDoc and README

65d4abb

eladb previously requested changes Feb 17, 2021

View reviewed changes

packages/@aws-cdk/core/lib/bundling.ts Outdated Show resolved Hide resolved

outputType

e9fb679

eladb previously approved these changes Feb 17, 2021

View reviewed changes

Merge branch 'master' into single-archive

aa59ce9

eladb approved these changes Feb 17, 2021

View reviewed changes

Merge branch 'master' into single-archive

14a0ad1

mergify bot merged commit 367a055 into aws:master Feb 17, 2021

jogold deleted the single-archive branch February 19, 2021 06:44

eladb pushed a commit that referenced this pull request Feb 19, 2021

fix: ENOTDIR invalid cwd on "cdk deploy"

4f02b45

This commit reverts two recent changes to the asset system (#12258 and ##13076) which introduced a regression in 1.90.0. Fixes #13131

eladb pushed a commit that referenced this pull request Feb 19, 2021

fix: ENOTDIR invalid cwd on "cdk deploy"

40b7932

This commit reverts two recent changes to the asset system (#12258 and ##13076) which introduced a regression in 1.90.0. Fixes #13131

eladb mentioned this pull request Feb 19, 2021

fix(core): ENOTDIR invalid cwd on "cdk deploy" #13145

Merged

jogold mentioned this pull request Feb 19, 2021

‼️ NOTICE: 'Error: ENOTDIR invalid cwd' on cdk deploy in 1.90.0 #13131

Closed

jogold restored the single-archive branch February 19, 2021 09:13

jogold mentioned this pull request Feb 19, 2021

feat(core): customize bundling output packaging #13152

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(core): customize bundling output packaging #13076

feat(core): customize bundling output packaging #13076

jogold commented Feb 16, 2021 •

edited by iliapolo

Loading

gitpod-io bot commented Feb 16, 2021 •

edited

Loading

jogold commented Feb 16, 2021

eladb left a comment

mergify bot commented Feb 17, 2021

eladb left a comment

iliapolo commented Feb 17, 2021

mergify bot commented Feb 17, 2021

aws-cdk-automation commented Feb 17, 2021

mergify bot commented Feb 17, 2021

NetaNir commented Feb 19, 2021

NetaNir commented Feb 19, 2021

eladb commented Feb 19, 2021

feat(core): customize bundling output packaging #13076

feat(core): customize bundling output packaging #13076

Conversation

jogold commented Feb 16, 2021 • edited by iliapolo Loading

gitpod-io bot commented Feb 16, 2021 • edited Loading

jogold commented Feb 16, 2021

eladb left a comment

Choose a reason for hiding this comment

mergify bot commented Feb 17, 2021

eladb left a comment

Choose a reason for hiding this comment

iliapolo commented Feb 17, 2021

mergify bot commented Feb 17, 2021

aws-cdk-automation commented Feb 17, 2021

AWS CodeBuild CI Report

mergify bot commented Feb 17, 2021

NetaNir commented Feb 19, 2021

NetaNir commented Feb 19, 2021

eladb commented Feb 19, 2021

jogold commented Feb 16, 2021 •

edited by iliapolo

Loading

gitpod-io bot commented Feb 16, 2021 •

edited

Loading