skuba 4.1.0 โ†’ 4.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/lib/cli/adapter/eslint.js +15 -0
  2. package/lib/cli/adapter/eslint.js.map +1 -1
  3. package/lib/cli/configure/processing/package.d.ts +1 -0
  4. package/lib/cli/node.js +4 -1
  5. package/lib/cli/node.js.map +1 -1
  6. package/package.json +7 -7
  7. package/template/base/jest.config.ts +6 -0
  8. package/template/express-rest-api/.buildkite/pipeline.yml +13 -22
  9. package/template/greeter/.buildkite/pipeline.yml +4 -9
  10. package/template/koa-rest-api/.buildkite/pipeline.yml +13 -22
  11. package/template/koa-rest-api/package.json +1 -1
  12. package/template/lambda-sqs-worker/.buildkite/pipeline.yml +16 -22
  13. package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml +14 -20
  14. package/template/private-npm-package/.buildkite/pipeline.yml +3 -2
package/lib/cli/adapter/eslint.js CHANGED
@@ -34,10 +34,25 @@ const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function*
34
34
  const cwd = process.cwd();
35
35
  logger.debug('Processing files...');
36
36
  const start = process.hrtime.bigint();
37
+ /* eslint-disable no-console */
38
+ const ogConsoleError = console.error;
39
+ console.error = (...args) => {
40
+ if (args[0] !==
41
+ // `eslint-plugin-react` prints this annoying error on non-React repos.
42
+ // We still want to support React linting for repos that have React code,
43
+ // so we have to manually suppress it.
44
+ //
45
+ // https://github.com/yannickcr/eslint-plugin-react/blob/7484acaca8351a8568fa99344bc811c5cd8396bd/lib/util/version.js#L61-L65
46
+ 'Warning: React version was set to "detect" in eslint-plugin-react settings, but the "react" package is not installed. Assuming latest React version for linting.') {
47
+ ogConsoleError(...args);
48
+ }
49
+ };
37
50
  const [formatter, results] = yield Promise.all([
38
51
  engine.loadFormatter(),
39
52
  engine.lintFiles('.'),
40
53
  ]);
54
+ console.error = ogConsoleError;
55
+ /* eslint-enable no-console */
41
56
  const end = process.hrtime.bigint();
42
57
  logger.plain(`Processed ${(0, logging_1.pluralise)(results.length, 'file')} in ${logger.timing(start, end)}.`);
43
58
  const errors = [];
