Merge branch 'main' into dependabot/go_modules/packages/jsii/go-runti…

…me/jsii-runtime-go/github.com/mattn/go-isatty-0.0.20

.github/workflows/docker-images.yml

@@ -22,16 +22,16 @@ jobs:
       fail-fast: false
       matrix:
         debian:
-          - 'buster'   # 10
-        node: ['16', '18', '20']
+          - 'buster' # 10
+        node: ['18', '20']
         include:
           - debian: 'bullseye' # 11
             node: '20'
           - debian: 'bookworm' #12
             node: '20'
     env:
       # Node version whose images will be aliased without the -nodeXX segment
-      DEFAULT_NODE_MAJOR_VERSION: 16
+      DEFAULT_NODE_MAJOR_VERSION: 18
     steps:
       - name: Check out
         uses: actions/checkout@v4
@@ -83,7 +83,7 @@ jobs:
       # Federate into the PR Validation AWS Account
       - name: Federate into AWS
         if: steps.should-run.outputs.result == 'true' && steps.federate_to_aws.outputs.enabled == 'true'
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: us-east-1
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
@@ -108,14 +108,14 @@ jobs:
         shell: bash
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64
 
       - name: Set up docker buildx
         id: buildx
         if: steps.should-run.outputs.result == 'true'
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           # Disable parallelism because IO contention makes it too slow on GitHub
           # workers...
@@ -168,14 +168,14 @@ jobs:
       # Re-authenticate to ECR Public, this time with image-push permissions
       - name: Federate with AWS role for ECR Public push
         if: steps.should-run.outputs.result == 'true' && github.event_name == 'push' && (github.ref == 'refs/heads/release' || github.ref == 'refs/heads/main')
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: us-east-1
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_FOR_ECR_PUBLIC_PUSH }}
           role-session-name: GHA_aws-jsii_docker-images-PUSH
       - name: Authenticate with ECR Public for Push
         if: steps.should-run.outputs.result == 'true' && github.event_name == 'push' && (github.ref == 'refs/heads/release' || github.ref == 'refs/heads/main')
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
         with:
           registry-type: public
 

.github/workflows/main.yml

@@ -42,11 +42,11 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '8'
-      - name: Set up Node 16
-        uses: actions/setup-node@v3
+      - name: Set up Node 18
+        uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: '16'
+          node-version: '18'
       - name: Set up Python 3.7
         uses: actions/setup-python@v4
         with:
@@ -125,11 +125,11 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '8'
-      - name: Set up Node 16
-        uses: actions/setup-node@v3
+      - name: Set up Node 18
+        uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: '16'
+          node-version: '18'
       - name: Set up Python 3.7
         uses: actions/setup-python@v4
         with:
@@ -195,35 +195,28 @@ jobs:
         dotnet: ['6.0.x']
         go: ['1.18']
         java: ['8']
-        node: ['16'] # EOL 2023-09-11
+        node: ['18'] # EOL 2025-04-30
         os: [ubuntu-latest]
         python: ['3.7']
-        # Add specific combinations to be tested against "node 14" (to restrict cardinality)
+        # Add specific combinations to be tested against (to restrict cardinality)
         include:
           # Test using Windows
           - title: 'Windows'
             os: windows-latest
             dotnet: '6.0.x'
             go: '1.18'
             java: '8'
-            node: '16'
+            node: '18'
             python: '3.7'
           # Test using macOS
           - title: 'macOS'
             os: macos-latest
             dotnet: '6.0.x'
             go: '1.18'
             java: '8'
-            node: '16'
+            node: '18'
             python: '3.7'
           # Test alternate Nodes
-          - title: 'Node 16'
-            java: '8'
-            dotnet: '6.0.x'
-            go: '1.18'
-            node: '16' # EOL 2023-09-11
-            os: ubuntu-latest
-            python: '3.7'
           - title: 'Node 18'
             java: '8'
             dotnet: '6.0.x'
@@ -243,23 +236,23 @@ jobs:
             java: '8'
             dotnet: '7.0.x'
             go: '1.18'
-            node: '16'
+            node: '18'
             os: ubuntu-latest
             python: '3.7'
           # Test alternate Gos
           - title: 'Go 1.19'
             java: '8'
             dotnet: '6.0.x'
             go: '1.19'
-            node: '16'
+            node: '18'
             os: ubuntu-latest
             python: '3.7'
           # Test alternate Javas
           - title: 'Java 11'
             java: '11'
             dotnet: '6.0.x'
             go: '1.18'
-            node: '16'
+            node: '18'
             os: ubuntu-latest
             python: '3.7'
           # Test alternate Pythons
@@ -268,28 +261,28 @@ jobs:
             dotnet: '6.0.x'
             go: '1.18'
             java: '8'
-            node: '16'
+            node: '18'
             os: ubuntu-latest
           - title: 'Python 3.9'
             python: '3.9'
             dotnet: '6.0.x'
             go: '1.18'
             java: '8'
-            node: '16'
+            node: '18'
             os: ubuntu-latest
           - title: 'Python 3.10'
             python: '3.10'
             dotnet: '6.0.x'
             go: '1.18'
             java: '8'
-            node: '16'
+            node: '18'
             os: ubuntu-latest
           - title: 'Python 3.11'
             python: '3.11'
             dotnet: '6.0.x'
             go: '1.18'
             java: '8'
-            node: '16'
+            node: '18'
             os: ubuntu-latest
 
     runs-on: ${{ matrix.os }}
