@adobe/aio-cli-plugin-api-mesh 2.3.2 → 3.0.0

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.3.2","commands":{"PLUGINNAME":{"id":"PLUGINNAME","description":"Your description here","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio PLUGINNAME:some_command"],"flags":{"someflag":{"name":"someflag","type":"option","char":"f","description":"this is some flag"}},"args":[]},"api-mesh:create":{"id":"api-mesh:create","description":"Create a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"}},"args":[{"name":"file"}]},"api-mesh:delete":{"id":"api-mesh:delete","description":"Delete the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false}},"args":[]},"api-mesh:describe":{"id":"api-mesh:describe","description":"Get details of a mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:get":{"id":"api-mesh:get","description":"Get the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false}},"args":[{"name":"file"}]},"api-mesh:init":{"id":"api-mesh:init","description":"This command will create a workspace where you can organise your API mesh configuration and other files","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[{"description":"API mesh workspace init","command":"aio api-mesh init commerce-mesh"},{"description":"API mesh workspace init with flags","command":"aio api-mesh init commerce-mesh --path ./mesh_projects/test_mesh --git y --packageManager yarn"}],"flags":{"path":{"name":"path","type":"option","char":"p","default":"."},"packageManager":{"name":"packageManager","type":"option","char":"m","options":["npm","yarn"]},"git":{"name":"git","type":"option","char":"g","options":["y","n"]}},"args":[{"name":"projectName","description":"Project name","required":true}]},"api-mesh:status":{"id":"api-mesh:status","description":"Get a mesh status with a given meshid.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:update":{"id":"api-mesh:update","description":"Update a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"}},"args":[{"name":"file"}]},"api-mesh:source:discover":{"id":"api-mesh:source:discover","description":"Return the list of avaliable sources","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm install action prompt. CLI will not check ask user to install source.","allowNo":false}},"args":[]},"api-mesh:source:get":{"id":"api-mesh:source:get","description":"Command returns the content of a specific source.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:get -s=<version>@<source_name>","$ aio api-mesh:source:get -s<source_name>","$ aio api-mesh:source:get -m"],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm print action prompt. CLI will not check ask user to print source.","allowNo":false},"source":{"name":"source","type":"option","char":"s","description":"Source name"},"multiple":{"name":"multiple","type":"boolean","char":"m","description":"Select multiple sources","allowNo":false}},"args":[]},"api-mesh:source:install":{"id":"api-mesh:source:install","description":"Command to install the source to your API mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:install <version>@<source_name>","$ aio api-mesh:source:install <source_name> -v <variable_name>=<variable_value>","$ aio api-mesh:source:install <source_name> -f <path_to_variables_file>"],"flags":{"source":{"name":"source","type":"option","char":"s","description":"Source name"},"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm override action prompt. CLI will not check ask user to override source.","allowNo":false},"variable":{"name":"variable","type":"option","char":"v","description":"Variables required for the source"},"variable-file":{"name":"variable-file","type":"option","char":"f","description":"Variables file path"},"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"source"}]}}}
+{"version":"3.0.0","commands":{"PLUGINNAME":{"id":"PLUGINNAME","description":"Your description here","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio PLUGINNAME:some_command"],"flags":{"someflag":{"name":"someflag","type":"option","char":"f","description":"this is some flag"}},"args":[]},"api-mesh:create":{"id":"api-mesh:create","description":"Create a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"}},"args":[{"name":"file"}]},"api-mesh:delete":{"id":"api-mesh:delete","description":"Delete the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false}},"args":[]},"api-mesh:describe":{"id":"api-mesh:describe","description":"Get details of a mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:get":{"id":"api-mesh:get","description":"Get the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false}},"args":[{"name":"file"}]},"api-mesh:init":{"id":"api-mesh:init","description":"This command will create a workspace where you can organise your API mesh configuration and other files","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[{"description":"API mesh workspace init","command":"aio api-mesh init commerce-mesh"},{"description":"API mesh workspace init with flags","command":"aio api-mesh init commerce-mesh --path ./mesh_projects/test_mesh --git y --packageManager yarn"}],"flags":{"path":{"name":"path","type":"option","char":"p","default":"."},"packageManager":{"name":"packageManager","type":"option","char":"m","options":["npm","yarn"]},"git":{"name":"git","type":"option","char":"g","options":["y","n"]}},"args":[{"name":"projectName","description":"Project name","required":true}]},"api-mesh:status":{"id":"api-mesh:status","description":"Get a mesh status with a given meshid.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:update":{"id":"api-mesh:update","description":"Update a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"}},"args":[{"name":"file"}]},"api-mesh:source:discover":{"id":"api-mesh:source:discover","description":"Return the list of avaliable sources","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm install action prompt. CLI will not check ask user to install source.","allowNo":false}},"args":[]},"api-mesh:source:get":{"id":"api-mesh:source:get","description":"Command returns the content of a specific source.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:get -s=<version>@<source_name>","$ aio api-mesh:source:get -s<source_name>","$ aio api-mesh:source:get -m"],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm print action prompt. CLI will not check ask user to print source.","allowNo":false},"source":{"name":"source","type":"option","char":"s","description":"Source name"},"multiple":{"name":"multiple","type":"boolean","char":"m","description":"Select multiple sources","allowNo":false}},"args":[]},"api-mesh:source:install":{"id":"api-mesh:source:install","description":"Command to install the source to your API mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:install <version>@<source_name>","$ aio api-mesh:source:install <source_name> -v <variable_name>=<variable_value>","$ aio api-mesh:source:install <source_name> -f <path_to_variables_file>"],"flags":{"source":{"name":"source","type":"option","char":"s","description":"Source name"},"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm override action prompt. CLI will not check ask user to override source.","allowNo":false},"variable":{"name":"variable","type":"option","char":"v","description":"Variables required for the source"},"variable-file":{"name":"variable-file","type":"option","char":"f","description":"Variables file path"},"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"source"}]}}}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adobe/aio-cli-plugin-api-mesh",
-	"version": "2.3.2",
+	"version": "3.0.0",
 	"publishConfig": {
 		"access": "public"
 	},

