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

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

@@ -102,8 +102,14 @@ const mapGitLabCIWorkflowContent = async (
       block_id: blockId,
       alias: cli.currentEnv,
       project_id: cli.currentProject,
-      client_id: '$CONTENSIS_CLIENT_ID',
-      shared_secret: '$CONTENSIS_SHARED_SECRET',
+      client_id:
+        cli.clientDetailsLocation === 'env'
+          ? cli.clientId
+          : '$CONTENSIS_CLIENT_ID',
+      shared_secret:
+        cli.clientDetailsLocation === 'env'
+          ? cli.clientSecret
+          : '$CONTENSIS_SHARED_SECRET',
     },
   };
 
@@ -174,12 +180,16 @@ const mapGitLabCIWorkflowContent = async (
     setWorkflowElement(
       workflowDoc,
       `${stepPath}.variables.client_id`,
-      '$CONTENSIS_CLIENT_ID'
+      cli.clientDetailsLocation === 'env'
+        ? cli.clientId
+        : '$CONTENSIS_CLIENT_ID'
     );
     setWorkflowElement(
       workflowDoc,
       `${stepPath}.variables.shared_secret`,
-      '$CONTENSIS_SHARED_SECRET'
+      cli.clientDetailsLocation === 'env'
+        ? cli.clientSecret
+        : '$CONTENSIS_SHARED_SECRET'
     );
   } else {
     // create job with push step
@@ -225,8 +235,14 @@ const mapGitHubActionCIWorkflowContent = async (
       // 'image-uri': '${{ steps.build.outputs.image-uri }}',
       alias: cli.currentEnv,
       'project-id': cli.currentProject,
-      'client-id': '${{ secrets.CONTENSIS_CLIENT_ID }}',
-      'shared-secret': '${{ secrets.CONTENSIS_SHARED_SECRET }}',
+      'client-id':
+        cli.clientDetailsLocation === 'env'
+          ? '${{ env.CONTENSIS_CLIENT_ID }}'
+          : '${{ secrets.CONTENSIS_CLIENT_ID }}',
+      'shared-secret':
+        cli.clientDetailsLocation === 'env'
+          ? '${{ env.CONTENSIS_SHARED_SECRET }}'
+          : '${{ secrets.CONTENSIS_SHARED_SECRET }}',
     },
   };
 
@@ -296,12 +312,16 @@ const mapGitHubActionCIWorkflowContent = async (
     setWorkflowElement(
       workflowDoc,
       `${stepPath}.with.client-id`,
-      '${{ secrets.CONTENSIS_CLIENT_ID }}'
+      cli.clientDetailsLocation === 'env'
+        ? '${{ env.CONTENSIS_CLIENT_ID }}'
+        : '${{ secrets.CONTENSIS_CLIENT_ID }}'
     );
     setWorkflowElement(
       workflowDoc,
       `${stepPath}.with.shared-secret`,
-      '${{ secrets.CONTENSIS_SHARED_SECRET }}'
+      cli.clientDetailsLocation === 'env'
+        ? '${{ env.CONTENSIS_SHARED_SECRET }}'
+        : '${{ secrets.CONTENSIS_SHARED_SECRET }}'
     );
   } else {
     // create job with push step
@@ -320,19 +340,22 @@ const mapGitHubActionCIWorkflowContent = async (
       const choices = existingBuildJobStep.map(s => s.parentProperty);
       choices.push(new inquirer.Separator() as any);
       choices.push('none');
+      if (choices.includes('build-app')) needs = 'build-app';
+      else {
+        ({ 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')
+            ),
+          },
+        ]));
+      }
 
-      ({ 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*
@@ -399,9 +422,12 @@ const mapGitHubActionCIWorkflowContent = async (
       `GitHub workflow YAML did not pass validation check`
     );
   }
-  const newWorkflow = normaliseLineEndings(
-    workflowDoc.toString({ lineWidth: 0 })
-  );
+
+  // const newWorkflow = normaliseLineEndings(
+  //   workflowDoc.toString({ lineWidth: 0 })
+  // );
+
+  const newWorkflow = workflowDoc.toString();
 
   return newWorkflow;
 };

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

@@ -1,10 +1,9 @@
 import { Role } from 'contensis-management-api/lib/models';
 