package/lib/cli/adapter/eslint.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/adapter/eslint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,kDAA0B;AAE1B,mCAAgC;AAGhC,iDAAgD;AAEhD,MAAM,eAAe,GAAG,CAAC,MAAyB,EAAE,EAAE;IACpD,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACvB;IAED,OAAO,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACpE,CAAC,CAAC;AAcK,MAAM,SAAS,GAAG,CACvB,IAAuB,EACvB,MAAc,EACS,EAAE;IACzB,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAEvC,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC;QACxB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;QAC/B,GAAG,EAAE,IAAI,KAAK,QAAQ;QACtB,6BAA6B,EAAE,OAAO;KACvC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAEpC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAEtC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC7C,MAAM,CAAC,aAAa,EAAE;QACtB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC;KACtB,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAEpC,MAAM,CAAC,KAAK,CACV,aAAa,IAAA,mBAAS,EAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,MAAM,CAAC,MAAM,CAChE,KAAK,EACL,GAAG,CACJ,GAAG,CACL,CAAC;IAEF,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAmB,EAAE,CAAC;IAEpC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC;gBACV,QAAQ,EAAE,YAAY;gBACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;SACJ;QAED,IAAI,MAAM,CAAC,YAAY,EAAE;YACvB,QAAQ,CAAC,IAAI,CAAC;gBACZ,QAAQ,EAAE,YAAY;gBACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;SACJ;QAED,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;KACrD;IAED,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAE/B,MAAM,eAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAElC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE/C,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACtB;IAED,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC1C,CAAC,CAAA,CAAC;AAlEW,QAAA,SAAS,aAkEpB"}
1
+ {"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/adapter/eslint.ts"],"names":[],"mappings":"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"}
package/lib/cli/configure/processing/package.d.ts CHANGED
@@ -21,6 +21,7 @@ export declare const createDependencyFilter: (names: readonly string[], type: 'd
21
21
  type?: "module" | "commonjs" | undefined;
22
22
  main?: string | undefined;
23
23
  exports?: import("type-fest").PackageJson.Exports | undefined;
24
+ imports?: import("type-fest").PackageJson.Imports | undefined;
24
25
  bin?: string | Record<string, string> | undefined;
25
26
  man?: string | string[] | undefined;
26
27
  directories?: import("type-fest").PackageJson.DirectoryLocations | undefined;
package/lib/cli/node.js CHANGED
@@ -50,7 +50,10 @@ const node = () => __awaiter(void 0, void 0, void 0, function* () {
50
50
  });
51
51
  // Run a script with plain `node` to support inspector options.
52
52
  // https://github.com/TypeStrong/ts-node#programmatic
53
- return exec('node', ...args.node, '--require', 'dotenv/config', '--require', 'tsconfig-paths/register', '--require', 'ts-node/register/transpile-only', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
53
+ return exec('node', ...args.node, '--require', 'dotenv/config', '--require', 'tsconfig-paths/register', '--require', 'ts-node/register/transpile-only',
54
+ // Override dangerously warn-only default on Node.js <15 so that we
55
+ // predictably return a non-zero exit code on an unhandled rejection.
56
+ '--unhandled-rejections=throw', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
54
57
  }
55
58
  // REPL with `ts-node` to support import statements.
56
59
  return tsNode
package/lib/cli/node.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/cli/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAC/B,gDAAkC;AAElC,wCAA6C;AAC7C,wCAA2C;AAC3C,oDAA+C;AAExC,MAAM,IAAI,GAAG,GAAS,EAAE;IAC7B,MAAM,IAAI,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,MAAM,IAAA,kBAAO,GAAE,CAAC;IAEtC,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;YACtB,GAAG,EAAE;gBACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;gBACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;aACtE;SACF,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qDAAqD;QACrD,OAAO,IAAI,CACT,MAAM,EACN,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,iCAAiC,EACjC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;KACH;IAED,oDAAoD;IACpD,OAAO,MAAM;SACV,UAAU,CAAC;QACV,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,EAAE,CAAC,eAAe,EAAE,yBAAyB,CAAC;YACrD,aAAa,EAAE,IAAI;SACpB,CAAC;KACH,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC,CAAA,CAAC;AAtCW,QAAA,IAAI,QAsCf"}
1
+ {"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/cli/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAC/B,gDAAkC;AAElC,wCAA6C;AAC7C,wCAA2C;AAC3C,oDAA+C;AAExC,MAAM,IAAI,GAAG,GAAS,EAAE;IAC7B,MAAM,IAAI,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,MAAM,IAAA,kBAAO,GAAE,CAAC;IAEtC,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;YACtB,GAAG,EAAE;gBACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;gBACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;aACtE;SACF,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qDAAqD;QACrD,OAAO,IAAI,CACT,MAAM,EACN,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,iCAAiC;QACjC,mEAAmE;QACnE,qEAAqE;QACrE,8BAA8B,EAC9B,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;KACH;IAED,oDAAoD;IACpD,OAAO,MAAM;SACV,UAAU,CAAC;QACV,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,EAAE,CAAC,eAAe,EAAE,yBAAyB,CAAC;YACrD,aAAa,EAAE,IAAI;SACpB,CAAC;KACH,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC,CAAA,CAAC;AAzCW,QAAA,IAAI,QAyCf"}
package/package.json CHANGED
@@ -16,7 +16,7 @@
16
16
  "ejs": "^3.1.6",
17
17
  "enquirer": "^2.3.6",
18
18
  "eslint": "^7.27.0",
19
- "eslint-config-skuba": "1.0.14",
19
+ "eslint-config-skuba": "1.0.15",
20
20
  "execa": "^5.0.0",
21
21
  "fdir": "^5.0.0",
22
22
  "fs-extra": "^10.0.0",
@@ -28,11 +28,11 @@
28
28
  "jest": "^27.4.5",
29
29
  "latest-version": "^5.1.0",
30
30
  "lodash.mergewith": "^4.6.2",
31
- "normalize-package-data": "^3.0.0",
31
+ "normalize-package-data": "^4.0.0",
32
32
  "npm-run-path": "^4.0.1",
33
33
  "npm-which": "^3.0.1",
34
34
  "picomatch": "^2.2.2",
35
- "prettier": "~2.5.0",
35
+ "prettier": "~2.6.0",
36
36
  "read-pkg-up": "^7.0.1",
37
37
  "runtypes": "^6.0.0",
38
38
  "semantic-release": "^19.0.0",
@@ -48,7 +48,7 @@
48
48
  },
49
49
  "description": "SEEK development toolkit for backend applications and packages",
50
50
  "devDependencies": {
51
- "@changesets/cli": "2.20.0",
51
+ "@changesets/cli": "2.21.1",
52
52
  "@changesets/get-github-info": "0.5.0",
53
53
  "@jest/reporters": "27.5.1",
54
54
  "@types/ejs": "3.1.0",
@@ -60,13 +60,13 @@
60
60
  "@types/npm-which": "3.0.1",
61
61
  "@types/picomatch": "2.3.0",
62
62
  "@types/supertest": "2.0.11",
63
- "express": "4.17.2",
63
+ "express": "4.17.3",
64
64
  "jsonfile": "6.1.0",
65
65
  "koa": "2.13.4",
66
66
  "memfs": "3.4.1",
67
67
  "semver": "7.3.5",
68
68
  "supertest": "6.2.2",
69
- "type-fest": "2.11.2"
69
+ "type-fest": "2.12.0"
70
70
  },
71
71
  "engines": {
72
72
  "node": ">=14.18"
@@ -124,5 +124,5 @@
124
124
  "version": "4.0.0"
125
125
  },
126
126
  "types": "./lib/index.d.ts",
127
- "version": "4.1.0"
127
+ "version": "4.1.1"
128
128
  }
