Merge pull request #1270 from contentstack/refactor/CS-43461

refactor: Launch base class refactor
contentstack · Jan 29, 2024 · d26ab7c · d26ab7c
2 parents 9ed1453 + 67cfdf9
commit d26ab7c
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 26 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-launch/src/adapters/github.ts b/packages/contentstack-launch/src/adapters/github.ts
@@ -60,16 +60,16 @@ export default class GitHub extends BaseClass {
   async createNewProject(): Promise<void> {
     const {
       branch,
-      provider,
       framework,
       repository,
       projectName,
       buildCommand,
       selectedStack,
       outputDirectory,
       environmentName,
+      provider: gitProvider,
     } = this.config;
-    const username = split(repository?.fullName, "/")[0];
+    const username = split(repository?.fullName, '/')[0];
 
     await this.apolloClient
       .mutate({
@@ -80,9 +80,9 @@ export default class GitHub extends BaseClass {
             cmsStackApiKey: selectedStack?.api_key || '',
             repository: {
               username,
-              gitProvider: provider,
               repositoryUrl: repository?.url,
               repositoryName: repository?.fullName,
+              gitProviderMetadata: { gitProvider },
             },
             environment: {
               gitBranch: branch,

diff --git a/...aunch/src/commands/launch/base-command.ts → ...s/contentstack-launch/src/base-command.ts b/...aunch/src/commands/launch/base-command.ts → ...s/contentstack-launch/src/base-command.ts
@@ -17,9 +17,9 @@ import {
   managementSDKInitiator,
 } from '@contentstack/cli-utilities';
 
-import config from '../../config';
-import { GraphqlApiClient, Logger } from '../../util';
-import { ConfigType, LogFn, Providers } from '../../types';
+import config from './config';
+import { GraphqlApiClient, Logger } from './util';
+import { ConfigType, LogFn, Providers } from './types';
 
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<(typeof BaseCommand)['baseFlags'] & T['flags']>;
 export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
@@ -36,8 +36,6 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
   protected flags!: Flags<T>;
   protected args!: Args<T>;
 
-  static hidden = true;
-
   // define flags that can be inherited by any command that extends BaseCommand
   static baseFlags: FlagInput = {
     'data-dir': Flags.string({
@@ -107,9 +105,9 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
       this.flags['data-dir'] || this.flags.config
         ? this.flags.config || resolve(this.flags['data-dir'], config.configName)
         : resolve(process.cwd(), config.configName);
-    const baseUrl = (config.launchHubUrls as Record<string, string>)[this.cmaAPIUrl];
+    const baseUrl = config.launchBaseUrl || (config.launchHubUrls as Record<string, string>)[this.cmaAPIUrl];
     this.sharedConfig = {
-      ...require('../../config').default,
+      ...require('./config').default,
       currentConfig: {},
       ...this.flags,
       flags: this.flags,

diff --git a/packages/contentstack-launch/src/commands/launch/deployments.ts b/packages/contentstack-launch/src/commands/launch/deployments.ts
@@ -4,12 +4,11 @@ import find from 'lodash/find';
 import isEmpty from 'lodash/isEmpty';
 import { FlagInput, Flags, cliux as ux } from '@contentstack/cli-utilities';
 
-import { BaseCommand } from './base-command';
+import { BaseCommand } from '../../base-command';
 import { environmentsQuery } from '../../graphql';
 import { Logger, selectOrg, selectProject } from '../../util';
 
 export default class Deployments extends BaseCommand<typeof Deployments> {
-  static hidden = false;
   static description = 'Show list of deployments for an environment';
 
   static examples = [

diff --git a/packages/contentstack-launch/src/commands/launch/environments.ts b/packages/contentstack-launch/src/commands/launch/environments.ts
@@ -4,12 +4,11 @@ import find from 'lodash/find';
 import isEmpty from 'lodash/isEmpty';
 import { FlagInput, Flags, cliux as ux } from '@contentstack/cli-utilities';
 
-import { BaseCommand } from './base-command';
+import { BaseCommand } from '../../base-command';
 import { Logger, selectOrg, selectProject } from '../../util';
 import { environmentsQuery, projectsQuery } from '../../graphql';
 
 export default class Environments extends BaseCommand<typeof Environments> {
-  static hidden = false;
   static description = 'Show list of environments for a project';
 
   static examples = [

diff --git a/packages/contentstack-launch/src/commands/launch/functions.ts b/packages/contentstack-launch/src/commands/launch/functions.ts
@@ -1,10 +1,9 @@
 import { FlagInput, Flags } from '@contentstack/cli-utilities';
 
-import { BaseCommand } from './base-command';
+import { BaseCommand } from '../../base-command';
 import Contentfly from '../../util/cloud-function';
 
 export default class Functions extends BaseCommand<typeof Functions> {
-  static hidden = false;
   static description = 'Serve cloud functions';
 
   static examples = [

diff --git a/packages/contentstack-launch/src/commands/launch/index.ts b/packages/contentstack-launch/src/commands/launch/index.ts
@@ -2,15 +2,13 @@ import map from 'lodash/map';
 import { FlagInput, Flags } from '@contentstack/cli-utilities';
 
 import config from '../../config';
-import { BaseCommand } from './base-command';
+import { BaseCommand } from '../../base-command';
 import { AdapterConstructorInputs } from '../../types';
 import { FileUpload, GitHub, PreCheck } from '../../adapters';
 
 export default class Launch extends BaseCommand<typeof Launch> {
   public preCheck!: PreCheck;
 
-  static hidden = false;
-
   static description = 'Launch related operations';
 
   static examples = [
@@ -58,6 +56,7 @@ export default class Launch extends BaseCommand<typeof Launch> {
       description: '[Optional, Hidden] Show variable values on the UI',
     }),
     init: Flags.boolean({
+      hidden: true,
       description: '[Optional, Hidden] Reinitialize the project if it is an existing launch project.',
     }),
   };

diff --git a/packages/contentstack-launch/src/commands/launch/logs.ts b/packages/contentstack-launch/src/commands/launch/logs.ts
@@ -5,13 +5,12 @@ import isArray from 'lodash/isArray';
 import includes from 'lodash/includes';
 import { Flags, FlagInput, cliux as ux } from '@contentstack/cli-utilities';
 
-import { BaseCommand } from './base-command';
+import { BaseCommand } from '../../base-command';
 import { environmentsQuery } from '../../graphql';
 import { Logger, LogPolling, selectOrg, selectProject } from '../../util';
 import { EmitMessage, DeploymentLogResp, ServerLogResp } from '../../types';
 
 export default class Logs extends BaseCommand<typeof Logs> {
-  static hidden = false;
   static description = 'Show deployment or server logs';
 
   static examples = [

diff --git a/packages/contentstack-launch/src/commands/launch/open.ts b/packages/contentstack-launch/src/commands/launch/open.ts
@@ -4,12 +4,11 @@ import find from 'lodash/find';
 import isEmpty from 'lodash/isEmpty';
 import { FlagInput, Flags, cliux as ux } from '@contentstack/cli-utilities';
 
-import { BaseCommand } from './base-command';
+import { BaseCommand } from '../../base-command';
 import { environmentsQuery } from '../../graphql';
 import { print, Logger, selectOrg, selectProject } from '../../util';
 
 export default class Open extends BaseCommand<typeof Open> {
-  static hidden = false;
   static description = 'Open a website for an environment';
 
   static examples = [

diff --git a/packages/contentstack-launch/src/config/index.ts b/packages/contentstack-launch/src/config/index.ts
@@ -28,6 +28,7 @@ const config = {
     'https://azure-na-api.contentstack.com': '',
     'https://azure-eu-api.contentstack.com': '',
   },
+  launchBaseUrl: '',
   supportedAdapters: ['GitHub'],
   deploymentStatus: ['LIVE', 'FAILED', 'SKIPPED', 'DEPLOYED'],
   pollingInterval: 1000,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml