feat: add task environment

cicd/.gitignore

@@ -1 +1,2 @@
-ssh-key*
+ssh-key*
+npmtoken

cicd/carlin.ts

@@ -0,0 +1,10 @@
+import * as fs from 'fs';
+
+export default {
+  pipelines: ['tag'],
+  sshKey: './ssh-key',
+  sshUrl: '[email protected]:ttoss/carlin.git',
+  taskEnvironment: [
+    { Name: 'NPM_TOKEN', Value: fs.readFileSync('./npmtoken', 'utf-8') },
+  ],
+};

packages/cli/.npmrc

@@ -0,0 +1 @@
+//registry.npmjs.org/:_authToken=${NPM_TOKEN}

packages/cli/package.json

@@ -6,12 +6,16 @@
   "scripts": {
     "test": "jest",
     "build": "tsc",
-    "prepare": "npm run test && rm -rf dist && npm run build"
+    "prepare": "npm run test && npm run build",
+    "deploy": "npm publish"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ttoss/carlin.git"
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "keywords": [],
   "author": {
     "email": "[email protected]",

packages/cli/src/deploy/cicd/cicd.template.ts

@@ -72,6 +72,7 @@ export const getCicdTemplate = ({
   cpu = ECS_TASK_DEFAULT_CPU,
   memory = ECS_TASK_DEFAULT_MEMORY,
   s3,
+  taskEnvironment = [],
 }: {
   pipelines: Pipeline[];
   cpu?: string;
@@ -81,6 +82,7 @@ export const getCicdTemplate = ({
     key: string;
     versionId: string;
   };
+  taskEnvironment?: Array<{ Name: string; Value: string }>;
 }): CloudFormationTemplate => {
   const resources: CloudFormationTemplate['Resources'] = {};
 
@@ -633,6 +635,7 @@ export const getCicdTemplate = ({
         ContainerDefinitions: [
           {
             Environment: [
+              ...taskEnvironment,
               {
                 /**
                  * https://docs.aws.amazon.com/AmazonECS/latest/developerguide/container-metadata.html#enable-metadata

packages/cli/src/deploy/cicd/command.ts

@@ -45,6 +45,23 @@ export const options = {
     demandOption: true,
     type: 'string',
   },
+  /**
+   * This option has the format:
+   *
+   * ```ts
+   * Array<{
+   *  Name: string,
+   *  Value: string,
+   * }>
+   * ```
+   */
+  'task-environment': {
+    alias: ['te'],
+    default: [],
+    describe:
+      'A list of environment variables that will be passed to the ECS container task.',
+    type: 'array',
+  },
 } as const;
 
 export const deployCicdCommand: CommandModule<

packages/cli/src/deploy/cicd/deployCicd.ts

@@ -89,13 +89,15 @@ export const deployCicd = async ({
   repositoryUpdate,
   sshKey,
   sshUrl,
+  taskEnvironment,
 }: {
   cpu?: string;
   memory?: string;
   pipelines: Pipeline[];
   repositoryUpdate?: boolean;
   sshKey: string;
   sshUrl: string;
+  taskEnvironment: Array<{ Name: string; Value: string }>;
 }) => {
   try {
     const { stackName } = await handleDeployInitialization({
@@ -109,6 +111,7 @@ export const deployCicd = async ({
         memory,
         pipelines,
         s3: await deployCicdLambdas({ stackName }),
+        taskEnvironment,
       }),
       params: {
         StackName: stackName,

packages/cli/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "incremental": false, // Do not create tsconfig.tsbuildinfo
     "outDir": "dist",
-    "noEmit": false
+    "noEmit": false,
+    "declaration": false
   },
   "include": ["src"],
   "exclude": ["**/*.spec.ts", "**/*.test.ts"]

packages/website/carlin.yml

@@ -1,10 +1,4 @@
 environments:
-  Staging:
-    aliases:
-      - carlin.ttoss.dev
-    csp:
-      default-src: ["* 'unsafe-inline' 'unsafe-eval'", replace]
-    stackName: CarlinWebsite
   Production:
     aliases:
       - carlin.ttoss.dev