Skip to content

Commit

Permalink
Merge branch 'main' into awsgh-28854
Browse files Browse the repository at this point in the history
  • Loading branch information
msambol authored Feb 6, 2024
2 parents 803d98a + 0f077c0 commit 630b3b0
Show file tree
Hide file tree
Showing 414 changed files with 9,703 additions and 7,964 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
permissions:
pull-requests: write
steps:
- uses: hmarr/auto-approve-action@v3.2.1
- uses: hmarr/auto-approve-action@v4.0.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/spec-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
path: ${{ runner.temp }}

- name: Make Pull Request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
# Git commit details
branch: automation/spec-update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
CONTRIB_OUTPUT_FILE: 'CONTRIBUTORS.md'
CONTRIB_IGNORE: 'github-actions[bot],mergify[bot],dependabot[bot],dependabot-preview[bot],aws-cdk-automation'
- name: Create a PR
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
# Git commit details
branch: automation/update-contributors
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-metadata-regions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
run: '[ -s ${{ runner.temp }}/update-spec.patch ] && git apply ${{ runner.temp }}/update-spec.patch || echo "Empty patch. Skipping."'

- name: Make Pull Request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
# Git commit details
branch: automation/region-update
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
}}/upgrade.patch || echo "Empty patch. Skipping."'

- name: Make Pull Request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
# Git commit details
branch: automation/yarn-upgrade
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk-testing/cli-integ/bin/stage-distribution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ async function main() {
}

async function validateDirectory(args: {
DIRECTORY: string,
DIRECTORY: string;
}) {
if (!await fs.pathExists(path.join(args.DIRECTORY, 'build.json'))) {
throw new Error(`${args.DIRECTORY} does not look like a CDK dist directory (build.json missing)`);
Expand Down Expand Up @@ -191,7 +191,7 @@ async function doLogin(repo: TestRepository, usageDir: UsageDir, args: {
}

async function publish(repo: TestRepository, usageDir: UsageDir, args: {
DIRECTORY: string,
DIRECTORY: string;
npm?: boolean;
python?: boolean;
java?: boolean;
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk-testing/cli-integ/lib/github.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { Octokit } from '@octokit/rest';
import * as semver from 'semver';

export async function fetchPreviousVersion(token: string, options?: {
priorTo?: string,
majorVersion?: string,
priorTo?: string;
majorVersion?: string;
}) {
const github = new Octokit({ auth: token });
const releases = await github.repos.listReleases({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,10 @@ export class TestRepository {
}

private async ensureRepository(name: string, options?: {
readonly description?: string,
readonly external?: string,
readonly upstreams?: string[],
readonly tags?: Record<string, string>,
readonly description?: string;
readonly external?: string;
readonly upstreams?: string[];
readonly tags?: Record<string, string>;
}) {
if (await this.repositoryExists(name)) { return; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ integTest('enableDiffNoFail', withDefaultFixture(async (fixture) => {
await fs.writeFile(path.join(fixture.integTestDir, 'cdk.json'), JSON.stringify(cdkJson));
}

type DiffParameters = { fail?: boolean, enableDiffNoFail: boolean };
type DiffParameters = { fail?: boolean; enableDiffNoFail: boolean };
}));

integTest('cdk diff --fail on multiple stacks exits with error if any of the stacks contains a diff', withDefaultFixture(async (fixture) => {
Expand Down

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"/691ad79f315c75c071d70876e6f5d46133743719c69836008839c2a30161b602.json"
"/385dc21acc91cd5566b3916587aa87a7acdda4c4a907a53e9c7bf25a117e817a.json"
]
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "c014eecccbb25b3f9b2930f62990f5a373bb117a6c78807df15d78a5ac33e9cd.zip"
"S3Key": "f6b251c5210167bd7ded2b4d904eed879427f3c53b8bdda0eb09eaa49c6d1db9.zip"
},
"Description": "AWS CDK resource provider framework - onEvent (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)",
"Environment": {
Expand Down Expand Up @@ -441,7 +441,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "c014eecccbb25b3f9b2930f62990f5a373bb117a6c78807df15d78a5ac33e9cd.zip"
"S3Key": "f6b251c5210167bd7ded2b4d904eed879427f3c53b8bdda0eb09eaa49c6d1db9.zip"
},
"Description": "AWS CDK resource provider framework - isComplete (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)",
"Environment": {
Expand Down Expand Up @@ -575,7 +575,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "c014eecccbb25b3f9b2930f62990f5a373bb117a6c78807df15d78a5ac33e9cd.zip"
"S3Key": "f6b251c5210167bd7ded2b4d904eed879427f3c53b8bdda0eb09eaa49c6d1db9.zip"
},
"Description": "AWS CDK resource provider framework - onTimeout (aws-cdk-dynamodb-global-replicas-provisioned/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)",
"Environment": {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
{
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1"
},
"/ec491a7cde45cb63a6fa419b5bc45469c1ef80e3406132b6fc92237e4f5ece32.json"
"/9c540b1a44a6cb4b42c3c40239f3a9ee6605bf50563a292e91dec5245c15ff04.json"
]
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1"
},
"S3Key": "c014eecccbb25b3f9b2930f62990f5a373bb117a6c78807df15d78a5ac33e9cd.zip"
"S3Key": "f6b251c5210167bd7ded2b4d904eed879427f3c53b8bdda0eb09eaa49c6d1db9.zip"
},
"Description": "AWS CDK resource provider framework - onEvent (cdk-dynamodb-global-20191121/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)",
"Environment": {
Expand Down Expand Up @@ -437,7 +437,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1"
},
"S3Key": "c014eecccbb25b3f9b2930f62990f5a373bb117a6c78807df15d78a5ac33e9cd.zip"
"S3Key": "f6b251c5210167bd7ded2b4d904eed879427f3c53b8bdda0eb09eaa49c6d1db9.zip"
},
"Description": "AWS CDK resource provider framework - isComplete (cdk-dynamodb-global-20191121/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)",
"Environment": {
Expand Down Expand Up @@ -571,7 +571,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-eu-west-1"
},
"S3Key": "c014eecccbb25b3f9b2930f62990f5a373bb117a6c78807df15d78a5ac33e9cd.zip"
"S3Key": "f6b251c5210167bd7ded2b4d904eed879427f3c53b8bdda0eb09eaa49c6d1db9.zip"
},
"Description": "AWS CDK resource provider framework - onTimeout (cdk-dynamodb-global-20191121/@aws-cdk--aws-dynamodb.ReplicaProvider/Provider)",
"Environment": {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ class ProducerStack extends Stack {
}

export interface consumerDeployProps extends StackProps {
stringListGetAtt: string[],
stringListRef: CfnParameter,
manualStringList: string[]
stringListGetAtt: string[];
stringListRef: CfnParameter;
manualStringList: string[];
}

class ConsumerStack extends Stack {
Expand Down
Loading

0 comments on commit 630b3b0

Please sign in to comment.