chore(release): 1.93.0 (#4367)

See [CHANGELOG](https://github.com/aws/jsii/blob/bump/1.93.0/CHANGELOG.md)
aws · Dec 8, 2023 · 1706ca5 · 1706ca5
2 parents db7f27d + e4d2caa
commit 1706ca5
Show file tree

Hide file tree

Showing 24 changed files with 166 additions and 84 deletions.
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
@@ -22,12 +22,13 @@ jobs:
       fail-fast: false
       matrix:
         debian:
-          - 'buster' # 10
           - 'bullseye' # 11
+          - 'bookworm' # 12
         node: ['18', '20']
-        include:
-          - debian: 'bookworm' #12
-            node: '20'
+        exclude:
+          # We publish bullseye only with Node >= 20
+          - debian: 'bullseye'
+            node: '18'
     env:
       # Node version whose images will be aliased without the -nodeXX segment
       DEFAULT_NODE_MAJOR_VERSION: 18
@@ -95,14 +96,21 @@ jobs:
           aws ecr-public get-login-password --region=us-east-1                  \
           | docker login --username AWS --password-stdin public.ecr.aws
 
+      - name: Slice DockerHub credentials
+        id: credentials
+        run: |-
+          echo "username=$(cut -d: -f1 <<< '${{ secrets.DOCKER_CREDENTIALS }}')" >> "$GITHUB_OUTPUT"
+          echo "password=$(cut -d: -f2 <<< '${{ secrets.DOCKER_CREDENTIALS }}')" >> "$GITHUB_OUTPUT"
+          echo "::add-mask::$(cut -d: -f2 <<< '${{ secrets.DOCKER_CREDENTIALS }}')"
+
       # We only authenticate to Docker on the 'aws/jsii' repo, as forks will not have the secret
       - name: Login to Docker Hub
         if: steps.should-run.outputs.result == 'true' && github.repository == 'aws/jsii'
         # The DOCKER_CREDENTIALS secret is expected to contain a username:token pair
         run: |-
           docker login                                                          \
-            --username=$(cut -d: -f1 <<< '${{ secrets.DOCKER_CREDENTIALS }}')   \
-            --password=$(cut -d: -f2 <<< '${{ secrets.DOCKER_CREDENTIALS }}')
+            --username=${{ steps.credentials.outputs.username }}                \
+            --password=${{ steps.credentials.outputs.password }}
         # Ensure we run with bash, because that's the syntax we're using here...
         shell: bash
 
@@ -216,6 +224,15 @@ jobs:
               .
           fi
 
+      - name: Update README (nightly)
+        if: steps.should-run.outputs.result == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
+        uses: peter-evans/dockerhub-description@v3
+        with:
+          username: ${{ steps.credentials.outputs.username }}
+          password: ${{ steps.credentials.outputs.password }}
+          repository: jsii/superchain
+          readme-filepath: ./superchain/README.md
+
       - name: Publish (latest)
         if: steps.should-run.outputs.result == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/release'
         # NOTE BELOW: The `--tag` flags can be provided multiple times... we use that capability...

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Check out
         uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           cache: 'pip'
           cache-dependency-path: 'gh-pages/requirements-dev.txt'

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,15 +30,15 @@ jobs:
         uses: actions/checkout@v4
       # Set up all of our standard runtimes
       - name: Set up .NET 6
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '6.0.x'
       - name: Set up Go 1.18
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: '1.18'
       - name: Set up Java 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '8'
@@ -48,7 +48,7 @@ jobs:
           cache: yarn
           node-version: '18'
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
           cache: pip
@@ -113,15 +113,15 @@ jobs:
         uses: actions/checkout@v4
       # Set up all of our standard runtimes
       - name: Set up .NET 6
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '6.0.x'
       - name: Set up Go 1.18
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: '1.18'
       - name: Set up Java 8
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '8'
@@ -131,7 +131,7 @@ jobs:
           cache: yarn
           node-version: '18'
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
           cache: pip
@@ -302,15 +302,15 @@ jobs:
           rm built-tree.tgz
       # Set up all of our standard runtimes (this is matrix-based)
       - name: Set up .NET ${{ matrix.dotnet }}
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ matrix.dotnet }}
       - name: Set up Go ${{ matrix.go }}
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
       - name: Set up Java ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
