Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(s3): allow empty string as keyPrefixEquals #26243

Merged
merged 6 commits into from
Jul 17, 2023
Merged

Conversation

dbartholomae
Copy link
Contributor

Closes #26242 .


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

@gitpod-io
Copy link

gitpod-io bot commented Jul 5, 2023

@aws-cdk-automation aws-cdk-automation requested a review from a team July 5, 2023 12:42
@github-actions github-actions bot added repeat-contributor [Pilot] contributed between 3-5 PRs to the CDK bug This issue is a bug. p2 labels Jul 5, 2023
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

@dbartholomae dbartholomae changed the title Allow empty string as keyPrefixEquals feat: allow empty string as keyPrefixEquals Jul 5, 2023
@github-actions github-actions bot added the effort/small Small work item – less than a day of effort label Jul 5, 2023
@dbartholomae dbartholomae changed the title feat: allow empty string as keyPrefixEquals fix: allow empty string as keyPrefixEquals Jul 5, 2023
@mrgrain
Copy link
Contributor

mrgrain commented Jul 6, 2023

Looks good. I'll run the integ test soon.

@mrgrain mrgrain self-assigned this Jul 7, 2023
@mrgrain
Copy link
Contributor

mrgrain commented Jul 10, 2023

@dbartholomae
For some reason I can't push to your branch, so here's a patch file.

0001-integ-test.patch

@dbartholomae
Copy link
Contributor Author

Thanks! Not sure why you couldn't push, the checkmark to allow edits is set.

@aws-cdk-automation aws-cdk-automation dismissed their stale review July 11, 2023 16:37

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@mrgrain
Copy link
Contributor

mrgrain commented Jul 11, 2023

Thanks! Not sure why you couldn't push, the checkmark to allow edits is set.

Yeah this might be an issue on my end. Not that I have figured it out yet. Anecdotally I can push to other forks...

@mrgrain
Copy link
Contributor

mrgrain commented Jul 11, 2023

Something else is failing on the PR now btw!

@dbartholomae
Copy link
Contributor Author

Seems like an integration test for lambda-python-alpha is failing. While it could potentially be related to the PR, as lambda assets are deployed via S3 buckets, I don't really see how it could be. Here's the error:

@aws-cdk/aws-lambda-python-alpha: ERROR: failed to solve: process "/bin/sh -c python -m venv /usr/app/venv &&     mkdir /tmp/pip-cache &&     chmod -R 777 /tmp/pip-cache &&     pip install --upgrade pip &&     mkdir /tmp/poetry-cache &&     chmod -R 777 /tmp/poetry-cache &&     pip install pipenv==2022.4.8 poetry &&     rm -rf /tmp/pip-cache/* /tmp/poetry-cache/*" did not complete successfully: exit code: 4294967295
@aws-cdk/aws-lambda-python-alpha: /codebuild/output/src612331878/src/github.com/aws/aws-cdk/packages/aws-cdk-lib/core/lib/private/asset-staging.js:187
@aws-cdk/aws-lambda-python-alpha:         throw new Error([
@aws-cdk/aws-lambda-python-alpha:         ^
@aws-cdk/aws-lambda-python-alpha: Error: docker exited with status 1
@aws-cdk/aws-lambda-python-alpha: --> Command: docker build -t cdk-10b67f2b3e1cb903b12b787ccfc006d1aae3850584e656bf5624e7ccc49f810c --platform "linux/amd64" --build-arg "IMAGE=public.ecr.aws/sam/build-python3.8" "/codebuild/output/src612331878/src/github.com/aws/aws-cdk/packages/@aws-cdk/aws-lambda-python-alpha/lib"
@aws-cdk/aws-lambda-python-alpha:     at dockerExec (/codebuild/output/src612331878/src/github.com/aws/aws-cdk/packages/aws-cdk-lib/core/lib/private/asset-staging.js:187:15)
@aws-cdk/aws-lambda-python-alpha:     at Function.fromBuild (/codebuild/output/src612331878/src/github.com/aws/aws-cdk/packages/aws-cdk-lib/core/lib/bundling.js:221:40)
@aws-cdk/aws-lambda-python-alpha:     at new Bundling (/codebuild/output/src612331878/src/github.com/aws/aws-cdk/packages/@aws-cdk/aws-lambda-python-alpha/lib/bundling.js:39:50)
@aws-cdk/aws-lambda-python-alpha:     at Function.bundle (/codebuild/output/src612331878/src/github.com/aws/aws-cdk/packages/@aws-cdk/aws-lambda-python-alpha/lib/bundling.js:25:50)
@aws-cdk/aws-lambda-python-alpha:     at new PythonFunction (/codebuild/output/src612331878/src/github.com/aws/aws-cdk/packages/@aws-cdk/aws-lambda-python-alpha/lib/function.js:43:39)
@aws-cdk/aws-lambda-python-alpha:     at new TestStack (/codebuild/output/src612331878/src/github.com/aws/aws-cdk/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.function.sub.js:15:20)
@aws-cdk/aws-lambda-python-alpha:     at Object.<anonymous> (/codebuild/output/src612331878/src/github.com/aws/aws-cdk/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.function.sub.js:28:18)
@aws-cdk/aws-lambda-python-alpha:     at Module._compile (node:internal/modules/cjs/loader:1196:14)
@aws-cdk/aws-lambda-python-alpha:     at Object.Module._extensions..js (node:internal/modules/cjs/loader:1250:10)
@aws-cdk/aws-lambda-python-alpha:     at Module.load (node:internal/modules/cjs/loader:1074:32)
@aws-cdk/aws-lambda-python-alpha:   ERROR      integ.function.sub 33.438s
@aws-cdk/aws-lambda-python-alpha:       Command exited with status 1

@mrgrain I'll try to take this to your Contributor Office hours next week :)

@mrgrain
Copy link
Contributor

mrgrain commented Jul 14, 2023

It's unrelated, I'm investigating this at the moment. You can add an empty commit to force a re-run, or update from main.

@aws-cdk-automation aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Jul 14, 2023
@dbartholomae
Copy link
Contributor Author

Thanks, that worked!

@mrgrain mrgrain changed the title fix: allow empty string as keyPrefixEquals fix(s3): allow empty string as keyPrefixEquals Jul 17, 2023
@aws-cdk-automation aws-cdk-automation removed the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label Jul 17, 2023
@mergify
Copy link
Contributor

mergify bot commented Jul 17, 2023

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 4d5e791
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify mergify bot merged commit 9381880 into aws:main Jul 17, 2023
6 checks passed
@mergify
Copy link
Contributor

mergify bot commented Jul 17, 2023

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

colifran pushed a commit that referenced this pull request Jul 17, 2023
Closes #26242 .

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
bmoffatt pushed a commit to bmoffatt/aws-cdk that referenced this pull request Jul 29, 2023
Closes aws#26242 .

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue is a bug. effort/small Small work item – less than a day of effort p2 repeat-contributor [Pilot] contributed between 3-5 PRs to the CDK
Projects
None yet
Development

Successfully merging this pull request may close these issues.

s3: websiteRoutingRule doesn't allow empty keyPrefixEquals
3 participants