@adobe/aio-cli-plugin-api-mesh 5.2.3 → 5.2.4-alpha.1

package/src/commands/api-mesh/config/delete/log-forwarding.js

@@ -0,0 +1,80 @@
+/*
+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 { Command } = require('@oclif/core');
+const logger = require('../../../../classes/logger');
+const { initSdk, promptConfirm } = require('../../../../helpers');
+const { ignoreCacheFlag, autoConfirmActionFlag } = require('../../../../utils');
+const { deleteLogForwarding, getMeshId } = require('../../../../lib/smsClient');
+
+class DeleteLogForwardingCommand extends Command {
+	static flags = {
+		ignoreCache: ignoreCacheFlag,
+		autoConfirmAction: autoConfirmActionFlag,
+	};
+
+	async run() {
+		logger.info(`RequestId: ${global.requestId}`);
+
+		const { flags } = await this.parse(DeleteLogForwardingCommand);
+
+		const ignoreCache = await flags.ignoreCache;
+		const autoConfirmAction = await flags.autoConfirmAction;
+
+		const { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
+			ignoreCache,
+		});
+
+		let meshId = null;
+
+		try {
+			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
+		} catch (err) {
+			this.error(
+				`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
+			);
+		}
+
+		// mesh could not be found
+		if (!meshId) {
+			this.error(
+				`Unable to delete log forwarding details. No mesh found for Org(${imsOrgCode}) -> Project(${projectId}) -> Workspace(${workspaceId}). Check the details and try again.`,
+			);
+		}
+
+		let shouldContinue = true;
+
+		if (!autoConfirmAction) {
+			shouldContinue = await promptConfirm(
+				`Are you sure you want to delete the log forwarding details for mesh: ${meshId}?`,
+			);
+		}
+
+		if (shouldContinue) {
+			try {
+				await deleteLogForwarding(imsOrgCode, projectId, workspaceId, meshId);
+				this.log('Successfully deleted log forwarding details');
+			} catch (error) {
+				this.log(error.message);
+				this.error(
+					`Unable to delete log forwarding details. Try again. RequestId: ${global.requestId}`,
+				);
+			}
+		} else {
+			this.log('delete log-forwarding cancelled');
+			return 'delete log-forwarding cancelled';
+		}
+	}
+}
+
+DeleteLogForwardingCommand.description = 'Delete log forwarding details for a given mesh';
+
+module.exports = DeleteLogForwardingCommand;

package/src/commands/api-mesh/config/get/log-forwarding.js

@@ -0,0 +1,78 @@
+/*
+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 { Command } = require('@oclif/core');
+const { initSdk, initRequestId } = require('../../../../helpers');
+const logger = require('../../../../classes/logger');
+const { ignoreCacheFlag, jsonFlag } = require('../../../../utils');
+const { getLogForwarding, getMeshId } = require('../../../../lib/smsClient');
+
+class GetLogForwardingCommand extends Command {
+	static flags = {
+		ignoreCache: ignoreCacheFlag,
+		json: jsonFlag,
+	};
+
+	static enableJsonFlag = true;
+
+	async run() {
+		await initRequestId();
+
+		logger.info(`RequestId: ${global.requestId}`);
+
+		const { flags } = await this.parse(GetLogForwardingCommand);
+
+		const ignoreCache = await flags.ignoreCache;
+
+		const { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
+			ignoreCache,
+		});
+
+		let meshId = null;
+
+		try {
+			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
+		} catch (err) {
+			this.log(err.message);
+			this.error(
+				`Unable to get mesh ID. Check the details and try again. RequestId: ${global.requestId}`,
+			);
+		}
+		// mesh could not be found
+		if (!meshId) {
+			this.error(
+				`Unable to get meshId. No mesh found for Org(${imsOrgCode}) -> Project(${projectId}) -> Workspace(${workspaceId}). Check the details and try again.`,
+			);
+		}
+		try {
+			const response = await getLogForwarding(imsOrgCode, projectId, workspaceId, meshId);
+			if (response && response.data) {
+				this.log(
+					'Successfully retrieved log forwarding details: \n',
+					JSON.stringify(response.data, null, 2),
+				);
+				return { imsOrgCode, projectId, workspaceId, workspaceName };
+			} else {
+				this.error(
+					`Unable to get log forwarding details. Try again. RequestId: ${global.requestId}`,
+				);
+				return;
+			}
+		} catch (error) {
+			this.log(error.message);
+			this.error(`Failed to get log forwarding details. Try again. RequestId: ${global.requestId}`);
+		}
+	}
+}
+
+GetLogForwardingCommand.description = `Get log forwarding details for a given mesh`;
+
+module.exports = GetLogForwardingCommand;

package/src/commands/api-mesh/config/set/log-forwarding.js

@@ -0,0 +1,156 @@
+/*
+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 { Command } = require('@oclif/core');
+const {
+	initSdk,
+	initRequestId,
+	promptConfirm,
+	promptSelect,
+	promptInput,
+	promptInputSecret,
+} = require('../../../../helpers');
+const logger = require('../../../../classes/logger');
+const {
+	ignoreCacheFlag,
+	autoConfirmActionFlag,
+	jsonFlag,
+	destinations,
+} = require('../../../../utils');
+const { setLogForwarding, getMeshId } = require('../../../../lib/smsClient');
+
+class SetLogForwardingCommand extends Command {
+	static flags = {
+		ignoreCache: ignoreCacheFlag,
+		autoConfirmAction: autoConfirmActionFlag,
+		json: jsonFlag,
+	};
+
+	static enableJsonFlag = true;
+
+	async run() {
+		await initRequestId();
+
+		logger.info(`RequestId: ${global.requestId}`);
+
+		const { flags } = await this.parse(SetLogForwardingCommand);
+
+		const ignoreCache = await flags.ignoreCache;
+		const autoConfirmAction = await flags.autoConfirmAction;
+
+		let destinationConfig;
+		try {
+			destinationConfig = await this.inputAndValidateConfigs(destinations);
+		} catch (error) {
+			this.error(error.message);
+			return;
+		}
+		const { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
+			ignoreCache,
+		});
+
+		let meshId = null;
+
+		try {
+			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
+		} catch (err) {
+			this.log(err.message);
+			this.error(
+				`Unable to get mesh ID. Check the details and try again. RequestId: ${global.requestId}`,
+			);
+		}
+
+		// mesh could not be found
+		if (!meshId) {
+			this.error(
+				`Unable to get meshId. No mesh found for Org(${imsOrgCode}) -> Project(${projectId}) -> Workspace(${workspaceId}). Check the details and try again.`,
+			);
+		}
+
+		let shouldContinue = true;
+
+		if (!autoConfirmAction) {
+			shouldContinue = await promptConfirm(
+				`Are you sure you want to set log forwarding to ${destinationConfig.destination}?`,
+			);
+		}
+
+		if (shouldContinue) {
+			try {
+				const response = await setLogForwarding(
+					imsOrgCode,
+					projectId,
+					workspaceId,
+					meshId,
+					destinationConfig,
+				);
+				if (response && response.result) {
+					this.log(`Log forwarding set successfully for ${meshId}`);
+					return { destinationConfig, imsOrgCode, projectId, workspaceId, workspaceName };
+				} else {
+					this.error(
+						`Unable to set log forwarding details. Try again. RequestId: ${global.requestId}`,
+					);
+					return;
+				}
+			} catch (error) {
+				this.log(error.message);
+				this.error(
+					`Failed to set log forwarding details. Try again. RequestId: ${global.requestId}`,
+				);
+			}
+		} else {
+			this.log('log-forwarding cancelled');
+			return 'set-log-forwarding cancelled';
+		}
+	}
+
+	async inputAndValidateConfigs(destinations) {
+		// Prompt for destination
+		const destinationKey = await promptSelect(
+			'Select log forwarding destination:',
+			Object.keys(destinations),
+		);
+		if (!destinationKey) {
+			throw new Error('Destination is required');
+		}
+
+		const destinationConfig = destinations[destinationKey];
+		const inputs = {};
+
+		// For each input defined in the destination config, prompt and validate
+		for (const inputConfig of destinationConfig.inputs) {
+			// Prompt for input value (regular or secret based on config)
+			const promptFn = inputConfig.isSecret ? promptInputSecret : promptInput;
+			const value = await promptFn(inputConfig.promptMessage);
+
+			// Validate the input
+			if (inputConfig.validate) {
+				inputConfig.validate(value);
+			}
+
+			// Store the validated input
+			inputs[inputConfig.name] = value;
+		}
+
+		return {
+			destination: destinationConfig.name,
+			config: inputs,
+		};
+	}
+}
+
+SetLogForwardingCommand.description = `Sets the log forwarding destination for API mesh. 
+- Select a log forwarding destination - Choose from available options (for example, New Relic).
+- Enter the base URI - Provide the URI for the log forwarding service. Ensure it includes the protocol (for example, if the hosted region of the New Relic account is the U.S, the base URI could be 'https://log-api.newrelic.com/log/v1').
+- Enter the license key - Provide the INGEST-LICENSE API key type.`;
+
+module.exports = SetLogForwardingCommand;

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

@@ -10,7 +10,9 @@ governing permissions and limitations under the License.
 */
 
 const { Command } = require('@oclif/core');