@@ -320,7 +320,7 @@ jobs:
           cache: yarn
           node-version: ${{ matrix.node }}
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           cache: pip
@@ -432,15 +432,15 @@ jobs:
           path: ${{ runner.temp }}/release-package
       # Set up all of our standard runtimes
       - name: Set up .NET 7
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '7.0.x'
       - name: Set up Go 1.20
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: '1.20'
       - name: Set up Java 20
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
           java-version: '20'
@@ -449,7 +449,7 @@ jobs:
         with:
           node-version: '20'
       - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
       - name: Install python3-venv

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: 16
+          node-version: 18
 
       - name: Install Tools
         run: |-

diff --git a/.mergify/config.yml b/.mergify/config.yml
@@ -11,7 +11,7 @@ pull_request_rules:
       label:
         add: [contribution/core]
     conditions:
-      - author~=^(RomainMuller|rix0rrr|MrArnoldPalmer|iliapolo|madeline-k|comcalvi|kaizencc|corymhall|otaviomacedo|TheRealAmazonKendra|vinayak-kukreja|mrgrain|colifran|mikewrighton)$
+      - author~=^(RomainMuller|rix0rrr|MrArnoldPalmer|iliapolo|madeline-k|comcalvi|kaizencc|corymhall|otaviomacedo|TheRealAmazonKendra|vinayak-kukreja|mrgrain|colifran|mikewrighton|paulhcsun)$
       - -label~="contribution/core"
   - name: Tell them we're good now
     actions:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 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.93.0](https://github.com/aws/jsii/compare/v1.92.0...v1.93.0) (2023-12-08)
+
+
+### Features
+
+* deprecate `jsii/superchain:buster-slim-*` images ([#4359](https://github.com/aws/jsii/issues/4359)) ([b580244](https://github.com/aws/jsii/commit/b5802449f4b9292b3396353f1fa3fa768a779cd7))
+* **go:** add jsii.Sprintf helper ([#4345](https://github.com/aws/jsii/issues/4345)) ([2ecfb77](https://github.com/aws/jsii/commit/2ecfb778130c1a2fdd6b4932216e144a0d079d5c))
+
+
+### Bug Fixes
+
+* **check-node:** unstable node 21 is incorrectly listed as supported ([#4362](https://github.com/aws/jsii/issues/4362)) ([886e465](https://github.com/aws/jsii/commit/886e465e60a5b6208a862a20af087cbd924416a9))
+
 ## [1.92.0](https://github.com/aws/jsii/compare/v1.91.0...v1.92.0) (2023-11-16)
 
 

diff --git a/gh-pages/requirements-dev.txt b/gh-pages/requirements-dev.txt
@@ -1,4 +1,4 @@
 mkdocs~=1.5.3
 mkdocs-awesome-pages-plugin~=2.9.2
-mkdocs-material~=9.4.8
+mkdocs-material~=9.4.14
 mkdocs-git-revision-date-plugin~=0.3.2
diff --git a/lerna.json b/lerna.json
@@ -12,6 +12,6 @@
       "rejectCycles": true
     }
   },
-  "version": "1.92.0",
+  "version": "1.93.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets
@@ -2,18 +2,18 @@
   <ItemGroup>
     <!-- Central configuration of dependency versions for all DotNet packages -->
 
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
 
-    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" />
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
     <PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2" />
 
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Update="NSubstitute" Version="5.1.0" />
     <PackageReference Update="xunit" Version="2.6.1" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.5.3" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.5.4" />
     <PackageReference Update="XunitXml.TestLogger" Version="3.1.17" />
 
     <PackageReference Update="Newtonsoft.Json" Version="13.0.3" />

diff --git a/packages/@jsii/check-node/src/constants.ts b/packages/@jsii/check-node/src/constants.ts
@@ -25,30 +25,31 @@ export class NodeRelease {
     ),
 
     // Past end-of-life releases
-    new NodeRelease(13, { endOfLife: new Date('2020-06-01') }),
-    new NodeRelease(14, {
-      endOfLife: new Date('2023-04-30'),
-      supportedRange: '^14.17.0',
-    }),
-    new NodeRelease(15, { endOfLife: new Date('2021-06-01') }),
     new NodeRelease(12, {
       endOfLife: new Date('2022-04-30'),
       supportedRange: '^12.7.0',
     }),
+    new NodeRelease(13, { endOfLife: new Date('2020-06-01'), untested: true }),
+    new NodeRelease(14, {
+      endOfLife: new Date('2023-04-30'),
+      supportedRange: '^14.17.0',
+    }),
+    new NodeRelease(15, { endOfLife: new Date('2021-06-01'), untested: true }),
     new NodeRelease(16, {
       endOfLife: new Date('2023-09-11'),
       supportedRange: '^16.3.0',
     }),
     new NodeRelease(17, {
       endOfLife: new Date('2022-06-01'),
       supportedRange: '^17.3.0',
+      untested: true,
     }),
-    new NodeRelease(19, { endOfLife: new Date('2023-06-01') }),
+    new NodeRelease(19, { endOfLife: new Date('2023-06-01'), untested: true }),
 
     // 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') }),
+    new NodeRelease(21, { endOfLife: new Date('2024-06-01'), untested: true }),
 
     // Future (planned releases)
   ];

diff --git a/packages/@jsii/go-runtime-test/project/go.mod b/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.15.0
+	golang.org/x/tools v0.16.0
 )
 
 require (

diff --git a/packages/@jsii/go-runtime-test/project/go.sum b/packages/@jsii/go-runtime-test/project/go.sum
@@ -34,8 +34,8 @@ 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.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
-golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
+golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
+golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 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=

diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
-	golang.org/x/tools v0.15.0
+	golang.org/x/tools v0.16.0
 )
 
 require (

diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum
@@ -34,8 +34,8 @@ 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.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
-golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
+golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
+golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 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=

diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/helpers.go b/packages/@jsii/go-runtime/jsii-runtime-go/helpers.go
@@ -1,6 +1,9 @@
 package jsii
 
-import "time"
+import (
+	"fmt"
+	"time"
+)
 
 type basicType interface {
 	bool | string | float64 | time.Time
@@ -51,6 +54,12 @@ func Numbers[T numberType](v ...T) *[]*float64 {
 // String returns a pointer to the provided string.
 func String(v string) *string { return Ptr(v) }
 
+// Sprintf returns a pointer to a fomratted string (semantics are the same as fmt.Sprintf).
+func Sprintf(format string, a ...interface{}) *string {
+	res := fmt.Sprintf(format, a...)
+	return &res
+}
+
 // Strings returns a pointer to a slice of pointers to all of the provided strings.
 func Strings(v ...string) *[]*string {
 	return PtrSlice(v...)

diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/helpers_test.go b/packages/@jsii/go-runtime/jsii-runtime-go/helpers_test.go
@@ -64,6 +64,10 @@ func TestString(t *testing.T) {
 	assert.Equal(t, "Hello", *String("Hello"))
 }
 
+func TestSprintf(t *testing.T) {
+	assert.Equal(t, "formatted: 42", *Sprintf("formatted: %d", 42))
+}
+
 func TestStrings(t *testing.T) {
 	assert.Equal(t, []*string{String("Hello"), String("World")}, *Strings("Hello", "World"))
 }

diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt
@@ -1,10 +1,10 @@
 black~=23.11
-mypy==1.7.0
+mypy==1.7.1
 pip~=23.3
 pytest~=7.4
 pytest-mypy~=0.10
-setuptools~=68.2.2
+setuptools~=69.0.2
 types-python-dateutil~=2.8
-wheel~=0.41
+wheel~=0.42
 
 -e .
diff --git a/packages/@jsii/python-runtime/setup.py b/packages/@jsii/python-runtime/setup.py
@@ -31,7 +31,7 @@
     },
     install_requires=[
         "attrs>=21.2,<24.0",
-        "cattrs>=1.8,<23.2",
+        "cattrs>=1.8,<23.3",
         "importlib_resources>=5.2.0",
         "publication>=0.0.3",  # This is used by all generated code.
         "typeguard~=2.13.3",  # This is used by all generated code.