Updating main with develop

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adobe/aio-cli-plugin-api-mesh",
-	"version": "5.2.3",
+	"version": "5.3.0",
 	"description": "Adobe I/O CLI plugin to develop and manage API mesh sources",
 	"keywords": [
 		"oclif-plugin"
@@ -38,7 +38,7 @@
 		"version": "oclif-dev readme && git add README.md"
 	},
 	"dependencies": {
-		"@adobe-apimesh/mesh-builder": "2.1.5",
+		"@adobe-apimesh/mesh-builder": "2.1.6",
 		"@adobe/aio-cli-lib-console": "^5.0.0",
 		"@adobe/aio-lib-core-config": "^5.0.0",
 		"@adobe/aio-lib-core-logging": "^3.0.0",
@@ -91,7 +91,6 @@
 		"jsmin": "1.0.1",
 		"json-interpolate": "^1.0.3",
 		"lru-cache": "^7.14.1",
-		"ms": "^2.1.3",
 		"node-clipboardy": "^1.0.3",
 		"node-fetch": "2.6.1",
 		"pino": "^9.5.0",
@@ -147,6 +146,9 @@
 			"@oclif/plugin-help"
 		],
 		"hooks": {
+			"init": [
+				"./src/hooks/initMetadata.js"
+			],
 			"prerun": [
 				"./src/hooks/versionCompare.js"
 			]

src/commands/api-mesh/__tests__/cache-purge.test.js

@@ -23,20 +23,20 @@ jest.mock('../../../helpers', () => ({
 	initRequestId: jest.fn().mockResolvedValue({}),
 	promptConfirm: jest.fn().mockResolvedValue(true),
 }));
-jest.mock('../../../lib/devConsole');
+jest.mock('../../../lib/smsClient');
 const mockConsoleCLIInstance = {};
 const selectedOrg = { id: '1234', code: 'CODE1234@AdobeOrg', name: 'ORG01', type: 'entp' };
 const selectedProject = { id: '5678', title: 'Project01' };
 const selectedWorkspace = { id: '123456789', title: 'Workspace01' };
 const CachePurgeCommand = require('../cache/purge');
-const { initSdk, initRequestId, promptConfirm } = require('../../../helpers');
+const { initSdk, promptConfirm } = require('../../../helpers');
 const {
 	getMeshId,
 	deleteMesh,
 	getApiKeyCredential,
 	unsubscribeCredentialFromMeshService,
 	cachePurge,
-} = require('../../../lib/devConsole');
+} = require('../../../lib/smsClient');
 let logSpy = null;
 let errorLogSpy = null;
 let parseSpy = null;
