contensis-cli 1.0.0-beta.51 → 1.0.0-beta.53

package/src/commands/login.ts

@@ -1,34 +1,34 @@
-import { Command } from 'commander';
-import { cliCommand } from '~/services/ContensisCliService';
-import { shell } from '~/shell';
-
-export const makeLoginCommand = () => {
-  const login = new Command()
-    .command('login')
-    .description('login to a connected Contensis instance')
-    .argument('<user/clientId>', 'the username to login with')
-    .argument(
-      '[password]',
-      'the password to use to login with (optional/insecure)'
-    )
-    .option(
-      '-s, --shared-secret <sharedSecret>',
-      'the shared secret to use when logging in with a client id'
-    )
-    .usage('<user/clientId> [password] [-s <sharedSecret>]')
-    .addHelpText(
-      'after',
-      `
-Example call:
-  > login myuserid\n  -- or --\n  > login {clientId} -s {sharedSecret}
-`
-    )
-    .action(async (user, password, opts) => {
-      const token = await cliCommand(['login', user]).Login(user, {
-        password,
-        sharedSecret: opts.sharedSecret,
-      });
-      if (token) await shell().restart();
-    });
-  return login;
-};
+import { Command } from 'commander';
+import { cliCommand } from '~/services/ContensisCliService';
+import { shell } from '~/shell';
+
+export const makeLoginCommand = () => {
+  const login = new Command()
+    .command('login')
+    .description('login to a connected Contensis instance')
+    .argument('<user/clientId>', 'the username to login with')
+    .argument(
+      '[password]',
+      'the password to use to login with (optional/insecure)'
+    )
+    .option(
+      '-s, --shared-secret <sharedSecret>',
+      'the shared secret to use when logging in with a client id'
+    )
+    .usage('<user/clientId> [password] [-s <sharedSecret>]')
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > login myuserid\n  -- or --\n  > login {clientId} -s {sharedSecret}
+`
+    )
+    .action(async (user, password, opts) => {
+      const token = await cliCommand(['login', user]).Login(user, {
+        password,
+        sharedSecret: opts.sharedSecret,
+      });
+      if (token) await shell().restart();
+    });
+  return login;
+};

package/src/commands/push.ts

@@ -1,127 +1,127 @@
-import { Command } from 'commander';
-import mapJson from 'jsonpath-mapper';
-import { PushBlockParams } from 'migratortron';
-import { cliCommand } from '~/services/ContensisCliService';
-
-export const makePushCommand = () => {
-  const push = new Command()
-    .command('push')
-    .description('push command')
-    .addHelpText('after', `\n`)
-    .showHelpAfterError(true)
-    .exitOverride();
-
-  push
-    .command('block')
-    .description('push a block')
-    .argument('<block-id>', 'the name of the block to push to')
-    .argument(
-      '<image uri:tag>',
-      'the uri and tag of the container image to push as a block (tag default: latest)'
-    )
-    .argument('[branch]', 'the branch we are pushing to')
-    .option(
-      '-r, --release',
-      'whether to release the pushed block version',
-      false
-    )
-    .option(
-      '-cid, --commit-id <commitId>',
-      'the id of the source git commit for the supplied image uri'
-    )
-    .option(
-      '-cmsg, --commit-message <commitMessage>',
-      'the git commit message for the supplied commit id'
-    )
-    .option(
-      '-cdt, --commit-datetime <commitDateTime>',
-      'the timestamp of the source git commit for the supplied image uri'
-    )
-    .option(
-      '-author, --author-email <authorEmail>',
-      'the git email address of the author of the source git commit'
-    )
-    .option(
-      '-committer, --committer-email <committerEmail>',
-      'the git email address of the commiter of the source git commit'
-    )
-    .option(
-      '-repo, --repository-url <repositoryUrl>',
-      'the url of the source repository for the supplied image uri'
-    )
-    .option(
-      '-pr, --provider <sourceProvider>',
-      'the url of the source repository for the supplied image uri'
-    )
-    .usage('<block-id> <image uri> [branch] [options]')
-    .addHelpText(
-      'after',
-      `
-Example call:
-  > push block contensis-app ghcr.io/contensis/contensis-app/app:build-4359 master --release\n`
-    )
-    .action(async (blockId: string, imageUri: string, branch: string, opts) => {
-      const cli = cliCommand(['push', 'block', blockId], opts);
-      const mapSourceVars = {
-        blockId,
-        imageUri,
-        branch,
-        ...opts,
-        ...process.env,
-      };
-
-      const blockRequest = mapJson(mapSourceVars, {
-        autoRelease: { $path: 'release', $default: () => false },
-        id: ['blockId'],
-        image: () => {
-          const lastIndexOfColon = imageUri.lastIndexOf(':');
-          return {
-            uri: imageUri.slice(0, lastIndexOfColon),
-            tag: imageUri.slice(lastIndexOfColon + 1) || 'latest',
-          };
-        },
-        projectId: () => cli.env.currentProject || '',
-        source: {
-          provider: {
-            $path: ['provider'],
-            $return: (provider: string, { GITHUB_ACTIONS, GITLAB_CI }) => {
-              if (provider) return provider;
-              if (GITHUB_ACTIONS) return 'Github';
-              else if (GITLAB_CI) return 'GitlabSelfHosted';
-            },
-          },
-          repositoryUrl: {
-            $path: ['repositoryUrl', 'CI_PROJECT_URL', 'GITHUB_REPOSITORY'],
-            $formatting: (url: string, { GITHUB_ACTIONS }) => {
-              if (GITHUB_ACTIONS) url = `https://github.com/${url}`;
-
-              if (url && !url.endsWith('.git')) return `${url}.git`;
-              return url;
-            },
-          },
-          branch: ['branch', 'CI_COMMIT_REF_NAME', 'GITHUB_REF_NAME'],
-          commit: {
-            id: ['commitId', 'CI_COMMIT_SHORT_SHA', 'GITHUB_SHA'],
-            message: {
-              $path: ['commitMessage', 'CI_COMMIT_MESSAGE'], // ${{ github.event.head_commit.message }}
-              $formatting: (msg?: string) =>
-                msg?.replace(/\\n/g, ' ').replace(/\\n/g, ' ').trim(),
-            },
-            dateTime: ['commitDatetime', 'CI_COMMIT_TIMESTAMP'], // ${{ github.event.head_commit.timestamp }}
-            authorEmail: ['authorEmail', 'GITLAB_USER_EMAIL', 'GITHUB_ACTOR'], // ${{ github.event.head_commit.author.email }}
-            committerEmail: [
-              'committerEmail',
-              'GITLAB_USER_EMAIL',
-              'GITHUB_TRIGGERING_ACTOR',
-            ], // ${{ github.event.head_commit.committer.email }}
-          },
-        },
-      }) as PushBlockParams;
-
-      await cli.PushBlock(blockRequest);
-
-      // console.log(process.env);
-    });
-
-  return push;
-};
+import { Command } from 'commander';
+import mapJson from 'jsonpath-mapper';
+import { PushBlockParams } from 'migratortron';
+import { cliCommand } from '~/services/ContensisCliService';
+
+export const makePushCommand = () => {
+  const push = new Command()
+    .command('push')
+    .description('push command')
+    .addHelpText('after', `\n`)
+    .showHelpAfterError(true)
+    .exitOverride();
+
+  push
+    .command('block')
+    .description('push a block')
+    .argument('<block-id>', 'the name of the block to push to')
+    .argument(
+      '<image uri:tag>',
+      'the uri and tag of the container image to push as a block (tag default: latest)'
+    )
+    .argument('[branch]', 'the branch we are pushing to')
+    .option(
+      '-r, --release',
+      'whether to release the pushed block version',
+      false
+    )
+    .option(
+      '-cid, --commit-id <commitId>',
+      'the id of the source git commit for the supplied image uri'
+    )
+    .option(
+      '-cmsg, --commit-message <commitMessage>',
+      'the git commit message for the supplied commit id'
+    )
+    .option(
+      '-cdt, --commit-datetime <commitDateTime>',
+      'the timestamp of the source git commit for the supplied image uri'
+    )
+    .option(
+      '-author, --author-email <authorEmail>',
+      'the git email address of the author of the source git commit'
+    )
+    .option(
+      '-committer, --committer-email <committerEmail>',
+      'the git email address of the commiter of the source git commit'
+    )
+    .option(
+      '-repo, --repository-url <repositoryUrl>',
+      'the url of the source repository for the supplied image uri'
+    )
+    .option(
+      '-pr, --provider <sourceProvider>',
+      'the url of the source repository for the supplied image uri'
+    )
+    .usage('<block-id> <image uri> [branch] [options]')
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > push block contensis-app ghcr.io/contensis/contensis-app/app:build-4359 master --release\n`
+    )
+    .action(async (blockId: string, imageUri: string, branch: string, opts) => {
+      const cli = cliCommand(['push', 'block', blockId], opts);
+      const mapSourceVars = {
+        blockId,
+        imageUri,
+        branch,
+        ...opts,
+        ...process.env,
+      };
+
+      const blockRequest = mapJson(mapSourceVars, {
+        autoRelease: { $path: 'release', $default: () => false },
+        id: ['blockId'],
+        image: () => {
+          const lastIndexOfColon = imageUri.lastIndexOf(':');
+          return {
+            uri: imageUri.slice(0, lastIndexOfColon),
+            tag: imageUri.slice(lastIndexOfColon + 1) || 'latest',
+          };
+        },
+        projectId: () => cli.env.currentProject || '',
+        source: {
+          provider: {
+            $path: ['provider'],
+            $return: (provider: string, { GITHUB_ACTIONS, GITLAB_CI }) => {
+              if (provider) return provider;
+              if (GITHUB_ACTIONS) return 'Github';
+              else if (GITLAB_CI) return 'GitlabSelfHosted';
+            },
+          },
+          repositoryUrl: {
+            $path: ['repositoryUrl', 'CI_PROJECT_URL', 'GITHUB_REPOSITORY'],
+            $formatting: (url: string, { GITHUB_ACTIONS }) => {
+              if (GITHUB_ACTIONS) url = `https://github.com/${url}`;
+
+              if (url && !url.endsWith('.git')) return `${url}.git`;
+              return url;
+            },
+          },
+          branch: ['branch', 'CI_COMMIT_REF_NAME', 'GITHUB_REF_NAME'],
+          commit: {
+            id: ['commitId', 'CI_COMMIT_SHORT_SHA', 'GITHUB_SHA'],
+            message: {
+              $path: ['commitMessage', 'CI_COMMIT_MESSAGE'], // ${{ github.event.head_commit.message }}
+              $formatting: (msg?: string) =>
+                msg?.replace(/\\n/g, ' ').replace(/\\n/g, ' ').trim(),
+            },
+            dateTime: ['commitDatetime', 'CI_COMMIT_TIMESTAMP'], // ${{ github.event.head_commit.timestamp }}
+            authorEmail: ['authorEmail', 'GITLAB_USER_EMAIL', 'GITHUB_ACTOR'], // ${{ github.event.head_commit.author.email }}
+            committerEmail: [
+              'committerEmail',
+              'GITLAB_USER_EMAIL',
+              'GITHUB_TRIGGERING_ACTOR',
+            ], // ${{ github.event.head_commit.committer.email }}
+          },
+        },
+      }) as PushBlockParams;
+
+      await cli.PushBlock(blockRequest);
+
+      // console.log(process.env);
+    });
+
+  return push;
+};

