skuba 14.0.0-replace-global-vars-20251117052457 → 14.0.0-rfc-upgrade-on-test-20251217012156

package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap

@@ -1,4 +1,4 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`returns expected CloudFormation stack for dev 1`] = `
 {
@@ -184,7 +184,6 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "DD_LAMBDA_HANDLER": "index.handler",
             "DD_LOGS_INJECTION": "false",
             "DD_MERGE_XRAY_TRACES": "false",
-            "DD_SERVERLESS_APPSEC_ENABLED": "false",
             "DD_SERVERLESS_LOGS_ENABLED": "false",
             "DD_SERVICE": "serviceName",
             "DD_SITE": "datadoghq.com",
@@ -217,7 +216,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
                 {
                   "Ref": "AWS::Region",
                 },
-                ":464622532012:layer:Datadog-Node22-x:x",
+                ":464622532012:layer:Datadog-Node24-x:x",
               ],
             ],
           },
@@ -242,7 +241,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs22.x",
+        "Runtime": "nodejs24.x",
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",
@@ -763,14 +762,6 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
     },
   },
   "Resources": {
-    "datadogapikeysecret046FEF06": {
-      "DeletionPolicy": "Delete",
-      "Properties": {
-        "GenerateSecretString": {},
-      },
-      "Type": "AWS::SecretsManager::Secret",
-      "UpdateReplacePolicy": "Delete",
-    },
     "destinationtopicDCE2E0B8": {
       "Properties": {
         "KmsMasterKeyId": {
@@ -928,16 +919,13 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
         },
         "Environment": {
           "Variables": {
-            "DD_API_KEY_SECRET_ARN": {
-              "Ref": "datadogapikeysecret046FEF06",
-            },
+            "DD_API_KEY_SECRET_ARN": "arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key",
             "DD_CAPTURE_LAMBDA_PAYLOAD": "false",
             "DD_ENV": "production",
             "DD_FLUSH_TO_LOG": "false",
             "DD_LAMBDA_HANDLER": "index.handler",
             "DD_LOGS_INJECTION": "false",
             "DD_MERGE_XRAY_TRACES": "false",
-            "DD_SERVERLESS_APPSEC_ENABLED": "false",
             "DD_SERVERLESS_LOGS_ENABLED": "false",
             "DD_SERVICE": "serviceName",
             "DD_SITE": "datadoghq.com",
@@ -970,7 +958,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
                 {
                   "Ref": "AWS::Region",
                 },
-                ":464622532012:layer:Datadog-Node22-x:x",
+                ":464622532012:layer:Datadog-Node24-x:x",
               ],
             ],
           },
@@ -995,7 +983,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs22.x",
+        "Runtime": "nodejs24.x",
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",
@@ -1394,9 +1382,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
                 "secretsmanager:DescribeSecret",
               ],
               "Effect": "Allow",
-              "Resource": {
-                "Ref": "datadogapikeysecret046FEF06",
-              },
+              "Resource": "arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key-??????",
             },
             {
               "Action": [

package/template/lambda-sqs-worker-cdk/infra/appStack.test.ts

@@ -1,6 +1,5 @@
 import { App, aws_secretsmanager, aws_sns } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
-import { afterAll, afterEach, expect, it, vi } from 'vitest';
 
 const originalDeployment = process.env.DEPLOYMENT;
 const originalVersion = process.env.VERSION;
@@ -11,7 +10,7 @@ afterAll(() => {
 });
 
 afterEach(() => {
-  vi.resetModules();
+  jest.resetModules();
 });
 
 it.each(['dev', 'prod'])(
@@ -22,16 +21,15 @@ it.each(['dev', 'prod'])(
 
     const { AppStack } = await import('./appStack.js');
 
-    vi.spyOn(aws_sns.Topic, 'fromTopicArn').mockImplementation(
-      (scope, id) => new aws_sns.Topic(scope, id),
-    );
+    jest
+      .spyOn(aws_sns.Topic, 'fromTopicArn')
+      .mockImplementation((scope, id) => new aws_sns.Topic(scope, id));
 
-    vi.spyOn(
-      aws_secretsmanager.Secret,
-      'fromSecretPartialArn',
-    ).mockImplementation(
-      (scope, id) => new aws_secretsmanager.Secret(scope, id),
-    );
+    jest
+      .spyOn(aws_secretsmanager.Secret, 'fromSecretPartialArn')
+      .mockImplementation(
+        (scope, id) => new aws_secretsmanager.Secret(scope, id),
+      );
 
     const app = new App({ context: { 'aws:cdk:bundling-stacks': [] } });
 

package/template/lambda-sqs-worker-cdk/infra/appStack.ts

@@ -19,7 +19,7 @@ import { DatadogLambda } from 'datadog-cdk-constructs-v2';
 import { config } from './config.js';
 
 // Updated by https://github.com/seek-oss/rynovate
-const DATADOG_EXTENSION_LAYER_VERSION = 88;
+const DATADOG_EXTENSION_LAYER_VERSION = 90;
 
 // Updated by https://github.com/seek-oss/rynovate
 const DATADOG_NODE_LAYER_VERSION = 126;
@@ -86,7 +86,7 @@ export class AppStack extends Stack {
 
     const worker = new aws_lambda_nodejs.NodejsFunction(this, 'worker', {
       architecture: aws_lambda.Architecture[architecture],
-      runtime: aws_lambda.Runtime.NODEJS_22_X,
+      runtime: aws_lambda.Runtime.NODEJS_24_X,
       memorySize: 512,
       environmentEncryption: kmsKey,
       // aws-sdk-v3 sets this to true by default, so it is not necessary to set the environment variable
@@ -96,7 +96,7 @@ export class AppStack extends Stack {
       timeout: Duration.seconds(30),
       bundling: {
         sourceMap: true,
-        target: 'node22',
+        target: 'node24',
         // aws-sdk-v3 is set as an external module by default, but we want it to be bundled with the function
         externalModules: [],
         esbuildArgs: {

package/template/lambda-sqs-worker-cdk/infra/config.ts

@@ -40,8 +40,7 @@ const configs: Record<Deployment, Config> = {
       },
     },
 
-    datadogApiKeySecretArn:
-      'arn:aws:secretsmanager:<Region>:<AccountId>:secret:TODO_SECRET_NAME',
+    datadogApiKeySecretArn: '<%- devDataDogApiKeySecretArn %>',
     sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
   },
   prod: {
@@ -57,8 +56,7 @@ const configs: Record<Deployment, Config> = {
       },
     },
 
-    datadogApiKeySecretArn:
-      'arn:aws:secretsmanager:<Region>:<AccountId>:secret:TODO_SECRET_NAME',
+    datadogApiKeySecretArn: '<%- prodDataDogApiKeySecretArn %>',
     sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
   },
 };

package/template/lambda-sqs-worker-cdk/package.json

@@ -2,7 +2,6 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
-  "type": "module",
   "imports": {
     "#src/*": {
       "@seek/<%- serviceName %>/source": "./src/*",
@@ -21,10 +20,11 @@
   "dependencies": {
     "@aws-sdk/client-codedeploy": "^3.363.0",
     "@aws-sdk/client-lambda": "^3.363.0",
+    "@aws-sdk/client-secrets-manager": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/aws-codedeploy-hooks": "^2.0.0",
     "@seek/logger": "^11.1.0",
-    "skuba-dive": "3.0.0-replace-global-vars-20251117052457",
+    "skuba-dive": "4.0.0-rfc-upgrade-on-test-20251217012156",
     "zod": "^4.0.0"
   },
   "devDependencies": {
@@ -33,19 +33,19 @@
     "@types/chance": "^1.1.3",
     "@types/node": "^22.13.10",
     "aws-cdk": "^2.1010.0",
-    "aws-cdk-lib": "^2.190.0",
-    "aws-sdk-client-mock": "^4.1.0",
-    "aws-sdk-client-mock-vitest": "^6.2.1",
+    "aws-cdk-lib": "^2.232.1",
+    "aws-sdk-client-mock": "^4.0.0",
+    "aws-sdk-client-mock-jest": "^4.0.0",
     "chance": "^1.1.8",
     "constructs": "^10.0.17",
-    "datadog-cdk-constructs-v2": "^3.0.0",
+    "datadog-cdk-constructs-v2": "^3.4.0",
     "datadog-lambda-js": "^12.0.0",
     "dd-trace": "^5.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "14.0.0-replace-global-vars-20251117052457"
+    "skuba": "14.0.0-rfc-upgrade-on-test-20251217012156"
   },
-  "packageManager": "pnpm@10.20.0",
+  "packageManager": "pnpm@10.25.0",
   "engines": {
-    "node": ">=22"
+    "node": ">=24"
   }
 }

package/template/lambda-sqs-worker-cdk/skuba.template.js

@@ -2,7 +2,7 @@
  * Run `skuba configure` to finish templating and remove this file.
  */
 
-export default {
+module.exports = {
   entryPoint: 'src/app.ts#handler',
   fields: [
     {
@@ -22,6 +22,18 @@ export default {
       initial: 'my-team-aws-account-prod:cicd',
       validate: (value) => /^.+:.+$/.test(value),
     },
+    {
+      name: 'devDataDogApiKeySecretArn',
+      message: 'Dev DataDog API Key Secret ARN',
+      initial:
+        'arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key',
+    },
+    {
+      name: 'prodDataDogApiKeySecretArn',
+      message: 'Prod DataDog API Key Secret ARN',
+      initial:
+        'arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key',
+    },
   ],
   packageManager: 'pnpm',
   type: 'application',

package/template/lambda-sqs-worker-cdk/src/app.test.ts

@@ -1,14 +1,5 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
 import type { SQSBatchResponse } from 'aws-lambda';
-import {
-  afterEach,
-  beforeAll,
-  beforeEach,
-  describe,
-  expect,
-  it,
-  vi,
-} from 'vitest';
 
 import * as app from './app.js';
 import { stdoutMock } from './framework/logging.js';
@@ -29,7 +20,7 @@ describe('handler', () => {
 
   const score = chance.floating({ max: 1, min: 0 });
 
-  const distribution = vi
+  const distribution = jest
     .spyOn(metricsClient, 'distribution')
     .mockReturnValue();
 
@@ -50,9 +41,9 @@ describe('handler', () => {
   it('handles one record', async () => {
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).resolves.toEqual({
+    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
       batchItemFailures: [],
-    } satisfies SQSBatchResponse);
+    });
 
     expect(scoringService.request).toHaveBeenCalledTimes(1);
 
@@ -81,9 +72,9 @@ describe('handler', () => {
       JSON.stringify(jobPublished),
     ]);
 
-    await expect(app.handler(event, ctx)).resolves.toEqual({
+    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
       batchItemFailures: [],
-    } satisfies SQSBatchResponse);
+    });
 
     expect(stdoutMock.calls).toMatchObject([
       { count: 2, level: 20, msg: 'Received jobs' },
@@ -109,9 +100,9 @@ describe('handler', () => {
       JSON.stringify(jobPublished),
     ]);
 
-    await expect(app.handler(event, ctx)).resolves.toEqual({
+    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
       batchItemFailures: [{ itemIdentifier: event.Records[0]!.messageId }],
-    } satisfies SQSBatchResponse);
+    });
 
     expect(stdoutMock.calls).toMatchObject([
       { count: 2, level: 20, msg: 'Received jobs' },
@@ -137,13 +128,13 @@ describe('handler', () => {
   it('returns a batchItemFailure on invalid input', () => {
     const event = createSqsEvent(['}']);
 
-    return expect(app.handler(event, ctx)).resolves.toEqual({
+    return expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
       batchItemFailures: [
         {
           itemIdentifier: event.Records[0]!.messageId,
         },
       ],
-    } satisfies SQSBatchResponse);
+    });
   });
 
   it('bubbles up scoring service error', async () => {
@@ -153,9 +144,9 @@ describe('handler', () => {
 
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).resolves.toEqual({
+    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
       batchItemFailures: [{ itemIdentifier: event.Records[0]!.messageId }],
-    } satisfies SQSBatchResponse);
+    });
 
     expect(stdoutMock.calls).toMatchObject([
       { count: 1, level: 20, msg: 'Received jobs' },
@@ -179,9 +170,9 @@ describe('handler', () => {
 
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).resolves.toEqual({
+    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
       batchItemFailures: [{ itemIdentifier: event.Records[0]!.messageId }],
-    } satisfies SQSBatchResponse);
+    });
 
     expect(stdoutMock.calls).toMatchObject([
       {

package/template/lambda-sqs-worker-cdk/src/framework/handler.test.ts

@@ -1,5 +1,4 @@
 import type { SQSEvent } from 'aws-lambda';
-import { afterEach, describe, expect, it } from 'vitest';
 
 import { createHandler } from './handler.js';
 import { logger, stdoutMock } from './logging.js';

package/template/lambda-sqs-worker-cdk/src/framework/validation.test.ts

@@ -1,5 +1,3 @@
-import { describe, expect, it } from 'vitest';
-
 import { validateJson } from './validation.js';
 
 import {
@@ -32,17 +30,17 @@ describe('validateJson', () => {
 
     expect(() => validateJson(input, IdDescriptionSchema))
       .toThrowErrorMatchingInlineSnapshot(`
