skuba 4.2.2 → 4.3.1

package/template/koa-rest-api/gantry.build.yml

@@ -11,3 +11,5 @@ buildArgs:
 
 # SEEK-Jobs/gantry#1661
 failOnScanFindings: false
+
+cpuArchitecture: arm64

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

@@ -1,11 +1,11 @@
 {
   "dependencies": {
-    "@koa/router": "^10.1.1",
+    "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/exporter-collector-grpc": "^0.25.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.7.0",
-    "@opentelemetry/instrumentation-http": "^0.28.0",
-    "@opentelemetry/sdk-node": "^0.28.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.8.0",
+    "@opentelemetry/instrumentation-http": "^0.31.0",
+    "@opentelemetry/sdk-node": "^0.31.0",
     "@seek/logger": "^5.0.1",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^9.0.0",
@@ -15,7 +15,7 @@
     "runtypes": "^6.4.1",
     "runtypes-filter": "^0.6.0",
     "seek-datadog-custom-metrics": "^4.0.0",
-    "seek-koala": "^5.2.1",
+    "seek-koala": "^6.0.0",
     "skuba-dive": "^2.0.0",
     "uuid": "^8.3.2"
   },
@@ -28,7 +28,7 @@
     "@types/supertest": "^2.0.11",
     "@types/uuid": "^8.3.1",
     "chance": "^1.1.8",
-    "pino-pretty": "^7.1.0",
+    "pino-pretty": "^8.0.0",
     "skuba": "*",
     "supertest": "^6.1.6"
   },

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

@@ -32,10 +32,9 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v3.9.0:
+        - docker-compose#v3.10.0:
             dependencies: false
             run: app
-            tty: false
       retry:
         manual:
           # Only use this if you need to roll back a deployment ASAP.
@@ -61,7 +60,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.9.0:
+      - docker-compose#v3.10.0:
           run: app
     timeout_in_minutes: 10
 

package/template/lambda-sqs-worker/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM node:16-alpine AS dev-deps
+FROM --platform=arm64 node:16-alpine AS dev-deps
 
 WORKDIR /workdir
 

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

@@ -4,23 +4,25 @@
 
 Next steps:
 
-1. [ ] Finish templating if this was skipped earlier:
+1. [ ] Check if your team has a Graviton-based Buildkite cluster;
+       see the [ARM64 guide] for more information.
+2. [ ] Finish templating if this was skipped earlier:
 
    ```shell
    yarn skuba configure
    ```
 
-2. [ ] Create a new repository in the appropriate GitHub organisation.
-3. [ ] Add the repository to BuildAgency;
+3. [ ] Create a new repository in the appropriate GitHub organisation.
+4. [ ] Add the repository to BuildAgency;
        see [Builds at SEEK] for more information.
-4. [ ] Fill out [.me](.me) to power SEEK's system catalogue;
-       see the [Codex] documentation for more information.
 5. [ ] Add deployment bucket configuration and data classification tags to [serverless.yml](serverless.yml).
 6. [ ] Push local commits to the upstream GitHub branch.
 7. [ ] Configure [GitHub repository settings].
