@adobe/aio-cli-plugin-api-mesh 2.3.3 → 3.0.1

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.3.3","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.1","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.3",
+	"version": "3.0.1",
 	"publishConfig": {
 		"access": "public"
 	},

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

@@ -67,6 +67,7 @@ describe('create command tests', () => {
 			imsOrgId: selectedOrg.id,
 			projectId: selectedProject.id,
 			workspaceId: selectedWorkspace.id,
+			workspaceName: selectedWorkspace.title,
 		});
 
 		global.requestId = 'dummy_request_id';
@@ -75,9 +76,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 +115,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 +175,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 +194,7 @@ describe('create command tests', () => {
 
 		expect(output).toMatchInlineSnapshot(`
 		{
-		  "adobeIdIntegrationsForWorkspace": {
-		    "apiKey": "dummy_api_key",
-		    "id": "dummy_id",
-		  },
+		  "apiKey": "dummy_api_key",
 		  "mesh": {
 		    "meshConfig": {
 		      "files": [
@@ -272,6 +279,7 @@ describe('create command tests', () => {
 		  "1234",
 		  "5678",
 		  "123456789",
+		  "Workspace01",
 		  {
 		    "meshConfig": {
 		      "sources": [
@@ -287,28 +295,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": [
@@ -379,6 +369,7 @@ describe('create command tests', () => {
 		  "1234",
 		  "5678",
 		  "123456789",
+		  "Workspace01",
 		  {
 		    "meshConfig": {
 		      "sources": [
@@ -395,27 +386,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": [
@@ -465,7 +439,7 @@ describe('create command tests', () => {
 		  [
 		    "Mesh Endpoint: %s
 		",
-		    "https://tigraph.adobe.io/dummy_mesh_id/graphql?api_key=dummy_api_key",
+		    "https://tigraph.adobe.io/dummy_mesh_id/graphql",
 		  ],
 		]
 	`);
@@ -521,7 +495,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 +537,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 +666,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 +825,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 +901,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({
@@ -953,6 +928,7 @@ describe('create command tests', () => {
 		  "1234",
 		  "5678",
 		  "123456789",
+		  "Workspace01",
 		  {
 		    "meshConfig": {
 		      "files": [
@@ -984,28 +960,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 +1167,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({
@@ -1228,6 +1190,7 @@ describe('create command tests', () => {
 		  "1234",
 		  "5678",
 		  "123456789",
+		  "Workspace01",
 		  {
 		    "files": [
 		      {
@@ -1256,28 +1219,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 +1303,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();
@@ -1370,6 +1319,7 @@ describe('create command tests', () => {
 		  "1234",
 		  "5678",
 		  "123456789",
+		  "Workspace01",
 		  {
 		    "meshConfig": {
 		      "files": [
@@ -1401,28 +1351,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 +1435,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();
@@ -1515,6 +1451,7 @@ describe('create command tests', () => {
 		  "1234",
 		  "5678",
 		  "123456789",
+		  "Workspace01",
 		  {
 		    "meshConfig": {
 		      "files": [
@@ -1545,28 +1482,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 +1553,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({
@@ -1657,6 +1580,7 @@ describe('create command tests', () => {
 		  "1234",
 		  "5678",
 		  "123456789",
+		  "Workspace01",
 		  {
 		    "meshConfig": {
 		      "files": [
@@ -1688,28 +1612,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__/describe.test.js

@@ -52,6 +52,7 @@ describe('describe command tests', () => {
 			imsOrgId: selectedOrg.id,
 			projectId: selectedProject.id,
 			workspaceId: selectedWorkspace.id,
+			workspaceName: selectedWorkspace.title,
 		});
 
 		global.requestId = 'dummy_request_id';
@@ -174,6 +175,11 @@ describe('describe command tests', () => {
 		    "Mesh ID: %s",
 		    "dummy_meshId",
 		  ],
+		  [
+		    "Mesh Endpoint: %s
+		",
+		    "https://graph.adobe.io/api/dummy_meshId/graphql",
+		  ],
 		]
 	`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
@@ -187,6 +193,7 @@ describe('describe command tests', () => {
 			selectedOrg.id,
 			selectedProject.id,
 			selectedWorkspace.id,
+			selectedWorkspace.title,
 		);
 		expect(runResult).toMatchInlineSnapshot(`
 		{
@@ -216,10 +223,6 @@ describe('describe command tests', () => {
 		    "Mesh ID: %s",
 		    "dummy_meshId",
 		  ],
-		  [
-		    "API Key: %s",
-		    "dummy_apiKey",
-		  ],
 		  [
 		    "Mesh Endpoint: %s
 		",
@@ -242,6 +245,7 @@ describe('describe command tests', () => {
 			selectedOrg.id,
 			selectedProject.id,
 			selectedWorkspace.id,
+			selectedWorkspace.title,
 		);
 		expect(runResult).toMatchInlineSnapshot(`
 		{
@@ -271,14 +275,10 @@ describe('describe command tests', () => {
 		    "Mesh ID: %s",
 		    "dummy_meshId",
 		  ],
-		  [
-		    "API Key: %s",
-		    "dummy_apiKey",
-		  ],
 		  [
 		    "Mesh Endpoint: %s
 		",
-		    "https://tigraph.adobe.io/dummy_meshId/graphql?api_key=dummy_apiKey",
+		    "https://tigraph.adobe.io/dummy_meshId/graphql",
 		  ],
 		]
 	`);

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

@@ -49,6 +49,7 @@ describe('get command tests', () => {
 			imsOrgId: selectedOrg.id,
 			projectId: selectedProject.id,
 			workspaceId: selectedWorkspace.id,
+			workspaceName: selectedWorkspace.title,
 		});
 
 		global.requestId = 'dummy_request_id';

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

@@ -23,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, TMOConstants } = CONSTANTS;
+const { MULTITENANT_GRAPHQL_SERVER_BASE_URL } = CONSTANTS;
 
 class CreateCommand extends Command {
 	static args = [{ name: 'file' }];
@@ -59,7 +54,7 @@ class CreateCommand extends Command {
 		const ignoreCache = await flags.ignoreCache;
 		const autoConfirmAction = await flags.autoConfirmAction;
 		const envFilePath = await flags.env;
-		const { imsOrgId, projectId, workspaceId } = await initSdk({
+		const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 		});
 
@@ -109,9 +104,13 @@ 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,
+					workspaceName,
+					data,
+				);
 
 				if (mesh) {
 					this.log(
@@ -127,60 +126,42 @@ 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,
+								workspaceName,
+								mesh.meshId,
 							);
-
-							const { meshURL } = await getMesh(imsOrgId, projectId, workspaceId, mesh.meshId);
 							const meshUrl =
 								meshURL === '' || meshURL === undefined
 									? MULTITENANT_GRAPHQL_SERVER_BASE_URL
 									: meshURL;
 
-							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 {
+							if (apiKey && MULTITENANT_GRAPHQL_SERVER_BASE_URL.includes(meshUrl)) {
 								this.log(
 									'Mesh Endpoint: %s\n',
-									`${meshUrl}/${mesh.meshId}/graphql?api_key=${adobeIdIntegrationsForWorkspace.apiKey}`,
+									`${meshUrl}/${mesh.meshId}/graphql?api_key=${apiKey}`,
 								);
+							} else {
+								this.log('Mesh Endpoint: %s\n', `${meshUrl}/${mesh.meshId}/graphql`);
 							}
 						} 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, TMOConstants } = CONSTANTS;
+const { MULTITENANT_GRAPHQL_SERVER_BASE_URL } = CONSTANTS;
 
 class DescribeCommand extends Command {
 	static flags = {
@@ -35,12 +35,12 @@ class DescribeCommand extends Command {
 
 		const ignoreCache = await flags.ignoreCache;
 
-		const { imsOrgId, projectId, workspaceId } = await initSdk({
+		const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 		});
 
 		try {
-			const meshDetails = await describeMesh(imsOrgId, projectId, workspaceId);
+			const meshDetails = await describeMesh(imsOrgId, projectId, workspaceId, workspaceName);
 
 			if (meshDetails) {
 				const { meshId, apiKey } = meshDetails;
@@ -52,19 +52,20 @@ class DescribeCommand extends Command {
 					this.log('Workspace ID: %s', workspaceId);
 					this.log('Mesh ID: %s', meshId);
 
-					const { meshURL } = await getMesh(imsOrgId, projectId, workspaceId, meshId);
-					const meshUrl = meshURL === '' ? MULTITENANT_GRAPHQL_SERVER_BASE_URL : meshURL;
+					const { meshURL } = await getMesh(
+						imsOrgId,
+						projectId,
+						workspaceId,
+						workspaceName,
+						meshId,
+					);
+					const meshUrl =
+						meshURL === '' || meshURL === undefined ? MULTITENANT_GRAPHQL_SERVER_BASE_URL : meshURL;
 
-					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);
+					if (apiKey && MULTITENANT_GRAPHQL_SERVER_BASE_URL.includes(meshUrl)) {
 						this.log('Mesh Endpoint: %s\n', `${meshUrl}/${meshId}/graphql?api_key=${apiKey}`);
+					} else {
+						this.log('Mesh Endpoint: %s\n', `${meshUrl}/${meshId}/graphql`);
 					}
 					return meshDetails;
 				} else {

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

@@ -38,7 +38,7 @@ class GetCommand extends Command {
 		const ignoreCache = await flags.ignoreCache;
 		const json = await flags.json;
 
-		const { imsOrgId, projectId, workspaceId } = await initSdk({
+		const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 			verbose: !json,
 		});
@@ -46,7 +46,7 @@ class GetCommand extends Command {
 		let meshId = null;
 
 		try {
-			meshId = await getMeshId(imsOrgId, projectId, workspaceId);
+			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
 		} catch (err) {
 			this.error(
 				`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
@@ -55,7 +55,7 @@ class GetCommand extends Command {
 
 		if (meshId) {
 			try {
-				const mesh = await getMesh(imsOrgId, projectId, workspaceId, meshId);
+				const mesh = await getMesh(imsOrgId, projectId, workspaceId, workspaceName, meshId);
 
 				if (mesh) {
 					this.log('Successfully retrieved mesh %s', JSON.stringify(mesh, null, 2));

package/src/commands/api-mesh/source/__tests__/install.test.js

@@ -39,6 +39,7 @@ initSdk.mockResolvedValue({
 	imsOrgId: selectedOrg.id,
 	projectId: selectedProject.id,
 	workspaceId: selectedWorkspace.id,
+	workspaceName: selectedWorkspace.title,
 });
 initRequestId.mockResolvedValue({});
 promptInput.mockResolvedValueOnce('test-03');
@@ -146,6 +147,7 @@ describe('source:install command tests', () => {
 			selectedOrg.id,
 			selectedProject.id,
 			selectedWorkspace.id,
+			selectedWorkspace.title,
 			'dummy_meshId',
 			res,
 		);

package/src/commands/api-mesh/source/install.js

@@ -36,7 +36,7 @@ class InstallCommand extends Command {
 		await initRequestId();
 		logger.info(`RequestId: ${global.requestId}`);
 		const ignoreCache = await flags.ignoreCache;
-		const { imsOrgId, projectId, workspaceId } = await initSdk({ ignoreCache });
+		const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({ ignoreCache });
 		const filepath = flags['variable-file'];
 		let variables = flags.variable
 			? flags.variable.reduce((obj, val) => {
@@ -119,7 +119,7 @@ class InstallCommand extends Command {
 		}
 
 		try {
-			meshId = await getMeshId(imsOrgId, projectId, workspaceId);
+			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
 		} catch (err) {
 			this.error(
 				`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
@@ -133,7 +133,7 @@ class InstallCommand extends Command {
 		}
 
 		try {
-			const mesh = await getMesh(imsOrgId, projectId, workspaceId, meshId);
+			const mesh = await getMesh(imsOrgId, projectId, workspaceId, meshId, workspaceName);
 
 			if (!mesh) {
 				this.error(
@@ -199,7 +199,7 @@ class InstallCommand extends Command {
 			}
 
 			try {
-				const response = await updateMesh(imsOrgId, projectId, workspaceId, meshId, {
+				const response = await updateMesh(imsOrgId, projectId, workspaceId, workspaceName, meshId, {
 					meshConfig: mesh.meshConfig,
 				});
 

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

@@ -18,14 +18,14 @@ class StatusCommand extends Command {
 		const { flags } = await this.parse(StatusCommand);
 		const ignoreCache = await flags.ignoreCache;
 
-		const { imsOrgId, projectId, workspaceId } = await initSdk({
+		const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 		});
 
 		let meshId = null;
 
 		try {
-			meshId = await getMeshId(imsOrgId, projectId, workspaceId);
+			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
 		} catch (err) {
 			this.log(err.message);
 			this.error(
@@ -35,7 +35,7 @@ class StatusCommand extends Command {
 
 		if (meshId) {
 			try {
-				const mesh = await getMesh(imsOrgId, projectId, workspaceId, meshId);
+				const mesh = await getMesh(imsOrgId, projectId, workspaceId, workspaceName, meshId);
 				switch (mesh.meshStatus) {
 					case 'success':
 						this.log(

package/src/constants.js

@@ -19,10 +19,6 @@ const ProdConstants = {
 	AIO_CLI_API_KEY: 'aio-cli-console-auth',
 	SMS_BASE_URL: 'https://graph.adobe.io/api-admin',
 };
-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 };
+module.exports = { ...envConstants };

package/src/helpers.js

@@ -424,6 +424,7 @@ async function initSdk(options) {
 		imsOrgId: org.id,
 		projectId: project.id,
 		workspaceId: workspace.id,
+		workspaceName: workspace.title,
 	};
 }
 

package/src/lib/devConsole.js

@@ -76,11 +76,11 @@ const getApiKeyCredential = async (organizationId, projectId, workspaceId) => {
 	}
 };
 
-const describeMesh = async (organizationId, projectId, workspaceId) => {
+const describeMesh = async (organizationId, projectId, workspaceId, workspaceName) => {
 	logger.info('Initiating Describe Mesh');
 
 	try {
-		const meshId = await getMeshId(organizationId, projectId, workspaceId);
+		const meshId = await getMeshId(organizationId, projectId, workspaceId, workspaceName);
 
 		logger.info('Response from getMeshId %s', meshId);
 
@@ -106,7 +106,7 @@ const describeMesh = async (organizationId, projectId, workspaceId) => {
 	}
 };
 
-const getMesh = async (organizationId, projectId, workspaceId, meshId) => {
+const getMesh = async (organizationId, projectId, workspaceId, workspaceName, meshId) => {
 	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
@@ -114,6 +114,7 @@ const getMesh = async (organizationId, projectId, workspaceId, meshId) => {
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
+			'workspaceName': workspaceName,
 		},
 	};
 
@@ -187,7 +188,7 @@ const getMesh = async (organizationId, projectId, workspaceId, meshId) => {
 	}
 };
 
-const createMesh = async (organizationId, projectId, workspaceId, data) => {
+const createMesh = async (organizationId, projectId, workspaceId, workspaceName, data) => {
 	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'post',
@@ -212,7 +213,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(
@@ -443,7 +481,7 @@ const deleteMesh = async (organizationId, projectId, workspaceId, meshId) => {
 	}
 };
 
-const getMeshId = async (organizationId, projectId, workspaceId) => {
+const getMeshId = async (organizationId, projectId, workspaceId, workspaceName) => {
 	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
 	logger.info('Initiating Mesh ID request');
 
@@ -453,6 +491,7 @@ const getMeshId = async (organizationId, projectId, workspaceId) => {
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
+			'workspaceName': workspaceName,
 		},
 	};