package/src/commands/release.ts

@@ -1,32 +1,32 @@
-import { Command } from 'commander';
-import { cliCommand } from '~/services/ContensisCliService';
-
-export const makeReleaseCommand = () => {
-  const release = new Command()
-    .command('release')
-    .description('release command')
-    .addHelpText('after', `\n`)
-    .showHelpAfterError(true)
-    .exitOverride();
-
-  release
-    .command('block')
-    .description('release a block version')
-    .argument('<block-id>', 'the name of the block to release')
-    .argument('<version>', 'the block version to release')
-    .usage('<block-id> <version>')
-    .addHelpText(
-      'after',
-      `
-Example call:
-  > release block contensis-app 3\n`
-    )
-    .action(async (blockId: string, version: string, opts) => {
-      await cliCommand(['release', 'block', blockId], opts).ReleaseBlock(
-        blockId,
-        version
-      );
-    });
-
-  return release;
-};
+import { Command } from 'commander';
+import { cliCommand } from '~/services/ContensisCliService';
+
+export const makeReleaseCommand = () => {
+  const release = new Command()
+    .command('release')
+    .description('release command')
+    .addHelpText('after', `\n`)
+    .showHelpAfterError(true)
+    .exitOverride();
+
+  release
+    .command('block')
+    .description('release a block version')
+    .argument('<block-id>', 'the name of the block to release')
+    .argument('<version>', 'the block version to release')
+    .usage('<block-id> <version>')
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > release block contensis-app 3\n`
+    )
+    .action(async (blockId: string, version: string, opts) => {
+      await cliCommand(['release', 'block', blockId], opts).ReleaseBlock(
+        blockId,
+        version
+      );
+    });
+
+  return release;
+};

package/src/commands/remove.ts

@@ -1,85 +1,85 @@
-import { Command } from 'commander';
-import { cliCommand } from '~/services/ContensisCliService';
-import { shell } from '~/shell';
-import { commit, mapContensisOpts, zenql } from './globalOptions';
-
-export const makeRemoveCommand = () => {
-  const remove = new Command()
-    .command('remove')
-    .description('remove command')
-    .addHelpText('after', `\n`)
-    .showHelpAfterError(true)
-    .exitOverride();
-
-  remove
-    .command('project')
-    .description('remove an entire project')
-    .argument('<projectId>', 'the project id to delete')
-    .usage('<projectId>')
-    .addHelpText('after', `\n`)
-    .action(async (projectId, opts) => {
-      const project = await cliCommand(
-        ['remove', 'project', projectId],
-        opts
-      ).SetProject(projectId);
-      if (project) await shell().restart();
-    });
-
-  remove
-    .command('key')
-    .description('remove api key')
-    .argument('<id>', 'the id of the API key to delete')
-    .usage('<id>')
-    .addHelpText(
-      'after',
-      `
-Example call:
-  > remove key 4ceb9575-28d3-4d5b-a77b-5e5221e603dd
-`
-    )
-    .action(async (id, opts) => {
-      await cliCommand(['remove', 'key', id], opts).RemoveApiKey(id);
-    });
-
-  remove
-    .command('components')
-    .description('delete components')
-    .argument('<id...>', 'the id(s) of the components to delete')
-    .addOption(commit)
-    .usage('<id> [--commit]')
-    .addHelpText(
-      'after',
-      `
-Example call:
-  > remove components addressComponent
-`
-    )
-    .action(async (id: string[], opts) => {
-      await cliCommand(
-        ['remove', 'components', id.join(' ')],
-        opts
-      ).RemoveComponents(id, opts.commit);
-    });
-
-  remove
-    .command('contenttypes')
-    .description('delete content types')
-    .argument('<id...>', 'the id(s) of the content types to delete')
-    .addOption(commit)
-    .usage('<id> [--commit]')
-    .addHelpText(
-      'after',
-      `
-Example call:
-  > remove contenttypes blogPost
-`
-    )
-    .action(async (id: string[], opts) => {
-      await cliCommand(
-        ['remove', 'contenttypes', id.join(' ')],
-        opts
-      ).RemoveContentTypes(id, opts.commit);
-    });
-
-  return remove;
-};
+import { Command } from 'commander';
+import { cliCommand } from '~/services/ContensisCliService';
+import { shell } from '~/shell';
+import { commit, mapContensisOpts, zenql } from './globalOptions';
+
+export const makeRemoveCommand = () => {
+  const remove = new Command()
+    .command('remove')
+    .description('remove command')
+    .addHelpText('after', `\n`)
+    .showHelpAfterError(true)
+    .exitOverride();
+
+  remove
+    .command('project')
+    .description('remove an entire project')
+    .argument('<projectId>', 'the project id to delete')
+    .usage('<projectId>')
+    .addHelpText('after', `\n`)
+    .action(async (projectId, opts) => {
+      const project = await cliCommand(
+        ['remove', 'project', projectId],
+        opts
+      ).SetProject(projectId);
+      if (project) await shell().restart();
+    });
+
+  remove
+    .command('key')
+    .description('remove api key')
+    .argument('<id>', 'the id of the API key to delete')
+    .usage('<id>')
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > remove key 4ceb9575-28d3-4d5b-a77b-5e5221e603dd
+`
+    )
+    .action(async (id, opts) => {
+      await cliCommand(['remove', 'key', id], opts).RemoveApiKey(id);
+    });
+
+  remove
+    .command('components')
+    .description('delete components')
+    .argument('<id...>', 'the id(s) of the components to delete')
+    .addOption(commit)
+    .usage('<id> [--commit]')
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > remove components addressComponent
+`
+    )
+    .action(async (id: string[], opts) => {
+      await cliCommand(
+        ['remove', 'components', id.join(' ')],
+        opts
+      ).RemoveComponents(id, opts.commit);
+    });
+
+  remove
+    .command('contenttypes')
+    .description('delete content types')
+    .argument('<id...>', 'the id(s) of the content types to delete')
+    .addOption(commit)
+    .usage('<id> [--commit]')
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > remove contenttypes blogPost
+`
+    )
+    .action(async (id: string[], opts) => {
+      await cliCommand(
+        ['remove', 'contenttypes', id.join(' ')],
+        opts
+      ).RemoveContentTypes(id, opts.commit);
+    });
+
+  return remove;
+};