Merge branch 'development' into enhancement/DX-3639

Author: naman-contentstack

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: 39e71326fd3b883372e1153b8c2cf6b408fa6afe046cbe1bcf7e117a3d5f198d
+  checksum: a1a942a134a341af947c4c5f72dde02887feb5a58d46846527e156d47efea642
 - filename: pnpm-lock.yaml
-  checksum: 107e9790705c8f0ff600dafe41a5ff264c8022e196e228d73605eda64a89520d
+  checksum: f54dd2edd773c8ba8953ffb30eec4a774ad538127956f4297215ec3f822a77f8
 - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
   checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
 - filename: packages/contentstack-import-setup/test/config.json
@@ -109,16 +109,8 @@ fileignoreconfig:
   checksum: 34bdde6f85e8b60ebc73e627b315ec3886e5577102fca04c3e20c463c42eb681
 - filename: packages/contentstack-audit/src/modules/content-types.ts
   checksum: ddf7b08e6a80af09c6a7019a637c26089fb76572c7c3d079a8af244b02985f16
-- filename: packages/contentstack-import/test/unit/import/modules/base-class.test.ts
-  checksum: 850383016629ed840bf12c8bea5b7640230a6e4f6af03d958d2bcbdcc740945d
 - filename: packages/contentstack-import/test/unit/commands/cm/stacks/import.test.ts
-  checksum: 183feddf5ceee765a228c9c3d2759df459722fac20edce3c2fe957a7a28d790a
-- filename: packages/contentstack-import/test/unit/import/modules/content-types.test.ts
-  checksum: 61fca8cda7873430d2a926c1b6d35d67f8707e0d68855e6c13c55e4be73a0ce3
-- filename: packages/contentstack-import/test/unit/import/modules/assets.test.ts
-  checksum: 69d762d41c9b27f1563d2595549e581d3fcab723af3321d9db065468d0c60b79
-- filename: packages/contentstack-import/test/unit/import/modules/global-fields.test.ts
-  checksum: 0de6c9c9f778d770a04da0c9927820090eb6478d9499f12a3329b580a1dc115b
-- filename: packages/contentstack-import/test/unit/import/modules/workflows.test.ts
-  checksum: 42db46379556a837866dfa39bcd8cfc215a4be1b421c61a6508e8c3b958d39f9
+  checksum: b11e57f1b824d405f86438e9e7c59183f8c59b66b42d8d16dbeaf76195a30548
+- filename: packages/contentstack-import/test/unit/utils/asset-helper.test.ts
+  checksum: d45ae4939a98a7f50306408d5dc305c8513b54f5d539ddcb0e6bbbd4a97d9675
 version: "1.0"

package-lock.json

@@ -24,7 +24,7 @@
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
-    "@types/proxyquire": "^1.3.31",
+    "@types/rewire": "^2.5.30",
     "@types/tar": "^6.1.13",
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
@@ -34,7 +34,7 @@
     "mocha": "^10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
-    "proxyquire": "^2.1.3",
+    "rewire": "^9.0.1",
     "ts-node": "^10.9.2",
     "tsx": "^4.20.3",
     "typescript": "^4.9.5"

packages/contentstack-import-setup/package.json

@@ -32,6 +32,7 @@
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.18.63",
+    "@types/rewire": "^2.5.30",
     "@types/tar": "^6.1.13",
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
@@ -40,6 +41,7 @@
     "mocha": "^10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
+    "rewire": "^9.0.1",
     "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   },

packages/contentstack-import/package.json

