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: integration test for appsync apikey auth fails with out of bound API key expiration (backport #21198) #21204

Merged
merged 2 commits into from
Jul 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 18, 2022

This is an automatic backport of pull request #21198 done by Mergify.
Cherry-pick of 37a44d7 has failed:

On branch mergify/bp/v1-main/pr-21198
Your branch is up to date with 'origin/v1-main'.

You are currently cherry-picking commit 37a44d7a86.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   packages/@aws-cdk/aws-appsync/test/auth-apikey.integ.snapshot/aws-appsync-integ.template.json
	modified:   packages/@aws-cdk/aws-appsync/test/auth-apikey.integ.snapshot/cdk.out
	modified:   packages/@aws-cdk/aws-appsync/test/auth-apikey.integ.snapshot/manifest.json
	modified:   packages/@aws-cdk/aws-appsync/test/integ.auth-apikey.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   packages/@aws-cdk/aws-appsync/test/auth-apikey.integ.snapshot/aws-appsync-integ.assets.json
	both modified:   packages/@aws-cdk/aws-appsync/test/auth-apikey.integ.snapshot/tree.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

… API key expiration (#21198)

The test case used an explicit expiration date, causing all PR builds to fail.
Changing this to a dynamic duration so we don't have to update this in future.

----

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)?
	* [ ] 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*

(cherry picked from commit 37a44d7)

# Conflicts:
#	packages/@aws-cdk/aws-appsync/test/auth-apikey.integ.snapshot/aws-appsync-integ.assets.json
#	packages/@aws-cdk/aws-appsync/test/auth-apikey.integ.snapshot/tree.json
@gitpod-io
Copy link

gitpod-io bot commented Jul 18, 2022

@github-actions github-actions bot added the p2 label Jul 18, 2022
@aws-cdk-automation aws-cdk-automation requested a review from a team July 18, 2022 14:27
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

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

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

@mergify
Copy link
Contributor Author

mergify bot commented Jul 18, 2022

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

@mergify mergify bot merged commit 0134d87 into v1-main Jul 18, 2022
@mergify mergify bot deleted the mergify/bp/v1-main/pr-21198 branch July 18, 2022 16:46
@HBobertz HBobertz mentioned this pull request Nov 10, 2022
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants