skuba 7.1.1 → 7.3.0

package/template/koa-rest-api/.buildkite/pipeline.yml

@@ -9,16 +9,17 @@ configs:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
     - &docker-ecr-cache
-      seek-oss/docker-ecr-cache#v2.0.0:
+      seek-oss/docker-ecr-cache#v2.1.0: &docker-ecr-cache-defaults
         cache-on:
           - package.json
           - yarn.lock
         dockerfile: Dockerfile.dev-deps
-        secrets: id=npm,src=.npmrc
+        secrets: id=npm,src=tmp/.npmrc
 
     - &private-npm
       seek-oss/private-npm#v1.2.0:
         env: NPM_READ_TOKEN
+        output-path: tmp/
 
   base-steps:
     - &deploy
@@ -36,7 +37,9 @@ steps:
     plugins:
       - *aws-sm
       - *private-npm
-      - *docker-ecr-cache
+      - seek-oss/docker-ecr-cache#v2.1.0:
+          <<: *docker-ecr-cache-defaults
+          skip-pull-from-cache: true
 
   - label: 🧪 Test & Lint
     commands:
@@ -51,7 +54,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.14.0:
+      - docker-compose#v4.16.0:
           run: app
     timeout_in_minutes: 10
 

package/template/koa-rest-api/Dockerfile.dev-deps

@@ -7,5 +7,5 @@ WORKDIR /workdir
 COPY package.json yarn.lock ./
 
 RUN \
-  --mount=type=secret,id=npm,dst=/workdir/.npmrc \
+  --mount=type=secret,id=npm,dst=/root/.npmrc \
   yarn install --frozen-lockfile --ignore-optional --non-interactive

package/template/koa-rest-api/README.md

@@ -19,12 +19,12 @@ Next steps:
 6. [ ] Configure [GitHub repository settings].
 7. [ ] Delete this checklist 😌.
 