-const { initSdk, initRequestId, promptConfirm, importFiles } = require('../../helpers');
+const chalk = require('chalk');
+
+const { initSdk, promptConfirm, importFiles } = require('../../helpers');
 const logger = require('../../classes/logger');
 const {
 	ignoreCacheFlag,
@@ -26,7 +28,7 @@ const {
 	validateSecretsFile,
 	encryptSecrets,
 } = require('../../utils');
-const { createMesh, getPublicEncryptionKey } = require('../../lib/devConsole');
+const { createMesh, getPublicEncryptionKey } = require('../../lib/smsClient');
 const { buildMeshUrl } = require('../../urlBuilder');
 
 class CreateCommand extends Command {
@@ -42,8 +44,6 @@ class CreateCommand extends Command {
 	static enableJsonFlag = true;
 
 	async run() {
-		await initRequestId();
-
 		logger.info(`RequestId: ${global.requestId}`);
 
 		const { args, flags } = await this.parse(CreateCommand);
@@ -121,6 +121,23 @@ class CreateCommand extends Command {
 
 		let shouldContinue = true;
 
+		if (
+			data?.meshConfig?.responseConfig?.includeHTTPDetails &&
+			workspaceName.toLowerCase() === 'production'
+		) {
+			this.warn(
+				`Your mesh has ${chalk.yellowBright('includeHTTPDetails')} set to ${chalk.redBright(
+					'true',
+				)}. This is a security risk and should not be used in production.\n` +
+					`When ${chalk.yellowBright('includeHTTPDetails')} is set to ${chalk.redBright(
+						'true',
+					)} it exposes HTTP request and response details in the mesh logs, which can cause sensitive information to be exposed.\n` +
+					`Consider setting ${chalk.yellowBright('includeHTTPDetails')} to ${chalk.greenBright(
+						'false',
+					)} in your mesh configuration file.`,
+			);
+		}
+
 		if (!autoConfirmAction) {
 			shouldContinue = await promptConfirm(`Are you sure you want to create a mesh?`);
 		}

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

@@ -12,9 +12,9 @@ governing permissions and limitations under the License.
 const { Command } = require('@oclif/command');
 
 const logger = require('../../classes/logger');
-const { initSdk, initRequestId, promptConfirm } = require('../../helpers');
+const { initSdk, promptConfirm } = require('../../helpers');
 const { ignoreCacheFlag, autoConfirmActionFlag } = require('../../utils');
-const { getMeshId, deleteMesh } = require('../../lib/devConsole');
+const { getMeshId, deleteMesh } = require('../../lib/smsClient');
 
 require('dotenv').config();
 
@@ -25,8 +25,6 @@ class DeleteCommand extends Command {
 	};
 
 	async run() {
-		await initRequestId();
-
 		logger.info(`RequestId: ${global.requestId}`);
 
 		const { flags } = await this.parse(DeleteCommand);

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

@@ -11,9 +11,9 @@ governing permissions and limitations under the License.
 
 const { Command } = require('@oclif/command');
 const logger = require('../../classes/logger');
-const { initSdk, initRequestId } = require('../../helpers');
+const { initSdk } = require('../../helpers');
 const { ignoreCacheFlag } = require('../../utils');
-const { describeMesh } = require('../../lib/devConsole');
+const { describeMesh } = require('../../lib/smsClient');
 const { buildMeshUrl } = require('../../urlBuilder');
 
 require('dotenv').config();
@@ -24,8 +24,6 @@ class DescribeCommand extends Command {
 	};
 
 	async run() {
-		await initRequestId();
-
 		logger.info(`RequestId: ${global.requestId}`);
 
 		const { flags } = await this.parse(DescribeCommand);

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

@@ -13,9 +13,9 @@ const { Command } = require('@oclif/core');
 const { writeFile } = require('fs/promises');
 
 const logger = require('../../classes/logger');
-const { initSdk, initRequestId } = require('../../helpers');
+const { initSdk } = require('../../helpers');
 const { ignoreCacheFlag, jsonFlag } = require('../../utils');
-const { getMeshId, getMesh } = require('../../lib/devConsole');
+const { getMeshId, getMesh } = require('../../lib/smsClient');
 const { buildMeshUrl } = require('../../urlBuilder');
 
 require('dotenv').config();
@@ -29,8 +29,6 @@ class GetCommand extends Command {
 	static enableJsonFlag = true;
 
 	async run() {
-		await initRequestId();
-
 		logger.info(`RequestId: ${global.requestId}`);
 
 		const { args, flags } = await this.parse(GetCommand);

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

@@ -1,8 +1,8 @@
 const { Command } = require('@oclif/core');
 const path = require('path');
 const fs = require('fs');
-const { initRequestId, initSdk, promptConfirm } = require('../../helpers');
-const { getMeshId, getPresignedUrls } = require('../../lib/devConsole');
+const { initSdk, promptConfirm } = require('../../helpers');
+const { getMeshId, getPresignedUrls } = require('../../lib/smsClient');
 const logger = require('../../classes/logger');
 const axios = require('axios');
 const {
@@ -11,12 +11,10 @@ const {
 	endTimeFlag,
 	logFilenameFlag,
 	pastFlag,
-	fromFlag,
 	suggestCorrectedDateFormat,
 	parsePastDuration,
 	validateDateTimeRange,
 	validateDateTimeFormat,
-	localToUTCTime,
 } = require('../../utils');
 
 require('dotenv').config();
@@ -28,7 +26,6 @@ class GetBulkLogCommand extends Command {
 		endTime: endTimeFlag,
 		filename: logFilenameFlag,
 		past: pastFlag,
-		from: fromFlag,
 	};
 
 	async run() {
@@ -36,7 +33,6 @@ class GetBulkLogCommand extends Command {
 		const columnHeaders =
 			'EventTimestampMs,Exceptions,Logs,Outcome,MeshId,RayID,URL,Request Method,Response Status,Level';
 
-		await initRequestId();
 		logger.info(`RequestId: ${global.requestId}`);
 		const { flags } = await this.parse(GetBulkLogCommand);
 		const ignoreCache = await flags.ignoreCache;
@@ -90,26 +86,9 @@ class GetBulkLogCommand extends Command {
 			formattedEndTime = flags.endTime.replace(/-|:|Z/g, '').replace('T', 'T');
 		} else if (flags.past) {
 			const pastTimeWindow = parsePastDuration(flags.past);
-			if (flags.from) {
-				let convertedTime;
-				const dateTimeRegex = /^\d{4}-\d{2}-\d{2}:\d{2}:\d{2}:\d{2}$/;
-				if (!dateTimeRegex.test(flags.from)) {
-					this.error('Invalid format. Use the format YYYY-MM-DD:HH:MM:SS for --from.');
-				} else {
-					try {
-						convertedTime = await localToUTCTime(flags.from.toString());
-					} catch (error) {
-						this.error(`Invalid date components passed in --from. Correct the date.`);
-					}
-				}
-				// add the past window to the converted time to get the end time to fetch logs from the past
-				calculatedStartTime = new Date(convertedTime);
-				calculatedEndTime = new Date(calculatedStartTime.getTime() + pastTimeWindow);
-			} else {
-				// subtract the past window from the current time to get the start time to fetch recent logs from now
-				calculatedEndTime = new Date();
-				calculatedStartTime = new Date(calculatedEndTime.getTime() - pastTimeWindow);
-			}
+			// Subtract the past window from the current time to get the start time to fetch recent logs from now
+			calculatedEndTime = new Date();
+			calculatedStartTime = new Date(calculatedEndTime.getTime() - pastTimeWindow);
 
 			// Validate the calculated start and end times range
 			validateDateTimeRange(calculatedStartTime, calculatedEndTime);
@@ -121,7 +100,7 @@ class GetBulkLogCommand extends Command {
 			return;
 		} else {
 			this.error(
-				'Missing required flags. Provide at least one flag --startTime, --endTime, or --past --from or  type `mesh log:get-bulk --help` for more information.',
+				'Missing required flags. Provide a time range with --startTime and  --endTime flags,  or use the --past flag for more recent logs. Use the `mesh log:get-bulk --help` command for more information.',
 			);
 			return;
 		}

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

@@ -10,9 +10,9 @@ governing permissions and limitations under the License.
 */
 const { Command } = require('@oclif/core');
 const logger = require('../../classes/logger');
-const { initSdk, initRequestId } = require('../../helpers');
+const { initSdk } = require('../../helpers');
 const { ignoreCacheFlag } = require('../../utils');
-const { getMeshId, getLogsByRayId } = require('../../lib/devConsole');
+const { getMeshId, getLogsByRayId } = require('../../lib/smsClient');
 require('dotenv').config();
 
 class FetchLogsCommand extends Command {
@@ -22,8 +22,6 @@ class FetchLogsCommand extends Command {
 	};
 
 	async run() {
-		await initRequestId();
-
 		logger.info(`RequestId: ${global.requestId}`);
 
 		const { args, flags } = await this.parse(FetchLogsCommand);

package/src/commands/api-mesh/log-list.js

@@ -1,9 +1,9 @@
 const { Command } = require('@oclif/core');
 
 const logger = require('../../classes/logger');
-const { initSdk, initRequestId } = require('../../helpers');
+const { initSdk } = require('../../helpers');
 const { ignoreCacheFlag, fileNameFlag } = require('../../utils');
-const { getMeshId, listLogs } = require('../../lib/devConsole');
+const { getMeshId, listLogs } = require('../../lib/smsClient');
 const { appendFileSync, existsSync } = require('fs');
 const { ux } = require('@oclif/core/lib/cli-ux');
 const path = require('path');
@@ -18,8 +18,6 @@ class ListLogsCommand extends Command {
 	static enableJsonFlag = true;
 
 	async run() {
-		await initRequestId();
-
 		logger.info(`RequestId: ${global.requestId}`);
 
 		const { flags } = await this.parse(ListLogsCommand);

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

@@ -28,15 +28,9 @@ const {
 const meshBuilder = require('@adobe-apimesh/mesh-builder');
 const fs = require('fs');
 const path = require('path');
-const {
-	initSdk,
-	initRequestId,
-	importFiles,
-	setUpTenantFiles,
-	writeSecretsFile,
-} = require('../../helpers');
+const { initSdk, importFiles, setUpTenantFiles, writeSecretsFile } = require('../../helpers');
 const logger = require('../../classes/logger');
-const { getMeshId, getMeshArtifact } = require('../../lib/devConsole');
+const { getMeshId, getMeshArtifact } = require('../../lib/smsClient');
 require('dotenv').config();
 const { start } = require('../../wranglerCli');
 const {
@@ -257,7 +251,6 @@ class RunCommand extends Command {
 
 	async run() {
 		try {
-			await initRequestId();
 			logger.info(`RequestId: ${global.requestId}`);
 
 			const { args, flags } = await this.parse(RunCommand);

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

@@ -20,13 +20,13 @@ const mockSources = { '0.0.1-test-03': mockSourceTest03v1Fixture };
 jest.mock('source-registry-storage-adapter');
 jest.mock('../../../../helpers');
 const InstallCommand = require('../install');
-const { getMeshId, getMesh, updateMesh } = require('../../../../lib/devConsole');
+const { getMeshId, getMesh, updateMesh } = require('../../../../lib/smsClient');
 const mockGetMeshConfig = require('../../../__fixtures__/sample_mesh.json');
 const selectedOrg = { id: '1234', code: 'CODE1234@AdobeOrg', name: 'ORG01', type: 'entp' };
 const selectedProject = { id: '5678', title: 'Project01' };
 const selectedWorkspace = { id: '123456789', title: 'Workspace01' };
 global.requestId = 'dummy_request_id';
-jest.mock('../../../../lib/devConsole');
+jest.mock('../../../../lib/smsClient');
 mockAdapter.mockImplementation(() => ({
 	get: jest.fn().mockResolvedValue(mockSources[`0.0.1-test-03`]),
 	getList: jest.fn().mockImplementation(() => mockMetadataFixture),

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

@@ -10,12 +10,7 @@ governing permissions and limitations under the License.
 */
 
 const { Command, CliUx, Flags } = require('@oclif/core');
-const {
-	promptConfirm,
-	initRequestId,
-	promptMultiselect,
-	promptSelect,
-} = require('../../../helpers');
+const { promptConfirm, promptMultiselect, promptSelect } = require('../../../helpers');
 const SourceRegistryStorage = require('source-registry-storage-adapter');
 const config = require('@adobe/aio-lib-core-config');
 const logger = require('../../../classes/logger');
@@ -24,8 +19,6 @@ const InstallCommand = require('./install');
 class DiscoverCommand extends Command {
 	async run() {
 		try {
-			await initRequestId();
-
 			logger.info(`RequestId: ${global.requestId}`);
 			const { flags } = await this.parse(DiscoverCommand);
 			const srs = new SourceRegistryStorage(config.get('api-mesh.sourceRegistry.path'));
@@ -58,7 +51,7 @@ class DiscoverCommand extends Command {
 		} catch (error) {
 			logger.error(error);
 			this.error(`
-				Something went wrong with "discover" command. Please try again later. 
+				Something went wrong with "discover" command. Please try again later.
 				${error}
 			`);
 		}

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

@@ -12,12 +12,7 @@ governing permissions and limitations under the License.
 
 const { Command, Flags } = require('@oclif/core');
 const SourceRegistryStorage = require('source-registry-storage-adapter');
-const {
-	promptMultiselect,
-	promptSelect,
-	promptConfirm,
-	initRequestId,
-} = require('../../../helpers');
+const { promptMultiselect, promptSelect, promptConfirm } = require('../../../helpers');
 const ncp = require('node-clipboardy');
 const chalk = require('chalk');
 const config = require('@adobe/aio-lib-core-config');
@@ -33,8 +28,6 @@ class GetCommand extends Command {
 
 	async run() {
 		try {
-			await initRequestId();
-
 			logger.info(`RequestId: ${global.requestId}`);
 			let list;
 			try {

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

@@ -12,13 +12,13 @@ governing permissions and limitations under the License.
 
 const { Command, Flags } = require('@oclif/core');
 const SourceRegistryStorage = require('source-registry-storage-adapter');
-const { promptConfirm, promptInput, initRequestId, initSdk } = require('../../../helpers');
+const { promptConfirm, promptInput, initSdk } = require('../../../helpers');
 const { ignoreCacheFlag } = require('../../../utils');
 const config = require('@adobe/aio-lib-core-config');
 const logger = require('../../../classes/logger');
 const { readFile } = require('fs/promises');
 const chalk = require('chalk');
-const { getMeshId, getMesh, updateMesh } = require('../../../lib/devConsole');
+const { getMeshId, getMesh, updateMesh } = require('../../../lib/smsClient');
 const JsonInterpolate = require('json-interpolate');
 
 class InstallCommand extends Command {
@@ -33,7 +33,6 @@ class InstallCommand extends Command {
 
 	async run() {
 		const { flags, args } = await this.parse(InstallCommand);
-		await initRequestId();
 		logger.info(`RequestId: ${global.requestId}`);
 		const ignoreCache = await flags.ignoreCache;
 		const {