package/src/commands/api-mesh/__tests__/create.test.js

@@ -75,9 +75,14 @@ describe('create command tests', () => {
 		errorLogSpy = jest.spyOn(CreateCommand.prototype, 'error');
 
 		createMesh.mockResolvedValue({
-			meshId: 'dummy_mesh_id',
-			meshConfig: sampleCreateMeshConfig.meshConfig,
+			mesh: {
+				meshId: 'dummy_mesh_id',
+				meshConfig: sampleCreateMeshConfig.meshConfig,
+			},
+			apiKey: 'dummy_api_key',
+			sdkList: ['dummy_service'],
 		});
+
 		createAPIMeshCredentials.mockResolvedValue({
 			apiKey: 'dummy_api_key',
 			id: 'dummy_id',
@@ -109,11 +114,11 @@ describe('create command tests', () => {
 		});
 		const output = await CreateCommand.run();
 		expect(output).toHaveProperty('mesh');
-		expect(output).toHaveProperty('adobeIdIntegrationsForWorkspace');
+		expect(output).toHaveProperty('apiKey');
+		expect(output).toHaveProperty('sdkList');
 		expect(output.mesh).toEqual(expect.objectContaining({ meshId: 'dummy_mesh_id' }));
-		expect(output.adobeIdIntegrationsForWorkspace).toEqual(
-			expect.objectContaining({ apiKey: 'dummy_api_key' }),
-		);
+		expect(output.apiKey).toEqual('dummy_api_key');
+		expect(output.sdkList).toEqual(['dummy_service']);
 	});
 
 	test('snapshot create command description', () => {
@@ -169,8 +174,12 @@ describe('create command tests', () => {
 
 	test('should pass if a valid mesh config file with composer files are provided', async () => {
 		createMesh.mockResolvedValueOnce({
-			meshId: 'dummy_mesh_id',
-			meshConfig: meshConfigWithComposerFiles.meshConfig,
+			mesh: {
+				meshId: 'dummy_mesh_id',
+				meshConfig: meshConfigWithComposerFiles.meshConfig,
+			},
+			apiKey: 'dummy_api_key',
+			sdkList: ['dummy_service'],
 		});
 
 		parseSpy.mockResolvedValueOnce({
@@ -184,10 +193,7 @@ describe('create command tests', () => {
 
 		expect(output).toMatchInlineSnapshot(`
 		{
-		  "adobeIdIntegrationsForWorkspace": {
-		    "apiKey": "dummy_api_key",
-		    "id": "dummy_id",
-		  },
+		  "apiKey": "dummy_api_key",
 		  "mesh": {
 		    "meshConfig": {
 		      "files": [
@@ -287,28 +293,10 @@ describe('create command tests', () => {
 		    },
 		  },
 		]
-	`);
-		expect(createAPIMeshCredentials.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		]
-	`);
-		expect(subscribeCredentialToMeshService.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		  "dummy_id",
-		]
 	`);
 		expect(runResult).toMatchInlineSnapshot(`
 		{
-		  "adobeIdIntegrationsForWorkspace": {
-		    "apiKey": "dummy_api_key",
-		    "id": "dummy_id",
-		  },
+		  "apiKey": "dummy_api_key",
 		  "mesh": {
 		    "meshConfig": {
 		      "sources": [
@@ -395,27 +383,10 @@ describe('create command tests', () => {
 		  },
 		]
 	`);
-		expect(createAPIMeshCredentials.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		]
-	`);
-		expect(subscribeCredentialToMeshService.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		  "dummy_id",
-		]
-	`);
+
 		expect(runResult).toMatchInlineSnapshot(`
 		{
-		  "adobeIdIntegrationsForWorkspace": {
-		    "apiKey": "dummy_api_key",
-		    "id": "dummy_id",
-		  },
+		  "apiKey": "dummy_api_key",
 		  "mesh": {
 		    "meshConfig": {
 		      "sources": [
@@ -521,7 +492,7 @@ describe('create command tests', () => {
 	`);
 	});
 
-	test('should fail if create api credential api has failed', async () => {
+	test.skip('should fail if create api credential api has failed', async () => {
 		createAPIMeshCredentials.mockRejectedValue(new Error('create api credential api failed'));
 
 		const runResult = CreateCommand.run();
@@ -563,7 +534,7 @@ describe('create command tests', () => {
 	`);
 	});
 
-	test('should fail if subscribe credential to mesh service api has failed', async () => {
+	test.skip('should fail if subscribe credential to mesh service api has failed', async () => {
 		subscribeCredentialToMeshService.mockRejectedValueOnce(
 			new Error('subscribe credential to mesh service api failed'),
 		);
@@ -692,11 +663,11 @@ describe('create command tests', () => {
 		});
 		const output = await CreateCommand.run();
 		expect(output).toHaveProperty('mesh');
-		expect(output).toHaveProperty('adobeIdIntegrationsForWorkspace');
+		expect(output).toHaveProperty('apiKey');
+		expect(output).toHaveProperty('sdkList');
 		expect(output.mesh).toEqual(expect.objectContaining({ meshId: 'dummy_mesh_id' }));
-		expect(output.adobeIdIntegrationsForWorkspace).toEqual(
-			expect.objectContaining({ apiKey: 'dummy_api_key' }),
-		);
+		expect(output.apiKey).toEqual('dummy_api_key');
+		expect(output.sdkList).toEqual(['dummy_service']);
 	});
 
 	test('should return error if the mesh has placeholders and env file provided using --env flag is not found', async () => {
@@ -851,10 +822,7 @@ describe('create command tests', () => {
 		expect(promptConfirm).toHaveBeenCalledWith('Are you sure you want to create a mesh?');
 		expect(runResult).toMatchInlineSnapshot(`
 		{
-		  "adobeIdIntegrationsForWorkspace": {
-		    "apiKey": "dummy_api_key",
-		    "id": "dummy_id",
-		  },
+		  "apiKey": "dummy_api_key",
 		  "mesh": {
 		    "meshConfig": {
 		      "sources": [
@@ -930,8 +898,12 @@ describe('create command tests', () => {
 		};
 
 		createMesh.mockResolvedValueOnce({
-			meshId: 'dummy_mesh_id',
-			meshConfig: meshConfig,
+			mesh: {
+				meshId: 'dummy_mesh_id',
+				meshConfig: meshConfig,
+			},
+			apiKey: 'dummy_api_key',
+			sdkList: ['dummy_service'],
 		});
 
 		parseSpy.mockResolvedValueOnce({
@@ -984,28 +956,10 @@ describe('create command tests', () => {
 		  },
 		]
 	`);
-		expect(createAPIMeshCredentials.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		]
-		`);
 
-		expect(subscribeCredentialToMeshService.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		  "dummy_id",
-		]
-		`);
 		expect(output).toMatchInlineSnapshot(`
 		{
-		  "adobeIdIntegrationsForWorkspace": {
-		    "apiKey": "dummy_api_key",
-		    "id": "dummy_id",
-		  },
+		  "apiKey": "dummy_api_key",
 		  "mesh": {
 		    "meshConfig": {
 		      "files": [
@@ -1209,8 +1163,12 @@ describe('create command tests', () => {
 		importFiles.mockResolvedValueOnce(meshConfig);
 
 		createMesh.mockResolvedValueOnce({
-			meshId: 'dummy_mesh_id',
-			meshConfig: meshConfig,
+			mesh: {
+				meshId: 'dummy_mesh_id',
+				meshConfig: meshConfig,
+			},
+			apiKey: 'dummy_api_key',
+			sdkList: ['dummy_service'],
 		});
 
 		parseSpy.mockResolvedValueOnce({
@@ -1256,28 +1214,10 @@ describe('create command tests', () => {
 		    ],
 		  },
 		]
-	`);
-		expect(createAPIMeshCredentials.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		]
-	`);
-		expect(subscribeCredentialToMeshService.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		  "dummy_id",
-		]
 	`);
 		expect(output).toMatchInlineSnapshot(`
 		{
-		  "adobeIdIntegrationsForWorkspace": {
-		    "apiKey": "dummy_api_key",
-		    "id": "dummy_id",
-		  },
+		  "apiKey": "dummy_api_key",
 		  "mesh": {
 		    "meshConfig": {
 		      "files": [
@@ -1358,8 +1298,12 @@ describe('create command tests', () => {
 		});
 
 		createMesh.mockResolvedValueOnce({
-			meshId: 'dummy_mesh_id',
-			meshConfig: meshConfig,
+			mesh: {
+				meshId: 'dummy_mesh_id',
+				meshConfig: meshConfig,
+			},
+			apiKey: 'dummy_api_key',
+			sdkList: ['dummy_service'],
 		});
 
 		const output = await CreateCommand.run();
@@ -1401,28 +1345,10 @@ describe('create command tests', () => {
 		  },
 		]
 	`);
-		expect(createAPIMeshCredentials.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		]
-	`);
 
-		expect(subscribeCredentialToMeshService.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		  "dummy_id",
-		]
-	`);
 		expect(output).toMatchInlineSnapshot(`
 		{
-		  "adobeIdIntegrationsForWorkspace": {
-		    "apiKey": "dummy_api_key",
-		    "id": "dummy_id",
-		  },
+		  "apiKey": "dummy_api_key",
 		  "mesh": {
 		    "meshConfig": {
 		      "files": [
@@ -1503,8 +1429,12 @@ describe('create command tests', () => {
 		});
 
 		createMesh.mockResolvedValueOnce({
-			meshId: 'dummy_mesh_id',
-			meshConfig: meshConfig,
+			mesh: {
+				meshId: 'dummy_mesh_id',
+				meshConfig: meshConfig,
+			},
+			apiKey: 'dummy_api_key',
+			sdkList: ['dummy_service'],
 		});
 
 		const output = await CreateCommand.run();
@@ -1545,28 +1475,10 @@ describe('create command tests', () => {
 		    },
 		  },
 		]
-	`);
-		expect(createAPIMeshCredentials.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		]
-	`);
-		expect(subscribeCredentialToMeshService.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		  "dummy_id",
-		]
 	`);
 		expect(output).toMatchInlineSnapshot(`
 		{
-		  "adobeIdIntegrationsForWorkspace": {
-		    "apiKey": "dummy_api_key",
-		    "id": "dummy_id",
-		  },
+		  "apiKey": "dummy_api_key",
 		  "mesh": {
 		    "meshConfig": {
 		      "files": [
@@ -1634,8 +1546,12 @@ describe('create command tests', () => {
 		};
 
 		createMesh.mockResolvedValueOnce({
-			meshId: 'dummy_mesh_id',
-			meshConfig: meshConfig,
+			mesh: {
+				meshId: 'dummy_mesh_id',
+				meshConfig: meshConfig,
+			},
+			apiKey: 'dummy_api_key',
+			sdkList: ['dummy_service'],
 		});
 
 		parseSpy.mockResolvedValueOnce({
@@ -1688,28 +1604,9 @@ describe('create command tests', () => {
 		  },
 		]
 	`);
-		expect(createAPIMeshCredentials.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		]
-		`);
-
-		expect(subscribeCredentialToMeshService.mock.calls[0]).toMatchInlineSnapshot(`
-		[
-		  "1234",
-		  "5678",
-		  "123456789",
-		  "dummy_id",
-		]
-		`);
 		expect(output).toMatchInlineSnapshot(`
 		{
-		  "adobeIdIntegrationsForWorkspace": {
-		    "apiKey": "dummy_api_key",
-		    "id": "dummy_id",
-		  },
+		  "apiKey": "dummy_api_key",
 		  "mesh": {
 		    "meshConfig": {
 		      "files": [

package/src/commands/api-mesh/__tests__/delete.test.js

@@ -112,7 +112,7 @@ describe('delete command tests', () => {
 	});
 
 	test('should fail if mesh id is missing', async () => {
-		getMeshId.mockResolvedValue(null);
+		getMeshId.mockResolvedValueOnce(null);
 		const runResult = DeleteCommand.run();
 
 		return runResult.catch(err => {
@@ -147,7 +147,7 @@ describe('delete command tests', () => {
 	});
 
 	test('should not ask for prompt if autoConfirmAction is set', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {},
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,

package/src/commands/api-mesh/__tests__/get.test.js

@@ -109,7 +109,7 @@ describe('get command tests', () => {
 	});
 
 	test('should fail if mesh id is missing', async () => {
-		getMeshId.mockResolvedValue(null);
+		getMeshId.mockResolvedValueOnce(null);
 		const runResult = GetCommand.run();
 
 		return runResult.catch(err => {
@@ -128,7 +128,7 @@ describe('get command tests', () => {
 	});
 
 	test('should fail if getMeshId failed', async () => {
-		getMeshId.mockRejectedValue(new Error('getMeshId failed'));
+		getMeshId.mockRejectedValueOnce(new Error('getMeshId failed'));
 		const runResult = GetCommand.run();
 
 		return runResult.catch(err => {

package/src/commands/api-mesh/__tests__/init.test.js

@@ -95,7 +95,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should pass with no flags', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -103,7 +103,7 @@ describe('Workspace init command tests', () => {
 				path: './template',
 			},
 		});
-		promptSelect.mockResolvedValue('yarn');
+		promptSelect.mockResolvedValueOnce('yarn');
 		await InitCommand.run();
 		expect(promptConfirm).toHaveBeenCalled();
 		expect(promptSelect).toHaveBeenCalled();
@@ -121,7 +121,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should pass and create git project if git flag is provided', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -149,7 +149,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should fail if git flag is provided and git init fails', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -178,7 +178,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should pass and create yarn project if yarn is package manager', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -203,7 +203,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should pass and create yarn + git project if yarn is package manager and git flag is set', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -227,7 +227,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should pass with creating the sub directory if the directory already exists', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -237,7 +237,7 @@ describe('Workspace init command tests', () => {
 				packageManager: mockPMDefaultFlag,
 			},
 		});
-		access.mockResolvedValue({});
+		access.mockResolvedValueOnce({});
 
 		await InitCommand.run();
 
@@ -252,7 +252,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should fail if the directory already exists and sub directory of project name exists', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -262,7 +262,7 @@ describe('Workspace init command tests', () => {
 				packageManager: mockPMDefaultFlag,
 			},
 		});
-		access.mockResolvedValue({});
+		access.mockResolvedValueOnce({});
 		mkdir.mockRejectedValue(new Error());
 
 		await expect(InitCommand.run()).rejects.toThrow();
@@ -280,7 +280,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should fail if directory creation fails', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -306,7 +306,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should fail if npm install fails', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -333,7 +333,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should fail if yarn install fails', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -360,7 +360,7 @@ describe('Workspace init command tests', () => {
 	});
 
 	test('Command should exit if sub directory prompt is provided with no', async () => {
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: {
 				projectName: mockProjectName,
 			},
@@ -373,7 +373,7 @@ describe('Workspace init command tests', () => {
 		// create workspace prompt
 		promptConfirm.mockResolvedValueOnce(true);
 		// access passes
-		access.mockResolvedValue({});
+		access.mockResolvedValueOnce({});
 		// create in sub directory prompt
 		promptConfirm.mockResolvedValueOnce(false);
 		await InitCommand.run();
@@ -383,8 +383,8 @@ describe('Workspace init command tests', () => {
 });
 
 test('test createPackageJson', async () => {
-	jest.spyOn(fs, 'readFile').mockResolvedValue({});
-	jest.spyOn(fs, 'writeFile').mockResolvedValue({});
+	jest.spyOn(fs, 'readFile').mockResolvedValueOnce({});
+	jest.spyOn(fs, 'writeFile').mockResolvedValueOnce({});
 
 	await expect(InitCommand.prototype.createPackageJson()).resolves;
 });

package/src/commands/api-mesh/__tests__/update.test.js

@@ -89,7 +89,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -148,7 +148,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -207,7 +207,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -267,7 +267,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -277,7 +277,7 @@ describe('update command tests', () => {
 			},
 		});
 
-		getMeshId.mockResolvedValue(null);
+		getMeshId.mockResolvedValueOnce(null);
 		const runResult = UpdateCommand.run();
 
 		await expect(runResult).rejects.toMatchInlineSnapshot(
@@ -308,7 +308,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -349,7 +349,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -451,7 +451,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh.json' },
@@ -500,7 +500,7 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
 		let meshConfig = {
 			sources: [
@@ -530,12 +530,12 @@ describe('update command tests', () => {
 			],
 		};
 
-		updateMesh.mockResolvedValue({
+		updateMesh.mockResolvedValueOnce({
 			meshId: 'dummy_mesh_id',
 			meshConfig: meshConfig,
 		});
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_files.json' },
 			flags: {
 				autoConfirmAction: mockAutoApproveAction,
@@ -645,9 +645,9 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_invalid_file_name.json' },
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,
@@ -700,9 +700,9 @@ describe('update command tests', () => {
 				],
 			},
 		};
-		readFile.mockResolvedValue(JSON.stringify(sampleMesh));
+		readFile.mockResolvedValueOnce(JSON.stringify(sampleMesh));
 
-		parseSpy.mockResolvedValue({
+		parseSpy.mockResolvedValueOnce({
 			args: { file: 'src/commands/__fixtures__/sample_mesh_files.json' },
 			flags: {
 				ignoreCache: mockIgnoreCacheFlag,

package/src/commands/api-mesh/create.js

@@ -10,7 +10,6 @@ governing permissions and limitations under the License.
 */
 
 const { Command } = require('@oclif/core');
-
 const { initSdk, initRequestId, promptConfirm, importFiles } = require('../../helpers');
 const logger = require('../../classes/logger');
 const CONSTANTS = require('../../constants');
@@ -24,14 +23,9 @@ const {
 	readFileContents,
 	validateAndInterpolateMesh,
 } = require('../../utils');
-const {
-	getMesh,
-	createMesh,
-	createAPIMeshCredentials,
-	subscribeCredentialToMeshService,
-} = require('../../lib/devConsole');
+const { getMesh, createMesh } = require('../../lib/devConsole');
 
-const { MULTITENANT_GRAPHQL_SERVER_BASE_URL } = CONSTANTS;
+const { MULTITENANT_GRAPHQL_SERVER_BASE_URL, TMOConstants } = CONSTANTS;
 
 class CreateCommand extends Command {
 	static args = [{ name: 'file' }];
@@ -110,9 +104,7 @@ class CreateCommand extends Command {
 
 		if (shouldContinue) {
 			try {
-				const mesh = await createMesh(imsOrgId, projectId, workspaceId, data);
-
-				let sdkList = [];
+				const { mesh, apiKey, sdkList } = await createMesh(imsOrgId, projectId, workspaceId, data);
 
 				if (mesh) {
 					this.log(
@@ -128,28 +120,11 @@ class CreateCommand extends Command {
 						'******************************************************************************************************',
 					);
 
-					// create API key credential
-					const adobeIdIntegrationsForWorkspace = await createAPIMeshCredentials(
-						imsOrgId,
-						projectId,
-						workspaceId,
-					);
-
-					if (adobeIdIntegrationsForWorkspace) {
-						this.log('Successfully created API Key %s', adobeIdIntegrationsForWorkspace.apiKey);
-						// subscribe the credential to API mesh service
-						sdkList = await subscribeCredentialToMeshService(
-							imsOrgId,
-							projectId,
-							workspaceId,
-							adobeIdIntegrationsForWorkspace.id,
-						);
+					if (apiKey) {
+						this.log('Successfully created API Key %s', apiKey);
 
 						if (sdkList) {
-							this.log(
-								'Successfully subscribed API Key %s to API Mesh service',
-								adobeIdIntegrationsForWorkspace.apiKey,
-							);
+							this.log('Successfully subscribed API Key %s to API Mesh service', apiKey);
 
 							const { meshURL } = await getMesh(imsOrgId, projectId, workspaceId, mesh.meshId);
 							const meshUrl =
@@ -157,23 +132,28 @@ class CreateCommand extends Command {
 									? MULTITENANT_GRAPHQL_SERVER_BASE_URL
 									: meshURL;
 
-							this.log(
-								'Mesh Endpoint: %s\n',
-								`${meshUrl}/${mesh.meshId}/graphql?api_key=${adobeIdIntegrationsForWorkspace.apiKey}`,
-							);
+							if (
+								meshUrl === TMOConstants.TMO_STAGE_URL ||
+								meshUrl === TMOConstants.TMO_SANDBOX_URL ||
+								meshUrl === TMOConstants.TMO_PROD_URL
+							) {
+								this.log('Mesh Endpoint: %s\n', `${meshUrl}/${mesh.meshId}/graphql`);
+							} else {
+								this.log(
+									'Mesh Endpoint: %s\n',
+									`${meshUrl}/${mesh.meshId}/graphql?api_key=${apiKey}`,
+								);
+							}
 						} else {
-							this.log(
-								'Unable to subscribe API Key %s to API Mesh service',
-								adobeIdIntegrationsForWorkspace.apiKey,
-							);
+							this.log('Unable to subscribe API Key %s to API Mesh service', apiKey);
 						}
 					} else {
 						this.log('Unable to create API Key');
 					}
-					// Do not remove or rename return values.
-					// Template adobe/generator-app-api-mesh relies on "mesh" & "adobeIdIntegrationsForWorkspace" obj structure
+					// When renaming the return values, make sure to make necessary changes to
+					// template adobe/generator-app-api-mesh since it relies on "mesh" & "apiKey"
 					return {
-						adobeIdIntegrationsForWorkspace,
+						apiKey,
 						sdkList,
 						mesh,
 					};

package/src/commands/api-mesh/describe.js

@@ -19,7 +19,7 @@ const { describeMesh, getMesh } = require('../../lib/devConsole');
 
 require('dotenv').config();
 
-const { MULTITENANT_GRAPHQL_SERVER_BASE_URL } = CONSTANTS;
+const { MULTITENANT_GRAPHQL_SERVER_BASE_URL, TMOConstants } = CONSTANTS;
 
 class DescribeCommand extends Command {
 	static flags = {
@@ -55,11 +55,17 @@ class DescribeCommand extends Command {
 					const { meshURL } = await getMesh(imsOrgId, projectId, workspaceId, meshId);
 					const meshUrl = meshURL === '' ? MULTITENANT_GRAPHQL_SERVER_BASE_URL : meshURL;
 
-					if (apiKey) {
+					if (
+						apiKey &&
+						(meshUrl === TMOConstants.TMO_STAGE_URL ||
+							meshUrl === TMOConstants.TMO_SANDBOX_URL ||
+							meshUrl === TMOConstants.TMO_PROD_URL)
+					) {
+						this.log('Mesh Endpoint: %s\n', `${meshUrl}/${meshId}/graphql`);
+					} else if (apiKey) {
 						this.log('API Key: %s', apiKey);
 						this.log('Mesh Endpoint: %s\n', `${meshUrl}/${meshId}/graphql?api_key=${apiKey}`);
 					}
-
 					return meshDetails;
 				} else {
 					logger.error(

package/src/constants.js

@@ -19,5 +19,10 @@ const ProdConstants = {
 	AIO_CLI_API_KEY: 'aio-cli-console-auth',
 	SMS_BASE_URL: 'https://graph.adobe.io/api-admin',
 };
-
-module.exports = clientEnv === 'stage' ? StageConstants : ProdConstants;
+const TMOConstants = {
+	TMO_STAGE_URL: 'https://tigraph-dev.adobe.io/api',
+	TMO_SANDBOX_URL: 'https://tigraph-sandbox.adobe.io/api',
+	TMO_PROD_URL: 'https://tigraph.adobe.io/api',
+};
+const envConstants = clientEnv === 'stage' ? StageConstants : ProdConstants;
+module.exports = { ...envConstants, TMOConstants };

package/src/lib/devConsole.js

@@ -212,7 +212,44 @@ const createMesh = async (organizationId, projectId, workspaceId, data) => {
 
 		if (response && response.status === 201) {
 			logger.info(`Mesh Config : ${objToString(response, ['data'])}`);
-			return response.data;
+
+			let sdkList = [];
+			let credential;
+			let isApiKeyNew = false;
+
+			credential = await getApiKeyCredential(organizationId, projectId, workspaceId);
+			if (!credential) {
+				logger.info('API Key credential not found on workspace');
+
+				// try to create a new API key credential
+				credential = await createAPIMeshCredentials(organizationId, projectId, workspaceId);
+				isApiKeyNew = true;
+			}
+			// subscribe the credential to API mesh service
+			sdkList = await subscribeCredentialToMeshService(
+				organizationId,
+				projectId,
+				workspaceId,
+				isApiKeyNew ? credential.id : credential.id_integration,
+			);
+			const newlyCreatedOrExistingApiKey = isApiKeyNew ? credential.apiKey : credential.client_id;
+
+			if (sdkList) {
+				logger.info(
+					'Successfully subscribed API Key %s to API Mesh service',
+					isApiKeyNew ? credential.apiKey : credential.client_id,
+				);
+			} else {
+				logger.error(
+					'Unable to subscribe API Key %s to API Mesh service',
+					newlyCreatedOrExistingApiKey,
+				);
+			}
+			return {
+				mesh: response.data,
+				apiKey: newlyCreatedOrExistingApiKey,
+				sdkList,
+			};
 		} else {
 			// Non 201 response received
 			logger.error(

package/src/utils.js

@@ -79,7 +79,7 @@ function getFilesInMeshConfig(data, meshConfigName) {
 
 	// Additional Resolvers
 	data.meshConfig.additionalResolvers?.forEach(additionalResolver => {
-		if (!fileURLRegex.test(additionalResolver)) {
+		if (typeof additionalResolver === 'string' && !fileURLRegex.test(additionalResolver)) {
 			filesList.push(additionalResolver);
 		}
 	});