-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
324 changed files
with
47,851 additions
and
1,980 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| name: Sync repository from upstream | ||
| on: | ||
| workflow_dispatch: {} | ||
| schedule: | ||
| - cron: 5 2 * * * | ||
|
|
||
| env: | ||
| BRANCHES: main v2-release | ||
|
|
||
| jobs: | ||
|
|
||
| # Check for the presence of a PROJEN_GITHUB_TOKEN secret. | ||
| # | ||
| # This is expected to contain a personal access token of someone | ||
| # who pas permissions to bypass branch protection rules. | ||
| # | ||
| # If not present, we will use GitHub Actions Token permissions, | ||
| # but those are bound by branch protection rules. | ||
| check-secret: | ||
| # Don't run on the target repo itself, only forks | ||
| if: github.repository != 'aws/aws-cdk' | ||
|
|
||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Check for presence of PROJEN_GITHUB_TOKEN | ||
| id: check-secrets | ||
| run: | | ||
| if [ ! -z "${{ secrets.PROJEN_GITHUB_TOKEN }}" ]; then | ||
| echo "ok=true" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "ok=false" >> $GITHUB_OUTPUT | ||
| fi | ||
| outputs: | ||
| ok: ${{ steps.check-secrets.outputs.ok }} | ||
|
|
||
| sync-branch: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| needs: [check-secret] | ||
| steps: | ||
| - name: Checkout using User Token | ||
| if: needs.check-secret.outputs.ok == 'true' | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| token: ${{ secrets.PROJEN_GITHUB_TOKEN }} | ||
|
|
||
| - name: Checkout using GitHub Actions permissions | ||
| if: needs.check-secret.outputs.ok == 'false' | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Sync from aws/aws-cdk | ||
| run: |- | ||
| git remote add upstream https://github.com/aws/aws-cdk.git | ||
| git fetch upstream | ||
| for branch in $BRANCHES; do | ||
| git push origin --force refs/remotes/upstream/$branch:refs/heads/$branch | ||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
...nteg/test/aws-certificatemanager/test/integ.certificate-key-algorithm.js.snapshot/cdk.out
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
19 changes: 19 additions & 0 deletions
19
...emanager/test/integ.certificate-key-algorithm.js.snapshot/integ-key-algorithm.assets.json
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
98 changes: 98 additions & 0 deletions
98
...anager/test/integ.certificate-key-algorithm.js.snapshot/integ-key-algorithm.template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| { | ||
| "Resources": { | ||
| "ECprime256v1A2C983CE": { | ||
| "Type": "AWS::CertificateManager::Certificate", | ||
| "Properties": { | ||
| "DomainName": "*.example.com", | ||
| "DomainValidationOptions": [ | ||
| { | ||
| "DomainName": "*.example.com", | ||
| "HostedZoneId": "Z23ABC4XYZL05B" | ||
| } | ||
| ], | ||
| "KeyAlgorithm": "EC_prime256v1", | ||
| "Tags": [ | ||
| { | ||
| "Key": "Name", | ||
| "Value": "integ-key-algorithm/EC_prime256v1" | ||
| } | ||
| ], | ||
| "ValidationMethod": "DNS" | ||
| } | ||
| }, | ||
| "ECsecp384r16CA95ECC": { | ||
| "Type": "AWS::CertificateManager::Certificate", | ||
| "Properties": { | ||
| "DomainName": "*.example.com", | ||
| "DomainValidationOptions": [ | ||
| { | ||
| "DomainName": "*.example.com", | ||
| "HostedZoneId": "Z23ABC4XYZL05B" | ||
| } | ||
| ], | ||
| "KeyAlgorithm": "EC_secp384r1", | ||
| "Tags": [ | ||
| { | ||
| "Key": "Name", | ||
| "Value": "integ-key-algorithm/EC_secp384r1" | ||
| } | ||
| ], | ||
| "ValidationMethod": "DNS" | ||
| } | ||
| }, | ||
| "RSA2048CD164E12": { | ||
| "Type": "AWS::CertificateManager::Certificate", | ||
| "Properties": { | ||
| "DomainName": "*.example.com", | ||
| "DomainValidationOptions": [ | ||
| { | ||
| "DomainName": "*.example.com", | ||
| "HostedZoneId": "Z23ABC4XYZL05B" | ||
| } | ||
| ], | ||
| "KeyAlgorithm": "RSA_2048", | ||
| "Tags": [ | ||
| { | ||
| "Key": "Name", | ||
| "Value": "integ-key-algorithm/RSA_2048" | ||
| } | ||
| ], | ||
| "ValidationMethod": "DNS" | ||
| } | ||
| } | ||
| }, | ||
| "Parameters": { | ||
| "BootstrapVersion": { | ||
| "Type": "AWS::SSM::Parameter::Value<String>", | ||
| "Default": "/cdk-bootstrap/hnb659fds/version", | ||
| "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" | ||
| } | ||
| }, | ||
| "Rules": { | ||
| "CheckBootstrapVersion": { | ||
| "Assertions": [ | ||
| { | ||
| "Assert": { | ||
| "Fn::Not": [ | ||
| { | ||
| "Fn::Contains": [ | ||
| [ | ||
| "1", | ||
| "2", | ||
| "3", | ||
| "4", | ||
| "5" | ||
| ], | ||
| { | ||
| "Ref": "BootstrapVersion" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
...g/test/aws-certificatemanager/test/integ.certificate-key-algorithm.js.snapshot/integ.json
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
19 changes: 19 additions & 0 deletions
19
...ertificate-key-algorithm.js.snapshot/integtestDefaultTestDeployAssert24D5C536.assets.json
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
36 changes: 36 additions & 0 deletions
36
...tificate-key-algorithm.js.snapshot/integtestDefaultTestDeployAssert24D5C536.template.json
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.