-        [ZodError: [
-          {
-            "expected": "string",
-            "code": "invalid_type",
-            "path": [
-              "id"
-            ],
-            "message": "Invalid input: expected string, received null"
-          }
-        ]]
-      `);
+      "[
+        {
+          "expected": "string",
+          "code": "invalid_type",
+          "path": [
+            "id"
+          ],
+          "message": "Invalid input: expected string, received null"
+        }
+      ]"
+    `);
   });
 
   it('blocks missing prop', () => {
@@ -50,25 +48,25 @@ describe('validateJson', () => {
 
     expect(() => validateJson(input, IdDescriptionSchema))
       .toThrowErrorMatchingInlineSnapshot(`
-        [ZodError: [
-          {
-            "expected": "string",
-            "code": "invalid_type",
-            "path": [
-              "id"
-            ],
-            "message": "Invalid input: expected string, received undefined"
-          },
-          {
-            "expected": "string",
-            "code": "invalid_type",
-            "path": [
-              "description"
-            ],
-            "message": "Invalid input: expected string, received undefined"
-          }
-        ]]
-      `);
+      "[
+        {
+          "expected": "string",
+          "code": "invalid_type",
+          "path": [
+            "id"
+          ],
+          "message": "Invalid input: expected string, received undefined"
+        },
+        {
+          "expected": "string",
+          "code": "invalid_type",
+          "path": [
+            "description"
+          ],
+          "message": "Invalid input: expected string, received undefined"
+        }
+      ]"
+    `);
   });
 
   it('blocks invalid JSON', () => {
@@ -77,7 +75,7 @@ describe('validateJson', () => {
     expect(() =>
       validateJson(input, IdDescriptionSchema),
     ).toThrowErrorMatchingInlineSnapshot(
-      `[SyntaxError: Unexpected token '}', "}" is not valid JSON]`,
+      `"Unexpected token '}', "}" is not valid JSON"`,
     );
   });
 });

package/template/lambda-sqs-worker-cdk/src/services/jobScorer.test.ts

@@ -1,18 +1,12 @@
-import { afterEach, beforeAll, describe, expect, it } from 'vitest';
-
 import * as jobScorer from './jobScorer.js';
 
 import { scoringService } from '#src/testing/services.js';
 import { chance, mockJobPublishedEvent } from '#src/testing/types.js';
 
 describe('scoreJobPublishedEvent', () => {
-  beforeAll(() => {
-    scoringService.spy();
-  });
+  beforeAll(scoringService.spy);
 
-  afterEach(() => {
-    scoringService.clear();
-  });
+  afterEach(scoringService.clear);
 
   it('scores an event', async () => {
     const score = chance.floating({ max: 1, min: 0 });

package/template/lambda-sqs-worker-cdk/src/services/pipelineEventSender.test.ts

@@ -1,5 +1,4 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
-import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { sendPipelineEvent } from './pipelineEventSender.js';
 
@@ -8,7 +7,7 @@ import { chance } from '#src/testing/types.js';
 
 describe('sendPipelineEvent', () => {
   afterEach(() => {
-    vi.clearAllMocks();
+    jest.clearAllMocks();
   });
 
   it('handles happy path', async () => {
@@ -35,7 +34,7 @@ describe('sendPipelineEvent', () => {
     return expect(
       sendPipelineEvent({}),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[Error: SNS did not return a message ID]`,
+      `"SNS did not return a message ID"`,
     );
   });
 });