-8. [ ] Keep dependencies up to date with [Renovate];
-       request installation in [SEEK-Jobs/renovate].
-9. [ ] Delete this checklist 😌.
+8. [ ] Delete this checklist 😌.
+
+[arm64 guide]: https://seek-oss.github.io/skuba/docs/deep-dives/arm64.html
+[builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
+[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 
 ## Design
 
@@ -127,12 +129,7 @@ TODO: add support links for the prod environment.
 - Splunk logs
 -->
 
-[builds at seek]: https://builds-at-seek.ssod.skinfra.xyz
 [codedeploy]: https://docs.aws.amazon.com/codedeploy
-[codex]: https://codex.ssod.skinfra.xyz/docs
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 [lambda]: https://docs.aws.amazon.com/lambda
-[renovate]: https://github.com/apps/renovate
-[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
 [serverless]: https://www.serverless.com/
 [technology strategy]: https://tech-strategy.ssod.skinfra.xyz

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

@@ -12,7 +12,7 @@
     "@types/chance": "^1.1.3",
     "@types/node": "^16.0.0",
     "chance": "^1.1.8",
-    "pino-pretty": "^7.1.0",
+    "pino-pretty": "^8.0.0",
     "serverless": "^3.17.0",
     "serverless-plugin-canary-deployments": "^0.8.0",
     "serverless-prune-plugin": "^2.0.0",

package/template/lambda-sqs-worker/serverless.yml

@@ -54,9 +54,6 @@ provider:
         - Action: sns:Publish
           Effect: Allow
           Resource: !Ref DestinationTopic
-        - Action: sqs:SendMessage*
-          Effect: Allow
-          Resource: !GetAtt DeadLetterQueue.Arn
   stackTags:
     # TODO: add data classification tags
     # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdataconsumers

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

@@ -32,7 +32,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v3.9.0:
+        - docker-compose#v3.10.0:
             dependencies: false
             run: app
       retry:
@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.9.0:
+      - docker-compose#v3.10.0:
           run: app
     timeout_in_minutes: 10
 

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

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM node:16-alpine AS dev-deps
+FROM --platform=arm64 node:16-alpine AS dev-deps
 
 WORKDIR /workdir
 

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

@@ -146,6 +146,9 @@ Object {
         "workerServiceRole2130CC7F",
       ],
       "Properties": Object {
+        "Architectures": Array [
+          "arm64",
+        ],
         "Code": Object {
           "S3Bucket": Object {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",
@@ -502,6 +505,9 @@ Object {
         "workerServiceRole2130CC7F",
       ],
       "Properties": Object {
+        "Architectures": Array [
+          "arm64",
+        ],
         "Code": Object {
           "S3Bucket": Object {
             "Fn::Sub": "cdk-hnb659fds-assets-\${AWS::AccountId}-\${AWS::Region}",

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

@@ -51,6 +51,7 @@ export class AppStack extends Stack {
     });
 
     const worker = new aws_lambda.Function(this, 'worker', {
+      architecture: aws_lambda.Architecture.ARM_64,
       code: new aws_lambda.AssetCode('./lib'),
       runtime: aws_lambda.Runtime.NODEJS_16_X,
       handler: 'app.handler',

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

@@ -10,13 +10,16 @@ Next steps:
 
 1. [ ] Read [SEEK's Open Source RFC].
 2. [ ] Create a new repository in the [seek-oss] GitHub organisation.
-3. [ ] Fill out [.me](.me) to power SEEK's system catalogue;
-       see the [Codex] documentation for more information.
-4. [ ] Push local commits to the upstream GitHub branch.
-5. [ ] Configure [GitHub repository settings].
-6. [ ] Keep dependencies up to date with [Renovate];
+3. [ ] Push local commits to the upstream GitHub branch.
+4. [ ] Configure [GitHub repository settings].
+5. [ ] Keep dependencies up to date with [Renovate];
        request installation in [#open-source].
-7. [ ] Delete this checklist 😌.
+6. [ ] Delete this checklist 😌.
+
+[#open-source]: https://slack.com/app_redirect?channel=C39P1H2SU
+[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
+[renovate]: https://github.com/apps/renovate
+[seek's open source rfc]: https://rfc.skinfra.xyz/RFC016-Open-Source.html
 
 ## API
 
@@ -117,14 +120,9 @@ Here are some branches that **semantic-release** supports by default:
 
 For more information, see the **semantic-release** docs on [triggering a release].
 
-[#open-source]: https://slack.com/app_redirect?channel=C39P1H2SU
-[codex]: https://codex.ssod.skinfra.xyz/docs
 [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
 [release workflow]: .github/workflows/release.yml
 [seek-oss]: https://github.com/seek-oss
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
-[seek's open source rfc]: https://rfc.skinfra.xyz/RFC016-Open-Source.html
-[renovate]: https://github.com/apps/renovate
 [semantic-release]: https://github.com/semantic-release/semantic-release
 [triggering a release]: https://github.com/semantic-release/semantic-release/#triggering-a-release

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

@@ -10,13 +10,12 @@ Next steps:
 
 1. [ ] Create a new repository in the [SEEK-Jobs] GitHub organisation.
 2. [ ] Follow [Gutenberg] instructions for [installing on your repository].
-3. [ ] Fill out [.me](.me) to power SEEK's system catalogue;
-       see the [Codex] documentation for more information.
-4. [ ] Push local commits to the upstream GitHub branch.
-5. [ ] Configure [GitHub repository settings].
-6. [ ] Keep dependencies up to date with [Renovate];
-       request installation in [SEEK-Jobs/renovate].
-7. [ ] Delete this checklist 😌.
+3. [ ] Push local commits to the upstream GitHub branch.
+4. [ ] Configure [GitHub repository settings].
+5. [ ] Delete this checklist 😌.
+
+[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
+[installing on your repository]: https://github.com/SEEK-Jobs/gutenberg#installing-on-your-repository
 
 ## API
 
@@ -103,13 +102,8 @@ Here are some branches that **semantic-release** supports by default:
 
 For more information, see the **semantic-release** docs on [triggering a release].
 
-[codex]: https://codex.ssod.skinfra.xyz/docs
 [distribution tags]: https://docs.npmjs.com/adding-dist-tags-to-packages
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 [gutenberg]: https://github.com/SEEK-Jobs/gutenberg
-[installing on your repository]: https://github.com/SEEK-Jobs/gutenberg#installing-on-your-repository
-[renovate]: https://github.com/apps/renovate
 [seek-jobs]: https://github.com/orgs/seek-jobs/sso
-[seek-jobs/renovate]: https://github.com/SEEK-Jobs/renovate
 [semantic-release]: https://github.com/semantic-release/semantic-release
 [triggering a release]: https://github.com/semantic-release/semantic-release/#triggering-a-release

package/template/express-rest-api/.me

@@ -1,22 +0,0 @@
----
-# https://codex.ssod.skinfra.xyz/docs
-
-components:
-  '<%- repoName %>':
-    # TODO: supply system catalog information
-    # dependencies:
-    #   - type: api
-    #     key: SEEK-Jobs/???
-    #   - type: datastore
-    #     arn: arn:aws:dynamodb:us-east-1:123456789012:table/???
-    #   - type: datastore
-    #     key: infrastructure/???
-    deploy_target: API
-    # is_production_system: true
-    primary_technologies:
-      - Buildkite
-      - Express
-      - Gantry
-      - skuba
-      - TypeScript
-    # scope: APAC

package/template/greeter/.me

@@ -1,20 +0,0 @@
----
-# https://codex.ssod.skinfra.xyz/docs
-
-components:
-  '<%- repoName %>':
-    # TODO: supply system catalog information
-    # dependencies:
-    #   - type: api
-    #     key: SEEK-Jobs/???
-    #   - type: datastore
-    #     arn: arn:aws:dynamodb:us-east-1:123456789012:table/???
-    #   - type: datastore
-    #     key: infrastructure/???
-    # deploy_target: Documentation
-    # is_production_system: false
-    primary_technologies:
-      - Buildkite
-      - skuba
-      - TypeScript
-    # scope: APAC

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

@@ -1,22 +0,0 @@
----
-# https://codex.ssod.skinfra.xyz/docs
-
-components:
-  '<%- repoName %>':
-    # TODO: supply system catalog information
-    # dependencies:
-    #   - type: api
-    #     key: SEEK-Jobs/???
-    #   - type: datastore
-    #     arn: arn:aws:dynamodb:us-east-1:123456789012:table/???
-    #   - type: datastore
-    #     key: infrastructure/???
-    deploy_target: API
-    # is_production_system: true
-    primary_technologies:
-      - Buildkite
-      - Gantry
-      - Koa
-      - skuba
-      - TypeScript
-    # scope: APAC

package/template/lambda-sqs-worker/.me

@@ -1,22 +0,0 @@
----
-# https://codex.ssod.skinfra.xyz/docs
-
-components:
-  '<%- repoName %>':
-    # TODO: supply system catalog information
-    # dependencies:
-    #   - type: api
-    #     key: SEEK-Jobs/???
-    #   - type: datastore
-    #     arn: arn:aws:dynamodb:us-east-1:123456789012:table/???
-    #   - type: datastore
-    #     key: infrastructure/???
-    deploy_target: Worker
-    # is_production_system: true
-    primary_technologies:
-      - AWS Lambda
-      - Buildkite
-      - Serverless
-      - skuba
-      - TypeScript
-    # scope: APAC

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

@@ -1,22 +0,0 @@
----
-# https://codex.ssod.skinfra.xyz/docs
-
-components:
-  '<%- repoName %>':
-    # TODO: supply system catalog information
-    # dependencies:
-    #   - type: api
-    #     key: SEEK-Jobs/???
-    #   - type: datastore
-    #     arn: arn:aws:dynamodb:us-east-1:123456789012:table/???
-    #   - type: datastore
-    #     key: infrastructure/???
-    deploy_target: Worker
-    # is_production_system: true
-    primary_technologies:
-      - AWS CDK
-      - AWS Lambda
-      - Buildkite
-      - skuba
-      - TypeScript
-    # scope: APAC

package/template/oss-npm-package/.me

@@ -1,21 +0,0 @@
----
-# https://codex.ssod.skinfra.xyz/docs
-
-components:
-  '<%- repoName %>':
-    # TODO: supply system catalog information
-    # dependencies:
-    #   - type: api
-    #     key: SEEK-Jobs/???
-    #   - type: datastore
-    #     arn: arn:aws:dynamodb:us-east-1:123456789012:table/???
-    #   - type: datastore
-    #     key: infrastructure/???
-    deploy_target: Library
-    # is_production_system: false
-    primary_technologies:
-      - GitHub Actions
-      - npm
-      - skuba
-      - TypeScript
-    # scope: APAC

package/template/private-npm-package/.me

@@ -1,21 +0,0 @@
----
-# https://codex.ssod.skinfra.xyz/docs
-
-components:
-  '<%- repoName %>':
-    # TODO: supply system catalog information
-    # dependencies:
-    #   - type: api
-    #     key: SEEK-Jobs/???
-    #   - type: datastore
-    #     arn: arn:aws:dynamodb:us-east-1:123456789012:table/???
-    #   - type: datastore
-    #     key: infrastructure/???
-    deploy_target: Library
-    # is_production_system: false
-    primary_technologies:
-      - Buildkite
-      - npm
-      - skuba
-      - TypeScript
-    # scope: APAC