package/template/base/jest.config.ts CHANGED
@@ -10,6 +10,12 @@ export default Jest.mergePreset({
10
10
  statements: 0,
11
11
  },
12
12
  },
13
+ globals: {
14
+ 'ts-jest': {
15
+ // seek-oss/skuba#626
16
+ isolatedModules: true,
17
+ },
18
+ },
13
19
  setupFiles: ['<rootDir>/jest.setup.ts'],
14
20
  testPathIgnorePatterns: ['/test\\.ts'],
15
21
  });
package/template/express-rest-api/.buildkite/pipeline.yml CHANGED
@@ -1,13 +1,7 @@
1
- configs:
2
- environments:
3
- - &dev
4
- agents:
5
- queue: <%- devBuildkiteQueueName %>
6
-
7
- - &prod
8
- agents:
9
- queue: <%- prodBuildkiteQueueName %>
1
+ agents:
2
+ queue: <%- prodBuildkiteQueueName %>
10
3
 
4
+ configs:
11
5
  plugins:
12
6
  - &aws-sm
13
7
  seek-oss/aws-sm#v2.3.1:
@@ -36,8 +30,7 @@ configs:
36
30
  permit_on_passed: true
37
31
 
38
32
  steps:
39
- - <<: *prod
40
- label: ๐Ÿง–โ€โ™€๏ธ Warm Prod
33
+ - label: ๐Ÿง–โ€โ™€๏ธ Warm Prod
41
34
  command: ':'
42
35
  key: warm-prod
43
36
  plugins:
@@ -45,8 +38,7 @@ steps:
45
38
  - *private-npm
46
39
  - *docker-ecr-cache
47
40
 
48
- - <<: *prod
49
- label: ๐Ÿงช Test & Lint
41
+ - label: ๐Ÿงช Test & Lint
50
42
  commands:
51
43
  - echo '+++ yarn test:ci'
52
44
  - yarn test:ci
@@ -62,14 +54,13 @@ steps:
62
54
  - docker-compose#v3.9.0:
63
55
  run: app
64
56
 
65
- - <<: *prod
66
- label: ๐Ÿ“ฆ Build & Package
57
+ - label: ๐Ÿ“ฆ Build & Package
67
58
  depends_on: warm-prod