package/template/lambda-sqs-worker-cdk/src/testing/services.ts

@@ -1,19 +1,18 @@
-import 'aws-sdk-client-mock-vitest/extend';
+import 'aws-sdk-client-mock-jest';
 
 import { PublishCommand } from '@aws-sdk/client-sns';
 import { mockClient } from 'aws-sdk-client-mock';
-import { vi } from 'vitest';
 
 import { sns as snsClient } from '#src/services/aws.js';
 import * as jobScorer from '#src/services/jobScorer.js';
 
 export const scoringService = {
-  request: vi.fn(),
+  request: jest.fn(),
 
   clear: () => scoringService.request.mockClear(),
 
   spy: () =>
-    vi
+    jest
       .spyOn(jobScorer.scoringService, 'request')
       .mockImplementation(scoringService.request),
 };

package/template/oss-npm-package/.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Check out repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

package/template/oss-npm-package/.github/workflows/validate.yml

@@ -16,7 +16,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Check out repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up pnpm
         uses: pnpm/action-setup@v4

package/template/oss-npm-package/.nvmrc

@@ -1 +1 @@
-22
+24

package/template/oss-npm-package/_package.json

@@ -14,7 +14,6 @@
   },
   "license": "MIT",
   "sideEffects": false,
-  "type": "module",
   "main": "./lib-commonjs/index.js",
   "module": "./lib-es2015/index.js",
   "types": "./lib-types/index.d.ts",

