Skip to content

Commit

Permalink
Merge branch 'master' into ecs-capacity-provider-l2
Browse files Browse the repository at this point in the history
  • Loading branch information
pahud authored Nov 3, 2020
2 parents 2b1cced + 29aa223 commit be38d99
Show file tree
Hide file tree
Showing 1,967 changed files with 129,087 additions and 35,727 deletions.
8 changes: 8 additions & 0 deletions .devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "Dev Container Definition - AWS CDK",
"image": "jsii/superchain",
"postCreateCommand": "yarn build --skip-test --no-bail --skip-prereqs --skip-compat",
"extensions": [
"[email protected]"
]
}
6 changes: 6 additions & 0 deletions .gitallowed
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ account: '012345678913'
# Account patterns used in the CHANGELOG
account: '123456789012'
123456789012

# The account ID's of public facing ECR images for App Mesh Envoy
# https://docs.aws.amazon.com/app-mesh/latest/userguide/envoy.html
account: '772975370895'
account: '856666278305'
account: '840364872350'
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ falling prey to the [X/Y problem][2]!


### Other information
<!-- e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc -->
<!-- e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc -->
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ What is the unexpected behavior you were seeing? If you got an error, paste it h

### Other

<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc -->
<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc -->



Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ labels: feature-request, needs-triage

<!--
e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix,
links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc
links for us to have context, eg. associated pull-request, stackoverflow, slack, etc
-->


Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/general-issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ falling prey to the [X/Y problem][2]!


### Other information
<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc -->
<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc -->
6 changes: 1 addition & 5 deletions .github/actions/prlinter/action.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: Pull Request Linter
description: Execute validation rules on GitHub Pull Requests
inputs:
check:
description: "Which check to execute. Choose one of: [MANDATORY_CHANGES]"
required: true
runs:
using: node12
main: index.js
main: index.js
14 changes: 1 addition & 13 deletions .github/actions/prlinter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,13 @@ const core = require('@actions/core');
const github = require('@actions/github');
const linter = require('prlint')

const checks = {
"MANDATORY_CHANGES": linter.mandatoryChanges
}

async function run() {
const number = github.context.issue.number;

try {

const checkType = core.getInput('check', {required: true});

const check = checks[checkType];

if (!check) {
throw new Error(`Unsupported check type '${checkType}'. Choose one of: ${Object.keys(checks)}`)
}
await linter.validatePr(number);

await check(number);

} catch (error) {

core.setFailed(error.message);
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/auto-approve-v2-merge-forward.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Automatically approve PRs that merge master forward to v2-main
#
# Only does approvals! mergify takes care of the actual merge.
name: Auto-approve forward merges onto v2-main
on:
pull_request:
types:
- labeled
- opened
- ready_for_review
- reopened
- synchronize
- unlabeled
- unlocked

jobs:
approve:
runs-on: ubuntu-latest
steps:
- uses: hmarr/[email protected]
if: >
github.event.pull_request.user.login == 'aws-cdk-automation'
&& github.event.pull_request.base.ref == 'v2-main'
&& contains(github.event.pull_request.labels.*.name, 'pr/forward-merge')
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
17 changes: 17 additions & 0 deletions .github/workflows/closed-issue-message.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Closed Issue Message
on:
issues:
types: [closed]
jobs:
auto_comment:
runs-on: ubuntu-latest
steps:
- uses: aws-actions/closed-issue-message@v1
with:
# These inputs are both required
repo-token: "${{ secrets.GITHUB_TOKEN }}"
message: |
### ⚠️COMMENT VISIBILITY WARNING⚠️
Comments on closed issues are hard for our team to see.
If you need more assistance, please either tag a team member or open a new issue that references this one.
If you wish to keep having a conversation with other community members under this issue feel free to do so.
Loading

0 comments on commit be38d99

Please sign in to comment.