From da501155b9cef0f541b7c4e2f9d91c88e821fff3 Mon Sep 17 00:00:00 2001
From: filmaj <fil.maj@sanity.io>
Date: Tue, 23 Dec 2025 14:46:25 -0500
Subject: [PATCH 1/2] drop use of no longer supported node runtime from mock
 projects

---
 test/mock/no-index-fail/src/http/get-foo/config.arc             | 2 +-
 test/mock/no-index-pass/src/http/get-foo/config.arc             | 2 +-
 test/mock/normal/app.arc                                        | 2 +-
 .../src/http/{get-nodejs18_x => get-nodejs24_x}/config.arc      | 2 +-
 .../normal/src/http/{get-nodejs18_x => get-nodejs24_x}/index.js | 2 +-
 .../greedy-get-index/src/http/get-index/config.arc              | 2 +-
 .../param-exact/src/http/get-000param-there/config.arc          | 2 +-
 .../root-handling/root-param/src/http/get-000param/config.arc   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename test/mock/normal/src/http/{get-nodejs18_x => get-nodejs24_x}/config.arc (70%)
 rename test/mock/normal/src/http/{get-nodejs18_x => get-nodejs24_x}/index.js (74%)

diff --git a/test/mock/no-index-fail/src/http/get-foo/config.arc b/test/mock/no-index-fail/src/http/get-foo/config.arc
index d9c37445..461a5aaf 100644
--- a/test/mock/no-index-fail/src/http/get-foo/config.arc
+++ b/test/mock/no-index-fail/src/http/get-foo/config.arc
@@ -1,5 +1,5 @@
 @aws
-runtime nodejs18.x
+runtime nodejs24.x
 # timeout 30
 # concurrency 1
 # memory 1152
diff --git a/test/mock/no-index-pass/src/http/get-foo/config.arc b/test/mock/no-index-pass/src/http/get-foo/config.arc
index d9c37445..461a5aaf 100644
--- a/test/mock/no-index-pass/src/http/get-foo/config.arc
+++ b/test/mock/no-index-pass/src/http/get-foo/config.arc
@@ -1,5 +1,5 @@
 @aws
-runtime nodejs18.x
+runtime nodejs24.x
 # timeout 30
 # concurrency 1
 # memory 1152
diff --git a/test/mock/normal/app.arc b/test/mock/normal/app.arc
index 6a2a52be..97cc2cd6 100644
--- a/test/mock/normal/app.arc
+++ b/test/mock/normal/app.arc
@@ -14,9 +14,9 @@ queue-custom
 @http
 get     / # runs default
 # Runtimes
+get     /nodejs24.x
 get     /nodejs22.x
 get     /nodejs20.x
-get     /nodejs18.x
 get     /node-esm
 get     /python3.13
 get     /python3.9
diff --git a/test/mock/normal/src/http/get-nodejs18_x/config.arc b/test/mock/normal/src/http/get-nodejs24_x/config.arc
similarity index 70%
rename from test/mock/normal/src/http/get-nodejs18_x/config.arc
rename to test/mock/normal/src/http/get-nodejs24_x/config.arc
index 9472b86c..016e42e6 100644
--- a/test/mock/normal/src/http/get-nodejs18_x/config.arc
+++ b/test/mock/normal/src/http/get-nodejs24_x/config.arc
@@ -1,5 +1,5 @@
 @aws
-runtime nodejs18.x
+runtime nodejs24.x
 timeout 12
 # concurrency 1
 # memory 1152
