contensis-cli 1.0.0-beta.94 → 1.0.0-beta.96

package/dist/mappers/DevInit-to-CIWorkflow.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,113 +17,353 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var DevInit_to_CIWorkflow_exports = {};
 __export(DevInit_to_CIWorkflow_exports, {
   mapCIWorkflowContent: () => mapCIWorkflowContent
 });
 module.exports = __toCommonJS(DevInit_to_CIWorkflow_exports);
+var import_inquirer = __toESM(require("inquirer"));
 var import_jsonpath_plus = require("jsonpath-plus");
 var import_file_provider = require("../providers/file-provider");
 var import_diff = require("../util/diff");
 var import_logger = require("../util/logger");
 var import_os = require("../util/os");
-var import_yaml = require("../util/yaml");
-const mapCIWorkflowContent = (cli, git) => {
-  const workflowFile = (0, import_file_provider.readFile)(git.ciFilePath);
+var import_yaml2 = require("../util/yaml");
+const mapCIWorkflowContent = async (cli) => {
+  const workflowFile = (0, import_file_provider.readFile)(cli.git.ciFilePath);
   if (!workflowFile)
     return void 0;
-  const blockId = git.name;
-  if (git.type === "github") {
-    const addGitHubActionJobStep = {
-      name: "Push block to Contensis",
-      id: "push-block",
-      uses: "contensis/block-push@v1",
-      with: {
-        "block-id": blockId,
-        alias: cli.currentEnv,
-        "project-id": cli.currentProject,
-        "client-id": "${{ secrets.CONTENSIS_CLIENT_ID }}",
-        "shared-secret": "${{ secrets.CONTENSIS_SHARED_SECRET }}"
-      }
-    };
-    const workflowDoc = (0, import_yaml.parseYamlDocument)(workflowFile);
-    const workflow = workflowDoc.toJS();
-    const setWorkflowElement = (path, value) => {
-      const findPath = typeof path === "string" && path.includes(".") ? path.split(".").map((p) => Number(p) || Number(p) !== 0 ? p : Number(p)) : path;
-      if (workflowDoc.hasIn(findPath)) {
-        workflowDoc.setIn(findPath, value);
-      } else {
-        workflowDoc.addIn(findPath, value);
-      }
+  const blockId = cli.git.name;
+  const workflowDoc = (0, import_yaml2.parseYamlDocument)(workflowFile);
+  const workflowJS = workflowDoc.toJS();
+  if (cli.git.type === "github") {
+    const newWorkflow = await mapGitHubActionCIWorkflowContent(
+      cli,
+      blockId,
+      workflowDoc,
+      workflowJS
+    );
+    return {
+      existingWorkflow: workflowFile,
+      newWorkflow,
+      diff: (0, import_diff.diffFileContent)(workflowFile, newWorkflow)
     };
-    const findExistingJobSteps = (resultType) => {
-      const path = git.type === "github" ? '$.jobs..steps.*[?(@property === "uses" && @.match(/^contensis\\/block-push/i))]^' : "";
-      const existingJobStep2 = (0, import_jsonpath_plus.JSONPath)({
-        path,
-        json: workflow,
-        resultType
-      });
-      return existingJobStep2;
+  } else if (cli.git.type === "gitlab") {
+    const newWorkflow = await mapGitLabCIWorkflowContent(
+      cli,
+      blockId,
+      workflowDoc,
+      workflowJS
+    );
+    return {
+      existingWorkflow: workflowFile,
+      newWorkflow,
+      diff: (0, import_diff.diffFileContent)(workflowFile, newWorkflow)
     };
-    const existingJobStep = findExistingJobSteps("all");
-    if (existingJobStep.length) {
-      const step = existingJobStep[0];
-      const stepPath = step.path.replace("$[", "").replaceAll("][", ".").replace("]", "").replaceAll("'", "");
-      cli.log.info(
-        `Found existing Job step: ${stepPath}
-          - name: ${step.value.name}
-            id: ${step.value.id}
-`
-      );
-      setWorkflowElement(`${stepPath}.with.alias`, cli.currentEnv);
-      setWorkflowElement(`${stepPath}.with.project-id`, cli.currentProject);
-      setWorkflowElement(`${stepPath}.with.block-id`, blockId);
+  }
+};
+const findExistingJobSteps = (path, json, resultType) => {
+  const existingJobStep = (0, import_jsonpath_plus.JSONPath)({
+    path,
+    json,
+    resultType
+  });
+  return existingJobStep;
+};
+const setWorkflowElement = (workflowDoc, path, value) => {
+  const findPath = typeof path === "string" && path.includes(".") ? path.split(".").map((p) => Number(p) || Number(p) !== 0 ? p : Number(p)) : path;
+  if (workflowDoc.hasIn(findPath)) {
+    workflowDoc.setIn(findPath, value);
+  } else {
+    workflowDoc.addIn(findPath, value);
+  }
+};
+const mapGitLabCIWorkflowContent = async (cli, blockId, workflowDoc, workflowJS) => {
+  const addGitLabJobStage = {
+    stage: "push-block",
+    variables: {
+      block_id: blockId,
+      alias: cli.currentEnv,
+      project_id: cli.currentProject,
+      client_id: "$CONTENSIS_CLIENT_ID",
+      shared_secret: "$CONTENSIS_SHARED_SECRET"
+    }
+  };
+  const addAppImageUri = async () => {
+    const appImageUri = await determineAppImageUri(
+      cli,
+      Object.entries(workflowJS.variables || {}),
+      "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/app:build-$CI_PIPELINE_IID"
+    );
+    if (appImageUri.addVar)
       setWorkflowElement(
-        `${stepPath}.with.client-id`,
-        "${{ secrets.CONTENSIS_CLIENT_ID }}"
+        workflowDoc,
+        `variables.${appImageUri.var}`,
+        appImageUri.uri
       );
+    if (appImageUri.var)
+      addGitLabJobStage.variables["image_uri"] = `$${appImageUri.var}`;
+  };
+  const existingJobStep = findExistingJobSteps(
+    '$..[?(@property === "stage" && @.match(/^push-block/i))]^',
+    workflowJS,
+    "all"
+  );
+  if (existingJobStep.length) {
+    const step = existingJobStep[0];
+    const stepPath = step.path.replace("$[", "").replaceAll("][", ".").replace("]", "").replaceAll("'", "");
+    cli.log.info(
+      `Found existing Job step:
+          ${stepPath}
+            stage: ${step.value.stage}
+`
+    );
+    setWorkflowElement(
+      workflowDoc,
+      `${stepPath}.variables.alias`,
+      cli.currentEnv
+    );
+    setWorkflowElement(
+      workflowDoc,
+      `${stepPath}.variables.project_id`,
+      cli.currentProject
+    );
+    setWorkflowElement(workflowDoc, `${stepPath}.variables.block_id`, blockId);
+    setWorkflowElement(
+      workflowDoc,
+      `${stepPath}.variables.client_id`,
+      "$CONTENSIS_CLIENT_ID"
+    );
+    setWorkflowElement(
+      workflowDoc,
+      `${stepPath}.variables.shared_secret`,
+      "$CONTENSIS_SHARED_SECRET"
+    );
+  } else {
+    await addAppImageUri();
+    workflowDoc.addIn(["stages"], "push-block");
+    workflowDoc.addIn([], {
+      key: "push-to-contensis",
+      value: addGitLabJobStage
+    });
+    setWorkflowElement(
+      workflowDoc,
+      `include`,
+      "https://gitlab.zengenti.com/ops/contensis-ci/-/raw/main/push-block.yml"
+    );
+  }
+  cli.log.debug(`New file content to write
+
+${workflowDoc}`);
+  const newWorkflow = (0, import_os.normaliseLineEndings)(
+    workflowDoc.toString({ lineWidth: 0 })
+  );
+  return newWorkflow;
+};
+const mapGitHubActionCIWorkflowContent = async (cli, blockId, workflowDoc, workflowJS) => {
+  const addGitHubActionJobStep = {
+    name: "Push block to Contensis",
+    id: "push-block",
+    uses: "contensis/block-push@v1",
+    with: {
+      "block-id": blockId,
+      alias: cli.currentEnv,
+      "project-id": cli.currentProject,
+      "client-id": "${{ secrets.CONTENSIS_CLIENT_ID }}",
+      "shared-secret": "${{ secrets.CONTENSIS_SHARED_SECRET }}"
+    }
+  };
+  const addAppImageUri = async () => {
+    const appImageUri = await determineAppImageUri(
+      cli,
+      Object.entries(workflowJS.env || {}),
+      "ghcr.io/${{ github.repository }}/${{ github.ref_name }}/app:build-${{ github.run_number }}"
+    );
+    if (appImageUri.addVar)
       setWorkflowElement(
-        `${stepPath}.with.shared-secret`,
-        "${{ secrets.CONTENSIS_SHARED_SECRET }}"
+        workflowDoc,
+        `env.${appImageUri.var}`,
+        appImageUri.uri
       );
-    } else {
-      workflowDoc.addIn(["jobs"], {
-        key: "deploy",
-        value: {
-          name: "Push image to Contensis",
-          "runs-on": "ubuntu-latest",
-          steps: [addGitHubActionJobStep]
+    if (appImageUri.var)
+      addGitHubActionJobStep.with["image-uri"] = `\${{ env.${appImageUri.var} }}`;
+  };
+  const existingJobStep = findExistingJobSteps(
+    '$.jobs..steps.*[?(@property === "uses" && @.match(/^contensis\\/block-push/i))]^',
+    workflowJS,
+    "all"
+  );
+  if (existingJobStep.length) {
+    const step = existingJobStep[0];
+    const stepPath = step.path.replace("$[", "").replaceAll("][", ".").replace("]", "").replaceAll("'", "");
+    cli.log.info(
+      `Found existing Job step: ${stepPath}
+          - name: ${step.value.name}
+            id: ${step.value.id}
+`
+    );
+    setWorkflowElement(workflowDoc, `${stepPath}.with.alias`, cli.currentEnv);
+    setWorkflowElement(
+      workflowDoc,
+      `${stepPath}.with.project-id`,
+      cli.currentProject
+    );
+    setWorkflowElement(workflowDoc, `${stepPath}.with.block-id`, blockId);
+    setWorkflowElement(
+      workflowDoc,
+      `${stepPath}.with.client-id`,
+      "${{ secrets.CONTENSIS_CLIENT_ID }}"
+    );
+    setWorkflowElement(
+      workflowDoc,
+      `${stepPath}.with.shared-secret`,
+      "${{ secrets.CONTENSIS_SHARED_SECRET }}"
+    );
+  } else {
+    const existingBuildJobStep = findExistingJobSteps(
+      "$.jobs[?(@property.match(/build/i))]",
+      workflowJS,
+      "all"
+    );
+    let needs;
+    if (existingBuildJobStep.length > 1) {
+      const choices = existingBuildJobStep.map((s) => s.parentProperty);
+      choices.push(new import_inquirer.default.Separator());
+      choices.push("none");
+      ({ needs } = await import_inquirer.default.prompt([
+        {
+          type: "list",
+          prefix: "\u231B",
+          message: cli.messages.devinit.ciMultipleBuildJobChoices(),
+          name: "needs",
+          choices,
+          default: choices.find(
+            (s) => typeof s === "string" && s.includes("docker")
+          )
+        }
+      ]));
+      cli.log.raw("");
+    } else if (existingBuildJobStep.length === 1)
+      needs = existingBuildJobStep[0].parentProperty;
+    if (existingBuildJobStep.length === 0 || needs === "none") {
+      const choices = Object.keys(workflowJS.jobs);
+      choices.push(new import_inquirer.default.Separator());
+      choices.push("none");
+      ({ needs } = await import_inquirer.default.prompt([
+        {
+          type: "list",
+          prefix: "\u231B",
+          message: cli.messages.devinit.ciMultipleJobChoices(),
+          name: "needs",
+          choices,
+          default: choices.find(
+            (j) => typeof j === "string" && j.includes("docker")
+          )
         }
-      });
+      ]));
+      if (needs === "none")
+        needs = void 0;
+      cli.log.raw("");
     }
-    const workflowIsValid = (0, import_yaml.validateWorkflowYaml)(workflowDoc.toString());
-    if (workflowIsValid === true) {
-      cli.log.debug(
-        `New file content to write to ${git.ciFilePath}
+    await addAppImageUri();
+    const newJob = {
+      name: "Deploy container image to Contensis",
+      "runs-on": "ubuntu-latest",
+      needs,
+      steps: [addGitHubActionJobStep]
+    };
+    workflowDoc.addIn(["jobs"], {
+      key: "deploy",
+      value: newJob
+    });
+  }
+  const workflowIsValid = (0, import_yaml2.validateWorkflowYaml)(workflowDoc.toString());
+  if (workflowIsValid === true) {
+    cli.log.success(`GitHub workflow YAML is valid`);
+    cli.log.debug(`New file content to write
 
-${workflowDoc}`
-      );
-    } else if (Array.isArray(workflowIsValid)) {
-      (0, import_logger.logError)(
-        [
-          ...workflowIsValid.map(
-            (res) => new Error(`${res.code}: ${res.detail || res.title}`)
-          ),
-          workflowDoc.toString()
-        ],
-        `GitHub workflow YAML did not pass validation check`
-      );
-    }
-    const newWorkflow = (0, import_os.normaliseLineEndings)(
-      workflowDoc.toString({ lineWidth: 0 })
+${workflowDoc}`);
+  } else if (Array.isArray(workflowIsValid)) {
+    (0, import_logger.logError)(
+      [
+        ...workflowIsValid.map(
+          (res) => new Error(`${res.code}: ${res.detail || res.title}`)
+        ),
+        workflowDoc.toString()
+      ],
+      `GitHub workflow YAML did not pass validation check`
     );
-    return {
-      existingWorkflow: workflowFile,
-      newWorkflow,
-      diff: (0, import_diff.diffFileContent)(workflowFile, newWorkflow)
-    };
   }
+  const newWorkflow = (0, import_os.normaliseLineEndings)(
+    workflowDoc.toString({ lineWidth: 0 })
+  );
+  return newWorkflow;
+};
+const determineAppImageUri = async (cli, vars, defaultUri) => {
+  const imageVars = vars.filter(
+    ([varname]) => varname.toLowerCase().includes("image")
+  );
+  const appImageVars = imageVars.filter(
+    ([varname, value]) => !varname.toLowerCase().includes("builder_") && (varname.toLowerCase().includes("app_") || varname.toLowerCase().includes("build_") || (value == null ? void 0 : value.toLowerCase().includes("/app")))
+  );
+  const appImageUriGuess = appImageVars == null ? void 0 : appImageVars[0];
+  let appImageUri;
+  let appImageVar;
+  if (appImageUriGuess) {
+    cli.log.success(
+      `Found variable ${cli.log.standardText(
+        appImageUriGuess[0]
+      )} we'll use for pulling the block image from: ${cli.log.infoText(
+        appImageUriGuess[1]
+      )}`
+    );
+    appImageVar = appImageUriGuess[0];
+  } else {
+    const choices = vars.map((v) => v[0]);
+    const enterOwnMsg = "enter my own / use default";
+    choices.push(new import_inquirer.default.Separator());
+    choices.push(enterOwnMsg);
+    choices.push(defaultUri);
+    ({ appImageVar, appImageUri } = await import_inquirer.default.prompt([
+      {
+        type: "list",
+        prefix: "\u{1F433}",
+        message: cli.messages.devinit.ciMultipleAppImageVarChoices(),
+        name: "appImageVar",
+        choices,
+        default: choices.find(
+          (v) => typeof v === "string" && v.toLowerCase().includes("image")
+        )
+      },
+      {
+        type: "input",
+        when(answers) {
+          return [enterOwnMsg, defaultUri].includes(answers.appImageVar);
+        },
+        prefix: `
+ 
+\u{1F517}`,
+        message: cli.messages.devinit.ciEnterOwnAppImagePrompt(cli.git),
+        name: "appImageUri",
+        default: defaultUri
+      }
+    ]));
+    cli.log.raw("");
+    if ([enterOwnMsg, defaultUri].includes(appImageVar || ""))
+      appImageVar = void 0;
+  }
+  if (appImageVar)
+    appImageUri = cli.git.type === "github" ? `\${{ env.${appImageVar} }}` : `$${appImageVar}`;
+  return {
+    addVar: !appImageVar,
+    uri: appImageUri,
+    var: appImageVar || "BUILD_IMAGE"
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/mappers/DevInit-to-CIWorkflow.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/mappers/DevInit-to-CIWorkflow.ts"],
-  "sourcesContent": ["import { JSONPath, JSONPathOptions } from 'jsonpath-plus';\nimport { readFile } from '~/providers/file-provider';\nimport ContensisDev from '~/services/ContensisDevService';\nimport { diffFileContent } from '~/util/diff';\nimport { GitHelper } from '~/util/git';\nimport { logError } from '~/util/logger';\nimport { normaliseLineEndings } from '~/util/os';\nimport { parseYamlDocument, validateWorkflowYaml } from '~/util/yaml';\n\ntype MappedWorkflowOutput = {\n  existingWorkflow: string;\n  newWorkflow: string;\n  diff: string;\n};\n\nexport const mapCIWorkflowContent = (\n  cli: ContensisDev,\n  git: GitHelper\n): MappedWorkflowOutput | undefined => {\n  // get existing workflow file\n  const workflowFile = readFile(git.ciFilePath);\n  if (!workflowFile) return undefined;\n\n  const blockId = git.name;\n  if (git.type === 'github') {\n    const addGitHubActionJobStep = {\n      name: 'Push block to Contensis',\n      id: 'push-block',\n      uses: 'contensis/block-push@v1',\n      with: {\n        'block-id': blockId,\n        // 'image-uri': '${{ steps.build.outputs.image-uri }}',\n        alias: cli.currentEnv,\n        'project-id': cli.currentProject,\n        'client-id': '${{ secrets.CONTENSIS_CLIENT_ID }}',\n        'shared-secret': '${{ secrets.CONTENSIS_SHARED_SECRET }}',\n      },\n    };\n\n    // parse yaml to js\n    const workflowDoc = parseYamlDocument(workflowFile);\n    const workflow = workflowDoc.toJS();\n    const setWorkflowElement = (path: string | any[], value: any) => {\n      const findPath =\n        typeof path === 'string' && path.includes('.')\n          ? path\n              .split('.')\n              .map(p => (Number(p) || Number(p) !== 0 ? p : Number(p)))\n          : path;\n\n      if (workflowDoc.hasIn(findPath)) {\n        workflowDoc.setIn(findPath, value);\n      } else {\n        workflowDoc.addIn(findPath, value);\n        // }\n      }\n    };\n    const findExistingJobSteps = (\n      resultType: JSONPathOptions['resultType']\n    ) => {\n      // look for line in job\n      //   jobs.x.steps[uses: contensis/block-push]\n      const path =\n        git.type === 'github'\n          ? '$.jobs..steps.*[?(@property === \"uses\" && @.match(/^contensis\\\\/block-push/i))]^'\n          : // TODO: add jsonpath for gitlab file\n            '';\n\n      const existingJobStep = JSONPath({\n        path,\n        json: workflow,\n        resultType: resultType,\n      });\n\n      return existingJobStep;\n    };\n\n    const existingJobStep = findExistingJobSteps('all');\n\n    // update job step\n    if (existingJobStep.length) {\n      //cli.log.json(existingJobStep);\n\n      // The [0] index means we're only looking at updating the first instance in the file\n      const step = existingJobStep[0];\n\n      // Path looks like this \"$['jobs']['build']['steps'][3]\"\n      // We want it to look like this \"jobs.build.steps.3\"\n      const stepPath = step.path\n        .replace('$[', '')\n        .replaceAll('][', '.')\n        .replace(']', '')\n        .replaceAll(\"'\", '');\n\n      cli.log.info(\n        `Found existing Job step: ${stepPath}\n          - name: ${step.value.name}\n            id: ${step.value.id}\\n`\n      );\n\n      setWorkflowElement(`${stepPath}.with.alias`, cli.currentEnv);\n      setWorkflowElement(`${stepPath}.with.project-id`, cli.currentProject);\n      setWorkflowElement(`${stepPath}.with.block-id`, blockId);\n      setWorkflowElement(\n        `${stepPath}.with.client-id`,\n        '${{ secrets.CONTENSIS_CLIENT_ID }}'\n      );\n      setWorkflowElement(\n        `${stepPath}.with.shared-secret`,\n        '${{ secrets.CONTENSIS_SHARED_SECRET }}'\n      );\n    } else {\n      // create job with push step\n      workflowDoc.addIn(['jobs'], {\n        key: 'deploy',\n        value: {\n          name: 'Push image to Contensis',\n          'runs-on': 'ubuntu-latest',\n          steps: [addGitHubActionJobStep],\n        },\n      });\n    }\n\n    // Workflow validation provided by @action-validator/core package\n    const workflowIsValid = validateWorkflowYaml(workflowDoc.toString());\n\n    if (workflowIsValid === true) {\n      cli.log.debug(\n        `New file content to write to ${git.ciFilePath}\\n\\n${workflowDoc}`\n      );\n    } else if (Array.isArray(workflowIsValid)) {\n      // Errors\n      logError(\n        [\n          ...workflowIsValid.map(\n            res => new Error(`${res.code}: ${res.detail || res.title}`)\n          ),\n          workflowDoc.toString(),\n        ],\n        `GitHub workflow YAML did not pass validation check`\n      );\n    }\n    const newWorkflow = normaliseLineEndings(\n      workflowDoc.toString({ lineWidth: 0 })\n    );\n\n    return {\n      existingWorkflow: workflowFile,\n      newWorkflow,\n      diff: diffFileContent(workflowFile, newWorkflow),\n    };\n  }\n};\n"],
-  "mappings": "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",
-  "names": ["existingJobStep"]
+  "sourcesContent": ["import inquirer from 'inquirer';\nimport { JSONPath, JSONPathOptions } from 'jsonpath-plus';\nimport { Document } from 'yaml';\nimport {\n  GitHubActionPushBlockJob,\n  GitHubActionPushBlockJobStep,\n  GitLabPushBlockJobStage,\n} from '~/models/DevService';\nimport { readFile } from '~/providers/file-provider';\nimport ContensisDev from '~/services/ContensisDevService';\nimport { diffFileContent } from '~/util/diff';\nimport { logError } from '~/util/logger';\nimport { normaliseLineEndings } from '~/util/os';\nimport { parseYamlDocument, validateWorkflowYaml } from '~/util/yaml';\n\ntype MappedWorkflowOutput = {\n  existingWorkflow: string;\n  newWorkflow: string;\n  diff: string;\n};\n\nexport const mapCIWorkflowContent = async (\n  cli: ContensisDev\n): Promise<MappedWorkflowOutput | undefined> => {\n  // get existing workflow file\n  const workflowFile = readFile(cli.git.ciFilePath);\n  if (!workflowFile) return undefined;\n\n  const blockId = cli.git.name;\n\n  // parse yaml to js\n  const workflowDoc = parseYamlDocument(workflowFile);\n  const workflowJS = workflowDoc.toJS();\n\n  if (cli.git.type === 'github') {\n    const newWorkflow = await mapGitHubActionCIWorkflowContent(\n      cli,\n      blockId,\n      workflowDoc,\n      workflowJS\n    );\n    return {\n      existingWorkflow: workflowFile,\n      newWorkflow,\n      diff: diffFileContent(workflowFile, newWorkflow),\n    };\n  } else if (cli.git.type === 'gitlab') {\n    const newWorkflow = await mapGitLabCIWorkflowContent(\n      cli,\n      blockId,\n      workflowDoc,\n      workflowJS\n    );\n    return {\n      existingWorkflow: workflowFile,\n      newWorkflow,\n      diff: diffFileContent(workflowFile, newWorkflow),\n    };\n  }\n};\n\nconst findExistingJobSteps = (\n  path: string,\n  json: any,\n  resultType: JSONPathOptions['resultType']\n) => {\n  const existingJobStep = JSONPath({\n    path,\n    json,\n    resultType: resultType,\n  });\n\n  return existingJobStep;\n};\n\nconst setWorkflowElement = (\n  workflowDoc: Document,\n  path: string | any[],\n  value: any\n) => {\n  const findPath =\n    typeof path === 'string' && path.includes('.')\n      ? path.split('.').map(p => (Number(p) || Number(p) !== 0 ? p : Number(p)))\n      : path;\n\n  if (workflowDoc.hasIn(findPath)) {\n    workflowDoc.setIn(findPath, value);\n  } else {\n    workflowDoc.addIn(findPath, value);\n  }\n};\n\nconst mapGitLabCIWorkflowContent = async (\n  cli: ContensisDev,\n  blockId: string,\n  workflowDoc: Document,\n  workflowJS: any\n) => {\n  const addGitLabJobStage: GitLabPushBlockJobStage = {\n    stage: 'push-block',\n    variables: {\n      block_id: blockId,\n      alias: cli.currentEnv,\n      project_id: cli.currentProject,\n      client_id: '$CONTENSIS_CLIENT_ID',\n      shared_secret: '$CONTENSIS_SHARED_SECRET',\n    },\n  };\n\n  const addAppImageUri = async () => {\n    // Look in document level \"variables\"\n    const appImageUri = await determineAppImageUri(\n      cli,\n      Object.entries(workflowJS.variables || {}),\n      '$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/app:build-$CI_PIPELINE_IID'\n    );\n\n    if (appImageUri.addVar)\n      setWorkflowElement(\n        workflowDoc,\n        `variables.${appImageUri.var}`,\n        appImageUri.uri\n      );\n\n    if (appImageUri.var)\n      addGitLabJobStage.variables['image_uri'] = `\\$${appImageUri.var}`;\n  };\n\n  // look for line in job\n  //   jobname[stage: push-block]\n  const existingJobStep = findExistingJobSteps(\n    '$..[?(@property === \"stage\" && @.match(/^push-block/i))]^',\n    workflowJS,\n    'all'\n  );\n\n  // update job step\n  if (existingJobStep.length) {\n    // cli.log.json(existingJobStep);\n\n    // The [0] index means we're only looking at updating the first instance in the file\n    const step = existingJobStep[0];\n\n    // Path looks like this \"$['job_name']\"\n    // We want it to look like this \"job_name\"\n    const stepPath = step.path\n      .replace('$[', '')\n      .replaceAll('][', '.')\n      .replace(']', '')\n      .replaceAll(\"'\", '');\n\n    cli.log.info(\n      `Found existing Job step:\n          ${stepPath}\n            stage: ${step.value.stage}\\n`\n    );\n\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.variables.alias`,\n      cli.currentEnv\n    );\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.variables.project_id`,\n      cli.currentProject\n    );\n    setWorkflowElement(workflowDoc, `${stepPath}.variables.block_id`, blockId);\n\n    // This is likely not needed when updating an existing push-block job step\n    // we are assuming this is a forked/copied workflow with an already working image-uri reference\n    // await addAppImageUri();\n\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.variables.client_id`,\n      '$CONTENSIS_CLIENT_ID'\n    );\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.variables.shared_secret`,\n      '$CONTENSIS_SHARED_SECRET'\n    );\n  } else {\n    // create job with push step\n\n    // Does a series of checks and prompts to determine the correct image-uri\n    // for the app container build\n    await addAppImageUri();\n\n    // Add the new \"job\" to the Yaml Document\n    workflowDoc.addIn(['stages'], 'push-block');\n    workflowDoc.addIn([], {\n      key: 'push-to-contensis',\n      value: addGitLabJobStage,\n    });\n    setWorkflowElement(\n      workflowDoc,\n      `include`,\n      'https://gitlab.zengenti.com/ops/contensis-ci/-/raw/main/push-block.yml'\n    );\n  }\n\n  cli.log.debug(`New file content to write\\n\\n${workflowDoc}`);\n\n  const newWorkflow = normaliseLineEndings(\n    workflowDoc.toString({ lineWidth: 0 })\n  );\n\n  return newWorkflow;\n};\n\nconst mapGitHubActionCIWorkflowContent = async (\n  cli: ContensisDev,\n  blockId: string,\n  workflowDoc: Document,\n  workflowJS: any\n) => {\n  const addGitHubActionJobStep: GitHubActionPushBlockJobStep = {\n    name: 'Push block to Contensis',\n    id: 'push-block',\n    uses: 'contensis/block-push@v1',\n    with: {\n      'block-id': blockId,\n      // 'image-uri': '${{ steps.build.outputs.image-uri }}',\n      alias: cli.currentEnv,\n      'project-id': cli.currentProject,\n      'client-id': '${{ secrets.CONTENSIS_CLIENT_ID }}',\n      'shared-secret': '${{ secrets.CONTENSIS_SHARED_SECRET }}',\n    },\n  };\n\n  const addAppImageUri = async () => {\n    // Look in document level \"env\" vars\n    const appImageUri = await determineAppImageUri(\n      cli,\n      Object.entries(workflowJS.env || {}),\n      'ghcr.io/${{ github.repository }}/${{ github.ref_name }}/app:build-${{ github.run_number }}'\n    );\n\n    if (appImageUri.addVar)\n      setWorkflowElement(\n        workflowDoc,\n        `env.${appImageUri.var}`,\n        appImageUri.uri\n      );\n    // workflowDoc.addIn(['env'], { [appImageUri.var]: appImageUri.uri });\n\n    if (appImageUri.var)\n      addGitHubActionJobStep.with[\n        'image-uri'\n      ] = `\\${{ env.${appImageUri.var} }}`;\n  };\n\n  // look for line in job\n  //   jobs.x.steps[uses: contensis/block-push]\n  const existingJobStep = findExistingJobSteps(\n    '$.jobs..steps.*[?(@property === \"uses\" && @.match(/^contensis\\\\/block-push/i))]^',\n    workflowJS,\n    'all'\n  );\n\n  // update job step\n  if (existingJobStep.length) {\n    //cli.log.json(existingJobStep);\n\n    // The [0] index means we're only looking at updating the first instance in the file\n    const step = existingJobStep[0];\n\n    // Path looks like this \"$['jobs']['build']['steps'][3]\"\n    // We want it to look like this \"jobs.build.steps.3\"\n    const stepPath = step.path\n      .replace('$[', '')\n      .replaceAll('][', '.')\n      .replace(']', '')\n      .replaceAll(\"'\", '');\n\n    cli.log.info(\n      `Found existing Job step: ${stepPath}\n          - name: ${step.value.name}\n            id: ${step.value.id}\\n`\n    );\n\n    setWorkflowElement(workflowDoc, `${stepPath}.with.alias`, cli.currentEnv);\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.with.project-id`,\n      cli.currentProject\n    );\n    setWorkflowElement(workflowDoc, `${stepPath}.with.block-id`, blockId);\n\n    // This is likely not needed when updating an existing push-block job step\n    // we are assuming this is a forked/copied workflow with an already working image-uri reference\n    // await addAppImageUri();\n\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.with.client-id`,\n      '${{ secrets.CONTENSIS_CLIENT_ID }}'\n    );\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.with.shared-secret`,\n      '${{ secrets.CONTENSIS_SHARED_SECRET }}'\n    );\n  } else {\n    // create job with push step\n\n    // is there already a job with a property name containing \"build\"?\n    const existingBuildJobStep = findExistingJobSteps(\n      '$.jobs[?(@property.match(/build/i))]',\n      workflowJS,\n      'all'\n    ) as JSONPathOptions[]; // This isn't the correct type for this object\n\n    let needs: string | undefined;\n    // There are multiple jobs called *build*\n    if (existingBuildJobStep.length > 1) {\n      // prompt which build job we should depend on before pushing the block\n      const choices = existingBuildJobStep.map(s => s.parentProperty);\n      choices.push(new inquirer.Separator() as any);\n      choices.push('none');\n\n      ({ needs } = await inquirer.prompt([\n        {\n          type: 'list',\n          prefix: '\u231B',\n          message: cli.messages.devinit.ciMultipleBuildJobChoices(),\n          name: 'needs',\n          choices,\n          default: choices.find(\n            s => typeof s === 'string' && s.includes('docker')\n          ),\n        },\n      ]));\n      cli.log.raw('');\n    } else if (existingBuildJobStep.length === 1)\n      // Exactly one job step found containing a property name of *build*\n      // we'll assume that is the one the push-block job depends on\n      needs = existingBuildJobStep[0].parentProperty;\n\n    if (existingBuildJobStep.length === 0 || needs === 'none') {\n      // No existing build step found or chosen, offer all job steps in prompt\n      const choices = Object.keys(workflowJS.jobs);\n      choices.push(new inquirer.Separator() as any);\n      choices.push('none');\n\n      ({ needs } = await inquirer.prompt([\n        {\n          type: 'list',\n          prefix: '\u231B',\n          message: cli.messages.devinit.ciMultipleJobChoices(),\n          name: 'needs',\n          choices,\n          default: choices.find(\n            j => typeof j === 'string' && j.includes('docker')\n          ),\n        },\n      ]));\n      if (needs === 'none') needs = undefined;\n      cli.log.raw('');\n    }\n\n    // Does a series of checks and prompts to determine the correct image-uri\n    // for the app container build\n    await addAppImageUri();\n\n    const newJob: GitHubActionPushBlockJob = {\n      name: 'Deploy container image to Contensis',\n      'runs-on': 'ubuntu-latest',\n      needs,\n      steps: [addGitHubActionJobStep],\n    };\n\n    // Add the new \"job\" to the Yaml Document\n    workflowDoc.addIn(['jobs'], {\n      key: 'deploy',\n      value: newJob,\n    });\n  }\n\n  // Workflow validation provided by @action-validator/core package\n  const workflowIsValid = validateWorkflowYaml(workflowDoc.toString());\n\n  // We could expand validation to check for having a build step to wait for\n  // or if a valid image-uri attribute is set\n  if (workflowIsValid === true) {\n    cli.log.success(`GitHub workflow YAML is valid`);\n    cli.log.debug(`New file content to write\\n\\n${workflowDoc}`);\n  } else if (Array.isArray(workflowIsValid)) {\n    // Errors\n    logError(\n      [\n        ...workflowIsValid.map(\n          res => new Error(`${res.code}: ${res.detail || res.title}`)\n        ),\n        workflowDoc.toString(),\n      ],\n      `GitHub workflow YAML did not pass validation check`\n    );\n  }\n  const newWorkflow = normaliseLineEndings(\n    workflowDoc.toString({ lineWidth: 0 })\n  );\n\n  return newWorkflow;\n};\n\nconst determineAppImageUri = async (\n  cli: ContensisDev,\n  vars: [string, string][],\n  defaultUri: string\n) => {\n  // Determine container image-uri via variables and/or prompts\n\n  // Find vars including the word \"image\"\n  const imageVars = vars.filter(([varname]) =>\n    varname.toLowerCase().includes('image')\n  );\n  // Find vars named \"image\" that include the word \"app\"\n  const appImageVars = imageVars.filter(\n    ([varname, value]) =>\n      !varname.toLowerCase().includes('builder_') &&\n      (varname.toLowerCase().includes('app_') ||\n        varname.toLowerCase().includes('build_') ||\n        value?.toLowerCase().includes('/app'))\n  );\n\n  const appImageUriGuess = appImageVars?.[0];\n\n  let appImageUri: string | undefined;\n  let appImageVar: string | undefined;\n\n  if (appImageUriGuess) {\n    cli.log.success(\n      `Found variable ${cli.log.standardText(\n        appImageUriGuess[0]\n      )} we'll use for pulling the block image from: ${cli.log.infoText(\n        appImageUriGuess[1]\n      )}`\n    );\n    appImageVar = appImageUriGuess[0];\n  } else {\n    // Could not find a suitable var to use for block image-uri\n    // prompt for an app image uri\n    const choices = vars.map(v => v[0]);\n    const enterOwnMsg = 'enter my own / use default';\n\n    choices.push(new inquirer.Separator() as any);\n    choices.push(enterOwnMsg);\n    choices.push(defaultUri);\n\n    ({ appImageVar, appImageUri } = await inquirer.prompt([\n      // First question determines if an existing env variable\n      // already containes the tagged app image uri\n      {\n        type: 'list',\n        prefix: '\uD83D\uDC33',\n        message: cli.messages.devinit.ciMultipleAppImageVarChoices(),\n        name: 'appImageVar',\n        choices,\n        default: choices.find(\n          v => typeof v === 'string' && v.toLowerCase().includes('image')\n        ),\n      },\n      // Subsequent prompt allows input of an image-uri if needed\n      {\n        type: 'input',\n        when(answers) {\n          return [enterOwnMsg, defaultUri].includes(answers.appImageVar);\n        },\n        prefix: `\\n \\n\uD83D\uDD17`,\n        message: cli.messages.devinit.ciEnterOwnAppImagePrompt(cli.git),\n        name: 'appImageUri',\n        default: defaultUri,\n      },\n    ]));\n    cli.log.raw('');\n\n    // this indicates a uri has been added and we will add a new var\n    // to the workflow to encourage users to update the docker tag part\n    // of their build workflow to use the same var as the push-block job/step\n    if ([enterOwnMsg, defaultUri].includes(appImageVar || ''))\n      appImageVar = undefined;\n  }\n\n  if (appImageVar)\n    appImageUri =\n      cli.git.type === 'github'\n        ? `\\${{ env.${appImageVar} }}`\n        : `\\$${appImageVar}`;\n\n  // TODO: prompt further for image tag\n\n  return {\n    addVar: !appImageVar,\n    uri: appImageUri,\n    var: appImageVar || 'BUILD_IMAGE',\n  };\n};\n"],
+  "mappings": "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",
+  "names": ["import_yaml", "inquirer"]
 }

package/dist/models/DevService.d.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/models/DevService.d.ts"],
-  "sourcesContent": ["export type EnvContentsToAdd = {\n  ALIAS: string;\n  PROJECT: string;\n  ACCESS_TOKEN?: string;\n}\n"],
+  "sourcesContent": ["export type EnvContentsToAdd = {\n  ALIAS: string;\n  PROJECT: string;\n  ACCESS_TOKEN?: string;\n};\n\nexport type GitHubActionPushBlockJobStep = {\n  name: string;\n  id: 'push-block';\n  uses: string;\n  with: {\n    'block-id': string;\n    alias: string;\n    'project-id': string;\n    'client-id': string;\n    'shared-secret': string;\n    'image-uri'?: string;\n  };\n};\n\nexport type GitHubActionPushBlockJob = {\n  name: string;\n  'runs-on': string;\n  needs?: string;\n  steps: GitHubActionPushBlockJobStep[];\n};\n\nexport type GitLabPushBlockJobStage = {\n  stage: string;\n  variables: {\n    alias: string;\n    project_id: string;\n    block_id: string;\n    image_uri?: string;\n    client_id: string;\n    shared_secret: string;\n  };\n};\n"],
   "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

package/dist/services/ContensisDevService.js

@@ -45,6 +45,7 @@ var import_json = require("../util/json.formatter");
 var import_os = require("../util/os");
 var import_yaml = require("../util/yaml");
 class ContensisDev extends import_ContensisRoleService.default {
+  git;
   constructor(args, outputOpts, contensisOpts = {}) {
     super(args, outputOpts, contensisOpts);
   }
@@ -62,7 +63,7 @@ class ContensisDev extends import_ContensisRoleService.default {
       const apiKeyExists = (findKey) => apiKeys == null ? void 0 : apiKeys.find(
         (k) => k.name.trim().toLowerCase() === (findKey == null ? void 0 : findKey.trim().toLowerCase())
       );
-      const git = new import_git.GitHelper(projectHome);
+      const git = this.git = new import_git.GitHelper(projectHome);
       const workflowFiles = git.workflows;
       let ciFileName = git.ciFileName;
       const devKeyName = `${git.name} development`;
@@ -101,6 +102,7 @@ class ContensisDev extends import_ContensisRoleService.default {
         ({ ciFileName } = await import_inquirer.default.prompt([
           {
             type: "list",
+            prefix: "\u29F0",
             message: messages.devinit.ciMultipleChoices(),
             name: "ciFileName",
             choices: workflowFiles,
@@ -111,7 +113,7 @@ class ContensisDev extends import_ContensisRoleService.default {
         git.ciFileName = ciFileName;
       }
       log.raw(log.infoText(messages.devinit.ciDetails(ciFileName)));
-      const mappedWorkflow = (0, import_DevInit_to_CIWorkflow.mapCIWorkflowContent)(this, git);
+      const mappedWorkflow = await (0, import_DevInit_to_CIWorkflow.mapCIWorkflowContent)(this);
       log.help(messages.devinit.ciIntro(git));
       if (!dryRun) {
         const { confirm } = await import_inquirer.default.prompt([
@@ -129,6 +131,7 @@ class ContensisDev extends import_ContensisRoleService.default {
       const { accessToken } = await import_inquirer.default.prompt([
         {
           type: "input",
+          prefix: "\u{1F6E1}\uFE0F",
           message: messages.devinit.accessTokenPrompt(),
           name: "accessToken"
         }
@@ -199,32 +202,40 @@ class ContensisDev extends import_ContensisRoleService.default {
       const envDiff = (0, import_diff.diffFileContent)(existingEnvFile || "", newEnvFileContent);
       if (dryRun) {
         if (envDiff) {
-          log.info(`updating .env file ${envFilePath}: ${envDiff}`);
+          log.info(`Updating .env file ${(0, import_os.winSlash)(envFilePath)}:
+${envDiff}`);
           log.raw("");
         }
         checkpoint("skip .env file update (dry-run)");
       } else {
         if (envDiff)
-          log.info(`updating .env file ${envFilePath}`);
+          log.info(`updating .env file ${(0, import_os.winSlash)(envFilePath)}`);
         (0, import_file_provider.writeFile)(envFilePath, envFileLines.join("\n"));
         checkpoint(".env file updated");
         log.success(messages.devinit.writeEnvFile());
       }
+      if (mappedWorkflow == null ? void 0 : mappedWorkflow.diff) {
+        log.info(
+          `Updating ${(0, import_os.winSlash)(ciFileName)} file:
+${mappedWorkflow.diff}`
+        );
+        log.raw("");
+      }
       if (dryRun) {
-        if (mappedWorkflow == null ? void 0 : mappedWorkflow.diff) {
-          log.info(`updating${ciFileName} file: ${mappedWorkflow.diff}`);
-          log.raw("");
-        }
         checkpoint("skip CI file update (dry-run)");
       } else {
-        if (mappedWorkflow == null ? void 0 : mappedWorkflow.diff)
-          log.info(`updating${ciFileName} file`);
-        (0, import_file_provider.writeFile)(git.ciFilePath, [].join("\n"));
-        log.success(messages.devinit.writeCiFile(`./${ciFileName}`));
-        log.info(
-          messages.devinit.ciBlockTip(blockId, currentEnv, currentProject)
-        );
-        checkpoint("CI file updated");
+        if (mappedWorkflow == null ? void 0 : mappedWorkflow.newWorkflow) {
+          if (mappedWorkflow == null ? void 0 : mappedWorkflow.diff) {
+            (0, import_file_provider.writeFile)(git.ciFilePath, mappedWorkflow.newWorkflow);
+            log.success(messages.devinit.writeCiFile(`./${ciFileName}`));
+            log.info(
+              messages.devinit.ciBlockTip(blockId, currentEnv, currentProject)
+            );
+          } else {
+            log.info(messages.devinit.ciFileNoChanges(`./${ciFileName}`));
+          }
+          checkpoint("CI file updated");
+        }
       }
       log.warning(messages.devinit.addGitSecretsIntro());
       log.help(