@adobe/aio-cli-plugin-api-mesh 3.9.4 → 4.0.0-beta

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

@@ -169,10 +169,6 @@ describe('delete command tests', () => {
 		    "Successfully deleted mesh %s",
 		    "mesh_id",
 		  ],
-		  [
-		    "Successfully unsubscribed API Key %s",
-		    "dummy_client_id",
-		  ],
 		]
 	`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
@@ -204,67 +200,7 @@ describe('delete command tests', () => {
 	`);
 	});
 
-	test('should delete mesh but fail to unsubscribe if unable to get api key', async () => {
-		getApiKeyCredential.mockRejectedValueOnce(new Error('unable to get api key'));
-
-		const runResult = DeleteCommand.run();
-
-		await expect(runResult).rejects.toEqual(
-			new Error(
-				'Unable to delete mesh. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id',
-			),
-		);
-		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		[
-		  [
-		    "Successfully deleted mesh %s",
-		    "mesh_id",
-		  ],
-		  [
-		    "unable to get api key",
-		  ],
-		]
-	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
-		[
-		  [
-		    "Unable to delete mesh. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id",
-		  ],
-		]
-	`);
-	});
-
-	test('should delete mesh but fail to unsubscribe if unsubscribe api failed', async () => {
-		unsubscribeCredentialFromMeshService.mockRejectedValueOnce(new Error('unsubscribe api failed'));
-
-		const runResult = DeleteCommand.run();
-
-		await expect(runResult).rejects.toEqual(
-			new Error(
-				'Unable to delete mesh. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id',
-			),
-		);
-		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
-		[
-		  [
-		    "Successfully deleted mesh %s",
-		    "mesh_id",
-		  ],
-		  [
-		    "unsubscribe api failed",
-		  ],
-		]
-	`);
-		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`
-		[
-		  [
-		    "Unable to delete mesh. Please check the details and try again. If the error persists please contact support. RequestId: dummy_request_id",
-		  ],
-		]
-	`);
-	});
-
-	test('should delete mesh and unsubscribe if correct args are provided', async () => {
+	test('should delete mesh if correct args are provided', async () => {
 		const runResult = await DeleteCommand.run();
 
 		expect(initRequestId).toHaveBeenCalled();
@@ -283,35 +219,13 @@ describe('delete command tests', () => {
 		  ],
 		]
 	`);
-		expect(getApiKeyCredential.mock.calls).toMatchInlineSnapshot(`
-		[
-		  [
-		    "1234",
-		    "5678",
-		    "123456789",
-		  ],
-		]
-	`);
-		expect(unsubscribeCredentialFromMeshService.mock.calls).toMatchInlineSnapshot(`
-		[
-		  [
-		    "1234",
-		    "5678",
-		    "123456789",
-		    "dummy_integration_id",
-		  ],
-		]
-	`);
+
 		expect(logSpy.mock.calls).toMatchInlineSnapshot(`
 		[
 		  [
 		    "Successfully deleted mesh %s",
 		    "mesh_id",
 		  ],
-		  [
-		    "Successfully unsubscribed API Key %s",
-		    "dummy_client_id",
-		  ],
 		]
 	`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);

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

@@ -186,27 +186,9 @@ describe('describe command tests', () => {
 		    "dummy_meshId",
 		  ],
 		  [
-		    "
-		API Mesh now runs at the edge and legacy mesh URLs will be deprecated.
-		Use the following link to find more information on how to migrate your mesh:",
-		  ],
-		  [
-		    "https://developer.adobe.com/graphql-mesh-gateway/mesh/release/migration
-		",
-		  ],
-		  [
-		    "Legacy Mesh Endpoint: %s",
-		    "https://graph.adobe.io/api/dummy_meshId/graphql",
-		  ],
-		  [
-		    "Edge Mesh Endpoint: %s
-		",
+		    "Mesh Endpoint: %s",
 		    "https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql",
 		  ],
-		  [
-		    "Update your mesh before using the edge mesh endpoint.
-		You can validate your edge mesh status using the aio api-mesh status command.",
-		  ],
 		]
 	`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
@@ -251,27 +233,9 @@ describe('describe command tests', () => {
 		    "dummy_meshId",
 		  ],
 		  [
-		    "
-		API Mesh now runs at the edge and legacy mesh URLs will be deprecated.
-		Use the following link to find more information on how to migrate your mesh:",
-		  ],
-		  [
-		    "https://developer.adobe.com/graphql-mesh-gateway/mesh/release/migration
-		",
-		  ],
-		  [
-		    "Legacy Mesh Endpoint: %s",
-		    "https://graph.adobe.io/api/dummy_meshId/graphql?api_key=dummy_apiKey",
-		  ],
-		  [
-		    "Edge Mesh Endpoint: %s
-		",
+		    "Mesh Endpoint: %s",
 		    "https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql",
 		  ],
-		  [
-		    "Update your mesh before using the edge mesh endpoint.
-		You can validate your edge mesh status using the aio api-mesh status command.",
-		  ],
 		]
 	`);
 	});
@@ -320,27 +284,9 @@ describe('describe command tests', () => {
 		    "dummy_meshId",
 		  ],
 		  [
-		    "
-		API Mesh now runs at the edge and legacy mesh URLs will be deprecated.
-		Use the following link to find more information on how to migrate your mesh:",
-		  ],
-		  [
-		    "https://developer.adobe.com/graphql-mesh-gateway/mesh/release/migration
-		",
-		  ],
-		  [
-		    "Legacy Mesh Endpoint: %s",
-		    "https://tigraph.adobe.io/dummy_meshId/graphql",
-		  ],
-		  [
-		    "Edge Mesh Endpoint: %s
-		",
+		    "Mesh Endpoint: %s",
 		    "https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql",
 		  ],
-		  [
-		    "Update your mesh before using the edge mesh endpoint.
-		You can validate your edge mesh status using the aio api-mesh status command.",
-		  ],
 		]
 	`);
 		expect(errorLogSpy.mock.calls).toMatchInlineSnapshot(`[]`);
@@ -361,12 +307,7 @@ describe('describe command tests', () => {
 		await DescribeCommand.run();
 
 		expect(logSpy).toHaveBeenCalledWith(
-			expect.stringContaining('Legacy Mesh Endpoint:'),
-			'https://graph.adobe.io/api/dummy_meshId/graphql?api_key=dummy_apiKey',
-		);
-
-		expect(logSpy).toHaveBeenCalledWith(
-			expect.stringContaining('Edge Mesh Endpoint:'),
+			expect.stringContaining('Mesh Endpoint:'),
 			'https://edge-graph.adobe.io/api/dummy_meshId/graphql',
 		);
 	});
@@ -386,12 +327,7 @@ describe('describe command tests', () => {
 		await DescribeCommand.run();
 
 		expect(logSpy).toHaveBeenCalledWith(
-			expect.stringContaining('Legacy Mesh Endpoint:'),
-			'https://graph.adobe.io/api/dummy_meshId/graphql?api_key=dummy_apiKey',
-		);
-
-		expect(logSpy).toHaveBeenCalledWith(
-			expect.stringContaining('Edge Mesh Endpoint:'),
+			expect.stringContaining('Mesh Endpoint:'),
 			'https://edge-sandbox-graph.adobe.io/api/dummy_meshId/graphql',
 		);
 	});

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

@@ -0,0 +1,97 @@
+const StatusCommand = require('../status');
+
+// Initialize mock values
+const mockOrg = { id: '1234', code: 'CODE1234@AdobeOrg', name: 'ORG01', type: 'entp' };
+const mockProject = { id: '5678', title: 'Project01' };
+const mockWorkspace = { id: '123456789', title: 'Workspace01' };
+const mockMeshId = '00000000-0000-0000-0000-000000000000';
+global.requestId = 'dummy_request_id';
+
+// Create mock modules and functions
+jest.mock('../../../lib/devConsole');
+jest.mock('../../../helpers');
+const parseSpy = jest.spyOn(StatusCommand.prototype, 'parse');
+const logSpy = jest.spyOn(StatusCommand.prototype, 'log');
+const errorLogSpy = jest.spyOn(StatusCommand.prototype, 'error');
+
+// Prepare mocks
+const { initSdk } = require('../../../helpers');
+const { getMeshId, getMesh, getMeshDeployments } = require('../../../lib/devConsole');
+initSdk.mockResolvedValue({
+	imsOrgId: mockOrg.id,
+	imsOrgCode: mockOrg.code,
+	projectId: mockProject.id,
+	workspaceId: mockWorkspace.id,
+	workspaceName: mockWorkspace.title,
+	orgName: mockOrg.name,
+	projectName: mockProject.title,
+});
+parseSpy.mockResolvedValue({
+	flags: {},
+});
+
+describe('status command tests', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+		getMeshId.mockResolvedValue(mockMeshId);
+		getMesh.mockResolvedValue({ meshStatus: null });
+	});
+
+	describe('use mesh build status', () => {
+		test.each([
+			['pending', 'Mesh is awaiting processing.'],
+			['building', 'Mesh is currently building. Wait a few minutes before checking again.'],
+			['error', 'Mesh build has errors.'],
+			['not-a-real-status', 'Mesh status is not available. Wait a few minutes and try again.'],
+			[null, 'Mesh status is not available. Wait a few minutes and try again.'],
+		])(
+			'should output correct message when mesh build status is "%s"',
+			async (meshBuildStatus, expectedMessage) => {
+				getMesh.mockResolvedValue({ meshStatus: meshBuildStatus });
+				await StatusCommand.run();
+				expect(logSpy).toHaveBeenCalledWith(expectedMessage);
+			},
+		);
+	});
+
+	describe('use mesh deployment status', () => {
+		beforeEach(() => {
+			getMesh.mockResolvedValue({ meshStatus: 'success' });
+			getMeshDeployments.mockResolvedValue({
+				status: null,
+				meshId: mockMeshId,
+				error: null,
+			});
+		});
+
+		test.each([
+			['provisioning', 'Currently provisioning your mesh. Wait a few minutes and try again.'],
+			['de-provisioning', 'Currently de-provisioning your mesh. Wait a few minutes and try again.'],
+			['success', 'Mesh was built successfully.'],
+			['error', 'Mesh build has errors.'],
+			['not-a-real-status', 'Mesh status is not available. Wait a few minutes and try again.'],
+			[null, 'Mesh status is not available. Wait a few minutes and try again.'],
+		])(
+			'should output correct message when mesh deployment status is "%s"',
+			async (meshDeployStatus, expectedMessage) => {
+				getMeshDeployments.mockResolvedValue({
+					status: meshDeployStatus,
+					meshId: mockMeshId,
+					error: null,
+				});
+				await StatusCommand.run();
+				expect(logSpy).toHaveBeenCalledWith(expectedMessage);
+			},
+		);
+	});
+
+	describe('unexpected error', () => {
+		test('should output mesh not found error when mesh does not exist', async () => {
+			getMeshId.mockResolvedValue(null);
+			const expectedMessage = `Unable to get mesh status. No mesh found for Org(${mockOrg.id}) -> Project(${mockProject.id}) -> Workspace(${mockWorkspace.id}). Please check the details and try again.`;
+			const runResult = StatusCommand.run();
+			await expect(runResult).rejects.toEqual(new Error(expectedMessage));
+			expect(errorLogSpy).toHaveBeenCalledWith(expectedMessage);
+		});
+	});
+});

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

