fix: stack clone & seed issue

Author: aman19K

packages/contentstack-auth/src/base-command.ts

@@ -1,12 +1,11 @@
 import { Command } from '@contentstack/cli-command';
-import { configHandler, Flags, Interfaces, LoggerService, log } from '@contentstack/cli-utilities';
+import { configHandler, Flags, Interfaces, log } from '@contentstack/cli-utilities';
 import { Context } from './interfaces';
 
 export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<(typeof BaseCommand)['baseFlags'] & T['flags']>;
 
 export abstract class BaseCommand<T extends typeof Command> extends Command {
-  public logger!: LoggerService;
   protected args!: Args<T>;
   protected flags!: Flags<T>;
   public contextDetails!: Context;
@@ -17,8 +16,6 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
    */
   public async init(): Promise<void> {
     await super.init();
-    // Init logger
-    this.logger = new LoggerService(process.cwd(), 'cli-log');
     this.contextDetails = { ...this.createExportContext() };
   }
 
@@ -51,11 +48,11 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
   // Create export context object
   protected createExportContext(apiKey?: string): Context {
     return {
-      command: this.context.info.command,
+      command: this.context?.info?.command || 'auth',
       module: '',
-      userId: configHandler.get('userUid'),
-      email: configHandler.get('email'),
-      sessionId: this.context.sessionId,
+      userId: configHandler.get('userUid') || '',
+      email: configHandler.get('email') || '',
+      sessionId: this.context?.sessionId,
       apiKey: apiKey || '',
       orgId: configHandler.get('oauthOrgUid') || '',
     };

packages/contentstack-export/src/commands/cm/stacks/export.ts

@@ -118,7 +118,7 @@ export default class ExportCommand extends Command {
       // Prepare the context object
       const context = this.createExportContext(exportConfig.apiKey, exportConfig.authenticationMethod);
       exportConfig.context = { ...context };
-      log.info(`Using Cli Version: ${this.context?.cliVersion}`, exportConfig.context);
+      //log.info(`Using Cli Version: ${this.context?.cliVersion}`, exportConfig.context);
 
       // Assign exportConfig variables
       this.assignExportConfig(exportConfig);
@@ -145,11 +145,11 @@ export default class ExportCommand extends Command {
   // Create export context object
   private createExportContext(apiKey: string, authenticationMethod?: string): Context {
     return {
-      command: this.context.info.command,
+      command: this.context?.info?.command || 'cm:stacks:export',
       module: '',
-      userId: configHandler.get('userUid'),
-      email: configHandler.get('email'),
-      sessionId: this.context.sessionId,
+      userId: configHandler.get('userUid') || '',
+      email: configHandler.get('email') || '',
+      sessionId: this.context?.sessionId || '',
       apiKey: apiKey || '',
       orgId: configHandler.get('oauthOrgUid') || '',
       authenticationMethod: authenticationMethod || 'Basic Auth',

packages/contentstack-import/src/commands/cm/stacks/import.ts

@@ -150,25 +150,24 @@ export default class ImportCommand extends Command {
       // Prepare the context object
       const context = this.createImportContext(importConfig.apiKey, importConfig.authenticationMethod);
       importConfig.context = {...context};
-      log.info(`Using Cli Version: ${this.context?.cliVersion}`, importConfig.context);
+      //log.info(`Using Cli Version: ${this.context?.cliVersion}`, importConfig.context);
 
       // Note setting host to create cma client
       importConfig.host = this.cmaHost;
       importConfig.region = this.region;
       if (this.developerHubUrl) importConfig.developerHubBaseUrl = this.developerHubUrl;
       if (this.personalizeUrl) importConfig.modules.personalize.baseURL[importConfig.region.name] = this.personalizeUrl;
-      backupDir = importConfig.cliLogsPath || importConfig.backupDir;
-
+      
       const managementAPIClient: ContentstackClient = await managementSDKClient(importConfig);
-
+      
       if (!flags.branch) {
         try {
           const branches = await managementAPIClient
-            .stack({ api_key: importConfig.apiKey })
-            .branch()
-            .query()
-            .find()
-            .then(({ items }: any) => items);
+          .stack({ api_key: importConfig.apiKey })
+          .branch()
+          .query()
+          .find()
+          .then(({ items }: any) => items);
           if (branches.length) {
             flags.branch = 'main';
           }
@@ -178,6 +177,7 @@ export default class ImportCommand extends Command {
       }
       const moduleImporter = new ModuleImporter(managementAPIClient, importConfig);
       const result = await moduleImporter.start();
+      backupDir = importConfig.backupDir;
 
       if (!result?.noSuccessMsg) {       
         const successMessage = importConfig.stackName
@@ -187,20 +187,22 @@ export default class ImportCommand extends Command {
       }
 
       log.success(`The log has been stored at '${getLogPath()}'`, importConfig.context)
+      log.info(`The backup content has been stored at '${backupDir}'`, importConfig.context);
     } catch (error) {
       handleAndLogError(error);
       log.info(`The log has been stored at '${getLogPath()}'`)
+      log.info(`The backup content has been stored at '${backupDir}'`);
     }
   }
 
   // Create export context object
   private createImportContext(apiKey: string, authenticationMethod?: string): Context {
     return {
-      command: this.context.info.command,
+      command: this.context?.info?.command || 'cm:stacks:import',
       module: '',
-      userId: configHandler.get('userUid'),
-      email: configHandler.get('email'),
-      sessionId: this.context.sessionId,
+      userId: configHandler.get('userUid') || '',
+      email: configHandler.get('email') || '',
+      sessionId: this.context?.sessionId,
       apiKey: apiKey || '',
       orgId: configHandler.get('oauthOrgUid') || '',
       authenticationMethod: authenticationMethod || 'Basic Auth',

packages/contentstack-utilities/src/logger/log.ts

@@ -61,7 +61,7 @@ function handleAndLogError(error: unknown, context?: ErrorContext, errorMessage?
 }
 
 function getLogPath(): string {
-  return process.env.CS_CLI_LOG_PATH || configHandler.get('log.path') || path.join(process.cwd(), 'logs');
+  return process.env.CS_CLI_LOG_PATH || configHandler.get('log.path') || path.join(__dirname, 'logs');
 }
 
 export { v2Logger, cliErrorHandler, handleAndLogError, getLogPath };