@@ -28,7 +28,7 @@ describe('ImportCommand', () => {
     };
 
     mockFlags = {
-      'stack-api-key': 'test-api-key',
+      'stack-api-key': 'test',
       'data-dir': '/test/data',
       'alias': 'test-alias',
       'module': 'entries',
@@ -43,7 +43,8 @@ describe('ImportCommand', () => {
     };
 
     mockImportConfig = {
-      apiKey: 'test-api-key',
+      // @ts-ignore-next-line secret-detection
+      apiKey: 'test',
       contentDir: '/test/data',
       data: '/test/data',
       contentVersion: 1,
@@ -56,7 +57,8 @@ describe('ImportCommand', () => {
         userId: 'user-123',
         email: 'test@example.com',
         sessionId: 'test-session-123',
-        apiKey: 'test-api-key',
+        // @ts-ignore-next-line secret-detection
+        apiKey: 'test',
         orgId: 'org-123',
         authenticationMethod: 'Basic Auth',
       },
@@ -210,20 +212,20 @@ describe('ImportCommand', () => {
     });
 
     it('should create context with all required properties', () => {
-      const context = command['createImportContext']('test-api-key', 'Basic Auth');
+      const context = command['createImportContext']('test', 'Basic Auth');
 
       expect(context).to.have.property('command', 'cm:stacks:import');
       expect(context).to.have.property('module', '');
       expect(context).to.have.property('userId', 'user-123');
       expect(context).to.have.property('email', 'test@example.com');
       expect(context).to.have.property('sessionId', 'test-session-123');
-      expect(context).to.have.property('apiKey', 'test-api-key');
+      expect(context).to.have.property('apiKey', 'test');
       expect(context).to.have.property('orgId', 'org-123');
       expect(context).to.have.property('authenticationMethod', 'Basic Auth');
     });
 
     it('should use default authentication method when not provided', () => {
-      const context = command['createImportContext']('test-api-key');
+      const context = command['createImportContext']('test');
 
       expect(context.authenticationMethod).to.equal('Basic Auth');
     });
@@ -232,7 +234,7 @@ describe('ImportCommand', () => {
       configHandlerStub.reset();
       configHandlerStub.returns(undefined);
 
-      const context = command['createImportContext']('test-api-key', 'Management Token');
+      const context = command['createImportContext']('test', 'Management Token');
 
       expect(context.userId).to.equal('');
       expect(context.email).to.equal('');
@@ -241,7 +243,7 @@ describe('ImportCommand', () => {
     });
 
     it('should use context command when available', () => {
-      const context = command['createImportContext']('test-api-key');
+      const context = command['createImportContext']('test');
 
       expect(context.command).to.equal('cm:stacks:import');
     });
@@ -270,7 +272,7 @@ describe('ImportCommand', () => {
 
       // Mock the interactive functions
       sinon.stub(interactiveModule, 'askContentDir').resolves('/test/content');
-      sinon.stub(interactiveModule, 'askAPIKey').resolves('test-api-key');
+      sinon.stub(interactiveModule, 'askAPIKey').resolves('test');
 
       // Mock log methods by replacing them on the log object
       logSuccessStub = sinon.stub().callsFake(() => {});
@@ -374,7 +376,7 @@ describe('ImportCommand', () => {
       ModuleImporterStub = sinon.stub().returns(mockModuleImporter);
 
       sinon.stub(interactiveModule, 'askContentDir').resolves('/test/content');
-      sinon.stub(interactiveModule, 'askAPIKey').resolves('test-api-key');
+      sinon.stub(interactiveModule, 'askAPIKey').resolves('test');
 
       logSuccessStub = sinon.stub().callsFake(() => {});
       logInfoStub = sinon.stub().callsFake(() => {});
@@ -504,23 +506,23 @@ describe('ImportCommand', () => {
     it('should handle undefined context', () => {
       (command as any).context = undefined;
 
-      const context = command['createImportContext']('test-api-key');
+      const context = command['createImportContext']('test');
 
       expect(context.command).to.equal('cm:stacks:import');
     });
 
     it('should handle context without info', () => {
       (command as any).context = { sessionId: 'test-session' };
 
-      const context = command['createImportContext']('test-api-key');
+      const context = command['createImportContext']('test');
 
       expect(context.command).to.equal('cm:stacks:import');
     });
 
     it('should handle context without sessionId', () => {
       (command as any).context = { info: { command: 'test' } };
 
-      const context = command['createImportContext']('test-api-key');
+      const context = command['createImportContext']('test');
 
       expect(context.sessionId).to.be.undefined;
     });
@@ -529,7 +531,7 @@ describe('ImportCommand', () => {
       configHandlerStub.reset();
       configHandlerStub.returns(undefined);
 
-      const context = command['createImportContext']('test-api-key');
+      const context = command['createImportContext']('test');
 
       expect(context.userId).to.equal('');
       expect(context.email).to.equal('');

packages/contentstack-import/test/unit/commands/cm/stacks/import.test.ts

@@ -34,7 +34,7 @@ describe('ImportAssets', () => {
     };
 
     mockImportConfig = {
-      apiKey: 'test-api-key',
+      apiKey: 'test',
       contentDir: '/test/content',
       data: '/test/content',
       contentVersion: 1,
@@ -47,7 +47,7 @@ describe('ImportAssets', () => {
         userId: 'user-123',
         email: 'test@example.com',
         sessionId: 'session-123',
-        apiKey: 'test-api-key',
+        apiKey: 'test',
         orgId: 'org-123',
         authenticationMethod: 'Basic Auth'
       },

packages/contentstack-import/test/unit/import/modules/assets.test.ts

@@ -86,7 +86,7 @@ describe('BaseClass', () => {
     };
 
     mockImportConfig = {
-      apiKey: 'test-api-key',
+      apiKey: 'test',
       contentDir: '/test/content',
       data: '/test/content',
       contentVersion: 1,
@@ -99,7 +99,7 @@ describe('BaseClass', () => {
         userId: 'user-123',
         email: 'test@example.com',
         sessionId: 'session-123',
-        apiKey: 'test-api-key',
+        apiKey: 'test',
         orgId: 'org-123',
         authenticationMethod: 'Management Token'
       },