-export const devKeyPermissions = { blocks: [] } as Partial<Role['permissions']>;
-
-export const deployKeyPermissions = { blocks: ['push', 'release'] } as Partial<
-  Role['permissions']
->;
+export const devKeyPermissions = {} as Partial<Role['permissions']>;
+export const deployKeyPermissions = {
+  blocks: { actions: ['push', 'release', 'view'] },
+} as Role['permissions'];
 
 export const devKeyRole = (
   keyName: string,

package/src/models/DevService.d.ts

@@ -2,6 +2,8 @@ export type EnvContentsToAdd = {
   ALIAS: string;
   PROJECT: string;
   ACCESS_TOKEN?: string;
+  CONTENSIS_CLIENT_ID?: string;
+  CONTENSIS_CLIENT_SECRET?: string;
 };
 
 export type GitHubActionPushBlockJobStep = {

package/src/services/ContensisCliService.ts

@@ -71,6 +71,10 @@ class ContensisCli {
   contensisOpts: Partial<MigrateRequest>;
   currentProject: string;
 
+  clientDetailsLocation?: 'env' | 'git';
+  clientId?: string;
+  clientSecret?: string;
+
   sourceAlias?: string;
   targetEnv?: string;
   urls:
@@ -290,6 +294,7 @@ class ContensisCli {
       | 'contentTypes'
       | 'components'
       | 'models'
+      | 'nodes'
       | 'user-input';
   }) => {
     const source: 'contensis' | 'file' = fromFile ? 'file' : 'contensis';
@@ -1736,6 +1741,85 @@ class ContensisCli {
     }
   };
 
+  ImportNodes = async ({
+    commit,
+    fromFile,
+    logOutput,
+  }: {
+    commit: boolean;
+    fromFile: string;
+    logOutput: string;
+  }) => {
+    const { currentEnv, currentProject, log, messages } = this;
+
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      fromFile,
+      importDataType: 'nodes',
+    });
+
+    if (contensis) {
+      log.line();
+      if (contensis.isPreview) {
+        console.log(log.successText(` -- IMPORT PREVIEW -- `));
+      } else {
+        console.log(log.warningText(` *** COMMITTING IMPORT *** `));
+      }
+
+      const [err, result] = await contensis.MigrateNodes();
+
+      if (err) logError(err);
+      else
+        this.HandleFormattingAndOutput(result, () => {
+          // print the migrateResult to console
+          // TODO: fix
+          printMigrateResult(this, result, {
+            showAllEntries: logOutput === 'all',
+            showChangedEntries: logOutput === 'changes',
+          });
+        });
+
+      const nodesTotalCount = result?.nodesToMigrate[currentProject].totalCount;
+      const nodesCreated = result?.nodesResult?.['created'] || 0;
+      const nodesUpdated = result?.nodesResult?.['updated'] || 0;
+      const noChange = result.nodesToMigrate[currentProject]['no change'] !== 0;
+
+      if (
+        !err &&
+        !result.errors?.length &&
+        ((!commit && nodesTotalCount) ||
+          (commit && (nodesCreated || nodesUpdated)))
+      ) {
+        let totalCount: number;
+        if (commit) {
+          let created = typeof nodesCreated === 'number' ? nodesCreated : 0;
+          let updated = typeof nodesUpdated === 'number' ? nodesUpdated : 0;
+
+          totalCount = created + updated;
+        } else {
+          totalCount =
+            typeof nodesTotalCount === 'number' ? nodesTotalCount : 0;
+        }
+
+        log.success(messages.nodes.imported(currentEnv, commit, totalCount));
+        if (!commit) {
+          log.raw(``);
+          log.help(messages.nodes.commitTip());
+        }
+      } else {
+        if (noChange) {
+          log.help(messages.nodes.noChange(currentEnv), err);
+        } else {
+          log.error(messages.nodes.failedImport(currentEnv), err);
+          if (!nodesTotalCount) log.help(messages.nodes.notFound(currentEnv));
+        }
+      }
+    } else {
+      log.warning(messages.models.noList(currentProject));
+      log.help(messages.connect.tip());
+    }
+  };
+
   PrintWebhookSubscriptions = async (subscriptionIdsOrNames?: string[]) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();

package/src/services/ContensisDevService.ts

@@ -1,5 +1,5 @@
 import to from 'await-to-js';
-import { execFile, spawn } from 'child_process';
+import { spawn } from 'child_process';
 import inquirer from 'inquirer';
 import path from 'path';
 
