contensis-cli 1.0.9-beta.5 → 1.0.9-beta.7

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

@@ -316,7 +316,7 @@ ${workflowDoc}`);
       `GitHub workflow YAML did not pass validation check`
     );
   }
-  const newWorkflow = workflowDoc.toString();
+  const newWorkflow = workflowDoc.toString({ lineWidth: 0 });
   return newWorkflow;
 };
 const determineAppImageUri = async (cli, vars, defaultUri) => {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/mappers/DevInit-to-CIWorkflow.ts"],
-  "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  // 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      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      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 findPath = (path: string | any[]) =>\n  typeof path === 'string' && path.includes('.')\n    ? path.split('.').map(p => (Number(p) || Number(p) !== 0 ? p : Number(p)))\n    : path;\n\nconst setWorkflowElement = (\n  workflowDoc: Document,\n  path: string | any[],\n  value: any\n) => {\n  if (workflowDoc.hasIn(findPath(path))) {\n    workflowDoc.setIn(findPath(path), value);\n  } else {\n    workflowDoc.addIn(findPath(path), value);\n  }\n};\n\nconst mapGitLabCIWorkflowContent = async (\n  cli: ContensisDev,\n  workflowDoc: Document,\n  workflowJS: any\n) => {\n  const addGitLabJobStage: GitLabPushBlockJobStage = {\n    stage: 'push-block',\n    variables: {\n      block_id: cli.blockId,\n      alias: cli.currentEnv,\n      project_id: cli.currentProject,\n      client_id:\n        cli.clientDetailsLocation === 'env'\n          ? cli.clientId\n          : '$CONTENSIS_CLIENT_ID',\n      shared_secret:\n        cli.clientDetailsLocation === 'env'\n          ? cli.clientSecret\n          : '$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(\n      workflowDoc,\n      `${stepPath}.variables.block_id`,\n      cli.blockId\n    );\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      cli.clientDetailsLocation === 'env'\n        ? cli.clientId\n        : '$CONTENSIS_CLIENT_ID'\n    );\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.variables.shared_secret`,\n      cli.clientDetailsLocation === 'env'\n        ? cli.clientSecret\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  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': cli.blockId,\n      // 'image-uri': '${{ steps.build.outputs.image-uri }}',\n      alias: cli.currentEnv,\n      'project-id': cli.currentProject,\n      'client-id':\n        cli.clientDetailsLocation === 'env'\n          ? '${{ env.CONTENSIS_CLIENT_ID }}'\n          : '${{ secrets.CONTENSIS_CLIENT_ID }}',\n      'shared-secret':\n        cli.clientDetailsLocation === 'env'\n          ? '${{ env.CONTENSIS_SHARED_SECRET }}'\n          : '${{ 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'\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} }}:build-\\${{ github.run_number }}`;\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 'env' and store client id and secret\n  if (cli.clientDetailsLocation === 'env') {\n    setWorkflowElement(workflowDoc, `env.CONTENSIS_CLIENT_ID`, cli.clientId);\n    setWorkflowElement(\n      workflowDoc,\n      `env.CONTENSIS_SHARED_SECRET`,\n      cli.clientSecret\n    );\n  }\n\n  if (cli.clientDetailsLocation === 'git') {\n    // remove env vars from yml if we choose git\n    workflowDoc.deleteIn(findPath(`env.CONTENSIS_CLIENT_ID`));\n    workflowDoc.deleteIn(findPath(`env.CONTENSIS_SHARED_SECRET`));\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`, cli.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      cli.clientDetailsLocation === 'env'\n        ? '${{ env.CONTENSIS_CLIENT_ID }}'\n        : '${{ secrets.CONTENSIS_CLIENT_ID }}'\n    );\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.with.shared-secret`,\n      cli.clientDetailsLocation === 'env'\n        ? '${{ env.CONTENSIS_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      if (choices.includes('build-app')) needs = 'build-app';\n      else {\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      }\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\n  // const newWorkflow = normaliseLineEndings(\n  //   workflowDoc.toString({ lineWidth: 0 })\n  // );\n\n  const newWorkflow = workflowDoc.toString();\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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",
+  "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  // 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      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      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 findPath = (path: string | any[]) =>\n  typeof path === 'string' && path.includes('.')\n    ? path.split('.').map(p => (Number(p) || Number(p) !== 0 ? p : Number(p)))\n    : path;\n\nconst setWorkflowElement = (\n  workflowDoc: Document,\n  path: string | any[],\n  value: any\n) => {\n  if (workflowDoc.hasIn(findPath(path))) {\n    workflowDoc.setIn(findPath(path), value);\n  } else {\n    workflowDoc.addIn(findPath(path), value);\n  }\n};\n\nconst mapGitLabCIWorkflowContent = async (\n  cli: ContensisDev,\n  workflowDoc: Document,\n  workflowJS: any\n) => {\n  const addGitLabJobStage: GitLabPushBlockJobStage = {\n    stage: 'push-block',\n    variables: {\n      block_id: cli.blockId,\n      alias: cli.currentEnv,\n      project_id: cli.currentProject,\n      client_id:\n        cli.clientDetailsLocation === 'env'\n          ? cli.clientId\n          : '$CONTENSIS_CLIENT_ID',\n      shared_secret:\n        cli.clientDetailsLocation === 'env'\n          ? cli.clientSecret\n          : '$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(\n      workflowDoc,\n      `${stepPath}.variables.block_id`,\n      cli.blockId\n    );\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      cli.clientDetailsLocation === 'env'\n        ? cli.clientId\n        : '$CONTENSIS_CLIENT_ID'\n    );\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.variables.shared_secret`,\n      cli.clientDetailsLocation === 'env'\n        ? cli.clientSecret\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  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': cli.blockId,\n      // 'image-uri': '${{ steps.build.outputs.image-uri }}',\n      alias: cli.currentEnv,\n      'project-id': cli.currentProject,\n      'client-id':\n        cli.clientDetailsLocation === 'env'\n          ? '${{ env.CONTENSIS_CLIENT_ID }}'\n          : '${{ secrets.CONTENSIS_CLIENT_ID }}',\n      'shared-secret':\n        cli.clientDetailsLocation === 'env'\n          ? '${{ env.CONTENSIS_SHARED_SECRET }}'\n          : '${{ 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'\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} }}:build-\\${{ github.run_number }}`;\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 'env' and store client id and secret\n  if (cli.clientDetailsLocation === 'env') {\n    setWorkflowElement(workflowDoc, `env.CONTENSIS_CLIENT_ID`, cli.clientId);\n    setWorkflowElement(\n      workflowDoc,\n      `env.CONTENSIS_SHARED_SECRET`,\n      cli.clientSecret\n    );\n  }\n\n  if (cli.clientDetailsLocation === 'git') {\n    // remove env vars from yml if we choose git\n    workflowDoc.deleteIn(findPath(`env.CONTENSIS_CLIENT_ID`));\n    workflowDoc.deleteIn(findPath(`env.CONTENSIS_SHARED_SECRET`));\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`, cli.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      cli.clientDetailsLocation === 'env'\n        ? '${{ env.CONTENSIS_CLIENT_ID }}'\n        : '${{ secrets.CONTENSIS_CLIENT_ID }}'\n    );\n    setWorkflowElement(\n      workflowDoc,\n      `${stepPath}.with.shared-secret`,\n      cli.clientDetailsLocation === 'env'\n        ? '${{ env.CONTENSIS_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      if (choices.includes('build-app')) needs = 'build-app';\n      else {\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      }\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\n  // const newWorkflow = normaliseLineEndings(\n  //   workflowDoc.toString({ lineWidth: 0 })\n  // );\n\n  const newWorkflow = workflowDoc.toString({ lineWidth: 0 });\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/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");
 var import_nanospinner = require("nanospinner");
+var import_gitignore = require("../util/gitignore");
 class ContensisDev extends import_ContensisRoleService.default {
   git;
   blockId;
@@ -87,11 +88,21 @@ class ContensisDev extends import_ContensisRoleService.default {
       );
       const workflowFiles = git.workflows;
       let ciFileName = git.ciFileName;
+      const devKeyName = `${blockId} development`;
+      const devKeyDescription = `${blockId} [contensis-cli]`;
+      let existingDevKey = apiKeyExists(devKeyName);
+      if (!existingDevKey) {
+        existingDevKey = await this.CreateOrUpdateApiKey(
+          existingDevKey,
+          devKeyName,
+          devKeyDescription
+        );
+        log.success("Successfully created development key");
+      }
       const deployKeyName = `${blockId} deployment`;
       const deployKeyDescription = `${blockId} deploy [contensis-cli]`;
       let existingDeployKey = apiKeyExists(deployKeyName);
       if (!existingDeployKey) {
-        log.info("Please wait, creating deploy key");
         existingDeployKey = await this.CreateOrUpdateApiKey(
           existingDeployKey,
           deployKeyName,
@@ -118,6 +129,11 @@ class ContensisDev extends import_ContensisRoleService.default {
           )
         )
       );
+      log.raw(
+        log.infoText(
+          messages.devinit.developmentKey(devKeyName, !!existingDevKey)
+        )
+      );
       log.raw(
         log.infoText(
           messages.devinit.deploymentKey(deployKeyName, !!existingDeployKey)
@@ -227,8 +243,8 @@ class ContensisDev extends import_ContensisRoleService.default {
       if (accessToken)
         envContentsToAdd["ACCESS_TOKEN"] = accessToken;
       if (this.clientDetailsLocation === "env") {
-        envContentsToAdd["CONTENSIS_CLIENT_ID"] = this.clientId;
-        envContentsToAdd["CONTENSIS_CLIENT_SECRET"] = this.clientSecret;
+        envContentsToAdd["CONTENSIS_CLIENT_ID"] = existingDevKey == null ? void 0 : existingDevKey.id;
+        envContentsToAdd["CONTENSIS_CLIENT_SECRET"] = existingDevKey == null ? void 0 : existingDevKey.sharedSecret;
       }
       const removeEnvItems = (items) => {
         const indexesToRemove = [];
@@ -267,6 +283,9 @@ ${envDiff}`);
         checkpoint(".env file updated");
         log.success(messages.devinit.writeEnvFile());
       }
+      const gitIgnorePath = `${projectHome}/.gitignore`;
+      const gitIgnoreContentsToAdd = [".env"];
+      (0, import_gitignore.mergeContentsToAddWithGitignore)(gitIgnorePath, gitIgnoreContentsToAdd);
       if (mappedWorkflow == null ? void 0 : mappedWorkflow.diff) {
         log.info(
           `Updating ${(0, import_os.winSlash)(ciFileName)} file:

package/dist/services/ContensisDevService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/services/ContensisDevService.ts"],
-  "sourcesContent": ["import to from 'await-to-js';\nimport { spawn } from 'child_process';\nimport inquirer from 'inquirer';\nimport path from 'path';\n\nimport { Role } from 'contensis-management-api/lib/models';\nimport { MigrateRequest } from 'migratortron';\n\nimport ContensisRole from './ContensisRoleService';\nimport { OutputOptionsConstructorArg } from '~/models/CliService';\nimport { EnvContentsToAdd } from '~/models/DevService';\nimport { mapSiteConfigYaml } from '~/mappers/DevRequests-to-RequestHanderSiteConfigYaml';\nimport { mapCIWorkflowContent } from '~/mappers/DevInit-to-CIWorkflow';\nimport {\n  deployKeyRole,\n  devKeyRole,\n} from '~/mappers/DevInit-to-RolePermissions';\nimport { appRootDir, readFile, writeFile } from '~/providers/file-provider';\nimport { diffFileContent } from '~/util/diff';\nimport { mergeDotEnvFileContents } from '~/util/dotenv';\nimport { findByIdOrName } from '~/util/find';\nimport { GitHelper } from '~/util/git';\nimport { jsonFormatter } from '~/util/json.formatter';\nimport { winSlash } from '~/util/os';\nimport { stringifyYaml } from '~/util/yaml';\nimport { createSpinner } from 'nanospinner';\n\nclass ContensisDev extends ContensisRole {\n  git!: GitHelper;\n  blockId: string;\n\n  constructor(\n    args: string[],\n    outputOpts?: OutputOptionsConstructorArg,\n    contensisOpts: Partial<MigrateRequest> = {}\n  ) {\n    super(args, outputOpts, contensisOpts);\n  }\n\n  DevelopmentInit = async (projectHome: string, opts: any) => {\n    // Retrieve git info\n    const git = (this.git = new GitHelper(projectHome));\n    // Check if we are in a git repo\n    const isRepo = git.checkIsRepo();\n    if (!isRepo) return;\n\n    const { dryRun = false } = opts || {};\n    const { currentEnv, currentProject, log, messages } = this;\n    const contensis = await this.ConnectContensis();\n\n    if (contensis) {\n      // First we need to get the block id from the user\n      const validateBlockId = (blockId: string) => {\n        const pattern = /^[a-z-]*$/;\n        if (typeof blockId === 'string' && blockId.length >= 3) {\n          return pattern.test(blockId);\n        } else return false;\n      };\n      let { blockId } = await inquirer.prompt({\n        name: 'blockId',\n        type: 'input',\n        prefix: '\uD83E\uDDF1',\n        message: messages.devinit.blockIdQuestion,\n        validate: validateBlockId,\n      });\n      // make sure block id is lowercase\n      this.blockId = blockId.toLowerCase();\n      log.success(`Valid block id: ${blockId.toLowerCase()}`);\n\n      // Retrieve keys list for env\n      const [keysErr, apiKeys] = await contensis.apiKeys.GetKeys();\n      if (keysErr) {\n        log.error(messages.keys.noList(currentEnv));\n        log.error(jsonFormatter(keysErr));\n        return;\n      }\n      const apiKeyExists = (findKey: string) =>\n        apiKeys?.find(\n          k => k.name.trim().toLowerCase() === findKey?.trim().toLowerCase()\n        );\n\n      // Retrieve ci workflow info\n      const workflowFiles = git.workflows;\n\n      // Set variables for performing operations and logging etc.\n      let ciFileName = git.ciFileName;\n\n      // const devKeyName = `${git.name} development`;\n      // const devKeyDescription = `${git.name} [contensis-cli]`;\n      // let existingDevKey = apiKeyExists(devKeyName);\n\n      const deployKeyName = `${blockId} deployment`;\n      const deployKeyDescription = `${blockId} deploy [contensis-cli]`;\n\n      let existingDeployKey = apiKeyExists(deployKeyName);\n\n      // if api key doesn't exisit go and create it (we need this for yml file).\n      if (!existingDeployKey) {\n        log.info('Please wait, creating deploy key');\n        existingDeployKey = await this.CreateOrUpdateApiKey(\n          existingDeployKey,\n          deployKeyName,\n          deployKeyDescription\n        );\n        log.success('Successfully created deploy key');\n      }\n\n      // check we have the deply key so we can assign them to this values\n      if (existingDeployKey) {\n        // Add client id and secret to global 'this'\n        this.clientId = existingDeployKey?.id;\n        this.clientSecret = existingDeployKey?.sharedSecret;\n      }\n\n      // const blockId = git.name;\n      const errors = [] as AppError[];\n\n      // Start render console output\n      log.raw('');\n      log.success(messages.devinit.intro());\n      log.raw('');\n      log.raw(\n        log.infoText(\n          messages.devinit.projectDetails(\n            git.name,\n            currentEnv,\n            currentProject,\n            blockId,\n            git\n          )\n        )\n      );\n      // log.raw(\n      //   log.infoText(\n      //     messages.devinit.developmentKey(devKeyName, !!existingDevKey)\n      //   )\n      // );\n      log.raw(\n        log.infoText(\n          messages.devinit.deploymentKey(deployKeyName, !!existingDeployKey)\n        )\n      );\n      log.raw('');\n\n      if (Array.isArray(workflowFiles) && workflowFiles.length > 1) {\n        // Choose GitHub workflow file (if multiple)\n        ({ ciFileName } = await inquirer.prompt([\n          {\n            type: 'list',\n            prefix: '\u29F0',\n            message: messages.devinit.ciMultipleChoices(),\n            name: 'ciFileName',\n            choices: workflowFiles,\n            default: workflowFiles.find(f => f.includes('docker')),\n          },\n        ]));\n        log.raw('');\n        git.ciFileName = ciFileName;\n      }\n\n      log.raw(log.infoText(messages.devinit.ciDetails(ciFileName)));\n\n      let mappedWorkflow;\n      // Location for Client ID / Secret.\n      const { clientDetailsOption } = await inquirer.prompt({\n        name: 'clientDetailsOption',\n        type: 'list',\n        prefix: '\uD83D\uDD11',\n        // Where would you like to store your Client ID/Secret?\n        message: messages.devinit.clientDetailsLocation(),\n        choices: [\n          messages.devinit.clientDetailsInGit(git),\n          messages.devinit.clientDetailsInEnv(),\n        ],\n      });\n\n      // global 'clientDetailsLocation' variable stores users input on where client id / secert are stored\n      if (clientDetailsOption === messages.devinit.clientDetailsInEnv()) {\n        this.clientDetailsLocation = 'env';\n      } else {\n        this.clientDetailsLocation = 'git';\n      }\n\n      if (this.clientDetailsLocation === 'env') {\n        // Update CI Workflow to pull from ENV variables\n        mappedWorkflow = await mapCIWorkflowContent(this);\n        log.help(messages.devinit.ciIntro(git, 'env'));\n      } else {\n        // Look at the workflow file content and make updates\n        mappedWorkflow = await mapCIWorkflowContent(this);\n        log.help(messages.devinit.ciIntro(git, 'git'));\n      }\n\n      if (!dryRun) {\n        // Confirm prompt\n        const { confirm } = await inquirer.prompt([\n          {\n            type: 'confirm',\n            message: messages.devinit.confirm(),\n            name: 'confirm',\n            default: false,\n          },\n        ]);\n        log.raw('');\n        if (!confirm) return;\n      }\n\n      // Fetching access token\n      let accessToken: string | undefined = undefined;\n      log.raw('');\n\n      const spinner = createSpinner(messages.devinit.accessTokenFetch());\n      spinner.start();\n\n      const token = await this.GetDeliveryApiKey();\n\n      if (token) {\n        spinner.success();\n        this.log.success(messages.devinit.accessTokenSuccess(token));\n        accessToken = token;\n      } else {\n        spinner.error();\n        this.log.error(messages.devinit.accessTokenFailed());\n        return;\n      }\n\n      // Magic happens...\n      const checkpoint = (op: string) => {\n        if (errors.length) throw errors[0];\n        else log.debug(`${op} completed ok`);\n        return true;\n      };\n\n      // Arrange API keys for development and deployment\n      const [getRolesErr, roles] = await to(contensis.roles.GetRoles());\n      if (!roles && getRolesErr) errors.push(getRolesErr);\n      checkpoint(`fetched ${roles?.length} roles`);\n      if (dryRun) {\n        checkpoint(`skip api key creation (dry-run)`);\n      } else {\n        // existingDevKey = await this.CreateOrUpdateApiKey(\n        //   existingDevKey,\n        //   devKeyName,\n        //   devKeyDescription\n        // );\n        // checkpoint('dev key created');\n\n        // Ensure dev API key is assigned to a role\n        // let existingDevRole = findByIdOrName(roles || [], devKeyName, true) as\n        //   | Role\n        //   | undefined;\n        // existingDevRole = await this.CreateOrUpdateRole(\n        //   existingDevRole,\n        //   devKeyRole(devKeyName, devKeyDescription)\n        // );\n        // checkpoint('dev key role assigned');\n        // log.success(messages.devinit.createDevKey(devKeyName, true));\n\n        // Ensure deploy API key is assigned to a role with the right permissions\n        let existingDeployRole = findByIdOrName(\n          roles || [],\n          deployKeyName,\n          true\n        ) as Role | undefined;\n        existingDeployRole = await this.CreateOrUpdateRole(\n          existingDeployRole,\n          deployKeyRole(deployKeyName, deployKeyDescription)\n        );\n\n        checkpoint('deploy key role assigned');\n        log.success(messages.devinit.createDeployKey(deployKeyName, true));\n        checkpoint('api keys done');\n      }\n\n      const envFilePath = `${projectHome}/.env`;\n      const existingEnvFile = readFile(envFilePath);\n      let existingEnvFileArray = (existingEnvFile || '')\n        .split('\\n')\n        .filter(l => !!l);\n\n      // Update or create a file called .env in project home\n      const envContentsToAdd: EnvContentsToAdd = {\n        ALIAS: currentEnv,\n        PROJECT: currentProject,\n        BLOCK_ID: blockId,\n      };\n      if (accessToken) envContentsToAdd['ACCESS_TOKEN'] = accessToken;\n      // add client id and secret to the env file\n      if (this.clientDetailsLocation === 'env') {\n        envContentsToAdd['CONTENSIS_CLIENT_ID'] = this.clientId;\n        envContentsToAdd['CONTENSIS_CLIENT_SECRET'] = this.clientSecret;\n      }\n\n      // if we have client id / secret in our env remove it\n      const removeEnvItems = (items: string[]) => {\n        const indexesToRemove = [];\n\n        for (let i = 0; i < existingEnvFileArray.length; i++) {\n          for (const item of items) {\n            if (existingEnvFileArray[i].includes(item)) {\n              indexesToRemove.push(i);\n              break;\n            }\n          }\n        }\n\n        for (let i = indexesToRemove.length - 1; i >= 0; i--) {\n          existingEnvFileArray.splice(indexesToRemove[i], 1);\n        }\n      };\n\n      if (this.clientDetailsLocation === 'git') {\n        removeEnvItems(['CONTENSIS_CLIENT_ID', 'CONTENSIS_CLIENT_SECRET']);\n      }\n\n      const envFileLines = mergeDotEnvFileContents(\n        existingEnvFileArray,\n        envContentsToAdd\n      );\n      const newEnvFileContent = envFileLines.join('\\n');\n      const envDiff = diffFileContent(existingEnvFile || '', newEnvFileContent);\n\n      if (dryRun) {\n        if (envDiff) {\n          log.info(`Updating .env file ${winSlash(envFilePath)}:\\n${envDiff}`);\n          log.raw('');\n        }\n        checkpoint('skip .env file update (dry-run)');\n      } else {\n        if (envDiff) log.info(`updating .env file ${winSlash(envFilePath)}`);\n        writeFile(envFilePath, envFileLines.join('\\n'));\n        checkpoint('.env file updated');\n        log.success(messages.devinit.writeEnvFile());\n        // log.help(messages.devinit.useEnvFileTip());\n      }\n\n      // Update CI file -- different for GH/GL\n      if (mappedWorkflow?.diff) {\n        log.info(\n          `Updating ${winSlash(ciFileName)} file:\\n${mappedWorkflow.diff}`\n        );\n        log.raw('');\n      }\n      if (dryRun) {\n        checkpoint('skip CI file update (dry-run)');\n        //log.object(ciFileLines);\n      } else {\n        if (mappedWorkflow?.newWorkflow) {\n          if (mappedWorkflow?.diff) {\n            writeFile(git.ciFilePath, mappedWorkflow.newWorkflow);\n            log.success(messages.devinit.writeCiFile(`./${ciFileName}`));\n            log.info(\n              messages.devinit.ciBlockTip(blockId, currentEnv, currentProject)\n            );\n          } else {\n            log.info(messages.devinit.ciFileNoChanges(`./${ciFileName}`));\n          }\n          checkpoint('CI file updated');\n        }\n      }\n\n      if (this.clientDetailsLocation === 'git') {\n        // Echo Deployment API key to console, ask user to add secrets to repo\n        log.warning(messages.devinit.addGitSecretsIntro());\n        log.help(\n          messages.devinit.addGitSecretsHelp(\n            git,\n            existingDeployKey?.id,\n            existingDeployKey?.sharedSecret\n          )\n        );\n      }\n\n      if (dryRun) {\n        log.success(messages.devinit.dryRun());\n        log.help(messages.devinit.noChanges());\n      } else {\n        log.success(messages.devinit.success());\n        log.help(messages.devinit.startProjectTip());\n      }\n    }\n  };\n\n  ExecRequestHandler = async (blockIds: string[], overrideArgs?: string[]) => {\n    // if no request handler exe\n    // download it.\n\n    // if update arg, redownload it\n\n    const { log } = this;\n    // const getPrefixOld = log.getPrefix;\n    const exeHome = path.join(appRootDir, 'reqhan');\n    const exe = 'Zengenti.Contensis.RequestHandler.LocalDevelopment';\n    const exePath = path.join(exeHome, exe);\n    const siteConfigPath = path.join(appRootDir, 'site_config.yaml');\n\n    const siteConfig = await mapSiteConfigYaml(this);\n    writeFile('site_config.yaml', stringifyYaml(siteConfig));\n\n    const args = overrideArgs\n      ? typeof overrideArgs?.[0] === 'string' &&\n        overrideArgs[0].includes(' ', 2)\n        ? overrideArgs[0].split(' ')\n        : overrideArgs\n      : []; // args could be [ '-c .\\\\site_config.yaml' ] or [ '-c', '.\\\\site_config.yaml' ]\n\n    // Add required args\n    if (!args.find(a => a === '-c')) args.push('-c', siteConfigPath);\n\n    // const child = execFile(exePath, args);\n\n    const child = spawn(exePath, args, { stdio: 'inherit' });\n\n    // log.raw('');\n    log.info(`Launching request handler...`);\n    if (overrideArgs?.length)\n      this.log.warning(\n        `Spawning process with supplied args: ${JSON.stringify(\n          child.spawnargs,\n          null,\n          2\n        )}`\n      );\n\n    let isRunning = false;\n\n    // Log child output through event listeners\n    child?.stdout?.on('data', data => {\n      isRunning = true;\n      log.raw(data);\n    });\n\n    child?.stderr?.on('data', data => {\n      log.error(data);\n    });\n\n    child.on('spawn', () => {\n      isRunning = true;\n      log.help(\n        `You may see a firewall popup requesting network access, it is safe to approve`\n      );\n      // log.getPrefix = () => Logger.infoText(`[rqh]`);\n    });\n\n    child.on('exit', code => {\n      isRunning = false;\n\n      log[code === 0 ? 'success' : 'warning'](\n        `Request handler exited with code ${code}\\n`\n      );\n    });\n\n    child.on('error', error => {\n      isRunning = false;\n      log.error(`Could not launch request handler due to error \\n${error}`);\n    });\n\n    await new Promise(resolve => setTimeout(resolve, 2000));\n\n    // keep the method running until we can return\n    while (true === true) {\n      if (!isRunning) {\n        // log.getPrefix = getPrefixOld; // restore logger state\n        return;\n      }\n      await new Promise(resolve => setTimeout(resolve, 1000));\n    }\n  };\n}\nexport const devCommand = (\n  commandArgs: string[],\n  outputOpts: OutputOptionsConstructorArg,\n  contensisOpts: Partial<MigrateRequest> = {}\n) => {\n  return new ContensisDev(['', '', ...commandArgs], outputOpts, contensisOpts);\n};\n\nexport default ContensisDev;\n"],
-  "mappings": "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",
+  "sourcesContent": ["import to from 'await-to-js';\nimport { spawn } from 'child_process';\nimport inquirer from 'inquirer';\nimport path from 'path';\n\nimport { Role } from 'contensis-management-api/lib/models';\nimport { MigrateRequest } from 'migratortron';\n\nimport ContensisRole from './ContensisRoleService';\nimport { OutputOptionsConstructorArg } from '~/models/CliService';\nimport { EnvContentsToAdd } from '~/models/DevService';\nimport { mapSiteConfigYaml } from '~/mappers/DevRequests-to-RequestHanderSiteConfigYaml';\nimport { mapCIWorkflowContent } from '~/mappers/DevInit-to-CIWorkflow';\nimport {\n  deployKeyRole,\n  devKeyRole,\n} from '~/mappers/DevInit-to-RolePermissions';\nimport { appRootDir, readFile, writeFile } from '~/providers/file-provider';\nimport { diffFileContent } from '~/util/diff';\nimport { mergeDotEnvFileContents } from '~/util/dotenv';\nimport { findByIdOrName } from '~/util/find';\nimport { GitHelper } from '~/util/git';\nimport { jsonFormatter } from '~/util/json.formatter';\nimport { winSlash } from '~/util/os';\nimport { stringifyYaml } from '~/util/yaml';\nimport { createSpinner } from 'nanospinner';\nimport { mergeContentsToAddWithGitignore } from '~/util/gitignore';\n\nclass ContensisDev extends ContensisRole {\n  git!: GitHelper;\n  blockId: string;\n\n  constructor(\n    args: string[],\n    outputOpts?: OutputOptionsConstructorArg,\n    contensisOpts: Partial<MigrateRequest> = {}\n  ) {\n    super(args, outputOpts, contensisOpts);\n  }\n\n  DevelopmentInit = async (projectHome: string, opts: any) => {\n    // Retrieve git info\n    const git = (this.git = new GitHelper(projectHome));\n    // Check if we are in a git repo\n    const isRepo = git.checkIsRepo();\n    if (!isRepo) return;\n\n    const { dryRun = false } = opts || {};\n    const { currentEnv, currentProject, log, messages } = this;\n    const contensis = await this.ConnectContensis();\n\n    if (contensis) {\n      // First we need to get the block id from the user\n      const validateBlockId = (blockId: string) => {\n        const pattern = /^[a-z-]*$/;\n        if (typeof blockId === 'string' && blockId.length >= 3) {\n          return pattern.test(blockId);\n        } else return false;\n      };\n      let { blockId } = await inquirer.prompt({\n        name: 'blockId',\n        type: 'input',\n        prefix: '\uD83E\uDDF1',\n        message: messages.devinit.blockIdQuestion,\n        validate: validateBlockId,\n      });\n      // make sure block id is lowercase\n      this.blockId = blockId.toLowerCase();\n      log.success(`Valid block id: ${blockId.toLowerCase()}`);\n\n      // Retrieve keys list for env\n      const [keysErr, apiKeys] = await contensis.apiKeys.GetKeys();\n      if (keysErr) {\n        log.error(messages.keys.noList(currentEnv));\n        log.error(jsonFormatter(keysErr));\n        return;\n      }\n      const apiKeyExists = (findKey: string) =>\n        apiKeys?.find(\n          k => k.name.trim().toLowerCase() === findKey?.trim().toLowerCase()\n        );\n\n      // Retrieve ci workflow info\n      const workflowFiles = git.workflows;\n\n      // Set variables for performing operations and logging etc.\n      let ciFileName = git.ciFileName;\n\n      const devKeyName = `${blockId} development`;\n      const devKeyDescription = `${blockId} [contensis-cli]`;\n      let existingDevKey = apiKeyExists(devKeyName);\n\n      // if dev api key doesn't exisit go and create it (we need this for local development, we will store these details in the .env file).\n      if (!existingDevKey) {\n        existingDevKey = await this.CreateOrUpdateApiKey(\n          existingDevKey,\n          devKeyName,\n          devKeyDescription\n        );\n        log.success('Successfully created development key');\n      }\n\n      const deployKeyName = `${blockId} deployment`;\n      const deployKeyDescription = `${blockId} deploy [contensis-cli]`;\n\n      let existingDeployKey = apiKeyExists(deployKeyName);\n\n      // if deploy api key doesn't exisit go and create it (we need this for yml file).\n      if (!existingDeployKey) {\n        existingDeployKey = await this.CreateOrUpdateApiKey(\n          existingDeployKey,\n          deployKeyName,\n          deployKeyDescription\n        );\n        log.success('Successfully created deploy key');\n      }\n\n      // check we have the deply key so we can assign them to this values\n      if (existingDeployKey) {\n        // Add client id and secret to global 'this'\n        this.clientId = existingDeployKey?.id;\n        this.clientSecret = existingDeployKey?.sharedSecret;\n      }\n\n      // const blockId = git.name;\n      const errors = [] as AppError[];\n\n      // Start render console output\n      log.raw('');\n      log.success(messages.devinit.intro());\n      log.raw('');\n      log.raw(\n        log.infoText(\n          messages.devinit.projectDetails(\n            git.name,\n            currentEnv,\n            currentProject,\n            blockId,\n            git\n          )\n        )\n      );\n      log.raw(\n        log.infoText(\n          messages.devinit.developmentKey(devKeyName, !!existingDevKey)\n        )\n      );\n      log.raw(\n        log.infoText(\n          messages.devinit.deploymentKey(deployKeyName, !!existingDeployKey)\n        )\n      );\n      log.raw('');\n\n      if (Array.isArray(workflowFiles) && workflowFiles.length > 1) {\n        // Choose GitHub workflow file (if multiple)\n        ({ ciFileName } = await inquirer.prompt([\n          {\n            type: 'list',\n            prefix: '\u29F0',\n            message: messages.devinit.ciMultipleChoices(),\n            name: 'ciFileName',\n            choices: workflowFiles,\n            default: workflowFiles.find(f => f.includes('docker')),\n          },\n        ]));\n        log.raw('');\n        git.ciFileName = ciFileName;\n      }\n\n      log.raw(log.infoText(messages.devinit.ciDetails(ciFileName)));\n\n      let mappedWorkflow;\n      // Location for Client ID / Secret.\n      const { clientDetailsOption } = await inquirer.prompt({\n        name: 'clientDetailsOption',\n        type: 'list',\n        prefix: '\uD83D\uDD11',\n        // Where would you like to store your Client ID/Secret?\n        message: messages.devinit.clientDetailsLocation(),\n        choices: [\n          messages.devinit.clientDetailsInGit(git),\n          messages.devinit.clientDetailsInEnv(),\n        ],\n      });\n\n      // global 'clientDetailsLocation' variable stores users input on where client id / secert are stored\n      if (clientDetailsOption === messages.devinit.clientDetailsInEnv()) {\n        this.clientDetailsLocation = 'env';\n      } else {\n        this.clientDetailsLocation = 'git';\n      }\n\n      if (this.clientDetailsLocation === 'env') {\n        // Update CI Workflow to pull from ENV variables\n        mappedWorkflow = await mapCIWorkflowContent(this);\n        log.help(messages.devinit.ciIntro(git, 'env'));\n      } else {\n        // Look at the workflow file content and make updates\n        mappedWorkflow = await mapCIWorkflowContent(this);\n        log.help(messages.devinit.ciIntro(git, 'git'));\n      }\n\n      if (!dryRun) {\n        // Confirm prompt\n        const { confirm } = await inquirer.prompt([\n          {\n            type: 'confirm',\n            message: messages.devinit.confirm(),\n            name: 'confirm',\n            default: false,\n          },\n        ]);\n        log.raw('');\n        if (!confirm) return;\n      }\n\n      // Fetching access token\n      let accessToken: string | undefined = undefined;\n      log.raw('');\n\n      const spinner = createSpinner(messages.devinit.accessTokenFetch());\n      spinner.start();\n\n      const token = await this.GetDeliveryApiKey();\n\n      if (token) {\n        spinner.success();\n        this.log.success(messages.devinit.accessTokenSuccess(token));\n        accessToken = token;\n      } else {\n        spinner.error();\n        this.log.error(messages.devinit.accessTokenFailed());\n        return;\n      }\n\n      // Magic happens...\n      const checkpoint = (op: string) => {\n        if (errors.length) throw errors[0];\n        else log.debug(`${op} completed ok`);\n        return true;\n      };\n\n      // Arrange API keys for development and deployment\n      const [getRolesErr, roles] = await to(contensis.roles.GetRoles());\n      if (!roles && getRolesErr) errors.push(getRolesErr);\n      checkpoint(`fetched ${roles?.length} roles`);\n      if (dryRun) {\n        checkpoint(`skip api key creation (dry-run)`);\n      } else {\n        // Ensure deploy API key is assigned to a role with the right permissions\n        let existingDeployRole = findByIdOrName(\n          roles || [],\n          deployKeyName,\n          true\n        ) as Role | undefined;\n        existingDeployRole = await this.CreateOrUpdateRole(\n          existingDeployRole,\n          deployKeyRole(deployKeyName, deployKeyDescription)\n        );\n\n        checkpoint('deploy key role assigned');\n        log.success(messages.devinit.createDeployKey(deployKeyName, true));\n        checkpoint('api keys done');\n      }\n\n      const envFilePath = `${projectHome}/.env`;\n      const existingEnvFile = readFile(envFilePath);\n      let existingEnvFileArray = (existingEnvFile || '')\n        .split('\\n')\n        .filter(l => !!l);\n\n      // Update or create a file called .env in project home\n      const envContentsToAdd: EnvContentsToAdd = {\n        ALIAS: currentEnv,\n        PROJECT: currentProject,\n        BLOCK_ID: blockId,\n      };\n      if (accessToken) envContentsToAdd['ACCESS_TOKEN'] = accessToken;\n      // add client id and secret to the env file\n      if (this.clientDetailsLocation === 'env') {\n        envContentsToAdd['CONTENSIS_CLIENT_ID'] = existingDevKey?.id;\n        envContentsToAdd['CONTENSIS_CLIENT_SECRET'] =\n          existingDevKey?.sharedSecret;\n      }\n\n      // if we have client id / secret in our env remove it\n      const removeEnvItems = (items: string[]) => {\n        const indexesToRemove = [];\n\n        for (let i = 0; i < existingEnvFileArray.length; i++) {\n          for (const item of items) {\n            if (existingEnvFileArray[i].includes(item)) {\n              indexesToRemove.push(i);\n              break;\n            }\n          }\n        }\n\n        for (let i = indexesToRemove.length - 1; i >= 0; i--) {\n          existingEnvFileArray.splice(indexesToRemove[i], 1);\n        }\n      };\n\n      if (this.clientDetailsLocation === 'git') {\n        removeEnvItems(['CONTENSIS_CLIENT_ID', 'CONTENSIS_CLIENT_SECRET']);\n      }\n\n      const envFileLines = mergeDotEnvFileContents(\n        existingEnvFileArray,\n        envContentsToAdd\n      );\n      const newEnvFileContent = envFileLines.join('\\n');\n      const envDiff = diffFileContent(existingEnvFile || '', newEnvFileContent);\n\n      if (dryRun) {\n        if (envDiff) {\n          log.info(`Updating .env file ${winSlash(envFilePath)}:\\n${envDiff}`);\n          log.raw('');\n        }\n        checkpoint('skip .env file update (dry-run)');\n      } else {\n        if (envDiff) log.info(`updating .env file ${winSlash(envFilePath)}`);\n        writeFile(envFilePath, envFileLines.join('\\n'));\n        checkpoint('.env file updated');\n        log.success(messages.devinit.writeEnvFile());\n        // log.help(messages.devinit.useEnvFileTip());\n      }\n\n      // Update git ignore\n      const gitIgnorePath = `${projectHome}/.gitignore`;\n      const gitIgnoreContentsToAdd = ['.env'];\n      mergeContentsToAddWithGitignore(gitIgnorePath, gitIgnoreContentsToAdd);\n\n      // Update CI file -- different for GH/GL\n      if (mappedWorkflow?.diff) {\n        log.info(\n          `Updating ${winSlash(ciFileName)} file:\\n${mappedWorkflow.diff}`\n        );\n        log.raw('');\n      }\n      if (dryRun) {\n        checkpoint('skip CI file update (dry-run)');\n        //log.object(ciFileLines);\n      } else {\n        if (mappedWorkflow?.newWorkflow) {\n          if (mappedWorkflow?.diff) {\n            writeFile(git.ciFilePath, mappedWorkflow.newWorkflow);\n            log.success(messages.devinit.writeCiFile(`./${ciFileName}`));\n            log.info(\n              messages.devinit.ciBlockTip(blockId, currentEnv, currentProject)\n            );\n          } else {\n            log.info(messages.devinit.ciFileNoChanges(`./${ciFileName}`));\n          }\n          checkpoint('CI file updated');\n        }\n      }\n\n      if (this.clientDetailsLocation === 'git') {\n        // Echo Deployment API key to console, ask user to add secrets to repo\n        log.warning(messages.devinit.addGitSecretsIntro());\n        log.help(\n          messages.devinit.addGitSecretsHelp(\n            git,\n            existingDeployKey?.id,\n            existingDeployKey?.sharedSecret\n          )\n        );\n      }\n\n      if (dryRun) {\n        log.success(messages.devinit.dryRun());\n        log.help(messages.devinit.noChanges());\n      } else {\n        log.success(messages.devinit.success());\n        log.help(messages.devinit.startProjectTip());\n      }\n    }\n  };\n\n  ExecRequestHandler = async (blockIds: string[], overrideArgs?: string[]) => {\n    // if no request handler exe\n    // download it.\n\n    // if update arg, redownload it\n\n    const { log } = this;\n    // const getPrefixOld = log.getPrefix;\n    const exeHome = path.join(appRootDir, 'reqhan');\n    const exe = 'Zengenti.Contensis.RequestHandler.LocalDevelopment';\n    const exePath = path.join(exeHome, exe);\n    const siteConfigPath = path.join(appRootDir, 'site_config.yaml');\n\n    const siteConfig = await mapSiteConfigYaml(this);\n    writeFile('site_config.yaml', stringifyYaml(siteConfig));\n\n    const args = overrideArgs\n      ? typeof overrideArgs?.[0] === 'string' &&\n        overrideArgs[0].includes(' ', 2)\n        ? overrideArgs[0].split(' ')\n        : overrideArgs\n      : []; // args could be [ '-c .\\\\site_config.yaml' ] or [ '-c', '.\\\\site_config.yaml' ]\n\n    // Add required args\n    if (!args.find(a => a === '-c')) args.push('-c', siteConfigPath);\n\n    // const child = execFile(exePath, args);\n\n    const child = spawn(exePath, args, { stdio: 'inherit' });\n\n    // log.raw('');\n    log.info(`Launching request handler...`);\n    if (overrideArgs?.length)\n      this.log.warning(\n        `Spawning process with supplied args: ${JSON.stringify(\n          child.spawnargs,\n          null,\n          2\n        )}`\n      );\n\n    let isRunning = false;\n\n    // Log child output through event listeners\n    child?.stdout?.on('data', data => {\n      isRunning = true;\n      log.raw(data);\n    });\n\n    child?.stderr?.on('data', data => {\n      log.error(data);\n    });\n\n    child.on('spawn', () => {\n      isRunning = true;\n      log.help(\n        `You may see a firewall popup requesting network access, it is safe to approve`\n      );\n      // log.getPrefix = () => Logger.infoText(`[rqh]`);\n    });\n\n    child.on('exit', code => {\n      isRunning = false;\n\n      log[code === 0 ? 'success' : 'warning'](\n        `Request handler exited with code ${code}\\n`\n      );\n    });\n\n    child.on('error', error => {\n      isRunning = false;\n      log.error(`Could not launch request handler due to error \\n${error}`);\n    });\n\n    await new Promise(resolve => setTimeout(resolve, 2000));\n\n    // keep the method running until we can return\n    while (true === true) {\n      if (!isRunning) {\n        // log.getPrefix = getPrefixOld; // restore logger state\n        return;\n      }\n      await new Promise(resolve => setTimeout(resolve, 1000));\n    }\n  };\n}\nexport const devCommand = (\n  commandArgs: string[],\n  outputOpts: OutputOptionsConstructorArg,\n  contensisOpts: Partial<MigrateRequest> = {}\n) => {\n  return new ContensisDev(['', '', ...commandArgs], outputOpts, contensisOpts);\n};\n\nexport default ContensisDev;\n"],
+  "mappings": "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",
   "names": ["ContensisRole", "blockId", "inquirer", "to", "path"]
 }

package/dist/util/gitignore.js

@@ -0,0 +1,50 @@
+"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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 gitignore_exports = {};
+__export(gitignore_exports, {
+  mergeContentsToAddWithGitignore: () => mergeContentsToAddWithGitignore
+});
+module.exports = __toCommonJS(gitignore_exports);
+var import_fs = __toESM(require("fs"));
+var import_logger = require("./logger");
+const mergeContentsToAddWithGitignore = (filename, contentsToAdd) => {
+  if (import_fs.default.existsSync(filename)) {
+    const existingContent = import_fs.default.readFileSync(filename, "utf-8");
+    const existingLines = existingContent.split("\n").filter((line) => line.trim() !== "");
+    const mergedLines = [...existingLines, ...contentsToAdd];
+    const updatedContent = Array.from(new Set(mergedLines)).sort().join("\n");
+    import_fs.default.writeFileSync(filename, updatedContent);
+    import_logger.Logger.success(".gitignore file updated");
+  } else {
+    const gitignoreContent = contentsToAdd.join("\n");
+    import_fs.default.writeFileSync(filename, gitignoreContent);
+    import_logger.Logger.success(".gitignore file created and updated");
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  mergeContentsToAddWithGitignore
+});
+//# sourceMappingURL=gitignore.js.map

package/dist/util/gitignore.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/util/gitignore.ts"],
+  "sourcesContent": ["import fs from 'fs';\nimport { Logger } from './logger';\n\nexport const mergeContentsToAddWithGitignore = (\n  filename: string,\n  contentsToAdd: string[]\n) => {\n  // Check if .gitignore file already exists\n  if (fs.existsSync(filename)) {\n    // Read the existing .gitignore file\n    const existingContent = fs.readFileSync(filename, 'utf-8');\n\n    // Split the existing content by newline and remove empty lines\n    const existingLines = existingContent\n      .split('\\n')\n      .filter(line => line.trim() !== '');\n\n    // Merge the existing content with the new contents to add\n    const mergedLines = [...existingLines, ...contentsToAdd];\n\n    // Deduplicate and sort the lines\n    const updatedContent = Array.from(new Set(mergedLines)).sort().join('\\n');\n\n    // Write the updated content back to .gitignore\n    fs.writeFileSync(filename, updatedContent);\n\n    Logger.success('.gitignore file updated');\n  } else {\n    // If .gitignore doesn't exist, create one and add the contents to add\n    const gitignoreContent = contentsToAdd.join('\\n');\n    fs.writeFileSync(filename, gitignoreContent);\n\n    Logger.success('.gitignore file created and updated');\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAAe;AACf,oBAAuB;AAEhB,MAAM,kCAAkC,CAC7C,UACA,kBACG;AAEH,MAAI,UAAAA,QAAG,WAAW,QAAQ,GAAG;AAE3B,UAAM,kBAAkB,UAAAA,QAAG,aAAa,UAAU,OAAO;AAGzD,UAAM,gBAAgB,gBACnB,MAAM,IAAI,EACV,OAAO,UAAQ,KAAK,KAAK,MAAM,EAAE;AAGpC,UAAM,cAAc,CAAC,GAAG,eAAe,GAAG,aAAa;AAGvD,UAAM,iBAAiB,MAAM,KAAK,IAAI,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,IAAI;AAGxE,cAAAA,QAAG,cAAc,UAAU,cAAc;AAEzC,yBAAO,QAAQ,yBAAyB;AAAA,EAC1C,OAAO;AAEL,UAAM,mBAAmB,cAAc,KAAK,IAAI;AAChD,cAAAA,QAAG,cAAc,UAAU,gBAAgB;AAE3C,yBAAO,QAAQ,qCAAqC;AAAA,EACtD;AACF;",
+  "names": ["fs"]
+}

package/dist/version.js

@@ -21,7 +21,7 @@ __export(version_exports, {
   LIB_VERSION: () => LIB_VERSION
 });
 module.exports = __toCommonJS(version_exports);
-const LIB_VERSION = "1.0.9-beta.5";
+const LIB_VERSION = "1.0.9-beta.7";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LIB_VERSION

package/dist/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/version.ts"],
-  "sourcesContent": ["export const LIB_VERSION = \"1.0.9-beta.5\";\n"],
+  "sourcesContent": ["export const LIB_VERSION = \"1.0.9-beta.7\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contensis-cli",
-  "version": "1.0.9-beta.5",
+  "version": "1.0.9-beta.7",
   "description": "A fully featured Contensis command line interface with a shell UI provides simple and intuitive ways to manage or profile your content in any NodeJS terminal.",
   "repository": "https://github.com/contensis/node-cli",
   "homepage": "https://github.com/contensis/node-cli/tree/main/packages/contensis-cli#readme",

package/src/mappers/DevInit-to-CIWorkflow.ts

@@ -441,7 +441,7 @@ const mapGitHubActionCIWorkflowContent = async (
   //   workflowDoc.toString({ lineWidth: 0 })
   // );
 
-  const newWorkflow = workflowDoc.toString();
+  const newWorkflow = workflowDoc.toString({ lineWidth: 0 });
 
   return newWorkflow;
 };

package/src/services/ContensisDevService.ts

@@ -24,6 +24,7 @@ import { jsonFormatter } from '~/util/json.formatter';
 import { winSlash } from '~/util/os';
 import { stringifyYaml } from '~/util/yaml';
 import { createSpinner } from 'nanospinner';
+import { mergeContentsToAddWithGitignore } from '~/util/gitignore';
 
 class ContensisDev extends ContensisRole {
   git!: GitHelper;
@@ -85,18 +86,27 @@ class ContensisDev extends ContensisRole {
       // Set variables for performing operations and logging etc.
       let ciFileName = git.ciFileName;
 
-      // const devKeyName = `${git.name} development`;
-      // const devKeyDescription = `${git.name} [contensis-cli]`;
-      // let existingDevKey = apiKeyExists(devKeyName);
+      const devKeyName = `${blockId} development`;
+      const devKeyDescription = `${blockId} [contensis-cli]`;
+      let existingDevKey = apiKeyExists(devKeyName);
+
+      // if dev api key doesn't exisit go and create it (we need this for local development, we will store these details in the .env file).
+      if (!existingDevKey) {
+        existingDevKey = await this.CreateOrUpdateApiKey(
+          existingDevKey,
+          devKeyName,
+          devKeyDescription
+        );
+        log.success('Successfully created development key');
+      }
 
       const deployKeyName = `${blockId} deployment`;
       const deployKeyDescription = `${blockId} deploy [contensis-cli]`;
 
       let existingDeployKey = apiKeyExists(deployKeyName);
 
-      // if api key doesn't exisit go and create it (we need this for yml file).
+      // if deploy api key doesn't exisit go and create it (we need this for yml file).
       if (!existingDeployKey) {
-        log.info('Please wait, creating deploy key');
         existingDeployKey = await this.CreateOrUpdateApiKey(
           existingDeployKey,
           deployKeyName,
@@ -130,11 +140,11 @@ class ContensisDev extends ContensisRole {
           )
         )
       );
-      // log.raw(
-      //   log.infoText(
-      //     messages.devinit.developmentKey(devKeyName, !!existingDevKey)
-      //   )
-      // );
+      log.raw(
+        log.infoText(
+          messages.devinit.developmentKey(devKeyName, !!existingDevKey)
+        )
+      );
       log.raw(
         log.infoText(
           messages.devinit.deploymentKey(deployKeyName, !!existingDeployKey)
@@ -238,24 +248,6 @@ class ContensisDev extends ContensisRole {
       if (dryRun) {
         checkpoint(`skip api key creation (dry-run)`);
       } else {
-        // existingDevKey = await this.CreateOrUpdateApiKey(
-        //   existingDevKey,
-        //   devKeyName,
-        //   devKeyDescription
-        // );
-        // checkpoint('dev key created');
-
-        // Ensure dev API key is assigned to a role
-        // let existingDevRole = findByIdOrName(roles || [], devKeyName, true) as
-        //   | Role
-        //   | undefined;
-        // existingDevRole = await this.CreateOrUpdateRole(
-        //   existingDevRole,
-        //   devKeyRole(devKeyName, devKeyDescription)
-        // );
-        // checkpoint('dev key role assigned');
-        // log.success(messages.devinit.createDevKey(devKeyName, true));
-
         // Ensure deploy API key is assigned to a role with the right permissions
         let existingDeployRole = findByIdOrName(
           roles || [],
@@ -287,8 +279,9 @@ class ContensisDev extends ContensisRole {
       if (accessToken) envContentsToAdd['ACCESS_TOKEN'] = accessToken;
       // add client id and secret to the env file
       if (this.clientDetailsLocation === 'env') {
-        envContentsToAdd['CONTENSIS_CLIENT_ID'] = this.clientId;
-        envContentsToAdd['CONTENSIS_CLIENT_SECRET'] = this.clientSecret;
+        envContentsToAdd['CONTENSIS_CLIENT_ID'] = existingDevKey?.id;
+        envContentsToAdd['CONTENSIS_CLIENT_SECRET'] =
+          existingDevKey?.sharedSecret;
       }
 
       // if we have client id / secret in our env remove it
@@ -334,6 +327,11 @@ class ContensisDev extends ContensisRole {
         // log.help(messages.devinit.useEnvFileTip());
       }
 
+      // Update git ignore
+      const gitIgnorePath = `${projectHome}/.gitignore`;
+      const gitIgnoreContentsToAdd = ['.env'];
+      mergeContentsToAddWithGitignore(gitIgnorePath, gitIgnoreContentsToAdd);
+
       // Update CI file -- different for GH/GL
       if (mappedWorkflow?.diff) {
         log.info(

package/src/util/gitignore.ts

@@ -0,0 +1,35 @@
+import fs from 'fs';
+import { Logger } from './logger';
+
+export const mergeContentsToAddWithGitignore = (
+  filename: string,
+  contentsToAdd: string[]
+) => {
+  // Check if .gitignore file already exists
+  if (fs.existsSync(filename)) {
+    // Read the existing .gitignore file
+    const existingContent = fs.readFileSync(filename, 'utf-8');
+
+    // Split the existing content by newline and remove empty lines
+    const existingLines = existingContent
+      .split('\n')
+      .filter(line => line.trim() !== '');
+
+    // Merge the existing content with the new contents to add
+    const mergedLines = [...existingLines, ...contentsToAdd];
+
+    // Deduplicate and sort the lines
+    const updatedContent = Array.from(new Set(mergedLines)).sort().join('\n');
+
+    // Write the updated content back to .gitignore
+    fs.writeFileSync(filename, updatedContent);
+
+    Logger.success('.gitignore file updated');
+  } else {
+    // If .gitignore doesn't exist, create one and add the contents to add
+    const gitignoreContent = contentsToAdd.join('\n');
+    fs.writeFileSync(filename, gitignoreContent);
+
+    Logger.success('.gitignore file created and updated');
+  }
+};

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.0.9-beta.5";
+export const LIB_VERSION = "1.0.9-beta.7";