diff --git a/test/mock/normal/src/http/get-nodejs18_x/index.js b/test/mock/normal/src/http/get-nodejs24_x/index.js
similarity index 74%
rename from test/mock/normal/src/http/get-nodejs18_x/index.js
rename to test/mock/normal/src/http/get-nodejs24_x/index.js
index dddcad42..1d9ff44e 100644
--- a/test/mock/normal/src/http/get-nodejs18_x/index.js
+++ b/test/mock/normal/src/http/get-nodejs24_x/index.js
@@ -1,6 +1,6 @@
 exports.handler = async (event) => {
   const body = event
-  body.message = 'Hello from get /nodejs18.x (running nodejs18.x)'
+  body.message = 'Hello from get /nodejs24.x (running nodejs24.x)'
   return {
     statusCode: 200,
     headers: { 'content-type': 'application/json' },
diff --git a/test/mock/root-handling/greedy-get-index/src/http/get-index/config.arc b/test/mock/root-handling/greedy-get-index/src/http/get-index/config.arc
index 164a9299..02318ee5 100644
--- a/test/mock/root-handling/greedy-get-index/src/http/get-index/config.arc
+++ b/test/mock/root-handling/greedy-get-index/src/http/get-index/config.arc
@@ -1,5 +1,5 @@
 @aws
-runtime nodejs18.x
+runtime nodejs24.x
 timeout 10
 # concurrency 1
 # memory 1152
diff --git a/test/mock/root-handling/param-exact/src/http/get-000param-there/config.arc b/test/mock/root-handling/param-exact/src/http/get-000param-there/config.arc
index 164a9299..02318ee5 100644
--- a/test/mock/root-handling/param-exact/src/http/get-000param-there/config.arc
+++ b/test/mock/root-handling/param-exact/src/http/get-000param-there/config.arc
@@ -1,5 +1,5 @@
 @aws
-runtime nodejs18.x
+runtime nodejs24.x
 timeout 10
 # concurrency 1
 # memory 1152
diff --git a/test/mock/root-handling/root-param/src/http/get-000param/config.arc b/test/mock/root-handling/root-param/src/http/get-000param/config.arc
index 164a9299..02318ee5 100644
--- a/test/mock/root-handling/root-param/src/http/get-000param/config.arc
+++ b/test/mock/root-handling/root-param/src/http/get-000param/config.arc
@@ -1,5 +1,5 @@
 @aws
-runtime nodejs18.x
+runtime nodejs24.x
 timeout 10
 # concurrency 1
 # memory 1152

From 676f096857ebaf9780333e2d8281f05e98f85142 Mon Sep 17 00:00:00 2001
From: filmaj <fil.maj@sanity.io>
Date: Tue, 23 Dec 2025 14:56:34 -0500
Subject: [PATCH 2/2] fix outdated runtime usage in integration tests

---
 test/integration/http/http-test.js   | 24 ++++++++++++------------
 test/integration/http/httpv1-test.js | 18 +++++++++---------
 test/integration/http/rest-test.js   | 18 +++++++++---------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/test/integration/http/http-test.js b/test/integration/http/http-test.js
index f3d598da..71251f5e 100644
--- a/test/integration/http/http-test.js
+++ b/test/integration/http/http-test.js
@@ -166,17 +166,17 @@ function runTests (runType, t) {
     })
   })
 