package/template/oss-npm-package/skuba.template.js

@@ -2,7 +2,7 @@
  * Run `skuba configure` to finish templating and remove this file.
  */
 
-export default {
+module.exports = {
   entryPoint: 'src/index.ts',
   fields: [
     {

package/template/oss-npm-package/src/index.test.ts

@@ -1,5 +1,3 @@
-import { describe, expect, it } from 'vitest';
-
 import { log } from './index.js';
 
 describe('app', () => {

package/template/private-npm-package/.nvmrc

@@ -1 +1 @@
-22
+24

package/template/private-npm-package/_package.json

@@ -14,7 +14,6 @@
   },
   "license": "UNLICENSED",
   "sideEffects": false,
-  "type": "module",
   "main": "./lib-commonjs/index.js",
   "module": "./lib-es2015/index.js",
   "types": "./lib-types/index.d.ts",
@@ -47,6 +46,6 @@
   },
   "packageManager": "pnpm@10.7.0",
   "engines": {
-    "node": ">=22"
+    "node": ">=20"
   }
 }

package/template/private-npm-package/skuba.template.js

@@ -2,7 +2,7 @@
  * Run `skuba configure` to finish templating and remove this file.
  */
 
-export default {
+module.exports = {
   entryPoint: 'src/index.ts',
   fields: [
     {
@@ -10,7 +10,7 @@ export default {
       message: 'Module name',
       initial: '@seek/my-first-module',
       validate: (value) =>
-        /^@seek\/.+$/.test(value) || 'must start with an @seek/ scope',
+        /^@seek\/.+$/.test(value) || 'Must start with @seek/ scope',
     },
     {
       name: 'description',

package/template/private-npm-package/src/index.test.ts

@@ -1,5 +1,3 @@
-import { describe, expect, it } from 'vitest';
-
 import { log } from './index.js';
 
 describe('app', () => {

package/lib/cli/lint/internalLints/upgrade/patches/12.5.0/index.js

@@ -1,11 +0,0 @@
-import { rewriteGlobalVars } from "./rewriteGlobalVars.js";
-const patches = [
-  {
-    apply: rewriteGlobalVars,
-    description: "Replace __dirname and __filename with import.meta equivalents"
-  }
-];
-export {
-  patches
-};
-//# sourceMappingURL=index.js.map

package/lib/cli/lint/internalLints/upgrade/patches/12.5.0/index.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.5.0/index.ts"],
-  "sourcesContent": ["import type { Patches } from '../../index.js';\n\nimport { rewriteGlobalVars } from './rewriteGlobalVars.js';\n\nexport const patches: Patches = [\n  {\n    apply: rewriteGlobalVars,\n    description:\n      'Replace __dirname and __filename with import.meta equivalents',\n  },\n];\n"],
-  "mappings": "AAEA,SAAS,yBAAyB;AAE3B,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aACE;AAAA,EACJ;AACF;",
-  "names": []
-}

package/lib/cli/lint/internalLints/upgrade/patches/12.5.0/rewriteGlobalVars.d.ts

@@ -1,5 +0,0 @@
-import type { PatchFunction } from '../../index.js';
-export declare const hasDirNameRegex: RegExp;
-export declare const hasFileNameRegex: RegExp;
-export declare const tryRewriteGlobalVars: PatchFunction;
-export declare const rewriteGlobalVars: PatchFunction;