68
59
  plugins:
69
60
  - *aws-sm
70
61
  - *private-npm
71
62
  - *docker-ecr-cache
72
- - seek-jobs/gantry#v1.6.1:
63
+ - seek-jobs/gantry#v1.6.2:
73
64
  command: build
74
65
  file: gantry.build.yml
75
66
  region: <%- region %>
@@ -79,13 +70,14 @@ steps:
79
70
  - block: ๐Ÿ™‹๐Ÿปโ€โ™€๏ธ Deploy Dev
80
71
  branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
81
72
 
82
- - <<: *dev
83
- <<: *deploy
73
+ - <<: *deploy
74
+ agents:
75
+ queue: <%- devBuildkiteQueueName %>
84
76
  label: ๐Ÿคž Deploy Dev
85
77
  concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
86
78
  key: deploy-dev
87
79
  plugins:
88
- - seek-jobs/gantry#v1.6.1:
80
+ - seek-jobs/gantry#v1.6.2:
89
81
  command: apply
90
82
  environment: <%- devGantryEnvironmentName %>
91
83
  file: gantry.apply.yml
@@ -94,14 +86,13 @@ steps:
94
86
  - .gantry/common.yml
95
87
  - .gantry/dev.yml
96
88
 
97
- - <<: *prod
98
- <<: *deploy
89
+ - <<: *deploy
99
90
  label: ๐Ÿš€ Deploy Prod
100
91
  branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
101
92
  concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
102
93
  depends_on: deploy-dev
103
94
  plugins:
104
- - seek-jobs/gantry#v1.6.1:
95
+ - seek-jobs/gantry#v1.6.2:
105
96
  command: apply
106
97
  environment: <%- prodGantryEnvironmentName %>
107
98
  file: gantry.apply.yml
package/template/greeter/.buildkite/pipeline.yml CHANGED
@@ -1,11 +1,7 @@
1
- configs:
2
- environments:
3
- - &prod
4
- agents:
5
- queue: <%- prodBuildkiteQueueName %>
6
- env:
7
- ENVIRONMENT: prod
1
+ agents:
2
+ queue: <%- prodBuildkiteQueueName %>
8
3
 
4
+ configs:
9
5
  plugins:
10
6
  - &aws-sm
11
7
  seek-oss/aws-sm#v2.3.1:
@@ -24,8 +20,7 @@ configs:
24
20
  env: NPM_READ_TOKEN
25
21
 
26
22
  steps:
27
- - <<: *prod
28
- label: ๐Ÿงช Test & Lint
23
+ - label: ๐Ÿงช Test & Lint
29
24
  commands:
30
25
  - echo '+++ yarn test:ci'
31
26
  - yarn test:ci
package/template/koa-rest-api/.buildkite/pipeline.yml CHANGED
@@ -1,13 +1,7 @@
1
- configs:
2
- environments:
3
- - &dev
4
- agents:
5
- queue: <%- devBuildkiteQueueName %>
6
-
7
- - &prod
8
- agents:
9
- queue: <%- prodBuildkiteQueueName %>
1
+ agents:
2
+ queue: <%- prodBuildkiteQueueName %>
10
3
 
4
+ configs:
11
5
  plugins:
12
6
  - &aws-sm
13
7
  seek-oss/aws-sm#v2.3.1:
@@ -36,8 +30,7 @@ configs:
36
30
  permit_on_passed: true
37
31
 
38
32
  steps:
39
- - <<: *prod
40
- label: ๐Ÿง–โ€โ™€๏ธ Warm Prod
33
+ - label: ๐Ÿง–โ€โ™€๏ธ Warm Prod
41
34
  command: ':'
42
35
  key: warm-prod
43
36
  plugins:
@@ -45,8 +38,7 @@ steps:
45
38
  - *private-npm
46
39
  - *docker-ecr-cache
47
40
 
48
- - <<: *prod
49
- label: ๐Ÿงช Test & Lint
41
+ - label: ๐Ÿงช Test & Lint
50
42
  commands:
51
43
  - echo '+++ yarn test:ci'
52
44
  - yarn test:ci
