Merge branch 'master' into DaWyz/events-target-loggroup

.github/ISSUE_TEMPLATE.md

@@ -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 -->

.github/ISSUE_TEMPLATE/bug.md

@@ -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 -->
 
 
 

.github/ISSUE_TEMPLATE/feature-request.md

@@ -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
 -->
 
 

.github/ISSUE_TEMPLATE/general-issues.md

@@ -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 -->

.github/workflows/auto-approve-v2-merge-forward.yml

@@ -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 }}"

.github/workflows/closed-issue-message.yml

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

.gitignore

@@ -40,5 +40,8 @@ yarn-error.log
 # Parcel default cache directory
 .parcel-cache
 
+# VSCode history plugin
+.vscode/.history/
+
 # Cloud9
 .c9

.gitpod.yml

@@ -1,4 +1,10 @@
+github:
+  prebuilds:
+    pullRequestsFromForks: true
+    addComment: true
+
 image: jsii/superchain
+
 tasks:
   - init: yarn build --skip-test --no-bail --skip-prereqs --skip-compat
 

.mergify.yml

@@ -19,6 +19,7 @@ pull_request_rules:
         commit_message: title+body
     conditions:
       - base!=release
+      - -base~=^v2
       - -title~=(WIP|wip)
       - -label~=(blocked|do-not-merge|no-squash|two-approvers)
       - -merged
@@ -41,6 +42,7 @@ pull_request_rules:
         commit_message: title+body
     conditions:
       - base!=release
+      - -base~=^v2
       - -title~=(WIP|wip)
       - label~=two-approvers
       - -label~=(blocked|do-not-merge|no-squash)
@@ -64,6 +66,7 @@ pull_request_rules:
         strict_method: merge
         commit_message: title+body
     conditions:
+      - -base~=^v2
       - -title~=(WIP|wip)
       - -label~=(blocked|do-not-merge)
       # Only if no-squash is set
@@ -119,3 +122,21 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
+  - name: automatic merge of v2 forward merges
+    actions:
+      comment:
+        message: Forward merge successful!
+      merge:
+        method: merge
+        strict: smart+fasttrack
+        strict_method: merge
+        commit_message: title+body
+    conditions:
+      - base=v2-main
+      - label~=forward-merge
+      - -label~=(blocked|do-not-merge)
+      - -merged
+      - -closed
+      - author~=aws-cdk-automation
+      - "#approved-reviews-by>=1"
+      - status-success~=AWS CodeBuild us-east-1