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

…me/jsii-runtime-go/golang.org/x/tools-0.15.0

.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

.github/workflows/main.yml

@@ -42,11 +42,11 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '8'
-      - name: Set up Node 16
+      - 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
+      - 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 }}
@@ -479,4 +472,3 @@ jobs:
         with:
           name: integtest_aws-cdk-lib
           path: ./node_modules/aws-cdk-lib/dist/
-

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=

packages/@jsii/kernel/src/kernel.ts

@@ -1371,13 +1371,20 @@ export class Kernel {
         throw new JsiiFault(`Script with name ${req.script} was not defined.`);
       }
 
+      // Make sure the current NODE_OPTIONS are honored if we shell out to node
+      const nodeOptions = [...process.execArgv];
+
+      // When we are using the symlinked version of the cache, we need to preserve both symlink settings for binaries
+      if (nodeOptions.includes('--preserve-symlinks')) {
+        nodeOptions.push('--preserve-symlinks-main');
+      }
+
       return {
         command: path.join(packageDir, scriptPath),
         args: req.args ?? [],
         env: {
           ...process.env,
-          // Make sure the current NODE_OPTIONS are honored if we shell out to node
-          NODE_OPTIONS: process.execArgv.join(' '),
+          NODE_OPTIONS: nodeOptions.join(' '),
           // Make sure "this" node is ahead of $PATH just in case
           PATH: `${path.dirname(process.execPath)}:${process.env.PATH}`,
         },

packages/@jsii/kernel/src/tar-cache/index.ts

@@ -15,7 +15,7 @@ export interface ExtractResult {
    * When `'hit'`, the data was already present in cache and was returned from
    * cache.
    *
-   * When `'miss'`, the data was extracted into the caache and returned from
+   * When `'miss'`, the data was extracted into the cache and returned from
    * cache.
    *
    * When `undefined`, the cache is not enabled.

packages/@jsii/python-runtime/tests/test_invoke_bin.py

@@ -23,8 +23,10 @@ def silence_node_deprecation_warnings():
     for var in variables:
         environ[var] = "1"
 
-    nodeEolAcknowledgement = "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."
-    environ["JSII_SILENCE_WARNING_END_OF_LIFE_NODE_VERSION"] = nodeEolAcknowledgement
+    # silence this for the next decades
+    environ[
+        "JSII_SILENCE_WARNING_END_OF_LIFE_NODE_VERSION"
+    ] = "14,16,18,20,22,24,26,28,30,32,34"
 
     # Execute the test
     yield

packages/jsii-calc/bin/run.ts

@@ -2,11 +2,16 @@
 
 /* eslint-disable no-console */
 
+import * as calcLib from '@scope/jsii-calc-lib';
+
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
 const runCommand = async () => {
   console.info('Hello World!');
 
+  // Make sure this binary depends on an external package to test dependencies with invokeBinScript
+  new calcLib.Number(1);
+
   const args = process.argv.slice(2);
   if (args.length > 0) {
     console.info(`  arguments: ${args.join(', ')}`);

superchain/Dockerfile

@@ -232,10 +232,10 @@ COPY superchain/m2-settings.xml /root/.m2/settings.xml
 # Install Go
 COPY --from=bindist /opt/golang/go ${GOROOT}
 
-# Install Node 14+ (configurable with '--build-arg NODE_MAJOR_VERSION=xxx') and yarn
+# Install Node (configurable with '--build-arg NODE_MAJOR_VERSION=xxx') and yarn
 # (Put this as late as possible in the Dockerfile so we get to reuse the layer cache
 # for most of the multiple builds).
-ARG NODE_MAJOR_VERSION="16"
+ARG NODE_MAJOR_VERSION="18"
 COPY superchain/gpg/nodesource.asc /tmp/nodesource.asc
 COPY superchain/gpg/yarn.asc /tmp/yarn.asc
 RUN apt-key add /tmp/nodesource.asc && rm /tmp/nodesource.asc                                                           \