@@ -62,14 +54,13 @@ steps:
62
54
  - docker-compose#v3.9.0:
63
55
  run: app
64
56
 
65
- - <<: *prod
66
- label: ๐Ÿ“ฆ Build & Package
57
+ - label: ๐Ÿ“ฆ Build & Package
67
58
  depends_on: warm-prod
68
59
  plugins:
69
60
  - *aws-sm
70
61
  - *private-npm
71
62
  - *docker-ecr-cache
72
- - seek-jobs/gantry#v1.6.1:
63
+ - seek-jobs/gantry#v1.6.2:
73
64
  command: build
74
65
  file: gantry.build.yml
75
66
  region: <%- region %>
@@ -79,13 +70,14 @@ steps:
79
70
  - block: ๐Ÿ™‹๐Ÿปโ€โ™€๏ธ Deploy Dev
80
71
  branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
81
72
 
82
- - <<: *dev
83
- <<: *deploy
73
+ - <<: *deploy
74
+ agents:
75
+ queue: <%- devBuildkiteQueueName %>
84
76
  label: ๐Ÿคž Deploy Dev
85
77
  concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
86
78
  key: deploy-dev
87
79
  plugins:
88
- - seek-jobs/gantry#v1.6.1:
80
+ - seek-jobs/gantry#v1.6.2:
89
81
  command: apply
90
82
  environment: <%- devGantryEnvironmentName %>
91
83
  file: gantry.apply.yml
@@ -94,14 +86,13 @@ steps:
94
86
  - .gantry/common.yml
95
87
  - .gantry/dev.yml
96
88
 
97
- - <<: *prod
98
- <<: *deploy
89
+ - <<: *deploy
99
90
  label: ๐Ÿš€ Deploy Prod
100
91
  branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
101
92
  concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
102
93
  depends_on: deploy-dev
103
94
  plugins:
104
- - seek-jobs/gantry#v1.6.1:
95
+ - seek-jobs/gantry#v1.6.2:
105
96
  command: apply
106
97
  environment: <%- prodGantryEnvironmentName %>
107
98
  file: gantry.apply.yml
package/template/koa-rest-api/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "@koa/router": "^10.1.1",
4
4
  "@opentelemetry/api": "^1.0.4",
5
5
  "@opentelemetry/exporter-collector-grpc": "^0.25.0",
6
- "@opentelemetry/instrumentation-aws-sdk": "^0.5.0",
6
+ "@opentelemetry/instrumentation-aws-sdk": "^0.6.0",
7
7
  "@opentelemetry/instrumentation-http": "^0.27.0",
8
8
  "@opentelemetry/sdk-node": "^0.27.0",
9
9
  "@seek/logger": "^5.0.1",
package/template/lambda-sqs-worker/.buildkite/pipeline.yml CHANGED
@@ -1,20 +1,7 @@
1
- env:
2
- VERSION: ${BUILDKITE_COMMIT:0:7}.${BUILDKITE_BUILD_NUMBER}
1
+ agents:
2
+ queue: <%- prodBuildkiteQueueName %>
3
3
 
4
4
  configs:
5
- environments:
6
- - &dev
7
- agents:
8
- queue: <%- devBuildkiteQueueName %>
9
- env:
10
- ENVIRONMENT: dev
11
-
12
- - &prod
13
- agents:
14
- queue: <%- prodBuildkiteQueueName %>
15
- env:
16
- ENVIRONMENT: prod
17
-
18
5
  plugins:
19
6
  - &aws-sm
20
7
  seek-oss/aws-sm#v2.3.1:
@@ -55,9 +42,11 @@ configs:
55
42
  # Always follow up with a proper revert or fix in Git history.
56
43
  permit_on_passed: true
57
44
 
45
+ env:
46
+ VERSION: ${BUILDKITE_COMMIT:0:7}.${BUILDKITE_BUILD_NUMBER}
47
+
58
48
  steps:
59
- - <<: *prod
60
- label: ๐Ÿงช Test, Lint & Build
49
+ - label: ๐Ÿงช Test, Lint & Build
61
50
  artifact_paths: lib/**/*
62
51
  commands:
63
52
  - echo '+++ yarn test:ci'
