skuba 8.2.0 → 8.2.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.
- package/lib/api/github/issueComment.js.map +2 -2
- package/lib/cli/init/getConfig.d.ts +1 -1
- package/lib/cli/init/getConfig.js.map +2 -2
- package/lib/wrapper/requestListener.js.map +2 -2
- package/package.json +2 -2
- package/template/express-rest-api/.buildkite/pipeline.yml +1 -2
- package/template/greeter/.buildkite/pipeline.yml +1 -2
- package/template/koa-rest-api/.buildkite/pipeline.yml +1 -2
- package/template/lambda-sqs-worker/.buildkite/pipeline.yml +2 -3
- package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml +3 -22
- package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +2 -266
- package/template/lambda-sqs-worker-cdk/package.json +1 -1
- package/template/private-npm-package/.buildkite/pipeline.yml +0 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/api/github/issueComment.ts"],
|
|
4
|
-
"sourcesContent": ["import type { Octokit } from '@octokit/rest';\n\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\nimport { createRestClient } from './octokit';\nimport { getPullRequestNumber } from './pullRequest';\n\nconst getUserId = async (client: Octokit): Promise<number> => {\n const { data } = await client.users.getAuthenticated();\n\n return data.id;\n};\n\n/**\n * https://docs.github.com/en/rest/reference/issues#create-an-issue-comment\n */\ninterface PutIssueCommentParameters {\n /**\n * The body of the issue comment.\n */\n body: string;\n\n /**\n * An internal identifier for the issue comment.\n *\n * This can be used to scope a given `put` to a particular comment, preventing\n * it from clobbering other comments from the same bot or user.\n *\n * The identifier is embedded as hidden content in the comment body.\n */\n internalId?: string;\n\n env?: Record<string, string | undefined>;\n\n /**\n * The number that identifies the GitHub issue.\n *\n * If this is not provided, the number will be inferred from the GitHub Repos\n * API by finding the latest pull request associated with the head commit.\n *\n * https://docs.github.com/en/rest/reference/repos#list-pull-requests-associated-with-a-commit\n */\n issueNumber?: number;\n\n /**\n * The ID of authenticated bot or user that is putting the issue comment.\n *\n * This drives our `put` behaviour, which tries to locate and edit an existing\n * comment before creating a new one. If this is not provided, the ID will be\n * inferred from the GitHub Users API.\n *\n * https://docs.github.com/en/rest/reference/users#get-the-authenticated-user\n *\n * If you're at SEEK and using BuildAgency's GitHub API integration, you may\n * use `'seek-build-agency'` as an optimisation to skip the user lookup.\n *\n * https://api.github.com/users/buildagencygitapitoken[bot]\n */\n userId?: number | 'seek-build-agency';\n}\n\ninterface IssueComment {\n id: number;\n}\n\n/**\n * Asynchronously creates or updates a GitHub issue comment.\n *\n * This emulates `put` behaviour by overwriting the first existing comment by\n * the same author on the issue, enabling use cases like a persistent bot\n * comment at the top of the pull request that reflects the current status of a\n * CI check.\n *\n * A `GITHUB_API_TOKEN` or `GITHUB_TOKEN` with write permissions must be present\n * on the environment.\n */\nexport const putIssueComment = async (\n params: PutIssueCommentParameters,\n): Promise<IssueComment> => {\n const env = params.env ?? process.env;\n\n const dir = process.cwd();\n\n const { owner, repo } = await Git.getOwnerAndRepo({ dir });\n\n const client = await createRestClient({ auth: apiTokenFromEnvironment() });\n\n const issueNumber =\n params.issueNumber ?? (await getPullRequestNumber({ client, env }));\n\n if (!issueNumber) {\n throw new Error('Failed to infer an issue number');\n }\n\n const comments = await client.issues.listComments({\n issue_number: issueNumber,\n owner,\n repo,\n });\n\n const userId: number =\n params.userId === 'seek-build-agency'\n ? // https://api.github.com/users/buildagencygitapitoken[bot]\n 87109344\n : params.userId ?? (await getUserId(client));\n\n const commentId = comments.data.find(\n (comment) =>\n comment.user?.id === userId &&\n (params.internalId\n ? comment.body?.endsWith(`\\n\\n<!-- ${params.internalId} -->`)\n : true),\n )?.id;\n\n const body = params.internalId\n ? [params.body.trim(), `<!-- ${params.internalId} -->`].join('\\n\\n')\n : params.body.trim();\n\n const response = await (commentId\n ? client.issues.updateComment({\n body,\n comment_id: commentId,\n issue_number: issueNumber,\n owner,\n repo,\n })\n : client.issues.createComment({\n body,\n issue_number: issueNumber,\n owner,\n repo,\n }));\n\n return {\n id: response.data.id,\n };\n};\n"],
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,UAAqB;AAErB,yBAAwC;AACxC,qBAAiC;AACjC,yBAAqC;AAErC,MAAM,YAAY,OAAO,WAAqC;AAC5D,QAAM,EAAE,KAAK,IAAI,MAAM,OAAO,MAAM,iBAAiB;AAErD,SAAO,KAAK;AACd;AAiEO,MAAM,kBAAkB,OAC7B,WAC0B;AAC1B,QAAM,MAAM,OAAO,OAAO,QAAQ;AAElC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,EAAE,OAAO,KAAK,IAAI,MAAM,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAEzD,QAAM,SAAS,UAAM,iCAAiB,EAAE,UAAM,4CAAwB,EAAE,CAAC;AAEzE,QAAM,cACJ,OAAO,eAAgB,UAAM,yCAAqB,EAAE,QAAQ,IAAI,CAAC;AAEnE,MAAI,CAAC,aAAa;AAChB,UAAM,IAAI,MAAM,iCAAiC;AAAA,EACnD;AAEA,QAAM,WAAW,MAAM,OAAO,OAAO,aAAa;AAAA,IAChD,cAAc;AAAA,IACd;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,SACJ,OAAO,WAAW;AAAA;AAAA,IAEd;AAAA,
|
|
4
|
+
"sourcesContent": ["import type { Octokit } from '@octokit/rest';\n\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\nimport { createRestClient } from './octokit';\nimport { getPullRequestNumber } from './pullRequest';\n\nconst getUserId = async (client: Octokit): Promise<number> => {\n const { data } = await client.users.getAuthenticated();\n\n return data.id;\n};\n\n/**\n * https://docs.github.com/en/rest/reference/issues#create-an-issue-comment\n */\ninterface PutIssueCommentParameters {\n /**\n * The body of the issue comment.\n */\n body: string;\n\n /**\n * An internal identifier for the issue comment.\n *\n * This can be used to scope a given `put` to a particular comment, preventing\n * it from clobbering other comments from the same bot or user.\n *\n * The identifier is embedded as hidden content in the comment body.\n */\n internalId?: string;\n\n env?: Record<string, string | undefined>;\n\n /**\n * The number that identifies the GitHub issue.\n *\n * If this is not provided, the number will be inferred from the GitHub Repos\n * API by finding the latest pull request associated with the head commit.\n *\n * https://docs.github.com/en/rest/reference/repos#list-pull-requests-associated-with-a-commit\n */\n issueNumber?: number;\n\n /**\n * The ID of authenticated bot or user that is putting the issue comment.\n *\n * This drives our `put` behaviour, which tries to locate and edit an existing\n * comment before creating a new one. If this is not provided, the ID will be\n * inferred from the GitHub Users API.\n *\n * https://docs.github.com/en/rest/reference/users#get-the-authenticated-user\n *\n * If you're at SEEK and using BuildAgency's GitHub API integration, you may\n * use `'seek-build-agency'` as an optimisation to skip the user lookup.\n *\n * https://api.github.com/users/buildagencygitapitoken[bot]\n */\n userId?: number | 'seek-build-agency';\n}\n\ninterface IssueComment {\n id: number;\n}\n\n/**\n * Asynchronously creates or updates a GitHub issue comment.\n *\n * This emulates `put` behaviour by overwriting the first existing comment by\n * the same author on the issue, enabling use cases like a persistent bot\n * comment at the top of the pull request that reflects the current status of a\n * CI check.\n *\n * A `GITHUB_API_TOKEN` or `GITHUB_TOKEN` with write permissions must be present\n * on the environment.\n */\nexport const putIssueComment = async (\n params: PutIssueCommentParameters,\n): Promise<IssueComment> => {\n const env = params.env ?? process.env;\n\n const dir = process.cwd();\n\n const { owner, repo } = await Git.getOwnerAndRepo({ dir });\n\n const client = await createRestClient({ auth: apiTokenFromEnvironment() });\n\n const issueNumber =\n params.issueNumber ?? (await getPullRequestNumber({ client, env }));\n\n if (!issueNumber) {\n throw new Error('Failed to infer an issue number');\n }\n\n const comments = await client.issues.listComments({\n issue_number: issueNumber,\n owner,\n repo,\n });\n\n const userId: number =\n params.userId === 'seek-build-agency'\n ? // https://api.github.com/users/buildagencygitapitoken[bot]\n 87109344\n : (params.userId ?? (await getUserId(client)));\n\n const commentId = comments.data.find(\n (comment) =>\n comment.user?.id === userId &&\n (params.internalId\n ? comment.body?.endsWith(`\\n\\n<!-- ${params.internalId} -->`)\n : true),\n )?.id;\n\n const body = params.internalId\n ? [params.body.trim(), `<!-- ${params.internalId} -->`].join('\\n\\n')\n : params.body.trim();\n\n const response = await (commentId\n ? client.issues.updateComment({\n body,\n comment_id: commentId,\n issue_number: issueNumber,\n owner,\n repo,\n })\n : client.issues.createComment({\n body,\n issue_number: issueNumber,\n owner,\n repo,\n }));\n\n return {\n id: response.data.id,\n };\n};\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,UAAqB;AAErB,yBAAwC;AACxC,qBAAiC;AACjC,yBAAqC;AAErC,MAAM,YAAY,OAAO,WAAqC;AAC5D,QAAM,EAAE,KAAK,IAAI,MAAM,OAAO,MAAM,iBAAiB;AAErD,SAAO,KAAK;AACd;AAiEO,MAAM,kBAAkB,OAC7B,WAC0B;AAC1B,QAAM,MAAM,OAAO,OAAO,QAAQ;AAElC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,EAAE,OAAO,KAAK,IAAI,MAAM,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAEzD,QAAM,SAAS,UAAM,iCAAiB,EAAE,UAAM,4CAAwB,EAAE,CAAC;AAEzE,QAAM,cACJ,OAAO,eAAgB,UAAM,yCAAqB,EAAE,QAAQ,IAAI,CAAC;AAEnE,MAAI,CAAC,aAAa;AAChB,UAAM,IAAI,MAAM,iCAAiC;AAAA,EACnD;AAEA,QAAM,WAAW,MAAM,OAAO,OAAO,aAAa;AAAA,IAChD,cAAc;AAAA,IACd;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,SACJ,OAAO,WAAW;AAAA;AAAA,IAEd;AAAA,MACC,OAAO,UAAW,MAAM,UAAU,MAAM;AAE/C,QAAM,YAAY,SAAS,KAAK;AAAA,IAC9B,CAAC,YACC,QAAQ,MAAM,OAAO,WACpB,OAAO,aACJ,QAAQ,MAAM,SAAS;AAAA;AAAA,OAAY,OAAO,UAAU,MAAM,IAC1D;AAAA,EACR,GAAG;AAEH,QAAM,OAAO,OAAO,aAChB,CAAC,OAAO,KAAK,KAAK,GAAG,QAAQ,OAAO,UAAU,MAAM,EAAE,KAAK,MAAM,IACjE,OAAO,KAAK,KAAK;AAErB,QAAM,WAAW,OAAO,YACpB,OAAO,OAAO,cAAc;AAAA,IAC1B;AAAA,IACA,YAAY;AAAA,IACZ,cAAc;AAAA,IACd;AAAA,IACA;AAAA,EACF,CAAC,IACD,OAAO,OAAO,cAAc;AAAA,IAC1B;AAAA,IACA,cAAc;AAAA,IACd;AAAA,IACA;AAAA,EACF,CAAC;AAEL,SAAO;AAAA,IACL,IAAI,SAAS,KAAK;AAAA,EACpB;AACF;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -2,7 +2,7 @@ import { type TemplateConfig } from '../../utils/template';
|
|
|
2
2
|
import { type Choice } from './prompts';
|
|
3
3
|
import { type InitConfig } from './types';
|
|
4
4
|
export declare const runForm: <T = Record<string, string>>(props: {
|
|
5
|
-
choices:
|
|
5
|
+
choices: readonly Choice[];
|
|
6
6
|
message: string;
|
|
7
7
|
name: string;
|
|
8
8
|
}) => Promise<T>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/cli/init/getConfig.ts"],
|
|
4
|
-
"sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { Form, type FormChoice } from 'enquirer';\nimport fs from 'fs-extra';\n\nimport { copyFiles } from '../../utils/copy';\nimport { isErrorWithCode } from '../../utils/error';\nimport { log } from '../../utils/logging';\nimport {\n DEFAULT_PACKAGE_MANAGER,\n configForPackageManager,\n} from '../../utils/packageManager';\nimport { getRandomPort } from '../../utils/port';\nimport {\n TEMPLATE_CONFIG_FILENAME,\n TEMPLATE_DIR,\n type TemplateConfig,\n templateConfigSchema,\n} from '../../utils/template';\n\nimport { downloadGitHubTemplate } from './git';\nimport {\n BASE_PROMPT_PROPS,\n type BaseFields,\n type Choice,\n GIT_PATH_PROMPT,\n SHOULD_CONTINUE_PROMPT,\n TEMPLATE_PROMPT,\n} from './prompts';\nimport { type InitConfig, initConfigInputSchema } from './types';\n\nexport const runForm = <T = Record<string, string>>(props: {\n choices:
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAsC;AACtC,sBAAe;AAEf,kBAA0B;AAC1B,mBAAgC;AAChC,qBAAoB;AACpB,4BAGO;AACP,kBAA8B;AAC9B,sBAKO;AAEP,iBAAuC;AACvC,qBAOO;AACP,mBAAuD;AAEhD,MAAM,UAAU,CAA6B,UAI9C;AACJ,QAAM,EAAE,SAAS,KAAK,IAAI;AAE1B,QAAM,UAAU,MAAM,QAAQ,IAAI,CAAC,YAAY;AAAA,IAC7C,GAAG;AAAA,IACH,UAAU,CAAC,UAA8B;AACvC,UACE,CAAC,SACD,UAAU,MACT,UAAU,OAAO,WAAW,CAAC,OAAO,cACrC;AACA,eAAO;AAAA,MACT;AAEA,aAAO,OAAO,WAAW,KAAK,KAAK;AAAA,IACrC;AAAA,EACF,EAAE;AAEF,QAAM,OAAO,IAAI,qBAAQ;AAAA,IACvB;AAAA,IACA;AAAA,IACA;AAAA,IACA,UAAU,OAAO,WAAW;AAC1B,YAAM,UAAU,MAAM,QAAQ;AAAA,QAC5B,QAAQ,IAAI,CAAC,WAAW,OAAO,SAAS,OAAO,OAAO,IAAI,CAAC,CAAC;AAAA,MAC9D;AAEA,aACE,QAAQ,KAAK,CAAC,WAAW,OAAO,WAAW,QAAQ,KACnD,QAAQ,MAAM,CAAC,WAAW,WAAW,IAAI;AAAA,IAE7C;AAAA,EACF,CAAC;AAED,SAAO,KAAK,IAAI;AAClB;AAEA,MAAM,wBAAwB,OAAO,
|
|
4
|
+
"sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { Form, type FormChoice } from 'enquirer';\nimport fs from 'fs-extra';\n\nimport { copyFiles } from '../../utils/copy';\nimport { isErrorWithCode } from '../../utils/error';\nimport { log } from '../../utils/logging';\nimport {\n DEFAULT_PACKAGE_MANAGER,\n configForPackageManager,\n} from '../../utils/packageManager';\nimport { getRandomPort } from '../../utils/port';\nimport {\n TEMPLATE_CONFIG_FILENAME,\n TEMPLATE_DIR,\n type TemplateConfig,\n templateConfigSchema,\n} from '../../utils/template';\n\nimport { downloadGitHubTemplate } from './git';\nimport {\n BASE_PROMPT_PROPS,\n type BaseFields,\n type Choice,\n GIT_PATH_PROMPT,\n SHOULD_CONTINUE_PROMPT,\n TEMPLATE_PROMPT,\n} from './prompts';\nimport { type InitConfig, initConfigInputSchema } from './types';\n\nexport const runForm = <T = Record<string, string>>(props: {\n choices: readonly Choice[];\n message: string;\n name: string;\n}) => {\n const { message, name } = props;\n\n const choices = props.choices.map((choice) => ({\n ...choice,\n validate: (value: string | undefined) => {\n if (\n !value ||\n value === '' ||\n (value === choice.initial && !choice.allowInitial)\n ) {\n return 'Form is not complete';\n }\n\n return choice.validate?.(value) ?? true;\n },\n }));\n\n const form = new Form<T>({\n choices,\n message,\n name,\n validate: async (values) => {\n const results = await Promise.all(\n choices.map((choice) => choice.validate(values[choice.name])),\n );\n\n return (\n results.find((result) => typeof result === 'string') ??\n results.every((result) => result === true)\n );\n },\n });\n\n return form.run();\n};\n\nconst confirmShouldContinue = async (choices: readonly FormChoice[]) => {\n const fieldsList = choices.map((choice) => choice.message);\n\n log.newline();\n log.plain('This template uses the following information:');\n log.newline();\n fieldsList.forEach((message) => log.subtle(`- ${message}`));\n\n log.newline();\n const result = await SHOULD_CONTINUE_PROMPT.run();\n\n return result === 'yes';\n};\n\nconst createDirectory = async (dir: string) => {\n try {\n await fs.promises.mkdir(dir);\n } catch (err) {\n if (isErrorWithCode(err, 'EEXIST')) {\n log.err(`The directory '${dir}' already exists.`);\n process.exit(1);\n }\n\n throw err;\n }\n};\n\nconst cloneTemplate = async (\n templateName: string,\n destinationDir: string,\n): Promise<TemplateConfig> => {\n const isCustomTemplate = templateName.startsWith('github:');\n\n if (isCustomTemplate) {\n const gitHubPath = templateName.slice('github:'.length);\n\n await downloadGitHubTemplate(gitHubPath, destinationDir);\n } else {\n const templateDir = path.join(TEMPLATE_DIR, templateName);\n\n await copyFiles({\n // assume built-in templates have no extraneous files\n include: () => true,\n sourceRoot: templateDir,\n destinationRoot: destinationDir,\n processors: [],\n // built-in templates have files like _package.json\n stripUnderscorePrefix: true,\n });\n }\n\n const templateConfig = getTemplateConfig(\n path.join(process.cwd(), destinationDir),\n );\n\n if (isCustomTemplate) {\n log.newline();\n log.warn(\n 'You may need to run',\n log.bold(\n configForPackageManager(templateConfig.packageManager).exec,\n 'skuba',\n 'configure',\n ),\n 'once this is done.',\n );\n }\n\n return templateConfig;\n};\n\nconst getTemplateName = async () => {\n const templateSelection = await TEMPLATE_PROMPT.run();\n\n if (templateSelection === 'github \u2192') {\n const gitHubPath = await GIT_PATH_PROMPT.run();\n return `github:${gitHubPath}`;\n }\n\n return templateSelection;\n};\n\nconst generatePlaceholders = (choices: FormChoice[]) =>\n Object.fromEntries(\n choices.map(({ name }) => [name, `<%- ${name} %>`] as const),\n );\n\nexport const getTemplateConfig = (dir: string): TemplateConfig => {\n const templateConfigPath = path.join(dir, TEMPLATE_CONFIG_FILENAME);\n\n try {\n /* eslint-disable-next-line @typescript-eslint/no-var-requires */\n const templateConfig = require(templateConfigPath) as unknown;\n\n return templateConfigSchema.parse(templateConfig);\n } catch (err) {\n if (isErrorWithCode(err, 'MODULE_NOT_FOUND')) {\n return {\n entryPoint: undefined,\n fields: [],\n packageManager: DEFAULT_PACKAGE_MANAGER,\n type: undefined,\n };\n }\n\n throw err;\n }\n};\n\nconst baseToTemplateData = async ({\n ownerName,\n platformName,\n repoName,\n defaultBranch,\n}: BaseFields) => {\n const [orgName, teamName] = ownerName.split('/');\n\n const port = String(await getRandomPort());\n\n if (!orgName) {\n throw new Error(`Invalid format for owner name: ${ownerName}`);\n }\n\n return {\n orgName,\n ownerName,\n repoName,\n defaultBranch,\n // Use standalone username in `teamName` contexts\n teamName: teamName ?? orgName,\n\n port,\n\n platformName,\n lambdaCdkArchitecture: platformName === 'amd64' ? 'X86_64' : 'ARM_64',\n lambdaServerlessArchitecture:\n platformName === 'amd64' ? 'x86_64' : platformName,\n };\n};\n\nexport const configureFromPrompt = async (): Promise<InitConfig> => {\n const { ownerName, platformName, repoName, defaultBranch } =\n await runForm<BaseFields>(BASE_PROMPT_PROPS);\n log.plain(chalk.cyan(repoName), 'by', chalk.cyan(ownerName));\n\n const templateData = await baseToTemplateData({\n ownerName,\n platformName,\n repoName,\n defaultBranch,\n });\n\n const destinationDir = repoName;\n\n await createDirectory(destinationDir);\n\n log.newline();\n const templateName = await getTemplateName();\n\n const { entryPoint, fields, noSkip, packageManager, type } =\n await cloneTemplate(templateName, destinationDir);\n\n if (fields.length === 0) {\n return {\n destinationDir,\n entryPoint,\n packageManager,\n templateComplete: true,\n templateData,\n templateName,\n type,\n };\n }\n\n const shouldContinue = noSkip ? true : await confirmShouldContinue(fields);\n\n if (shouldContinue) {\n log.newline();\n const customAnswers = await runForm({\n choices: fields,\n message: chalk.bold(`Complete ${chalk.cyan(templateName)}:`),\n name: 'customAnswers',\n });\n\n return {\n destinationDir,\n entryPoint,\n packageManager,\n templateComplete: true,\n templateData: { ...templateData, ...customAnswers },\n templateName,\n type,\n };\n }\n\n log.newline();\n log.warn(\n `Resume this later with ${chalk.bold(\n configForPackageManager(packageManager).exec,\n 'skuba configure',\n )}.`,\n );\n\n const customAnswers = generatePlaceholders(fields);\n\n return {\n destinationDir,\n entryPoint,\n packageManager,\n templateComplete: false,\n templateData: { ...templateData, ...customAnswers },\n templateName,\n type,\n };\n};\n\nexport const readJSONFromStdIn = async () => {\n let text = '';\n\n await new Promise((resolve) =>\n process.stdin\n .on('data', (chunk) => (text += chunk.toString()))\n .once('end', resolve),\n );\n\n text = text.trim();\n\n if (text === '') {\n log.err('No data from stdin.');\n process.exit(1);\n }\n\n let value: unknown;\n\n try {\n value = JSON.parse(text) as unknown;\n } catch {\n log.err('Invalid JSON from stdin.');\n process.exit(1);\n }\n\n return value;\n};\n\nconst configureFromPipe = async (): Promise<InitConfig> => {\n const value = await readJSONFromStdIn();\n\n const result = initConfigInputSchema.safeParse(value);\n\n if (!result.success) {\n log.err('Invalid data from stdin:');\n log.err(result.error);\n process.exit(1);\n }\n\n const { destinationDir, templateComplete, templateName } = result.data;\n\n const templateData = {\n ...(await baseToTemplateData(result.data.templateData)),\n ...result.data.templateData,\n };\n\n await createDirectory(destinationDir);\n\n const { entryPoint, fields, noSkip, packageManager, type } =\n await cloneTemplate(templateName, destinationDir);\n\n if (!templateComplete) {\n if (noSkip) {\n log.err('Templating for', log.bold(templateName), 'cannot be skipped.');\n process.exit(1);\n }\n\n return {\n ...result.data,\n entryPoint,\n packageManager,\n templateData: {\n ...templateData,\n ...generatePlaceholders(fields),\n },\n type,\n };\n }\n\n const required = fields.map(({ name }) => name);\n\n const provided = new Set(Object.keys(templateData));\n\n const missing = required.filter((name) => !provided.has(name));\n\n if (missing.length > 0) {\n log.err('This template uses the following information:');\n log.newline();\n missing.forEach((name) => log.err(`- ${name}`));\n process.exit(1);\n }\n\n return {\n ...result.data,\n entryPoint,\n packageManager,\n templateData,\n type,\n };\n};\n\nexport const getConfig = () =>\n process.stdin.isTTY ? configureFromPrompt() : configureFromPipe();\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["fs", "path", "chalk", "customAnswers"]
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/wrapper/requestListener.ts"],
|
|
4
|
-
"sourcesContent": ["import http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation';\n\nimport { serveRequestListener, startServer } from './http';\n\n// Express compatibility\ninterface FunctionConfig extends http.RequestListener {\n port?: number;\n}\n\ninterface ObjectConfig {\n // Koa compatibility\n callback?: () => http.RequestListener;\n\n requestListener?: http.RequestListener;\n\n // Fastify compatibility\n server?: http.Server;\n\n default?: Promise<unknown>;\n port?: unknown;\n}\n\nconst isConfig = (\n data: unknown,\n): data is Promise<FunctionConfig> | Promise<ObjectConfig> =>\n isFunction(data) || isObject(data);\n\ninterface Args {\n availablePort?: number;\n entryPoint: unknown;\n}\n\n/**\n * Create an HTTP server that calls into an exported `http.RequestListener`.\n *\n * This supports Express and Koa applications out of the box.\n */\nexport const runRequestListener = async ({\n availablePort,\n entryPoint,\n}: Args): Promise<void> => {\n if (!isConfig(entryPoint)) {\n // Assume an executable script with weird exports\n return;\n }\n\n let config: FunctionConfig | ObjectConfig = await entryPoint;\n\n if (typeof config === 'object' && isConfig(config.default)) {\n // Prefer `export default` over `export =`\n config = await config.default;\n }\n\n if (Object.keys(config).length === 0) {\n // Assume an executable script with no exports\n return;\n }\n\n const port = isIpPort(config.port) ? config.port : availablePort;\n\n // http.Server support\n if (typeof config !== 'function' && config instanceof http.Server) {\n return startServer(config, port);\n }\n\n // Fastify workaround\n if (\n typeof config !== 'function' &&\n config.server &&\n config.server instanceof http.Server\n ) {\n return startServer(config.server, port);\n }\n\n const requestListener =\n typeof config === 'function'\n ? config\n : config.requestListener ?? config.callback?.();\n\n if (typeof requestListener !== 'function') {\n // Assume an executable script with non-request listener exports\n return;\n }\n\n return serveRequestListener(requestListener, port);\n};\n"],
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAA+C;AAE/C,IAAAA,eAAkD;AAoBlD,MAAM,WAAW,CACf,aAEA,8BAAW,IAAI,SAAK,4BAAS,IAAI;AAY5B,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,CAAC,SAAS,UAAU,GAAG;AAEzB;AAAA,EACF;AAEA,MAAI,SAAwC,MAAM;AAElD,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,MAAM,OAAO;AAAA,EACxB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAGnD,MAAI,OAAO,WAAW,cAAc,kBAAkB,YAAAC,QAAK,QAAQ;AACjE,eAAO,0BAAY,QAAQ,IAAI;AAAA,EACjC;AAGA,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAA,QAAK,QAC9B;AACA,eAAO,0BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,
|
|
4
|
+
"sourcesContent": ["import http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation';\n\nimport { serveRequestListener, startServer } from './http';\n\n// Express compatibility\ninterface FunctionConfig extends http.RequestListener {\n port?: number;\n}\n\ninterface ObjectConfig {\n // Koa compatibility\n callback?: () => http.RequestListener;\n\n requestListener?: http.RequestListener;\n\n // Fastify compatibility\n server?: http.Server;\n\n default?: Promise<unknown>;\n port?: unknown;\n}\n\nconst isConfig = (\n data: unknown,\n): data is Promise<FunctionConfig> | Promise<ObjectConfig> =>\n isFunction(data) || isObject(data);\n\ninterface Args {\n availablePort?: number;\n entryPoint: unknown;\n}\n\n/**\n * Create an HTTP server that calls into an exported `http.RequestListener`.\n *\n * This supports Express and Koa applications out of the box.\n */\nexport const runRequestListener = async ({\n availablePort,\n entryPoint,\n}: Args): Promise<void> => {\n if (!isConfig(entryPoint)) {\n // Assume an executable script with weird exports\n return;\n }\n\n let config: FunctionConfig | ObjectConfig = await entryPoint;\n\n if (typeof config === 'object' && isConfig(config.default)) {\n // Prefer `export default` over `export =`\n config = await config.default;\n }\n\n if (Object.keys(config).length === 0) {\n // Assume an executable script with no exports\n return;\n }\n\n const port = isIpPort(config.port) ? config.port : availablePort;\n\n // http.Server support\n if (typeof config !== 'function' && config instanceof http.Server) {\n return startServer(config, port);\n }\n\n // Fastify workaround\n if (\n typeof config !== 'function' &&\n config.server &&\n config.server instanceof http.Server\n ) {\n return startServer(config.server, port);\n }\n\n const requestListener =\n typeof config === 'function'\n ? config\n : (config.requestListener ?? config.callback?.());\n\n if (typeof requestListener !== 'function') {\n // Assume an executable script with non-request listener exports\n return;\n }\n\n return serveRequestListener(requestListener, port);\n};\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAA+C;AAE/C,IAAAA,eAAkD;AAoBlD,MAAM,WAAW,CACf,aAEA,8BAAW,IAAI,SAAK,4BAAS,IAAI;AAY5B,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,CAAC,SAAS,UAAU,GAAG;AAEzB;AAAA,EACF;AAEA,MAAI,SAAwC,MAAM;AAElD,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,MAAM,OAAO;AAAA,EACxB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAGnD,MAAI,OAAO,WAAW,cAAc,kBAAkB,YAAAC,QAAK,QAAQ;AACjE,eAAO,0BAAY,QAAQ,IAAI;AAAA,EACjC;AAGA,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAA,QAAK,QAC9B;AACA,eAAO,0BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACC,OAAO,mBAAmB,OAAO,WAAW;AAEnD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,aAAO,mCAAqB,iBAAiB,IAAI;AACnD;",
|
|
6
6
|
"names": ["import_http", "http"]
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "skuba",
|
|
3
|
-
"version": "8.2.
|
|
3
|
+
"version": "8.2.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "SEEK development toolkit for backend applications and packages",
|
|
6
6
|
"homepage": "https://github.com/seek-oss/skuba#readme",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"dotenv": "^16.0.0",
|
|
64
64
|
"ejs": "^3.1.6",
|
|
65
65
|
"enquirer": "^2.3.6",
|
|
66
|
-
"esbuild": "~0.
|
|
66
|
+
"esbuild": "~0.23.0",
|
|
67
67
|
"eslint": "^8.56.0",
|
|
68
68
|
"execa": "^5.0.0",
|
|
69
69
|
"fast-glob": "^3.3.2",
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
$schema: https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
|
|
2
1
|
agents:
|
|
3
2
|
queue: <%- prodBuildkiteQueueName %>
|
|
4
3
|
|
|
@@ -58,7 +57,7 @@ steps:
|
|
|
58
57
|
- *aws-sm
|
|
59
58
|
- *private-npm
|
|
60
59
|
- *docker-ecr-cache
|
|
61
|
-
- docker-compose#v5.
|
|
60
|
+
- docker-compose#v5.3.0:
|
|
62
61
|
run: app
|
|
63
62
|
environment:
|
|
64
63
|
- GITHUB_API_TOKEN
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
$schema: https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
|
|
2
1
|
agents:
|
|
3
2
|
queue: <%- prodBuildkiteQueueName %>
|
|
4
3
|
|
|
@@ -39,7 +38,7 @@ steps:
|
|
|
39
38
|
- *aws-sm
|
|
40
39
|
- *private-npm
|
|
41
40
|
- *docker-ecr-cache
|
|
42
|
-
- docker-compose#v5.
|
|
41
|
+
- docker-compose#v5.3.0:
|
|
43
42
|
run: app
|
|
44
43
|
environment:
|
|
45
44
|
- GITHUB_API_TOKEN
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
$schema: https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
|
|
2
1
|
agents:
|
|
3
2
|
queue: <%- prodBuildkiteQueueName %>
|
|
4
3
|
|
|
@@ -58,7 +57,7 @@ steps:
|
|
|
58
57
|
- *aws-sm
|
|
59
58
|
- *private-npm
|
|
60
59
|
- *docker-ecr-cache
|
|
61
|
-
- docker-compose#v5.
|
|
60
|
+
- docker-compose#v5.3.0:
|
|
62
61
|
run: app
|
|
63
62
|
environment:
|
|
64
63
|
- GITHUB_API_TOKEN
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
$schema: https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
|
|
2
1
|
agents:
|
|
3
2
|
queue: <%- prodBuildkiteQueueName %>
|
|
4
3
|
|
|
@@ -37,7 +36,7 @@ configs:
|
|
|
37
36
|
- *aws-sm
|
|
38
37
|
- *private-npm
|
|
39
38
|
- *docker-ecr-cache
|
|
40
|
-
- docker-compose#v5.
|
|
39
|
+
- docker-compose#v5.3.0:
|
|
41
40
|
dependencies: false
|
|
42
41
|
run: app
|
|
43
42
|
propagate-environment: true
|
|
@@ -68,7 +67,7 @@ steps:
|
|
|
68
67
|
- *aws-sm
|
|
69
68
|
- *private-npm
|
|
70
69
|
- *docker-ecr-cache
|
|
71
|
-
- docker-compose#v5.
|
|
70
|
+
- docker-compose#v5.3.0:
|
|
72
71
|
run: app
|
|
73
72
|
environment:
|
|
74
73
|
- GITHUB_API_TOKEN
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
$schema: https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
|
|
2
1
|
agents:
|
|
3
2
|
queue: <%- prodBuildkiteQueueName %>
|
|
4
3
|
|
|
@@ -34,7 +33,7 @@ configs:
|
|
|
34
33
|
- *aws-sm
|
|
35
34
|
- *private-npm
|
|
36
35
|
- *docker-ecr-cache
|
|
37
|
-
- docker-compose#v5.
|
|
36
|
+
- docker-compose#v5.3.0:
|
|
38
37
|
dependencies: false
|
|
39
38
|
run: app
|
|
40
39
|
environment:
|
|
@@ -64,7 +63,7 @@ steps:
|
|
|
64
63
|
- *aws-sm
|
|
65
64
|
- *private-npm
|
|
66
65
|
- *docker-ecr-cache
|
|
67
|
-
- docker-compose#v5.
|
|
66
|
+
- docker-compose#v5.3.0:
|
|
68
67
|
run: app
|
|
69
68
|
environment:
|
|
70
69
|
- GITHUB_API_TOKEN
|
|
@@ -84,6 +83,7 @@ steps:
|
|
|
84
83
|
skip-pull-from-cache: true
|
|
85
84
|
|
|
86
85
|
- wait
|
|
86
|
+
|
|
87
87
|
- block: 🙋🏻♀️ Deploy Dev
|
|
88
88
|
branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
|
|
89
89
|
|
|
@@ -96,25 +96,6 @@ steps:
|
|
|
96
96
|
concurrency_group: '<%- repoName %>/deploy/dev'
|
|
97
97
|
key: deploy-dev
|
|
98
98
|
|
|
99
|
-
- block: 🙋🏻♀️ Deploy Dev (Hotswap)
|
|
100
|
-
key: deploy-dev-hotswap-block
|
|
101
|
-
branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
|
|
102
|
-
|
|
103
|
-
- <<: *deploy
|
|
104
|
-
branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
|
|
105
|
-
depends_on: deploy-dev-hotswap-block
|
|
106
|
-
agents:
|
|
107
|
-
queue: <%- devBuildkiteQueueName %>
|
|
108
|
-
env:
|
|
109
|
-
ENVIRONMENT: dev
|
|
110
|
-
commands:
|
|
111
|
-
- echo '--- pnpm install --offline'
|
|
112
|
-
- pnpm install --offline
|
|
113
|
-
- echo '+++ pnpm run deploy:hotswap'
|
|
114
|
-
- pnpm run deploy:hotswap
|
|
115
|
-
label: 🤞 Deploy Dev (Hotswap)
|
|
116
|
-
concurrency_group: '<%- repoName %>/deploy/dev'
|
|
117
|
-
|
|
118
99
|
- <<: *deploy
|
|
119
100
|
env:
|
|
120
101
|
ENVIRONMENT: prod
|
|
@@ -2,130 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
exports[`returns expected CloudFormation stack for dev 1`] = `
|
|
4
4
|
{
|
|
5
|
-
"Mappings": {
|
|
6
|
-
"ServiceprincipalMap": {
|
|
7
|
-
"af-south-1": {
|
|
8
|
-
"codedeploy": "codedeploy.af-south-1.amazonaws.com",
|
|
9
|
-
},
|
|
10
|
-
"ap-east-1": {
|
|
11
|
-
"codedeploy": "codedeploy.ap-east-1.amazonaws.com",
|
|
12
|
-
},
|
|
13
|
-
"ap-northeast-1": {
|
|
14
|
-
"codedeploy": "codedeploy.ap-northeast-1.amazonaws.com",
|
|
15
|
-
},
|
|
16
|
-
"ap-northeast-2": {
|
|
17
|
-
"codedeploy": "codedeploy.ap-northeast-2.amazonaws.com",
|
|
18
|
-
},
|
|
19
|
-
"ap-northeast-3": {
|
|
20
|
-
"codedeploy": "codedeploy.ap-northeast-3.amazonaws.com",
|
|
21
|
-
},
|
|
22
|
-
"ap-south-1": {
|
|
23
|
-
"codedeploy": "codedeploy.ap-south-1.amazonaws.com",
|
|
24
|
-
},
|
|
25
|
-
"ap-south-2": {
|
|
26
|
-
"codedeploy": "codedeploy.ap-south-2.amazonaws.com",
|
|
27
|
-
},
|
|
28
|
-
"ap-southeast-1": {
|
|
29
|
-
"codedeploy": "codedeploy.ap-southeast-1.amazonaws.com",
|
|
30
|
-
},
|
|
31
|
-
"ap-southeast-2": {
|
|
32
|
-
"codedeploy": "codedeploy.ap-southeast-2.amazonaws.com",
|
|
33
|
-
},
|
|
34
|
-
"ap-southeast-3": {
|
|
35
|
-
"codedeploy": "codedeploy.ap-southeast-3.amazonaws.com",
|
|
36
|
-
},
|
|
37
|
-
"ap-southeast-4": {
|
|
38
|
-
"codedeploy": "codedeploy.ap-southeast-4.amazonaws.com",
|
|
39
|
-
},
|
|
40
|
-
"ap-southeast-5": {
|
|
41
|
-
"codedeploy": "codedeploy.ap-southeast-5.amazonaws.com",
|
|
42
|
-
},
|
|
43
|
-
"ap-southeast-7": {
|
|
44
|
-
"codedeploy": "codedeploy.ap-southeast-7.amazonaws.com",
|
|
45
|
-
},
|
|
46
|
-
"ca-central-1": {
|
|
47
|
-
"codedeploy": "codedeploy.ca-central-1.amazonaws.com",
|
|
48
|
-
},
|
|
49
|
-
"ca-west-1": {
|
|
50
|
-
"codedeploy": "codedeploy.ca-west-1.amazonaws.com",
|
|
51
|
-
},
|
|
52
|
-
"cn-north-1": {
|
|
53
|
-
"codedeploy": "codedeploy.cn-north-1.amazonaws.com.cn",
|
|
54
|
-
},
|
|
55
|
-
"cn-northwest-1": {
|
|
56
|
-
"codedeploy": "codedeploy.cn-northwest-1.amazonaws.com.cn",
|
|
57
|
-
},
|
|
58
|
-
"eu-central-1": {
|
|
59
|
-
"codedeploy": "codedeploy.eu-central-1.amazonaws.com",
|
|
60
|
-
},
|
|
61
|
-
"eu-central-2": {
|
|
62
|
-
"codedeploy": "codedeploy.eu-central-2.amazonaws.com",
|
|
63
|
-
},
|
|
64
|
-
"eu-isoe-west-1": {
|
|
65
|
-
"codedeploy": "codedeploy.eu-isoe-west-1.amazonaws.com",
|
|
66
|
-
},
|
|
67
|
-
"eu-north-1": {
|
|
68
|
-
"codedeploy": "codedeploy.eu-north-1.amazonaws.com",
|
|
69
|
-
},
|
|
70
|
-
"eu-south-1": {
|
|
71
|
-
"codedeploy": "codedeploy.eu-south-1.amazonaws.com",
|
|
72
|
-
},
|
|
73
|
-
"eu-south-2": {
|
|
74
|
-
"codedeploy": "codedeploy.eu-south-2.amazonaws.com",
|
|
75
|
-
},
|
|
76
|
-
"eu-west-1": {
|
|
77
|
-
"codedeploy": "codedeploy.eu-west-1.amazonaws.com",
|
|
78
|
-
},
|
|
79
|
-
"eu-west-2": {
|
|
80
|
-
"codedeploy": "codedeploy.eu-west-2.amazonaws.com",
|
|
81
|
-
},
|
|
82
|
-
"eu-west-3": {
|
|
83
|
-
"codedeploy": "codedeploy.eu-west-3.amazonaws.com",
|
|
84
|
-
},
|
|
85
|
-
"il-central-1": {
|
|
86
|
-
"codedeploy": "codedeploy.il-central-1.amazonaws.com",
|
|
87
|
-
},
|
|
88
|
-
"me-central-1": {
|
|
89
|
-
"codedeploy": "codedeploy.me-central-1.amazonaws.com",
|
|
90
|
-
},
|
|
91
|
-
"me-south-1": {
|
|
92
|
-
"codedeploy": "codedeploy.me-south-1.amazonaws.com",
|
|
93
|
-
},
|
|
94
|
-
"mx-central-1": {
|
|
95
|
-
"codedeploy": "codedeploy.mx-central-1.amazonaws.com",
|
|
96
|
-
},
|
|
97
|
-
"sa-east-1": {
|
|
98
|
-
"codedeploy": "codedeploy.sa-east-1.amazonaws.com",
|
|
99
|
-
},
|
|
100
|
-
"us-east-1": {
|
|
101
|
-
"codedeploy": "codedeploy.us-east-1.amazonaws.com",
|
|
102
|
-
},
|
|
103
|
-
"us-east-2": {
|
|
104
|
-
"codedeploy": "codedeploy.us-east-2.amazonaws.com",
|
|
105
|
-
},
|
|
106
|
-
"us-gov-east-1": {
|
|
107
|
-
"codedeploy": "codedeploy.us-gov-east-1.amazonaws.com",
|
|
108
|
-
},
|
|
109
|
-
"us-gov-west-1": {
|
|
110
|
-
"codedeploy": "codedeploy.us-gov-west-1.amazonaws.com",
|
|
111
|
-
},
|
|
112
|
-
"us-iso-east-1": {
|
|
113
|
-
"codedeploy": "codedeploy.amazonaws.com",
|
|
114
|
-
},
|
|
115
|
-
"us-iso-west-1": {
|
|
116
|
-
"codedeploy": "codedeploy.amazonaws.com",
|
|
117
|
-
},
|
|
118
|
-
"us-isob-east-1": {
|
|
119
|
-
"codedeploy": "codedeploy.amazonaws.com",
|
|
120
|
-
},
|
|
121
|
-
"us-west-1": {
|
|
122
|
-
"codedeploy": "codedeploy.us-west-1.amazonaws.com",
|
|
123
|
-
},
|
|
124
|
-
"us-west-2": {
|
|
125
|
-
"codedeploy": "codedeploy.us-west-2.amazonaws.com",
|
|
126
|
-
},
|
|
127
|
-
},
|
|
128
|
-
},
|
|
129
5
|
"Parameters": {
|
|
130
6
|
"BootstrapVersion": {
|
|
131
7
|
"Default": "/cdk-bootstrap/hnb659fds/version",
|
|
@@ -218,15 +94,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
|
|
|
218
94
|
"Action": "sts:AssumeRole",
|
|
219
95
|
"Effect": "Allow",
|
|
220
96
|
"Principal": {
|
|
221
|
-
"Service":
|
|
222
|
-
"Fn::FindInMap": [
|
|
223
|
-
"ServiceprincipalMap",
|
|
224
|
-
{
|
|
225
|
-
"Ref": "AWS::Region",
|
|
226
|
-
},
|
|
227
|
-
"codedeploy",
|
|
228
|
-
],
|
|
229
|
-
},
|
|
97
|
+
"Service": "codedeploy.amazonaws.com",
|
|
230
98
|
},
|
|
231
99
|
},
|
|
232
100
|
],
|
|
@@ -1065,130 +933,6 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
|
|
|
1065
933
|
|
|
1066
934
|
exports[`returns expected CloudFormation stack for prod 1`] = `
|
|
1067
935
|
{
|
|
1068
|
-
"Mappings": {
|
|
1069
|
-
"ServiceprincipalMap": {
|
|
1070
|
-
"af-south-1": {
|
|
1071
|
-
"codedeploy": "codedeploy.af-south-1.amazonaws.com",
|
|
1072
|
-
},
|
|
1073
|
-
"ap-east-1": {
|
|
1074
|
-
"codedeploy": "codedeploy.ap-east-1.amazonaws.com",
|
|
1075
|
-
},
|
|
1076
|
-
"ap-northeast-1": {
|
|
1077
|
-
"codedeploy": "codedeploy.ap-northeast-1.amazonaws.com",
|
|
1078
|
-
},
|
|
1079
|
-
"ap-northeast-2": {
|
|
1080
|
-
"codedeploy": "codedeploy.ap-northeast-2.amazonaws.com",
|
|
1081
|
-
},
|
|
1082
|
-
"ap-northeast-3": {
|
|
1083
|
-
"codedeploy": "codedeploy.ap-northeast-3.amazonaws.com",
|
|
1084
|
-
},
|
|
1085
|
-
"ap-south-1": {
|
|
1086
|
-
"codedeploy": "codedeploy.ap-south-1.amazonaws.com",
|
|
1087
|
-
},
|
|
1088
|
-
"ap-south-2": {
|
|
1089
|
-
"codedeploy": "codedeploy.ap-south-2.amazonaws.com",
|
|
1090
|
-
},
|
|
1091
|
-
"ap-southeast-1": {
|
|
1092
|
-
"codedeploy": "codedeploy.ap-southeast-1.amazonaws.com",
|
|
1093
|
-
},
|
|
1094
|
-
"ap-southeast-2": {
|
|
1095
|
-
"codedeploy": "codedeploy.ap-southeast-2.amazonaws.com",
|
|
1096
|
-
},
|
|
1097
|
-
"ap-southeast-3": {
|
|
1098
|
-
"codedeploy": "codedeploy.ap-southeast-3.amazonaws.com",
|
|
1099
|
-
},
|
|
1100
|
-
"ap-southeast-4": {
|
|
1101
|
-
"codedeploy": "codedeploy.ap-southeast-4.amazonaws.com",
|
|
1102
|
-
},
|
|
1103
|
-
"ap-southeast-5": {
|
|
1104
|
-
"codedeploy": "codedeploy.ap-southeast-5.amazonaws.com",
|
|
1105
|
-
},
|
|
1106
|
-
"ap-southeast-7": {
|
|
1107
|
-
"codedeploy": "codedeploy.ap-southeast-7.amazonaws.com",
|
|
1108
|
-
},
|
|
1109
|
-
"ca-central-1": {
|
|
1110
|
-
"codedeploy": "codedeploy.ca-central-1.amazonaws.com",
|
|
1111
|
-
},
|
|
1112
|
-
"ca-west-1": {
|
|
1113
|
-
"codedeploy": "codedeploy.ca-west-1.amazonaws.com",
|
|
1114
|
-
},
|
|
1115
|
-
"cn-north-1": {
|
|
1116
|
-
"codedeploy": "codedeploy.cn-north-1.amazonaws.com.cn",
|
|
1117
|
-
},
|
|
1118
|
-
"cn-northwest-1": {
|
|
1119
|
-
"codedeploy": "codedeploy.cn-northwest-1.amazonaws.com.cn",
|
|
1120
|
-
},
|
|
1121
|
-
"eu-central-1": {
|
|
1122
|
-
"codedeploy": "codedeploy.eu-central-1.amazonaws.com",
|
|
1123
|
-
},
|
|
1124
|
-
"eu-central-2": {
|
|
1125
|
-
"codedeploy": "codedeploy.eu-central-2.amazonaws.com",
|
|
1126
|
-
},
|
|
1127
|
-
"eu-isoe-west-1": {
|
|
1128
|
-
"codedeploy": "codedeploy.eu-isoe-west-1.amazonaws.com",
|
|
1129
|
-
},
|
|
1130
|
-
"eu-north-1": {
|
|
1131
|
-
"codedeploy": "codedeploy.eu-north-1.amazonaws.com",
|
|
1132
|
-
},
|
|
1133
|
-
"eu-south-1": {
|
|
1134
|
-
"codedeploy": "codedeploy.eu-south-1.amazonaws.com",
|
|
1135
|
-
},
|
|
1136
|
-
"eu-south-2": {
|
|
1137
|
-
"codedeploy": "codedeploy.eu-south-2.amazonaws.com",
|
|
1138
|
-
},
|
|
1139
|
-
"eu-west-1": {
|
|
1140
|
-
"codedeploy": "codedeploy.eu-west-1.amazonaws.com",
|
|
1141
|
-
},
|
|
1142
|
-
"eu-west-2": {
|
|
1143
|
-
"codedeploy": "codedeploy.eu-west-2.amazonaws.com",
|
|
1144
|
-
},
|
|
1145
|
-
"eu-west-3": {
|
|
1146
|
-
"codedeploy": "codedeploy.eu-west-3.amazonaws.com",
|
|
1147
|
-
},
|
|
1148
|
-
"il-central-1": {
|
|
1149
|
-
"codedeploy": "codedeploy.il-central-1.amazonaws.com",
|
|
1150
|
-
},
|
|
1151
|
-
"me-central-1": {
|
|
1152
|
-
"codedeploy": "codedeploy.me-central-1.amazonaws.com",
|
|
1153
|
-
},
|
|
1154
|
-
"me-south-1": {
|
|
1155
|
-
"codedeploy": "codedeploy.me-south-1.amazonaws.com",
|
|
1156
|
-
},
|
|
1157
|
-
"mx-central-1": {
|
|
1158
|
-
"codedeploy": "codedeploy.mx-central-1.amazonaws.com",
|
|
1159
|
-
},
|
|
1160
|
-
"sa-east-1": {
|
|
1161
|
-
"codedeploy": "codedeploy.sa-east-1.amazonaws.com",
|
|
1162
|
-
},
|
|
1163
|
-
"us-east-1": {
|
|
1164
|
-
"codedeploy": "codedeploy.us-east-1.amazonaws.com",
|
|
1165
|
-
},
|
|
1166
|
-
"us-east-2": {
|
|
1167
|
-
"codedeploy": "codedeploy.us-east-2.amazonaws.com",
|
|
1168
|
-
},
|
|
1169
|
-
"us-gov-east-1": {
|
|
1170
|
-
"codedeploy": "codedeploy.us-gov-east-1.amazonaws.com",
|
|
1171
|
-
},
|
|
1172
|
-
"us-gov-west-1": {
|
|
1173
|
-
"codedeploy": "codedeploy.us-gov-west-1.amazonaws.com",
|
|
1174
|
-
},
|
|
1175
|
-
"us-iso-east-1": {
|
|
1176
|
-
"codedeploy": "codedeploy.amazonaws.com",
|
|
1177
|
-
},
|
|
1178
|
-
"us-iso-west-1": {
|
|
1179
|
-
"codedeploy": "codedeploy.amazonaws.com",
|
|
1180
|
-
},
|
|
1181
|
-
"us-isob-east-1": {
|
|
1182
|
-
"codedeploy": "codedeploy.amazonaws.com",
|
|
1183
|
-
},
|
|
1184
|
-
"us-west-1": {
|
|
1185
|
-
"codedeploy": "codedeploy.us-west-1.amazonaws.com",
|
|
1186
|
-
},
|
|
1187
|
-
"us-west-2": {
|
|
1188
|
-
"codedeploy": "codedeploy.us-west-2.amazonaws.com",
|
|
1189
|
-
},
|
|
1190
|
-
},
|
|
1191
|
-
},
|
|
1192
936
|
"Parameters": {
|
|
1193
937
|
"BootstrapVersion": {
|
|
1194
938
|
"Default": "/cdk-bootstrap/hnb659fds/version",
|
|
@@ -1281,15 +1025,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
|
|
|
1281
1025
|
"Action": "sts:AssumeRole",
|
|
1282
1026
|
"Effect": "Allow",
|
|
1283
1027
|
"Principal": {
|
|
1284
|
-
"Service":
|
|
1285
|
-
"Fn::FindInMap": [
|
|
1286
|
-
"ServiceprincipalMap",
|
|
1287
|
-
{
|
|
1288
|
-
"Ref": "AWS::Region",
|
|
1289
|
-
},
|
|
1290
|
-
"codedeploy",
|
|
1291
|
-
],
|
|
1292
|
-
},
|
|
1028
|
+
"Service": "codedeploy.amazonaws.com",
|
|
1293
1029
|
},
|
|
1294
1030
|
},
|
|
1295
1031
|
],
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"license": "UNLICENSED",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"deploy": "cdk deploy appStack --require-approval never",
|
|
7
|
-
"deploy:hotswap": "pnpm --silent deploy --hotswap",
|
|
7
|
+
"deploy:hotswap": "pnpm --silent run deploy --hotswap",
|
|
8
8
|
"deploy:watch": "pnpm --silent deploy:hotswap --watch",
|
|
9
9
|
"format": "skuba format",
|
|
10
10
|
"lint": "skuba lint",
|