@@ -21,8 +21,9 @@ import { mergeDotEnvFileContents } from '~/util/dotenv';
 import { findByIdOrName } from '~/util/find';
 import { GitHelper } from '~/util/git';
 import { jsonFormatter } from '~/util/json.formatter';
-import { normaliseLineEndings, winSlash } from '~/util/os';
+import { winSlash } from '~/util/os';
 import { stringifyYaml } from '~/util/yaml';
+import { createSpinner } from 'nanospinner';
 
 class ContensisDev extends ContensisRole {
   git!: GitHelper;
@@ -54,7 +55,7 @@ class ContensisDev extends ContensisRole {
         );
 
       // Retrieve git info
-      const git = this.git = new GitHelper(projectHome);
+      const git = (this.git = new GitHelper(projectHome));
 
       // Retrieve ci workflow info
       const workflowFiles = git.workflows;
@@ -118,10 +119,39 @@ class ContensisDev extends ContensisRole {
 
       log.raw(log.infoText(messages.devinit.ciDetails(ciFileName)));
 
-      // Look at the workflow file content and make updates
-      const mappedWorkflow = await mapCIWorkflowContent(this);
+      let mappedWorkflow;
+      // Location for Client ID / Secret.
+      const { clientDetailsOption } = await inquirer.prompt({
+        name: 'clientDetailsOption',
+        type: 'list',
+        prefix: '🔑',
+        // Where would you like to store your Client ID/Secret?
+        message: messages.devinit.clientDetailsLocation(),
+        choices: [
+          messages.devinit.clientDetailsInGit(git),
+          messages.devinit.clientDetailsInEnv(),
+        ],
+      });
+
+      // global 'clientDetailsLocation' variable stores users input on where client id / secert are stored
+      if (clientDetailsOption === messages.devinit.clientDetailsInEnv()) {
+        this.clientDetailsLocation = 'env';
+      } else {
+        this.clientDetailsLocation = 'git';
+      }
 
-      log.help(messages.devinit.ciIntro(git));
+      if (this.clientDetailsLocation === 'env') {
+        // Update CI Workflow to pull from ENV variables
+        mappedWorkflow = await mapCIWorkflowContent(this);
+        // Add client id and secret to global 'this'
+        this.clientId = existingDeployKey?.id;
+        this.clientSecret = existingDeployKey?.sharedSecret;
+        log.help(messages.devinit.ciIntro(git, this.clientDetailsLocation));
+      } else {
+        // Look at the workflow file content and make updates
+        mappedWorkflow = await mapCIWorkflowContent(this);
+        log.help(messages.devinit.ciIntro(git, this.clientDetailsLocation));
+      }
 
       if (!dryRun) {
         // Confirm prompt
@@ -138,16 +168,37 @@ class ContensisDev extends ContensisRole {
       }
 
       // Access token prompt
-      const { accessToken }: { accessToken: string } = await inquirer.prompt([
+      let accessToken: string | undefined = undefined;
+      const { canContinue } = await inquirer.prompt([
         {
-          type: 'input',
+          type: 'confirm',
           prefix: '🛡️',
+          // We're all set to grab your access token. Can we proceed? (⏎ continue)
           message: messages.devinit.accessTokenPrompt(),
-          name: 'accessToken',
+          name: 'canContinue',
         },
       ]);
       log.raw('');
 
+      if (!canContinue) return;
+      if (canContinue) {
+        const spinner = createSpinner(messages.devinit.accessTokenFetch());
+        spinner.start();
+
+        // Fetching access token
+        const token = await this.GetDeliveryApiKey();
+
+        if (token) {
+          spinner.success();
+          this.log.success(messages.devinit.accessTokenSuccess(token));
+          accessToken = token;
+        } else {
+          spinner.error();
+          this.log.error(messages.devinit.accessTokenFailed());
+          return;
+        }
+      }
+
       // Magic happens...
       const checkpoint = (op: string) => {
         if (errors.length) throw errors[0];
@@ -209,6 +260,12 @@ class ContensisDev extends ContensisRole {
         PROJECT: currentProject,
       };
       if (accessToken) envContentsToAdd['ACCESS_TOKEN'] = accessToken;
+      if (this.clientDetailsLocation === 'env') {
+        if (git.type === 'github') {
+          envContentsToAdd['CONTENSIS_CLIENT_ID'] = this.clientId;
+          envContentsToAdd['CONTENSIS_CLIENT_SECRET'] = this.clientSecret;
+        }
+      }
 
       const envFilePath = `${projectHome}/.env`;
       const existingEnvFile = readFile(envFilePath);
@@ -216,9 +273,7 @@ class ContensisDev extends ContensisRole {
         (existingEnvFile || '').split('\n').filter(l => !!l),
         envContentsToAdd
       );
-      const newEnvFileContent = normaliseLineEndings(
-        `${envFileLines.join('\n')}\n`
-      );
+      const newEnvFileContent = envFileLines.join('\n');
       const envDiff = diffFileContent(existingEnvFile || '', newEnvFileContent);
 
       if (dryRun) {
@@ -260,15 +315,17 @@ class ContensisDev extends ContensisRole {
         }
       }
 
-      // Echo Deployment API key to console, ask user to add secrets to repo
-      log.warning(messages.devinit.addGitSecretsIntro());
-      log.help(
-        messages.devinit.addGitSecretsHelp(
-          git,
-          existingDeployKey?.id,
-          existingDeployKey?.sharedSecret
-        )
-      );
+      if (this.clientDetailsLocation === 'git') {
+        // Echo Deployment API key to console, ask user to add secrets to repo
+        log.warning(messages.devinit.addGitSecretsIntro());
+        log.help(
+          messages.devinit.addGitSecretsHelp(
+            git,
+            existingDeployKey?.id,
+            existingDeployKey?.sharedSecret
+          )
+        );
+      }
 
       if (dryRun) {
         log.success(messages.devinit.dryRun());

package/src/services/ContensisRoleService.ts

@@ -1,8 +1,9 @@
 import { Role } from 'contensis-management-api/lib/models';
 import { ApiKey, MigrateRequest } from 'migratortron';
-
+import to from 'await-to-js';
 import ContensisCli from './ContensisCliService';
 import { OutputOptionsConstructorArg } from '~/models/CliService';
+import { Logger } from '~/util/logger';
 
 class ContensisRole extends ContensisCli {
   constructor(
@@ -13,6 +14,37 @@ class ContensisRole extends ContensisCli {
     super(args, outputOpts, contensisOpts);
   }
 
+  GetDeliveryApiKey = async () => {
+    const { contensis, currentEnv } = this;
+
+    const CMS = `https://cms-${currentEnv}.cloud.contensis.com`;
+    const API = 'api/contensis-cli/settings/defaultDeliveryApiAccessToken';
+
+    if (contensis) {
+      const [error, bearerToken] = await to(
+        contensis.content.sourceRepo.repo.BearerToken()
+      );
+      if (error) Logger.error(error.message);
+
+      const token = fetch(`${CMS}/${API}`, {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${bearerToken}`,
+        },
+      })
+        .then(repsonse => repsonse.json())
+        .then(({ value }) => {
+          if (value) return value;
+        })
+        .catch(error => {
+          throw new Error(error);
+        });
+
+      return token;
+    }
+  };
+
   CreateOrUpdateApiKey = async (
     existingKey: ApiKey | undefined,
     name: string,

package/src/util/diff.ts

@@ -34,9 +34,8 @@ export const diffFileContent = (
 
   // Create formatted output for console
   const output: string[] = [];
-  const lnSpaceLength = Math.max(
-    ...diffRanges.map(d => d.startLineNumber.toString().length)
-  );
+  const lnSpaceLength =
+    Math.max(...diffRanges.map(d => d.startLineNumber.toString().length)) || 0;
 
   const lnSpaces = Array(lnSpaceLength).join(' ');
 

package/src/util/git.ts

@@ -111,13 +111,14 @@ export class GitHelper {
   githubWorkflows = () => {
     const workflowPath = path.join(this.gitcwd(), '.github/workflows');
     const workflowFiles = readFiles(workflowPath, false);
-    // console.log('gh workflows: ', workflowFiles);
     const addFolderSuffix = (files: string[]) =>
       files.map(f => `.github/workflows/${f}`);
 
-    if (workflowFiles.some(f => f.includes('build')))
+    if (workflowFiles.some(f => f.includes('build'))) {
       return addFolderSuffix(workflowFiles.filter(f => f.includes('build')));
-    return addFolderSuffix(workflowFiles);
+    } else {
+      return addFolderSuffix(workflowFiles);
+    }
   };
   gitlabWorkflow = (ciFileName = GITLAB_CI_FILENAME) => {
     const workflowPath = this.gitcwd();

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.0.0-beta.96";
+export const LIB_VERSION = "1.0.0-beta.98";