-  t.test(`${mode} get /nodejs22.x`, t => {
+  t.test(`${mode} get /nodejs24.x`, t => {
     t.plan(15)
-    let rawPath = '/nodejs22.x'
+    let rawPath = '/nodejs24.x'
     tiny.get({
       url: url + rawPath,
     }, function _got (err, result) {
       if (err) t.end(err)
       else {
         checkResult(t, result.body, {
-          message: 'Hello from get /nodejs22.x (running nodejs22.x)',
-          routeKey: 'GET /nodejs22.x',
+          message: 'Hello from get /nodejs24.x (running nodejs24.x)',
+          routeKey: 'GET /nodejs24.x',
           rawPath,
           pathParameters: undefined,
           cookies: undefined,
@@ -190,17 +190,17 @@ function runTests (runType, t) {
     })
   })
 
-  t.test(`${mode} get /nodejs20.x`, t => {
+  t.test(`${mode} get /nodejs22.x`, t => {
     t.plan(15)
-    let rawPath = '/nodejs20.x'
+    let rawPath = '/nodejs22.x'
     tiny.get({
       url: url + rawPath,
     }, function _got (err, result) {
       if (err) t.end(err)
       else {
         checkResult(t, result.body, {
-          message: 'Hello from get /nodejs20.x (running nodejs20.x)',
-          routeKey: 'GET /nodejs20.x',
+          message: 'Hello from get /nodejs22.x (running nodejs22.x)',
+          routeKey: 'GET /nodejs22.x',
           rawPath,
           pathParameters: undefined,
           cookies: undefined,
@@ -214,17 +214,17 @@ function runTests (runType, t) {
     })
   })
 
-  t.test(`${mode} get /nodejs18.x`, t => {
+  t.test(`${mode} get /nodejs20.x`, t => {
     t.plan(15)
-    let rawPath = '/nodejs18.x'
+    let rawPath = '/nodejs20.x'
     tiny.get({
       url: url + rawPath,
     }, function _got (err, result) {
       if (err) t.end(err)
       else {
         checkResult(t, result.body, {
-          message: 'Hello from get /nodejs18.x (running nodejs18.x)',
-          routeKey: 'GET /nodejs18.x',
+          message: 'Hello from get /nodejs20.x (running nodejs20.x)',
+          routeKey: 'GET /nodejs20.x',
           rawPath,
           pathParameters: undefined,
           cookies: undefined,
diff --git a/test/integration/http/httpv1-test.js b/test/integration/http/httpv1-test.js
index 65275c67..83df28e7 100644
--- a/test/integration/http/httpv1-test.js
+++ b/test/integration/http/httpv1-test.js
@@ -128,16 +128,16 @@ function runTests (runType, t) {
     })
   })
 
-  t.test(`${mode} get /nodejs22.x`, t => {
+  t.test(`${mode} get /nodejs24.x`, t => {
     t.plan(16)
-    let path = '/nodejs22.x'
+    let path = '/nodejs24.x'
     tiny.get({
       url: url + path,
     }, function _got (err, result) {
       if (err) t.end(err)
       else {
         checkResult(t, result.body, {
-          message: 'Hello from get /nodejs22.x (running nodejs22.x)',
+          message: 'Hello from get /nodejs24.x (running nodejs24.x)',
           resource: path,
           path,
           httpMethod: 'GET',
@@ -153,16 +153,16 @@ function runTests (runType, t) {
     })
   })
 
-  t.test(`${mode} get /nodejs20.x`, t => {
+  t.test(`${mode} get /nodejs22.x`, t => {
     t.plan(16)
-    let path = '/nodejs20.x'
+    let path = '/nodejs22.x'
     tiny.get({
       url: url + path,
     }, function _got (err, result) {
       if (err) t.end(err)
       else {
         checkResult(t, result.body, {
-          message: 'Hello from get /nodejs20.x (running nodejs20.x)',
+          message: 'Hello from get /nodejs22.x (running nodejs22.x)',
           resource: path,
           path,
           httpMethod: 'GET',
@@ -178,16 +178,16 @@ function runTests (runType, t) {
     })
   })
 
-  t.test(`${mode} get /nodejs18.x`, t => {
+  t.test(`${mode} get /nodejs20.x`, t => {
     t.plan(16)
-    let path = '/nodejs18.x'
+    let path = '/nodejs20.x'
     tiny.get({
       url: url + path,
     }, function _got (err, result) {
       if (err) t.end(err)
       else {
         checkResult(t, result.body, {
-          message: 'Hello from get /nodejs18.x (running nodejs18.x)',
+          message: 'Hello from get /nodejs20.x (running nodejs20.x)',
           resource: path,
           path,
           httpMethod: 'GET',
diff --git a/test/integration/http/rest-test.js b/test/integration/http/rest-test.js
index da814cdf..06d53648 100644
--- a/test/integration/http/rest-test.js
+++ b/test/integration/http/rest-test.js
@@ -128,16 +128,16 @@ function runTests (runType) {
     })
   })
 
-  test(`${mode} get /nodejs22.x`, t => {
+  test(`${mode} get /nodejs24.x`, t => {
     t.plan(16)
-    let path = '/nodejs22.x'
+    let path = '/nodejs24.x'
     tiny.get({
       url: url + path,
     }, function _got (err, result) {
       if (err) t.end(err)
       else {
         checkResult(t, result.body, {
-          message: 'Hello from get /nodejs22.x (running nodejs22.x)',
+          message: 'Hello from get /nodejs24.x (running nodejs24.x)',
           resource: path,
           path,
           httpMethod: 'GET',
@@ -153,16 +153,16 @@ function runTests (runType) {
     })
   })
 
-  test(`${mode} get /nodejs20.x`, t => {
+  test(`${mode} get /nodejs22.x`, t => {
     t.plan(16)
-    let path = '/nodejs20.x'
+    let path = '/nodejs22.x'
     tiny.get({
       url: url + path,
     }, function _got (err, result) {
       if (err) t.end(err)
       else {
         checkResult(t, result.body, {
-          message: 'Hello from get /nodejs20.x (running nodejs20.x)',
+          message: 'Hello from get /nodejs22.x (running nodejs22.x)',
           resource: path,
           path,
           httpMethod: 'GET',
@@ -178,16 +178,16 @@ function runTests (runType) {
     })
   })
 
-  test(`${mode} get /nodejs18.x`, t => {
+  test(`${mode} get /nodejs20.x`, t => {
     t.plan(16)
-    let path = '/nodejs18.x'
+    let path = '/nodejs20.x'
     tiny.get({
       url: url + path,
     }, function _got (err, result) {
       if (err) t.end(err)
       else {
         checkResult(t, result.body, {
-          message: 'Hello from get /nodejs18.x (running nodejs18.x)',
+          message: 'Hello from get /nodejs20.x (running nodejs20.x)',
           resource: path,
           path,
           httpMethod: 'GET',