@@ -229,7 +229,6 @@ describe('cache purge command tests', () => {
 		cachePurge.mockResolvedValueOnce({ success: true });
 		const runResult = await CachePurgeCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(runResult).toMatchInlineSnapshot(`
 		{
 		  "success": true,

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

@@ -27,24 +27,18 @@ jest.mock('../../../helpers', () => ({
 	interpolateMesh: jest.fn().mockResolvedValue({}),
 	importFiles: jest.fn().mockResolvedValue(),
 }));
-jest.mock('../../../lib/devConsole');
+jest.mock('../../../lib/smsClient');
 
 const CreateCommand = require('../create');
 const sampleCreateMeshConfig = require('../../__fixtures__/sample_mesh.json');
 const meshConfigWithComposerFiles = require('../../__fixtures__/sample_mesh_with_composer_files.json');
-const {
-	initSdk,
-	initRequestId,
-	promptConfirm,
-	interpolateMesh,
-	importFiles,
-} = require('../../../helpers');
+const { initSdk, promptConfirm, interpolateMesh, importFiles } = require('../../../helpers');
 const {
 	getMesh,
 	createMesh,
 	getTenantFeatures,
 	getPublicEncryptionKey,
-} = require('../../../lib/devConsole');
+} = require('../../../lib/smsClient');
 
 const selectedOrg = { id: '1234', code: 'CODE1234@AdobeOrg', name: 'ORG01', type: 'entp' };
 
@@ -69,7 +63,7 @@ jest.mock('../../../helpers', () => ({
 	interpolateMesh: jest.fn().mockResolvedValue({}),
 	importFiles: jest.fn().mockResolvedValue({}),
 }));
-jest.mock('../../../lib/devConsole');
+jest.mock('../../../lib/smsClient');
 jest.mock('chalk', () => ({
 	red: jest.fn(text => text), // Return the input text without any color formatting
 	bold: jest.fn(text => text),
@@ -340,7 +334,6 @@ describe('create command tests', () => {
 	test('should create if a valid mesh config file is provided', async () => {
 		const runResult = await CreateCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
 		  "CODE1234@AdobeOrg",
@@ -422,7 +415,6 @@ describe('create command tests', () => {
 
 		const runResult = await CreateCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
 		  "CODE1234@AdobeOrg",
@@ -557,7 +549,6 @@ describe('create command tests', () => {
 
 		await CreateCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(promptConfirm).not.toHaveBeenCalled();
 		expect(initSdk).toHaveBeenCalledWith({
 			ignoreCache: true,
@@ -594,7 +585,6 @@ describe('create command tests', () => {
 
 		await CreateCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(promptConfirm).toHaveBeenCalled();
 		expect(initSdk).toHaveBeenCalledWith({
 			ignoreCache: true,
@@ -902,7 +892,6 @@ describe('create command tests', () => {
 
 		const output = await CreateCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
 		  "CODE1234@AdobeOrg",
@@ -1164,7 +1153,6 @@ describe('create command tests', () => {
 
 		const output = await CreateCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
 		  "1234",
@@ -1292,7 +1280,6 @@ describe('create command tests', () => {
 
 		const output = await CreateCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
 		  "1234",
@@ -1422,7 +1409,6 @@ describe('create command tests', () => {
 
 		const output = await CreateCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
 		  "CODE1234@AdobeOrg",
@@ -1552,7 +1538,6 @@ describe('create command tests', () => {
 
 		const output = await CreateCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(createMesh.mock.calls[0]).toMatchInlineSnapshot(`
 		[
 		  "CODE1234@AdobeOrg",

src/commands/api-mesh/__tests__/delete-log-forwarding.test.js

@@ -0,0 +1,106 @@
+/*
+Copyright 2021 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+const DeleteLogForwardingCommand = require('../config/delete/log-forwarding');
+const { initSdk, promptConfirm } = require('../../../helpers');
+const { getMeshId, deleteLogForwarding } = require('../../../lib/smsClient');
+
+jest.mock('../../../helpers', () => ({
+	initSdk: jest.fn().mockResolvedValue({}),
+	initRequestId: jest.fn().mockResolvedValue({}),
+	promptConfirm: jest.fn().mockResolvedValue(true),
+}));
+jest.mock('../../../lib/smsClient');
+
+let logSpy, errorLogSpy, parseSpy;
+
+describe('delete log forwarding command tests', () => {
+	beforeEach(() => {
+		initSdk.mockResolvedValue({
+			imsOrgCode: 'mockOrgCode',
+			projectId: 'mockProjectId',
+			workspaceId: 'mockWorkspaceId',
+			workspaceName: 'mockWorkspaceName',
+		});
+
+		getMeshId.mockResolvedValue('mockMeshId');
+		deleteLogForwarding.mockResolvedValue();
+
+		global.requestId = 'dummy_request_id';
+
+		logSpy = jest.spyOn(DeleteLogForwardingCommand.prototype, 'log');
+		errorLogSpy = jest.spyOn(DeleteLogForwardingCommand.prototype, 'error');
+		parseSpy = jest.spyOn(DeleteLogForwardingCommand.prototype, 'parse');
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	test('should fail if mesh ID is not found', async () => {
+		getMeshId.mockResolvedValueOnce(null);
+
+		await expect(DeleteLogForwardingCommand.run()).rejects.toThrow(
+			'Unable to delete log forwarding details. No mesh found for Org(mockOrgCode) -> Project(mockProjectId) -> Workspace(mockWorkspaceId). Check the details and try again.',
+		);
+
+		expect(logSpy).not.toHaveBeenCalled();
+		expect(errorLogSpy).toHaveBeenCalledWith(
+			'Unable to delete log forwarding details. No mesh found for Org(mockOrgCode) -> Project(mockProjectId) -> Workspace(mockWorkspaceId). Check the details and try again.',
+		);
+	});
+
+	test('should skip confirmation if autoConfirmAction is set', async () => {
+		parseSpy.mockResolvedValueOnce({
+			flags: {
+				ignoreCache: false,
+				autoConfirmAction: true,
+			},
+		});
+
+		await DeleteLogForwardingCommand.run();
+
+		expect(promptConfirm).not.toHaveBeenCalled();
+		expect(deleteLogForwarding).toHaveBeenCalledWith(
+			'mockOrgCode',
+			'mockProjectId',
+			'mockWorkspaceId',
+			'mockMeshId',
+		);
+		expect(logSpy).toHaveBeenCalledWith('Successfully deleted log forwarding details');
+	});
+
+	test('should fail if deleteLogForwarding throws an error', async () => {
+		deleteLogForwarding.mockRejectedValueOnce(new Error('Deletion failed'));
+
+		await expect(DeleteLogForwardingCommand.run()).rejects.toThrow(
+			'Unable to delete log forwarding details. Try again. RequestId: dummy_request_id',
+		);
+
+		expect(logSpy).not.toHaveBeenCalledWith('Successfully deleted log forwarding details');
+		expect(errorLogSpy).toHaveBeenCalledWith(
+			'Unable to delete log forwarding details. Try again. RequestId: dummy_request_id',
+		);
+	});
+
+	test('should delete log forwarding details successfully', async () => {
+		await DeleteLogForwardingCommand.run();
+
+		expect(deleteLogForwarding).toHaveBeenCalledWith(
+			'mockOrgCode',
+			'mockProjectId',
+			'mockWorkspaceId',
+			'mockMeshId',
+		);
+		expect(logSpy).toHaveBeenCalledWith('Successfully deleted log forwarding details');
+	});
+});

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

@@ -23,7 +23,7 @@ jest.mock('../../../helpers', () => ({
 	initRequestId: jest.fn().mockResolvedValue({}),
 	promptConfirm: jest.fn().mockResolvedValue(true),
 }));
-jest.mock('../../../lib/devConsole');
+jest.mock('../../../lib/smsClient');
 
 const mockConsoleCLIInstance = {};
 
@@ -34,13 +34,13 @@ const selectedProject = { id: '5678', title: 'Project01' };
 const selectedWorkspace = { id: '123456789', title: 'Workspace01' };
 
 const DeleteCommand = require('../delete');
-const { initSdk, initRequestId, promptConfirm } = require('../../../helpers');
+const { initSdk, promptConfirm } = require('../../../helpers');
 const {
 	getMeshId,
 	deleteMesh,
 	getApiKeyCredential,
 	unsubscribeCredentialFromMeshService,
-} = require('../../../lib/devConsole');
+} = require('../../../lib/smsClient');
 
 let logSpy = null;
 let errorLogSpy = null;
@@ -203,7 +203,6 @@ describe('delete command tests', () => {
 	test('should delete mesh if correct args are provided', async () => {
 		const runResult = await DeleteCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(runResult).toMatchInlineSnapshot(`
 		{
 		  "status": "success",

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

@@ -23,7 +23,7 @@ jest.mock('@adobe/aio-cli-lib-console', () => ({
 	init: jest.fn().mockResolvedValue(mockConsoleCLIInstance),
 	cleanStdOut: jest.fn(),
 }));
-jest.mock('../../../lib/devConsole');
+jest.mock('../../../lib/smsClient');
 jest.mock('chalk', () => ({
 	bold: jest.fn(text => text), // Return the input text without any color formatting
 	underline: {
@@ -33,8 +33,8 @@ jest.mock('chalk', () => ({
 }));
 
 const DescribeCommand = require('../describe');
-const { initSdk, initRequestId } = require('../../../helpers');
-const { describeMesh, getMesh, getTenantFeatures } = require('../../../lib/devConsole');
+const { initSdk } = require('../../../helpers');
+const { describeMesh, getMesh, getTenantFeatures } = require('../../../lib/smsClient');
 const sampleCreateMeshConfig = require('../../__fixtures__/sample_mesh.json');
 
 const selectedOrg = { id: '1234', code: 'CODE1234@AdobeOrg', name: 'ORG01', type: 'entp' };
@@ -202,7 +202,6 @@ describe('describe command tests', () => {
 	test('should return Non TI url if request is Non Ti', async () => {
 		const runResult = await DescribeCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(describeMesh).toHaveBeenCalledWith(
 			selectedOrg.code,
 			selectedProject.id,
@@ -258,7 +257,6 @@ describe('describe command tests', () => {
 		getMesh.mockResolvedValue(fetchedMeshConfig);
 		const runResult = await DescribeCommand.run();
 
-		expect(initRequestId).toHaveBeenCalled();
 		expect(describeMesh).toHaveBeenCalledWith(
 			selectedOrg.code,
 			selectedProject.id,