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

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 { execFile, 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 { normaliseLineEndings } from '~/util/os';\nimport { stringifyYaml } from '~/util/yaml';\n\nclass ContensisDev extends ContensisRole {\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    const { dryRun = false } = opts || {};\n    const { currentEnv, currentProject, log, messages } = this;\n    const contensis = await this.ConnectContensis();\n\n    if (contensis) {\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 git info\n      const git = new GitHelper(projectHome);\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 = `${git.name} deployment`;\n      const deployKeyDescription = `${git.name} deploy [contensis-cli]`;\n\n      let existingDeployKey = apiKeyExists(deployKeyName);\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            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            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      // Look at the workflow file content and make updates\n      const mappedWorkflow = mapCIWorkflowContent(this, git);\n\n      log.help(messages.devinit.ciIntro(git));\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      // Access token prompt\n      const { accessToken }: { accessToken: string } = await inquirer.prompt([\n        {\n          type: 'input',\n          message: messages.devinit.accessTokenPrompt(),\n          name: 'accessToken',\n        },\n      ]);\n      log.raw('');\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        existingDeployKey = await this.CreateOrUpdateApiKey(\n          existingDeployKey,\n          deployKeyName,\n          deployKeyDescription\n        );\n        checkpoint('deploy 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      // Update or create a file called .env in project home\n      const envContentsToAdd: EnvContentsToAdd = {\n        ALIAS: currentEnv,\n        PROJECT: currentProject,\n      };\n      if (accessToken) envContentsToAdd['ACCESS_TOKEN'] = accessToken;\n\n      const envFilePath = `${projectHome}/.env`;\n      const existingEnvFile = readFile(envFilePath);\n      const envFileLines = mergeDotEnvFileContents(\n        (existingEnvFile || '').split('\\n').filter(l => !!l),\n        envContentsToAdd\n      );\n      const newEnvFileContent = normaliseLineEndings(\n        `${envFileLines.join('\\n')}\\n`\n      );\n      const envDiff = diffFileContent(existingEnvFile || '', newEnvFileContent);\n\n      if (dryRun) {\n        if (envDiff) {\n          log.info(`updating .env file ${envFilePath}: ${envDiff}`);\n          log.raw('');\n        }\n        checkpoint('skip .env file update (dry-run)');\n      } else {\n        if (envDiff) log.info(`updating .env file ${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 -- create a sample one with build?\n      if (dryRun) {\n        if (mappedWorkflow?.diff) {\n          log.info(`updating${ciFileName} file: ${mappedWorkflow.diff}`);\n          log.raw('');\n        }\n        checkpoint('skip CI file update (dry-run)');\n        //log.object(ciFileLines);\n      } else {\n        if (mappedWorkflow?.diff) log.info(`updating${ciFileName} file`);\n        writeFile(git.ciFilePath, [].join('\\n'));\n        log.success(messages.devinit.writeCiFile(`./${ciFileName}`));\n        log.info(\n          messages.devinit.ciBlockTip(blockId, currentEnv, currentProject)\n        );\n        checkpoint('CI file updated');\n      }\n\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      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 { execFile, 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 { normaliseLineEndings, winSlash } from '~/util/os';\nimport { stringifyYaml } from '~/util/yaml';\n\nclass ContensisDev extends ContensisRole {\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    const { dryRun = false } = opts || {};\n    const { currentEnv, currentProject, log, messages } = this;\n    const contensis = await this.ConnectContensis();\n\n    if (contensis) {\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 git info\n      const git = new GitHelper(projectHome);\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 = `${git.name} deployment`;\n      const deployKeyDescription = `${git.name} deploy [contensis-cli]`;\n\n      let existingDeployKey = apiKeyExists(deployKeyName);\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            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      // Look at the workflow file content and make updates\n      const mappedWorkflow = await mapCIWorkflowContent(this, git);\n\n      log.help(messages.devinit.ciIntro(git));\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      // Access token prompt\n      const { accessToken }: { accessToken: string } = await inquirer.prompt([\n        {\n          type: 'input',\n          prefix: '\uD83D\uDEE1\uFE0F',\n          message: messages.devinit.accessTokenPrompt(),\n          name: 'accessToken',\n        },\n      ]);\n      log.raw('');\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        existingDeployKey = await this.CreateOrUpdateApiKey(\n          existingDeployKey,\n          deployKeyName,\n          deployKeyDescription\n        );\n        checkpoint('deploy 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      // Update or create a file called .env in project home\n      const envContentsToAdd: EnvContentsToAdd = {\n        ALIAS: currentEnv,\n        PROJECT: currentProject,\n      };\n      if (accessToken) envContentsToAdd['ACCESS_TOKEN'] = accessToken;\n\n      const envFilePath = `${projectHome}/.env`;\n      const existingEnvFile = readFile(envFilePath);\n      const envFileLines = mergeDotEnvFileContents(\n        (existingEnvFile || '').split('\\n').filter(l => !!l),\n        envContentsToAdd\n      );\n      const newEnvFileContent = normaliseLineEndings(\n        `${envFileLines.join('\\n')}\\n`\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      // 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      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", "inquirer", "to", "path"]
 }

package/dist/util/diff.js

@@ -54,18 +54,24 @@ const diffFileContent = (existingContent, newContent) => {
     ...diffRanges.map((d) => d.startLineNumber.toString().length)
   );
   const lnSpaces = Array(lnSpaceLength).join(" ");
+  let needsNewLine = false;
   for (let i = 0; i < diffRanges.length; i++) {
     const part = diffRanges[i];
     if (part.added || part.removed) {
       const colour = part.added ? "green" : part.removed ? "red" : "grey";
-      if (part.value !== "\n")
+      if (part.value !== "\n") {
+        if (needsNewLine)
+          output.push("\n### --");
         output.push(
           `
 ${part.value.split("\n").map(
             (ln, idx) => ln.trim() !== "" ? `${part.startLineNumber ? part.startLineNumber + idx : lnSpaces}${part.added ? "+" : part.removed ? "-" : " "} ${import_chalk.default[colour](`${ln}`)}` : ln
           ).join("\n")}`
         );
-    }
+      } else
+        needsNewLine = true;
+    } else
+      needsNewLine = true;
   }
   return output.join("");
 };