-[builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
+[builds at seek]: https://backstage.myseek.xyz/docs/default/component/builds-cicd-seek/
 [github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 
 ## Design
 
-<%-repoName %> is a Node.js HTTP server built in line with our [technology strategy].
+<%-repoName %> is a Node.js HTTP server built in line with our [Technical Guidelines].
 It uses the [Koa] middleware framework and common SEEK packages.
 Resource APIs enable synchronous interactions and serve as the backbone of SEEK's general service architecture.
 
@@ -105,7 +105,7 @@ TODO: add support links for the prod environment.
 - Splunk logs
 -->
 
-[codedeploy]: https://docs.aws.amazon.com/codedeploy
-[gantry]: https://backstage.myseek.xyz/docs/default/component/gantry/
-[koa]: https://koajs.com
-[technology strategy]: https://tech-strategy.ssod.skinfra.xyz
+[CodeDeploy]: https://docs.aws.amazon.com/codedeploy
+[Gantry]: https://backstage.myseek.xyz/docs/default/component/gantry/
+[Koa]: https://koajs.com
+[Technical Guidelines]: https://myseek.atlassian.net/wiki/spaces/AA/pages/2358346017/

package/template/koa-rest-api/package.json

@@ -14,10 +14,10 @@
   "dependencies": {
     "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.41.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.44.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.36.0",
-    "@opentelemetry/instrumentation-http": "^0.41.0",
-    "@opentelemetry/sdk-node": "^0.41.0",
+    "@opentelemetry/instrumentation-http": "^0.44.0",
+    "@opentelemetry/sdk-node": "^0.44.0",
     "@seek/logger": "^6.0.0",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^10.0.0",
@@ -25,7 +25,7 @@
     "koa-bodyparser": "^4.3.0",
     "koa-compose": "^4.2.0",
     "seek-datadog-custom-metrics": "^4.2.1",
-    "seek-koala": "^6.0.0",
+    "seek-koala": "^7.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
   },

package/template/koa-rest-api/src/app.test.ts

@@ -10,11 +10,15 @@ describe('app', () => {
 
   it('has a happy health check', () => agent.get('/health').expect(200, ''));
 
-  it('has a reachable smoke test', () =>
-    agent.get('/smoke').expect(({ status }) => status !== 404));
+  it('has a reachable smoke test', async () => {
+    const response = await agent.get('/smoke');
+    expect(response.status).not.toBe(404);
+  });
 
-  it('has a reachable nested route', () =>
-    agent.get('/jobs').expect(({ status }) => status !== 404));
+  it('has a reachable nested route', async () => {
+    const response = await agent.get('/jobs');
+    expect(response.status).not.toBe(404);
+  });
 
   it('has OPTIONS for a nested route', () =>
     agent.options('/jobs').expect(200).expect('allow', /HEAD/));

package/template/lambda-sqs-worker/.buildkite/pipeline.yml

@@ -9,15 +9,16 @@ configs:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
     - &docker-ecr-cache
-      seek-oss/docker-ecr-cache#v2.0.0:
+      seek-oss/docker-ecr-cache#v2.1.0: &docker-ecr-cache-defaults
         cache-on:
           - package.json
           - yarn.lock
-        secrets: id=npm,src=.npmrc
+        secrets: id=npm,src=tmp/.npmrc
 
     - &private-npm
       seek-oss/private-npm#v1.2.0:
         env: NPM_READ_TOKEN
+        output-path: tmp/
 
   base-steps:
     - &deploy
@@ -26,13 +27,13 @@ configs:
         - yarn deploy
       concurrency: 1
       plugins:
-        - artifacts#v1.9.0:
+        - artifacts#v1.9.2:
             build: ${BUILDKITE_BUILD_ID}
             download: lib/*
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v4.14.0:
+        - docker-compose#v4.16.0:
             dependencies: false
             run: app
       retry:
@@ -60,7 +61,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.14.0:
+      - docker-compose#v4.16.0:
           run: app
     timeout_in_minutes: 10
 
@@ -72,7 +73,9 @@ steps:
     plugins:
       - *aws-sm
       - *private-npm
-      - *docker-ecr-cache
+      - seek-oss/docker-ecr-cache#v2.1.0:
+          <<: *docker-ecr-cache-defaults
+          skip-pull-from-cache: true
 
   - wait
   - block: 🙋🏻‍♀️ Deploy Dev

package/template/lambda-sqs-worker/Dockerfile

@@ -7,6 +7,6 @@ WORKDIR /workdir
 COPY package.json yarn.lock ./
 
 RUN \
-  --mount=type=secret,id=npm,dst=/workdir/.npmrc \
+  --mount=type=secret,id=npm,dst=/root/.npmrc \
   yarn install --frozen-lockfile --ignore-optional --non-interactive && \
   yarn cache clean

package/template/lambda-sqs-worker/README.md

@@ -18,12 +18,12 @@ Next steps:
 6. [ ] Configure [GitHub repository settings].
 7. [ ] Delete this checklist 😌.
 
-[builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
+[builds at seek]: https://backstage.myseek.xyz/docs/default/component/builds-cicd-seek/
 [github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 
 ## Design
 
-<%-repoName %> is a Node.js [Lambda] application built in line with our [technology strategy].
+<%-repoName %> is a Node.js [Lambda] application built in line with our [Technical Guidelines].
 It is backed by a typical SQS message + dead letter queue configuration and uses common SEEK packages.
 Workers enable fault-tolerant asynchronous processing of events.
 
@@ -126,7 +126,7 @@ TODO: add support links for the prod environment.
 - Splunk logs
 -->
 
-[codedeploy]: https://docs.aws.amazon.com/codedeploy
-[lambda]: https://docs.aws.amazon.com/lambda
-[serverless]: https://www.serverless.com/
-[technology strategy]: https://tech-strategy.ssod.skinfra.xyz
+[CodeDeploy]: https://docs.aws.amazon.com/codedeploy
+[Lambda]: https://docs.aws.amazon.com/lambda
+[Serverless]: https://www.serverless.com/
+[Technical Guidelines]: https://myseek.atlassian.net/wiki/spaces/AA/pages/2358346017/

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

@@ -78,7 +78,7 @@ describe('validateJson', () => {
     expect(() =>
       validateJson(input, IdDescriptionSchema),
     ).toThrowErrorMatchingInlineSnapshot(
-      `"Unexpected token } in JSON at position 0"`,
+      `"Unexpected token '}', "}" is not valid JSON"`,
     );
   });
 });

package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml

@@ -9,15 +9,16 @@ configs:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
     - &docker-ecr-cache
-      seek-oss/docker-ecr-cache#v2.0.0:
+      seek-oss/docker-ecr-cache#v2.1.0: &docker-ecr-cache-defaults
         cache-on:
           - package.json
           - yarn.lock
-        secrets: id=npm,src=.npmrc
+        secrets: id=npm,src=tmp/.npmrc
 
     - &private-npm
       seek-oss/private-npm#v1.2.0:
         env: NPM_READ_TOKEN
+        output-path: tmp/
 
   base-steps:
     - &deploy
@@ -26,13 +27,13 @@ configs:
         - yarn deploy
       concurrency: 1
       plugins:
-        - artifacts#v1.9.0:
+        - artifacts#v1.9.2:
             build: ${BUILDKITE_BUILD_ID}
             download: lib/*
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v4.14.0:
+        - docker-compose#v4.16.0:
             dependencies: false
             run: app
       retry:
@@ -57,7 +58,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v4.14.0:
+      - docker-compose#v4.16.0:
           run: app
     timeout_in_minutes: 10
 
@@ -69,7 +70,9 @@ steps:
     plugins:
       - *aws-sm
       - *private-npm
-      - *docker-ecr-cache
+      - seek-oss/docker-ecr-cache#v2.1.0:
+          <<: *docker-ecr-cache-defaults
+          skip-pull-from-cache: true
 
   - wait
   - block: 🙋🏻‍♀️ Deploy Dev

package/template/lambda-sqs-worker-cdk/Dockerfile

@@ -7,7 +7,7 @@ WORKDIR /workdir
 COPY package.json yarn.lock ./
 
 RUN \
-  --mount=type=secret,id=npm,dst=/workdir/.npmrc \
+  --mount=type=secret,id=npm,dst=/root/.npmrc \
   yarn install --frozen-lockfile --ignore-optional --non-interactive && \
   yarn package && \
   yarn cache clean

package/template/oss-npm-package/README.md

@@ -121,7 +121,7 @@ Here are some branches that **semantic-release** supports by default:
 For more information, see the **semantic-release** docs on [triggering a release].
 
 [distribution tags]: https://docs.npmjs.com/adding-dist-tags-to-packages
-[oss npm package guidance]: https://github.com/SEEK-Jobs/seek-oss-ci/blob/master/NPM_PACKAGES.md#access-to-publish-to-npm
+[OSS npm package guidance]: https://github.com/SEEK-Jobs/seek-oss-ci/blob/master/NPM_PACKAGES.md#access-to-publish-to-npm
 [release workflow]: .github/workflows/release.yml
 [seek-oss]: https://github.com/seek-oss
 [semantic-release]: https://github.com/semantic-release/semantic-release

package/template/private-npm-package/README.md

@@ -103,7 +103,7 @@ Here are some branches that **semantic-release** supports by default:
 For more information, see the **semantic-release** docs on [triggering a release].
 
 [distribution tags]: https://docs.npmjs.com/adding-dist-tags-to-packages
-[gutenberg]: https://github.com/SEEK-Jobs/gutenberg
-[seek-jobs]: https://github.com/orgs/seek-jobs/sso
+[Gutenberg]: https://github.com/SEEK-Jobs/gutenberg
+[SEEK-Jobs]: https://github.com/orgs/seek-jobs/sso
 [semantic-release]: https://github.com/semantic-release/semantic-release
 [triggering a release]: https://github.com/semantic-release/semantic-release/#triggering-a-release