@@ -75,7 +64,8 @@ steps:
75
64
  - docker-compose#v3.9.0:
76
65
  run: app
77
66
 
78
- - <<: *dev
67
+ - agents:
68
+ queue: <%- devBuildkiteQueueName %>
79
69
  branches: '!renovate/*'
80
70
  label: ๐Ÿง–โ€โ™€๏ธ Warm Dev
81
71
  command: ':'
@@ -88,15 +78,19 @@ steps:
88
78
  - block: ๐Ÿ™‹๐Ÿปโ€โ™€๏ธ Deploy Dev
89
79
  branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
90
80
 
91
- - <<: *dev
92
- <<: *deploy
81
+ - <<: *deploy
82
+ agents:
83
+ queue: <%- devBuildkiteQueueName %>
84
+ env:
85
+ ENVIRONMENT: dev
93
86
  concurrency_group: <%- repoName %>/deploy/dev
94
87
  label: ๐Ÿคž Deploy Dev
95
88
 
96
89
  - wait
97
90
 
98
- - <<: *prod
99
- <<: *deploy
91
+ - <<: *deploy
92
+ env:
93
+ ENVIRONMENT: prod
100
94
  branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
101
95
  concurrency_group: <%- repoName %>/deploy/prod
102
96
  label: ๐Ÿš€ Deploy Prod
package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml CHANGED
@@ -1,17 +1,7 @@
1
- configs:
2
- environments:
3
- - &dev
4
- agents:
5
- queue: <%- devBuildkiteQueueName %>
6
- env:
7
- ENVIRONMENT: dev
8
-
9
- - &prod
10
- agents:
11
- queue: <%- prodBuildkiteQueueName %>
12
- env:
13
- ENVIRONMENT: prod
1
+ agents:
2
+ queue: <%- prodBuildkiteQueueName %>
14
3
 
4
+ configs:
15
5
  plugins:
16
6
  - &aws-sm
17
7
  seek-oss/aws-sm#v2.3.1:
@@ -52,8 +42,7 @@ configs:
52
42
  permit_on_passed: true
53
43
 
54
44
  steps:
55
- - <<: *prod
56
- label: ๐Ÿงช Test, Lint & Build
45
+ - label: ๐Ÿงช Test, Lint & Build
57
46
  artifact_paths: lib/**/*
58
47
  commands:
59
48
  - echo '+++ yarn test:ci'
@@ -71,7 +60,8 @@ steps:
71
60
  - docker-compose#v3.9.0:
72
61
  run: app
73
62
 
74
- - <<: *dev
63
+ - agents:
64
+ queue: <%- devBuildkiteQueueName %>
75
65
  branches: '!renovate/*'
76
66
  label: ๐Ÿง–โ€โ™€๏ธ Warm Dev
77
67
  command: ':'
@@ -84,14 +74,18 @@ steps:
84
74
  - block: ๐Ÿ™‹๐Ÿปโ€โ™€๏ธ Deploy Dev
85
75
  branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
86
76
 
87
- - <<: *dev
88
- <<: *deploy
77
+ - <<: *deploy
78
+ agents:
79
+ queue: <%- devBuildkiteQueueName %>
80
+ env:
81
+ ENVIRONMENT: dev
89
82
  label: ๐Ÿคž Deploy Dev
90
83
  concurrency_group: '<%- repoName %>/deploy/dev'
91
84
  key: deploy-dev
92
85
 
93
- - <<: *prod
94
- <<: *deploy
86
+ - <<: *deploy
87
+ env:
88
+ ENVIRONMENT: prod
95
89
  label: ๐Ÿš€ Deploy Prod
96
90
  branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
97
91
  concurrency_group: '<%- repoName %>/deploy/prod'
package/template/private-npm-package/.buildkite/pipeline.yml CHANGED
@@ -1,4 +1,5 @@
1
+ agents:
2
+ queue: artefacts:npm
3
+
1
4
  steps:
2
5
  - command: aws s3 cp s3://seek-npm-package-buildkite-pipeline/pipeline-latest.sh - | bash | buildkite-agent pipeline upload
3
- agents:
4
- queue: artefacts:npm