package/dist/util/diff.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/util/diff.ts"],
-  "sourcesContent": ["import chalk from 'chalk';\nimport { Change, diffLines } from 'diff';\nimport { normaliseLineEndings } from './os';\n\nexport const diffLogStrings = (updates: string, previous: string) => {\n  const lastFewLines = previous.split('\\n').slice(-10);\n  const incomingLines = updates.split('\\n');\n\n  // Find the line indices in the incoming lines\n  // of the last few lines previously rendered\n  const incomingLineIndices = [];\n  for (const lastRenderedLine of lastFewLines) {\n    if (lastRenderedLine.length > 10)\n      incomingLineIndices.push(incomingLines.lastIndexOf(lastRenderedLine));\n  }\n\n  // Get the new lines from the next position on from the last of the already shown lines\n  const differentFromPos = Math.max(...incomingLineIndices) + 1 || 0;\n  // Return just the incoming lines from the position we matched\n  return incomingLines.slice(differentFromPos).join('\\n');\n};\n\nexport const diffFileContent = (\n  existingContent: string,\n  newContent: string\n) => {\n  const existingContentNormalised = normaliseLineEndings(existingContent, '\\n');\n  const newContentNormalised = normaliseLineEndings(newContent, '\\n');\n\n  const diff = diffLines(existingContentNormalised, newContentNormalised, {\n    newlineIsToken: true,\n  });\n  const diffRanges = addDiffPositionInfo(diff);\n\n  // Create formatted output for console\n  const output: string[] = [];\n  const lnSpaceLength = Math.max(\n    ...diffRanges.map(d => d.startLineNumber.toString().length)\n  );\n\n  const lnSpaces = Array(lnSpaceLength).join(' ');\n\n  for (let i = 0; i < diffRanges.length; i++) {\n    const part = diffRanges[i];\n    if (part.added || part.removed) {\n      const colour = part.added ? 'green' : part.removed ? 'red' : 'grey';\n\n      if (part.value !== '\\n')\n        output.push(\n          `\\n${part.value\n            .split('\\n')\n            .map((ln, idx) =>\n              ln.trim() !== ''\n                ? `${\n                    part.startLineNumber ? part.startLineNumber + idx : lnSpaces\n                  }${part.added ? '+' : part.removed ? '-' : ' '} ${chalk[\n                    colour\n                  ](`${ln}`)}`\n                : ln\n            )\n            .join('\\n')}`\n        );\n    }\n  }\n\n  return output.join('');\n  // return retOutput.endsWith('\\n') ? retOutput : `${retOutput}\\n`;\n};\n\nconst addDiffPositionInfo = (diff: Change[]) => {\n  const diffRanges: (Change & {\n    startLineNumber: number;\n    startColumn: number;\n    endLineNumber: number;\n    endColumn: number;\n  })[] = [];\n\n  let lineNumber = 0;\n  let column = 0;\n  for (let partIndex = 0; partIndex < diff.length; partIndex++) {\n    const part = diff[partIndex];\n\n    // // Skip any parts that aren't in `after`\n    // if (part.removed === true) {\n    //   continue;\n    // }\n\n    const startLineNumber = lineNumber;\n    const startColumn = column;\n\n    // Split the part into lines. Loop throug these lines to find\n    // the line no. and column at the end of this part.\n    const substring = part.value;\n    const lines = substring.split('\\n');\n    lines.forEach((line, lineIndex) => {\n      // The first `line` is actually just a continuation of the last line\n      if (lineIndex === 0) {\n        column += line.length;\n        // All other lines come after a line break.\n      } else if (lineIndex > 0) {\n        lineNumber += 1;\n        column = line.length;\n      }\n    });\n\n    // Save a range for all of the parts with position info added\n    if (part.added === true || part.removed === true) {\n      diffRanges.push({\n        startLineNumber: startLineNumber + 1,\n        startColumn: startColumn,\n        endLineNumber: lineNumber,\n        endColumn: column,\n        ...part,\n      });\n    }\n  }\n  return diffRanges;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,kBAAkC;AAClC,gBAAqC;AAE9B,MAAM,iBAAiB,CAAC,SAAiB,aAAqB;AACnE,QAAM,eAAe,SAAS,MAAM,IAAI,EAAE,MAAM,GAAG;AACnD,QAAM,gBAAgB,QAAQ,MAAM,IAAI;AAIxC,QAAM,sBAAsB,CAAC;AAC7B,aAAW,oBAAoB,cAAc;AAC3C,QAAI,iBAAiB,SAAS;AAC5B,0BAAoB,KAAK,cAAc,YAAY,gBAAgB,CAAC;AAAA,EACxE;AAGA,QAAM,mBAAmB,KAAK,IAAI,GAAG,mBAAmB,IAAI,KAAK;AAEjE,SAAO,cAAc,MAAM,gBAAgB,EAAE,KAAK,IAAI;AACxD;AAEO,MAAM,kBAAkB,CAC7B,iBACA,eACG;AACH,QAAM,gCAA4B,gCAAqB,iBAAiB,IAAI;AAC5E,QAAM,2BAAuB,gCAAqB,YAAY,IAAI;AAElE,QAAM,WAAO,uBAAU,2BAA2B,sBAAsB;AAAA,IACtE,gBAAgB;AAAA,EAClB,CAAC;AACD,QAAM,aAAa,oBAAoB,IAAI;AAG3C,QAAM,SAAmB,CAAC;AAC1B,QAAM,gBAAgB,KAAK;AAAA,IACzB,GAAG,WAAW,IAAI,OAAK,EAAE,gBAAgB,SAAS,EAAE,MAAM;AAAA,EAC5D;AAEA,QAAM,WAAW,MAAM,aAAa,EAAE,KAAK,GAAG;AAE9C,WAAS,IAAI,GAAG,IAAI,WAAW,QAAQ,KAAK;AAC1C,UAAM,OAAO,WAAW;AACxB,QAAI,KAAK,SAAS,KAAK,SAAS;AAC9B,YAAM,SAAS,KAAK,QAAQ,UAAU,KAAK,UAAU,QAAQ;AAE7D,UAAI,KAAK,UAAU;AACjB,eAAO;AAAA,UACL;AAAA,EAAK,KAAK,MACP,MAAM,IAAI,EACV;AAAA,YAAI,CAAC,IAAI,QACR,GAAG,KAAK,MAAM,KACV,GACE,KAAK,kBAAkB,KAAK,kBAAkB,MAAM,WACnD,KAAK,QAAQ,MAAM,KAAK,UAAU,MAAM,OAAO,aAAAA,QAChD,QACA,GAAG,IAAI,MACT;AAAA,UACN,EACC,KAAK,IAAI;AAAA,QACd;AAAA,IACJ;AAAA,EACF;AAEA,SAAO,OAAO,KAAK,EAAE;AAEvB;AAEA,MAAM,sBAAsB,CAAC,SAAmB;AAC9C,QAAM,aAKC,CAAC;AAER,MAAI,aAAa;AACjB,MAAI,SAAS;AACb,WAAS,YAAY,GAAG,YAAY,KAAK,QAAQ,aAAa;AAC5D,UAAM,OAAO,KAAK;AAOlB,UAAM,kBAAkB;AACxB,UAAM,cAAc;AAIpB,UAAM,YAAY,KAAK;AACvB,UAAM,QAAQ,UAAU,MAAM,IAAI;AAClC,UAAM,QAAQ,CAAC,MAAM,cAAc;AAEjC,UAAI,cAAc,GAAG;AACnB,kBAAU,KAAK;AAAA,MAEjB,WAAW,YAAY,GAAG;AACxB,sBAAc;AACd,iBAAS,KAAK;AAAA,MAChB;AAAA,IACF,CAAC;AAGD,QAAI,KAAK,UAAU,QAAQ,KAAK,YAAY,MAAM;AAChD,iBAAW,KAAK;AAAA,QACd,iBAAiB,kBAAkB;AAAA,QACnC;AAAA,QACA,eAAe;AAAA,QACf,WAAW;AAAA,QACX,GAAG;AAAA,MACL,CAAC;AAAA,IACH;AAAA,EACF;AACA,SAAO;AACT;",
+  "sourcesContent": ["import chalk from 'chalk';\nimport { Change, diffLines } from 'diff';\nimport { normaliseLineEndings } from './os';\n\nexport const diffLogStrings = (updates: string, previous: string) => {\n  const lastFewLines = previous.split('\\n').slice(-10);\n  const incomingLines = updates.split('\\n');\n\n  // Find the line indices in the incoming lines\n  // of the last few lines previously rendered\n  const incomingLineIndices = [];\n  for (const lastRenderedLine of lastFewLines) {\n    if (lastRenderedLine.length > 10)\n      incomingLineIndices.push(incomingLines.lastIndexOf(lastRenderedLine));\n  }\n\n  // Get the new lines from the next position on from the last of the already shown lines\n  const differentFromPos = Math.max(...incomingLineIndices) + 1 || 0;\n  // Return just the incoming lines from the position we matched\n  return incomingLines.slice(differentFromPos).join('\\n');\n};\n\nexport const diffFileContent = (\n  existingContent: string,\n  newContent: string\n) => {\n  const existingContentNormalised = normaliseLineEndings(existingContent, '\\n');\n  const newContentNormalised = normaliseLineEndings(newContent, '\\n');\n\n  const diff = diffLines(existingContentNormalised, newContentNormalised, {\n    newlineIsToken: true,\n  });\n  const diffRanges = addDiffPositionInfo(diff);\n\n  // Create formatted output for console\n  const output: string[] = [];\n  const lnSpaceLength = Math.max(\n    ...diffRanges.map(d => d.startLineNumber.toString().length)\n  );\n\n  const lnSpaces = Array(lnSpaceLength).join(' ');\n\n  let needsNewLine = false;\n  for (let i = 0; i < diffRanges.length; i++) {\n    const part = diffRanges[i];\n    if (part.added || part.removed) {\n      const colour = part.added ? 'green' : part.removed ? 'red' : 'grey';\n\n      if (part.value !== '\\n') {\n        if (needsNewLine) output.push('\\n### --');\n        output.push(\n          `\\n${part.value\n            .split('\\n')\n            .map((ln, idx) =>\n              ln.trim() !== ''\n                ? `${\n                    part.startLineNumber ? part.startLineNumber + idx : lnSpaces\n                  }${part.added ? '+' : part.removed ? '-' : ' '} ${chalk[\n                    colour\n                  ](`${ln}`)}`\n                : ln\n            )\n            .join('\\n')}`\n        );\n      } else needsNewLine = true;\n    } else needsNewLine = true;\n  }\n\n  return output.join('');\n};\n\nconst addDiffPositionInfo = (diff: Change[]) => {\n  const diffRanges: (Change & {\n    startLineNumber: number;\n    startColumn: number;\n    endLineNumber: number;\n    endColumn: number;\n  })[] = [];\n\n  let lineNumber = 0;\n  let column = 0;\n  for (let partIndex = 0; partIndex < diff.length; partIndex++) {\n    const part = diff[partIndex];\n\n    // // Skip any parts that aren't in `after`\n    // if (part.removed === true) {\n    //   continue;\n    // }\n\n    const startLineNumber = lineNumber;\n    const startColumn = column;\n\n    // Split the part into lines. Loop throug these lines to find\n    // the line no. and column at the end of this part.\n    const substring = part.value;\n    const lines = substring.split('\\n');\n    lines.forEach((line, lineIndex) => {\n      // The first `line` is actually just a continuation of the last line\n      if (lineIndex === 0) {\n        column += line.length;\n        // All other lines come after a line break.\n      } else if (lineIndex > 0) {\n        lineNumber += 1;\n        column = line.length;\n      }\n    });\n\n    // Save a range for all of the parts with position info added\n    if (part.added === true || part.removed === true) {\n      diffRanges.push({\n        startLineNumber: startLineNumber + 1,\n        startColumn: startColumn,\n        endLineNumber: lineNumber,\n        endColumn: column,\n        ...part,\n      });\n    }\n  }\n  return diffRanges;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,kBAAkC;AAClC,gBAAqC;AAE9B,MAAM,iBAAiB,CAAC,SAAiB,aAAqB;AACnE,QAAM,eAAe,SAAS,MAAM,IAAI,EAAE,MAAM,GAAG;AACnD,QAAM,gBAAgB,QAAQ,MAAM,IAAI;AAIxC,QAAM,sBAAsB,CAAC;AAC7B,aAAW,oBAAoB,cAAc;AAC3C,QAAI,iBAAiB,SAAS;AAC5B,0BAAoB,KAAK,cAAc,YAAY,gBAAgB,CAAC;AAAA,EACxE;AAGA,QAAM,mBAAmB,KAAK,IAAI,GAAG,mBAAmB,IAAI,KAAK;AAEjE,SAAO,cAAc,MAAM,gBAAgB,EAAE,KAAK,IAAI;AACxD;AAEO,MAAM,kBAAkB,CAC7B,iBACA,eACG;AACH,QAAM,gCAA4B,gCAAqB,iBAAiB,IAAI;AAC5E,QAAM,2BAAuB,gCAAqB,YAAY,IAAI;AAElE,QAAM,WAAO,uBAAU,2BAA2B,sBAAsB;AAAA,IACtE,gBAAgB;AAAA,EAClB,CAAC;AACD,QAAM,aAAa,oBAAoB,IAAI;AAG3C,QAAM,SAAmB,CAAC;AAC1B,QAAM,gBAAgB,KAAK;AAAA,IACzB,GAAG,WAAW,IAAI,OAAK,EAAE,gBAAgB,SAAS,EAAE,MAAM;AAAA,EAC5D;AAEA,QAAM,WAAW,MAAM,aAAa,EAAE,KAAK,GAAG;AAE9C,MAAI,eAAe;AACnB,WAAS,IAAI,GAAG,IAAI,WAAW,QAAQ,KAAK;AAC1C,UAAM,OAAO,WAAW;AACxB,QAAI,KAAK,SAAS,KAAK,SAAS;AAC9B,YAAM,SAAS,KAAK,QAAQ,UAAU,KAAK,UAAU,QAAQ;AAE7D,UAAI,KAAK,UAAU,MAAM;AACvB,YAAI;AAAc,iBAAO,KAAK,UAAU;AACxC,eAAO;AAAA,UACL;AAAA,EAAK,KAAK,MACP,MAAM,IAAI,EACV;AAAA,YAAI,CAAC,IAAI,QACR,GAAG,KAAK,MAAM,KACV,GACE,KAAK,kBAAkB,KAAK,kBAAkB,MAAM,WACnD,KAAK,QAAQ,MAAM,KAAK,UAAU,MAAM,OAAO,aAAAA,QAChD,QACA,GAAG,IAAI,MACT;AAAA,UACN,EACC,KAAK,IAAI;AAAA,QACd;AAAA,MACF;AAAO,uBAAe;AAAA,IACxB;AAAO,qBAAe;AAAA,EACxB;AAEA,SAAO,OAAO,KAAK,EAAE;AACvB;AAEA,MAAM,sBAAsB,CAAC,SAAmB;AAC9C,QAAM,aAKC,CAAC;AAER,MAAI,aAAa;AACjB,MAAI,SAAS;AACb,WAAS,YAAY,GAAG,YAAY,KAAK,QAAQ,aAAa;AAC5D,UAAM,OAAO,KAAK;AAOlB,UAAM,kBAAkB;AACxB,UAAM,cAAc;AAIpB,UAAM,YAAY,KAAK;AACvB,UAAM,QAAQ,UAAU,MAAM,IAAI;AAClC,UAAM,QAAQ,CAAC,MAAM,cAAc;AAEjC,UAAI,cAAc,GAAG;AACnB,kBAAU,KAAK;AAAA,MAEjB,WAAW,YAAY,GAAG;AACxB,sBAAc;AACd,iBAAS,KAAK;AAAA,MAChB;AAAA,IACF,CAAC;AAGD,QAAI,KAAK,UAAU,QAAQ,KAAK,YAAY,MAAM;AAChD,iBAAW,KAAK;AAAA,QACd,iBAAiB,kBAAkB;AAAA,QACnC;AAAA,QACA,eAAe;AAAA,QACf,WAAW;AAAA,QACX,GAAG;AAAA,MACL,CAAC;AAAA,IACH;AAAA,EACF;AACA,SAAO;AACT;",
   "names": ["chalk"]
 }

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.0-beta.94";
+const LIB_VERSION = "1.0.0-beta.95";
 // 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.0-beta.94\";\n"],
+  "sourcesContent": ["export const LIB_VERSION = \"1.0.0-beta.95\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contensis-cli",
-  "version": "1.0.0-beta.94",
+  "version": "1.0.0-beta.95",
   "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/localisation/en-GB.ts

@@ -456,8 +456,24 @@ We will ask you to add secrets/variables to your git repository to give your wor
       `Add push-block job to CI file: ${Logger.highlightText(filename)}\n`,
     ciMultipleChoices: () =>
       `Multiple GitHub workflow files found\n${Logger.infoText(
-        `Tell us which GitHub workflow builds the container image after each push:`
+        `Tell us which GitHub workflow builds a container image after each push:`
       )}`,
+    ciMultipleBuildJobChoices: () =>
+      `Multiple build jobs found in workflow\n${Logger.infoText(
+        `Choose the build job that produces a fresh container image to push to a block:`
+      )}`,
+    ciMultipleJobChoices: () =>
+      `Other jobs found in workflow\n${Logger.infoText(
+        `Choose the job that produces a fresh container image we can push to a block:`
+      )}`,
+    ciMultipleAppImageVarChoices: () =>
+      `Do one of these variables point to your tagged app image?\n${Logger.infoText(
+        `we have included a default choice - ensure your build image is tagged exactly the same as this`
+      )}`,
+    ciEnterOwnAppImagePrompt: () =>
+      `Tell us the registry uri your app image is tagged and pushed with (⏎ accept default) \n${Logger.infoText(
+        `Tip: GitHub context variables available\nhttps://docs.github.com/en/actions/learn-github-actions/variables#using-contexts-to-access-variable-values`
+      )}\n`,
     confirm: () =>
       `Confirm these details are correct so we can make changes to your project`,
     accessTokenPrompt: () =>
@@ -479,6 +495,10 @@ We will ask you to add secrets/variables to your git repository to give your wor
       `You should alter existing project code that connects a Contensis client to use the variables from this file`,
     writeCiFile: (ciFilePath: string) =>
       `Updated CI file ${Logger.standardText(winSlash(ciFilePath))}`,
+    ciFileNoChanges: (ciFilePath: string) =>
+      `No updates needed for CI file ${Logger.standardText(
+        winSlash(ciFilePath)
+      )}`,
     ciBlockTip: (blockId: string, env: string, projectId: string) =>
       `A job is included to deploy your built container image to ${Logger.standardText(
         projectId
@@ -512,7 +532,7 @@ We will ask you to add secrets/variables to your git repository to give your wor
     dryRun: () =>
       `Contensis developer environment initialisation dry run completed`,
     noChanges: () =>
-      `No changes were made to your project - run the command again without the --dry-run flag to update your project with these changes`,
+      `No changes were made to your project, run the command again without the --dry-run flag to update your project with these changes`,
     startProjectTip: () =>
       `Start up your project in the normal way for development`,
   },

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

@@ -1,4 +1,9 @@
+import inquirer from 'inquirer';
 import { JSONPath, JSONPathOptions } from 'jsonpath-plus';
+import {
+  GitHubActionPushBlockJob,
+  GitHubActionPushBlockJobStep,
+} from '~/models/DevService';
 import { readFile } from '~/providers/file-provider';
 import ContensisDev from '~/services/ContensisDevService';
 import { diffFileContent } from '~/util/diff';
@@ -13,17 +18,17 @@ type MappedWorkflowOutput = {
   diff: string;
 };
 
-export const mapCIWorkflowContent = (
+export const mapCIWorkflowContent = async (
   cli: ContensisDev,
   git: GitHelper
-): MappedWorkflowOutput | undefined => {
+): Promise<MappedWorkflowOutput | undefined> => {
   // get existing workflow file
   const workflowFile = readFile(git.ciFilePath);
   if (!workflowFile) return undefined;
 
   const blockId = git.name;
   if (git.type === 'github') {
-    const addGitHubActionJobStep = {
+    const addGitHubActionJobStep: GitHubActionPushBlockJobStep = {
       name: 'Push block to Contensis',
       id: 'push-block',
       uses: 'contensis/block-push@v1',
@@ -39,7 +44,7 @@ export const mapCIWorkflowContent = (
 
     // parse yaml to js
     const workflowDoc = parseYamlDocument(workflowFile);
-    const workflow = workflowDoc.toJS();
+    const workflowJS = workflowDoc.toJS();
     const setWorkflowElement = (path: string | any[], value: any) => {
       const findPath =
         typeof path === 'string' && path.includes('.')
@@ -56,26 +61,44 @@ export const mapCIWorkflowContent = (
       }
     };
     const findExistingJobSteps = (
+      path: string,
       resultType: JSONPathOptions['resultType']
     ) => {
-      // look for line in job
-      //   jobs.x.steps[uses: contensis/block-push]
-      const path =
-        git.type === 'github'
-          ? '$.jobs..steps.*[?(@property === "uses" && @.match(/^contensis\\/block-push/i))]^'
-          : // TODO: add jsonpath for gitlab file
-            '';
-
       const existingJobStep = JSONPath({
         path,
-        json: workflow,
+        json: workflowJS,
         resultType: resultType,
       });
 
       return existingJobStep;
     };
 
-    const existingJobStep = findExistingJobSteps('all');
+    // look for line in job
+    //   jobs.x.steps[uses: contensis/block-push]
+    const existingJobStep = findExistingJobSteps(
+      git.type === 'github'
+        ? '$.jobs..steps.*[?(@property === "uses" && @.match(/^contensis\\/block-push/i))]^'
+        : // TODO: add jsonpath for gitlab file
+          '',
+      'all'
+    );
+
+    const addAppImageUri = async () => {
+      // Look in document level "env" vars
+      const appImageUri = await determineAppImageUri(
+        cli,
+        Object.entries(workflowJS.env || {})
+      );
+
+      if (appImageUri.addVar)
+        setWorkflowElement(`env.${appImageUri.var}`, appImageUri.uri);
+      // workflowDoc.addIn(['env'], { [appImageUri.var]: appImageUri.uri });
+
+      if (appImageUri.var)
+        addGitHubActionJobStep.with[
+          'image-uri'
+        ] = `\${{ env.${appImageUri.var} }}`;
+    };
 
     // update job step
     if (existingJobStep.length) {
@@ -101,6 +124,11 @@ export const mapCIWorkflowContent = (
       setWorkflowElement(`${stepPath}.with.alias`, cli.currentEnv);
       setWorkflowElement(`${stepPath}.with.project-id`, cli.currentProject);
       setWorkflowElement(`${stepPath}.with.block-id`, blockId);
+
+      // This is likely not needed when updating an existing push-block job step
+      // we are assuming this is a forked/copied workflow with an already working image-uri reference
+      // await addAppImageUri();
+
       setWorkflowElement(
         `${stepPath}.with.client-id`,
         '${{ secrets.CONTENSIS_CLIENT_ID }}'
@@ -111,20 +139,89 @@ export const mapCIWorkflowContent = (
       );
     } else {
       // create job with push step
+
+      // is there already a job with a property name containing "build"?
+      const existingBuildJobStep = findExistingJobSteps(
+        git.type === 'github'
+          ? '$.jobs[?(@property.match(/build/i))]'
+          : // TODO: add jsonpath for gitlab file
+            '',
+        'all'
+      ) as JSONPathOptions[]; // This isn't the correct type for this object
+
+      let needs: string | undefined;
+      // There are multiple jobs called *build*
+      if (existingBuildJobStep.length > 1) {
+        // prompt which build job we should depend on before pushing the block
+        const choices = existingBuildJobStep.map(s => s.parentProperty);
+        choices.push(new inquirer.Separator() as any);
+        choices.push('none');
+
+        ({ needs } = await inquirer.prompt([
+          {
+            type: 'list',
+            prefix: '⌛',
+            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)
+        // Exactly one job step found containing a property name of *build*
+        // we'll assume that is the one the push-block job depends on
+        needs = existingBuildJobStep[0].parentProperty;
+
+      if (existingBuildJobStep.length === 0 || needs === 'none') {
+        // No existing build step found or chosen, offer all job steps in prompt
+        const choices = Object.keys(workflowJS.jobs);
+        choices.push(new inquirer.Separator() as any);
+        choices.push('none');
+
+        ({ needs } = await inquirer.prompt([
+          {
+            type: 'list',
+            prefix: '⌛',
+            message: cli.messages.devinit.ciMultipleJobChoices(),
+            name: 'needs',
+            choices,
+            default: choices.find(
+              j => typeof j === 'string' && j.includes('docker')
+            ),
+          },
+        ]));
+        if (needs === 'none') needs = undefined;
+        cli.log.raw('');
+      }
+
+      // Does a series of checks and prompts to determine the correct image-uri
+      // for the app container build
+      await addAppImageUri();
+
+      const newJob: GitHubActionPushBlockJob = {
+        name: 'Deploy container image to Contensis',
+        'runs-on': 'ubuntu-latest',
+        needs,
+        steps: [addGitHubActionJobStep],
+      };
+
+      // Add the new "job" to the Yaml Document
       workflowDoc.addIn(['jobs'], {
         key: 'deploy',
-        value: {
-          name: 'Push image to Contensis',
-          'runs-on': 'ubuntu-latest',
-          steps: [addGitHubActionJobStep],
-        },
+        value: newJob,
       });
     }
 
     // Workflow validation provided by @action-validator/core package
     const workflowIsValid = validateWorkflowYaml(workflowDoc.toString());
 
+    // We could expand validation to check for having a build step to wait for
+    // or if a valid image-uri attribute is set
     if (workflowIsValid === true) {
+      cli.log.success(`GitHub workflow YAML is valid`);
       cli.log.debug(
         `New file content to write to ${git.ciFilePath}\n\n${workflowDoc}`
       );
@@ -151,3 +248,89 @@ export const mapCIWorkflowContent = (
     };
   }
 };
+
+const determineAppImageUri = async (
+  cli: ContensisDev,
+  vars: [string, string][]
+) => {
+  // Determine container image-uri via variables and/or prompts
+
+  // Find vars including the word "image"
+  const imageVars = vars.filter(([varname, value]) =>
+    varname.toLowerCase().includes('image')
+  );
+  // Find vars named "image" that include the word "app"
+  const appImageVars = imageVars.filter(
+    ([varname, value]) =>
+      varname.toLowerCase().includes('app_') ||
+      varname.toLowerCase().includes('build_') ||
+      value?.toLowerCase().includes('/app')
+  );
+
+  const appImageUriGuess = appImageVars?.[0];
+
+  let appImageUri: string | undefined;
+  let appImageVar: string | undefined;
+
+  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 {
+    // Could not find a suitable var to use for block image-uri
+    // prompt for an app image uri
+    const choices = vars.map(v => v[0]);
+    const enterOwnMsg = 'enter my own / use default';
+    const defaultUri =
+      'ghcr.io/${{ github.repository }}/${{ github.ref_name }}/app:build-${{ github.run_number }}';
+    choices.push(new inquirer.Separator() as any);
+    choices.push(enterOwnMsg);
+    choices.push(defaultUri);
+
+    ({ appImageVar, appImageUri } = await inquirer.prompt([
+      // First question determines if an existing env variable
+      // already containes the tagged app image uri
+      {
+        type: 'list',
+        prefix: '🐳',
+        message: cli.messages.devinit.ciMultipleAppImageVarChoices(),
+        name: 'appImageVar',
+        choices,
+        default: choices.find(
+          v => typeof v === 'string' && v.toLowerCase().includes('image')
+        ),
+      },
+      // Subsequent prompt allows input of an image-uri if needed
+      {
+        type: 'input',
+        when(answers) {
+          return [enterOwnMsg, defaultUri].includes(answers.appImageVar);
+        },
+        prefix: `\n \n🔗`,
+        message: cli.messages.devinit.ciEnterOwnAppImagePrompt(),
+        name: 'appImageUri',
+        default: defaultUri,
+      },
+    ]));
+    cli.log.raw('');
+
+    // this indicates a uri has been added and we will add a new var
+    // to the workflow to encourage users to update the docker tag part
+    // of their build workflow to use the same var as the push-block job/step
+    if ([enterOwnMsg, defaultUri].includes(appImageVar || ''))
+      appImageVar = undefined;
+  }
+
+  if (appImageVar) appImageUri = `\${{ env.${appImageVar} }}`;
+
+  return {
+    addVar: !appImageVar,
+    uri: appImageUri,
+    var: appImageVar || 'BUILD_IMAGE',
+  };
+};

package/src/models/DevService.d.ts

@@ -2,4 +2,25 @@ export type EnvContentsToAdd = {
   ALIAS: string;
   PROJECT: string;
   ACCESS_TOKEN?: string;
-}
+};
+
+export type GitHubActionPushBlockJobStep = {
+  name: string;
+  id: 'push-block';
+  uses: string;
+  with: {
+    'block-id': string;
+    alias: string;
+    'project-id': string;
+    'client-id': string;
+    'shared-secret': string;
+    'image-uri'?: string;
+  };
+};
+
+export type GitHubActionPushBlockJob = {
+  name: string;
+  'runs-on': string;
+  needs?: string;
+  steps: GitHubActionPushBlockJobStep[];
+};

package/src/models/JsModules.d.ts

@@ -1,2 +1,3 @@
 declare module 'giturl';
 declare module 'inquirer-command-prompt';
+declare module 'printable-characters';

package/src/services/ContensisDevService.ts

@@ -21,7 +21,7 @@ import { mergeDotEnvFileContents } from '~/util/dotenv';
 import { findByIdOrName } from '~/util/find';
 import { GitHelper } from '~/util/git';
 import { jsonFormatter } from '~/util/json.formatter';
-import { normaliseLineEndings } from '~/util/os';
+import { normaliseLineEndings, winSlash } from '~/util/os';
 import { stringifyYaml } from '~/util/yaml';
 
 class ContensisDev extends ContensisRole {
@@ -103,6 +103,7 @@ class ContensisDev extends ContensisRole {
         ({ ciFileName } = await inquirer.prompt([
           {
             type: 'list',
+            prefix: '⧰',
             message: messages.devinit.ciMultipleChoices(),
             name: 'ciFileName',
             choices: workflowFiles,
@@ -116,7 +117,7 @@ class ContensisDev extends ContensisRole {
       log.raw(log.infoText(messages.devinit.ciDetails(ciFileName)));
 
       // Look at the workflow file content and make updates
-      const mappedWorkflow = mapCIWorkflowContent(this, git);
+      const mappedWorkflow = await mapCIWorkflowContent(this, git);
 
       log.help(messages.devinit.ciIntro(git));
 
@@ -138,6 +139,7 @@ class ContensisDev extends ContensisRole {
       const { accessToken }: { accessToken: string } = await inquirer.prompt([
         {
           type: 'input',
+          prefix: '🛡️',
           message: messages.devinit.accessTokenPrompt(),
           name: 'accessToken',
         },
@@ -219,34 +221,41 @@ class ContensisDev extends ContensisRole {
 
       if (dryRun) {
         if (envDiff) {
-          log.info(`updating .env file ${envFilePath}: ${envDiff}`);
+          log.info(`Updating .env file ${winSlash(envFilePath)}:\n${envDiff}`);
           log.raw('');
         }
         checkpoint('skip .env file update (dry-run)');
       } else {
-        if (envDiff) log.info(`updating .env file ${envFilePath}`);
+        if (envDiff) log.info(`updating .env file ${winSlash(envFilePath)}`);
         writeFile(envFilePath, envFileLines.join('\n'));
         checkpoint('.env file updated');
         log.success(messages.devinit.writeEnvFile());
         // log.help(messages.devinit.useEnvFileTip());
       }
 
-      // Update CI file -- different for GH/GL -- create a sample one with build?
+      // Update CI file -- different for GH/GL
+      if (mappedWorkflow?.diff) {
+        log.info(
+          `Updating ${winSlash(ciFileName)} file:\n${mappedWorkflow.diff}`
+        );
+        log.raw('');
+      }
       if (dryRun) {
-        if (mappedWorkflow?.diff) {
-          log.info(`updating${ciFileName} file: ${mappedWorkflow.diff}`);
-          log.raw('');
-        }
         checkpoint('skip CI file update (dry-run)');
         //log.object(ciFileLines);
       } else {
-        if (mappedWorkflow?.diff) log.info(`updating${ciFileName} file`);
-        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?.newWorkflow) {
+          if (mappedWorkflow?.diff) {
+            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');
+        }
       }
 
       // Echo Deployment API key to console, ask user to add secrets to repo