@@ -10,7 +10,6 @@ governing permissions and limitations under the License.
 */
 
 const { Command } = require('@oclif/core');
-const chalk = require('chalk');
 const { initSdk, initRequestId, promptConfirm, importFiles } = require('../../helpers');
 const logger = require('../../classes/logger');
 const {
@@ -28,7 +27,7 @@ const {
 	encryptSecrets,
 } = require('../../utils');
 const { createMesh, getPublicEncryptionKey } = require('../../lib/devConsole');
-const { buildEdgeMeshUrl, buildMeshUrl } = require('../../urlBuilder');
+const { buildMeshUrl } = require('../../urlBuilder');
 
 class CreateCommand extends Command {
 	static args = [{ name: 'file' }];
@@ -131,7 +130,7 @@ class CreateCommand extends Command {
 
 		if (shouldContinue) {
 			try {
-				const { mesh, apiKey, sdkList } = await createMesh(
+				const { mesh } = await createMesh(
 					imsOrgId,
 					projectId,
 					workspaceId,
@@ -155,47 +154,12 @@ class CreateCommand extends Command {
 						'******************************************************************************************************',
 					);
 
-					if (apiKey) {
-						this.log('Successfully created API Key %s', apiKey);
-
-						if (sdkList) {
-							this.log('Successfully subscribed API Key %s to API Mesh service', apiKey);
-
-							const meshUrl = await buildMeshUrl(
-								imsOrgId,
-								projectId,
-								workspaceId,
-								workspaceName,
-								mesh.meshId,
-								apiKey,
-							);
-
-							const edgeMeshUrl = buildEdgeMeshUrl(mesh.meshId, workspaceName);
-							this.log(
-								chalk.bgYellow(
-									`\nAPI Mesh now runs at the edge and legacy mesh URLs will be deprecated.\nUse the following link to find more information on how to migrate your mesh:`,
-								),
-							);
-							this.log(
-								chalk.underline.blue(
-									'https://developer.adobe.com/graphql-mesh-gateway/mesh/release/migration\n',
-								),
-							);
-							this.log('Legacy Mesh Endpoint: %s', meshUrl);
-							this.log(chalk.bold('Edge Mesh Endpoint: %s\n'), edgeMeshUrl);
-						} else {
-							this.log('Unable to subscribe API Key %s to API Mesh service', apiKey);
-						}
-					} else {
-						this.log('Unable to create API Key');
-					}
+					const meshUrl = buildMeshUrl(mesh.meshId, workspaceName);
+					this.log('Mesh Endpoint: %s', meshUrl);
+
 					// 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 {
-						apiKey,
-						sdkList,
-						mesh,
-					};
+					// template adobe/generator-app-api-mesh since it relies on "mesh"
+					return { mesh };
 				} else {
 					this.error(`Unable to create a mesh. Please try again. RequestId: ${global.requestId}`, {
 						exit: false,

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

@@ -14,12 +14,7 @@ const { Command } = require('@oclif/command');
 const logger = require('../../classes/logger');
 const { initSdk, initRequestId, promptConfirm } = require('../../helpers');
 const { ignoreCacheFlag, autoConfirmActionFlag } = require('../../utils');
-const {
-	getMeshId,
-	deleteMesh,
-	getApiKeyCredential,
-	unsubscribeCredentialFromMeshService,
-} = require('../../lib/devConsole');
+const { getMeshId, deleteMesh } = require('../../lib/devConsole');
 
 require('dotenv').config();
 
@@ -69,25 +64,6 @@ class DeleteCommand extends Command {
 					if (deleteMeshResponse) {
 						this.log('Successfully deleted mesh %s', meshId);
 
-						const credential = await getApiKeyCredential(imsOrgId, projectId, workspaceId);
-
-						if (credential) {
-							const newSDKList = await unsubscribeCredentialFromMeshService(
-								imsOrgId,
-								projectId,
-								workspaceId,
-								credential.id_integration,
-							);
-
-							if (newSDKList) {
-								this.log('Successfully unsubscribed API Key %s', credential.client_id);
-							} else {
-								this.log('Unable to unsubscribe API Key %s', credential.client_id);
-							}
-						} else {
-							this.log('No API Key found to unsubscribe');
-						}
-
 						return deleteMeshResponse;
 					} else {
 						throw new Error('Unable to delete mesh');

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

@@ -10,13 +10,11 @@ governing permissions and limitations under the License.
 */
 
 const { Command } = require('@oclif/command');
-const chalk = require('chalk');
-
 const logger = require('../../classes/logger');
 const { initSdk, initRequestId } = require('../../helpers');
 const { ignoreCacheFlag } = require('../../utils');
 const { describeMesh } = require('../../lib/devConsole');
-const { buildMeshUrl, buildEdgeMeshUrl } = require('../../urlBuilder');
+const { buildMeshUrl } = require('../../urlBuilder');
 
 require('dotenv').config();
 
@@ -40,42 +38,17 @@ class DescribeCommand extends Command {
 			const meshDetails = await describeMesh(imsOrgId, projectId, workspaceId, workspaceName);
 
 			if (meshDetails) {
-				const { meshId, apiKey } = meshDetails;
+				const { meshId } = meshDetails;
 
 				if (meshId) {
-					const meshUrl = await buildMeshUrl(
-						imsOrgId,
-						projectId,
-						workspaceId,
-						workspaceName,
-						meshId,
-						apiKey,
-					);
-
+					const meshUrl = buildMeshUrl(meshId, workspaceName);
 					this.log('Successfully retrieved mesh details \n');
 					this.log('Org ID: %s', imsOrgId);
 					this.log('Project ID: %s', projectId);
 					this.log('Workspace ID: %s', workspaceId);
 					this.log('Mesh ID: %s', meshId);
+					this.log('Mesh Endpoint: %s', meshUrl);
 
-					const edgeMeshUrl = buildEdgeMeshUrl(meshId, workspaceName);
-					this.log(
-						chalk.bgYellow(
-							`\nAPI Mesh now runs at the edge and legacy mesh URLs will be deprecated.\nUse the following link to find more information on how to migrate your mesh:`,
-						),
-					);
-					this.log(
-						chalk.underline.blue(
-							'https://developer.adobe.com/graphql-mesh-gateway/mesh/release/migration\n',
-						),
-					);
-					this.log('Legacy Mesh Endpoint: %s', meshUrl);
-					this.log(chalk.bold('Edge Mesh Endpoint: %s\n'), edgeMeshUrl);
-					this.log(
-						chalk.bgYellow(
-							'Update your mesh before using the edge mesh endpoint.\nYou can validate your edge mesh status using the aio api-mesh status command.',
-						),
-					);
 					return meshDetails;
 				} else {
 					logger.error(