@@ -322,7 +315,7 @@ jobs:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
       - name: Set up Node ${{ matrix.node }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: yarn
           node-version: ${{ matrix.node }}
@@ -397,7 +390,7 @@ jobs:
 
           rm built-tree.tgz
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: yarn
           node-version: '18'
@@ -452,7 +445,7 @@ jobs:
           distribution: 'corretto'
           java-version: '20'
       - name: Set up Node 20
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '20'
       - name: Set up Python 3.11
@@ -479,4 +472,3 @@ jobs:
         with:
           name: integtest_aws-cdk-lib
           path: ./node_modules/aws-cdk-lib/dist/
-

.github/workflows/yarn-upgrade.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: yarn
           node-version: 16

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.91.0](https://github.com/aws/jsii/compare/v1.90.0...v1.91.0) (2023-10-24)
+
 ## [1.90.0](https://github.com/aws/jsii/compare/v1.89.0...v1.90.0) (2023-10-06)
 
 ## [1.89.0](https://github.com/aws/jsii/compare/v1.88.0...v1.89.0) (2023-09-20)

gh-pages/mkdocs.yml

@@ -58,8 +58,8 @@ markdown_extensions:
   - pymdownx.superfences
   - pymdownx.tabbed
   - pymdownx.emoji:
-      emoji_index: !!python/name:materialx.emoji.twemoji
-      emoji_generator: !!python/name:materialx.emoji.to_svg
+      emoji_index: !!python/name:material.extensions.emoji.twemoji
+      emoji_generator: !!python/name:material.extensions.emoji.to_svg
 
 plugins:
   - awesome-pages:

gh-pages/requirements-dev.txt

@@ -1,4 +1,4 @@
 mkdocs~=1.5.3
 mkdocs-awesome-pages-plugin~=2.9.2
-mkdocs-material~=9.4.6
+mkdocs-material~=9.4.8
 mkdocs-git-revision-date-plugin~=0.3.2

lerna.json

@@ -12,6 +12,6 @@
       "rejectCycles": true
     }
   },
-  "version": "1.90.0",
+  "version": "1.91.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

packages/@jsii/Directory.Build.targets

@@ -12,7 +12,7 @@
 
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Update="NSubstitute" Version="5.1.0" />
-    <PackageReference Update="xunit" Version="2.5.2" />
+    <PackageReference Update="xunit" Version="2.6.1" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.5.3" />
     <PackageReference Update="XunitXml.TestLogger" Version="3.1.17" />
 

packages/@jsii/check-node/src/constants.ts

@@ -35,9 +35,6 @@ export class NodeRelease {
       endOfLife: new Date('2022-04-30'),
       supportedRange: '^12.7.0',
     }),
-    new NodeRelease(19, { endOfLife: new Date('2023-06-01') }),
-
-    // Currently active releases (as of last edit to this file...)
     new NodeRelease(16, {
       endOfLife: new Date('2023-09-11'),
       supportedRange: '^16.3.0',
@@ -46,8 +43,12 @@ export class NodeRelease {
       endOfLife: new Date('2022-06-01'),
       supportedRange: '^17.3.0',
     }),
+    new NodeRelease(19, { endOfLife: new Date('2023-06-01') }),
+
+    // Currently active releases (as of last edit to this file...)
     new NodeRelease(18, { endOfLife: new Date('2025-04-30') }),
     new NodeRelease(20, { endOfLife: new Date('2026-04-30') }),
+    new NodeRelease(21, { endOfLife: new Date('2024-06-01') }),
 
     // Future (planned releases)
   ];

packages/@jsii/check-node/src/index.test.ts

@@ -11,7 +11,7 @@ test('tested node releases are correctly registered & supported', () => {
 
 // This test is there to ensure house-keeping happens when it should. If we are
 // testing a given node release, it must not have been EOL for over 60 days.
-test(`tested node release (${process.version}) has not ben EOL for more than 60 days`, () => {
+test(`tested node release (${process.version}) has not been EOL for more than 60 days`, () => {
   const { nodeRelease } = NodeRelease.forThisRuntime();
   expect(nodeRelease?.endOfLifeDate?.getTime()).toBeGreaterThan(
     Date.now() - 60 * 86_400_000,

packages/@jsii/check-node/src/index.ts

@@ -22,12 +22,13 @@ export function checkNode(envPrefix = 'JSII'): void {
 
   if (nodeRelease?.endOfLife) {
     const silenceVariable = `${envPrefix}_SILENCE_WARNING_END_OF_LIFE_NODE_VERSION`;
-    const acknowledgeNodeEol =
-      'Node14 is now end of life (EOL) as of April 30, 2023. Support of EOL runtimes are only guaranteed for 30 days after EOL. By silencing this warning you acknowledge that you are using an EOL version of Node and will upgrade to a supported version as soon as possible.';
+    const silencedVersions = (process.env[silenceVariable] ?? '')
+      .split(',')
+      .map((v) => v.trim());
     const qualifier = nodeRelease.endOfLifeDate
       ? ` on ${nodeRelease.endOfLifeDate.toISOString().slice(0, 10)}`
       : '';
-    if (!(process.env[silenceVariable] === acknowledgeNodeEol))
+    if (!silencedVersions.includes(nodeRelease.majorVersion.toString()))
       veryVisibleMessage(
         bgRed.white.bold,
         `Node ${nodeRelease.majorVersion} has reached end-of-life${qualifier} and is not supported.`,

packages/@jsii/go-runtime-test/project/go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
-	golang.org/x/tools v0.14.0
+	golang.org/x/tools v0.15.0
 )
 
 require (
@@ -21,8 +21,8 @@ require (
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/yuin/goldmark v1.4.13 // indirect
-	golang.org/x/mod v0.13.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

packages/@jsii/go-runtime-test/project/go.sum

@@ -28,12 +28,15 @@ golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
 golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
 golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
 golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -50,6 +53,8 @@ golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
@@ -64,6 +69,8 @@ golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
 golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
+golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=