@adobe/aio-cli-plugin-api-mesh 4.1.0-alpha → 4.1.0-beta.2

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

@@ -16,6 +16,7 @@ const logger = require('../../classes/logger');
 const { initSdk, initRequestId } = require('../../helpers');
 const { ignoreCacheFlag, jsonFlag } = require('../../utils');
 const { getMeshId, getMesh } = require('../../lib/devConsole');
+const { buildMeshUrl } = require('../../urlBuilder');
 
 require('dotenv').config();
 class GetCommand extends Command {
@@ -37,7 +38,7 @@ class GetCommand extends Command {
 		const ignoreCache = await flags.ignoreCache;
 		const json = await flags.json;
 
-		const { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
+		const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 			verbose: !json,
 		});
@@ -45,20 +46,22 @@ class GetCommand extends Command {
 		let meshId = null;
 
 		try {
-			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
+			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
 		} catch (err) {
 			this.error(
-				`Unable to get mesh ID. Check the details and try again. RequestId: ${global.requestId}`,
+				`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
 			);
 		}
 
 		if (meshId) {
 			try {
-				const mesh = await getMesh(imsOrgCode, projectId, workspaceId, workspaceName, meshId);
+				const mesh = await getMesh(imsOrgId, projectId, workspaceId, workspaceName, meshId);
 
 				if (mesh) {
 					this.log('Successfully retrieved mesh %s', JSON.stringify(mesh, null, 2));
 
+					const meshUrl = buildMeshUrl(meshId, workspaceName);
+
 					if (args.file) {
 						try {
 							const { meshConfig } = mesh;
@@ -72,10 +75,10 @@ class GetCommand extends Command {
 						}
 					}
 
-					return mesh;
+					return { ...mesh, meshUrl, imsOrgId, projectId, workspaceId, workspaceName };
 				} else {
 					logger.error(
-						`Unable to get mesh with the ID ${meshId}. Check the mesh ID and try again. RequestId: ${global.requestId}`,
+						`Unable to get mesh with the ID ${meshId}. Please check the mesh ID and try again. RequestId: ${global.requestId}`,
 						{ exit: false },
 					);
 				}
@@ -83,12 +86,12 @@ class GetCommand extends Command {
 				this.log(error.message);
 
 				this.error(
-					`Unable to get mesh. Check the details and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
+					`Unable to get mesh. Please check the details and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
 				);
 			}
 		} else {
 			this.error(
-				`Unable to get mesh config. No mesh found for Org(${imsOrgCode}) -> Project(${projectId}) -> Workspace(${workspaceId}). Please check the details and try again.`,
+				`Unable to get mesh config. No mesh found for Org(${imsOrgId}) -> Project(${projectId}) -> Workspace(${workspaceId}). Please check the details and try again.`,
 				{ exit: false },
 			);
 		}

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

@@ -26,12 +26,10 @@ const {
 } = require('../../utils');
 const meshBuilder = require('@adobe-apimesh/mesh-builder');
 const fs = require('fs');
-const UUID = require('../../uuid');
 const path = require('path');
 const {
 	initSdk,
 	initRequestId,
-	startGraphqlServer,
 	importFiles,
 	setUpTenantFiles,
 	writeSecretsFile,
@@ -39,6 +37,8 @@ const {
 const logger = require('../../classes/logger');
 const { getMeshId, getMeshArtifact } = require('../../lib/devConsole');
 require('dotenv').config();
+const { runServer } = require('../../server');
+const { fixPlugins } = require('../../fixPlugins');
 
 const { validateMesh, buildMesh, compileMesh } = meshBuilder.default;
 
@@ -82,10 +82,10 @@ class RunCommand extends Command {
 			if (fs.existsSync(path.join(process.cwd(), 'package.json'))) {
 				//If select flag is present then getMeshId for the specified org
 				if (flags.select) {
-					const { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({});
+					const { imsOrgId, projectId, workspaceId, workspaceName } = await initSdk({});
 
 					try {
-						meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
+						meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
 					} catch (err) {
 						throw new Error(
 							`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
@@ -93,7 +93,7 @@ class RunCommand extends Command {
 					}
 
 					try {
-						await getMeshArtifact(imsOrgCode, projectId, workspaceId, workspaceName, meshId);
+						await getMeshArtifact(imsOrgId, projectId, workspaceId, workspaceName, meshId);
 					} catch (err) {
 						throw new Error(
 							`Unable to retrieve mesh. Please check the details and try again. RequestId: ${global.requestId}`,
@@ -163,13 +163,12 @@ class RunCommand extends Command {
 					}
 
 					//Generating unique mesh id
-					meshId = UUID.newUuid().toString();
+					meshId = 'testMesh';
 
 					await validateMesh(data.meshConfig);
 					await buildMesh(meshId, data.meshConfig);
 					await compileMesh(meshId);
 				}
-
 				let portNo;
 				//secrets management
 				if (secretsFilePath) {
@@ -183,6 +182,8 @@ class RunCommand extends Command {
 					}
 				}
 
+				await this.copyMeshContent(meshId);
+
 				//To set the port number using the environment file
 				if (process.env.PORT !== undefined) {
 					if (isNaN(process.env.PORT) || !Number.isInteger(parseInt(process.env.PORT))) {
@@ -201,9 +202,8 @@ class RunCommand extends Command {
 				if (!portNo) {
 					portNo = 5000;
 				}
-
-				this.log(`Starting server on port : ${portNo}`);
-				await startGraphqlServer(meshId, portNo, flags.debug);
+				meshId = '000000000000-0000-0000-0000-000000000000';
+				runServer(meshId, portNo);
 			} else {
 				throw new Error(
 					'`aio api-mesh run` cannot be executed because there is no package.json file in the current directory. Use `aio api-mesh init` to set up a package.',
@@ -213,6 +213,31 @@ class RunCommand extends Command {
 			this.error(error.message);
 		}
 	}
+
+	async copyMeshContent(meshId) {
+		// Remove mesh artifact directory if exists
+		if (fs.existsSync('.mesh')) {
+			fs.rmdirSync('.mesh', { recursive: true });
+		}
+		// Move built mesh artifact to expect directory
+		fs.renameSync(`mesh-artifact/${meshId}`, '.mesh');
+		// Remove tenant files directory if exists
+		if (fs.existsSync('tenantFiles')) {
+			fs.rmdirSync('tenantFiles', { recursive: true });
+		}
+		// Move built tenant files if exists
+		if (fs.existsSync('mesh-artifact/tenantFiles')) {
+			fs.cpSync('mesh-artifact/tenantFiles', '.mesh/tenantFiles', { recursive: true });
+			fs.renameSync('mesh-artifact/tenantFiles', 'tenantFiles');
+		}
+
+		await fixPlugins('.mesh/index.js');
+
+		if (fs.existsSync(`${__dirname}/../../../.mesh`)) {
+			fs.rmdirSync(`${__dirname}/../../../.mesh`, { recursive: true });
+		}
+		fs.cpSync('.mesh', `${__dirname}/../../../.mesh`, { recursive: true });
+	}
 }
 
 module.exports = RunCommand;

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 { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
+		const { imsOrgId, imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,
 		});
 
 		let meshId = null;
 
 		try {
-			meshId = await getMeshId(imsOrgCode, projectId, workspaceId, workspaceName);
+			meshId = await getMeshId(imsOrgId, projectId, workspaceId, workspaceName);
 		} catch (err) {
 			// API Request failed
 			this.log(err.message);
@@ -37,12 +37,12 @@ class StatusCommand extends Command {
 		// API Request succeeded, but mesh could not be found
 		if (!meshId) {
 			this.error(
-				`Unable to get mesh status. No mesh found for Org(${imsOrgCode}) -> Project(${projectId}) -> Workspace(${workspaceId}). Check the details and try again.`,
+				`Unable to get mesh status. No mesh found for Org(${imsOrgId}) -> Project(${projectId}) -> Workspace(${workspaceId}). Please check the details and try again.`,
 			);
 		}
 
 		try {
-			const mesh = await getMesh(imsOrgCode, projectId, workspaceId, workspaceName, meshId);
+			const mesh = await getMesh(imsOrgId, projectId, workspaceId, workspaceName, meshId);
 			this.log(''.padEnd(102, '*'));
 			await this.displayMeshStatus(mesh, imsOrgCode, projectId, workspaceId);
 			this.log(''.padEnd(102, '*'));

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

@@ -73,10 +73,10 @@ class UpdateCommand extends Command {
 		let meshId = null;
 
 		try {
-			meshId = await getMeshId(imsOrgCode, projectId, workspaceId);
+			meshId = await getMeshId(imsOrgId, projectId, workspaceId);
 		} catch (err) {
 			this.error(
-				`Unable to get mesh ID. Check the details and try again. RequestId: ${global.requestId}`,
+				`Unable to get mesh ID. Please check the details and try again. RequestId: ${global.requestId}`,
 			);
 		}
 
@@ -90,7 +90,7 @@ class UpdateCommand extends Command {
 				data = JSON.parse(inputMeshData);
 			} catch (err) {
 				this.log(err.message);
-				this.error('Input mesh file is not a valid JSON. Check the file provided.');
+				this.error('Input mesh file is not a valid JSON. Please check the file provided.');
 			}
 		}
 
@@ -109,7 +109,9 @@ class UpdateCommand extends Command {
 				data = await importFiles(data, filesList, args.file, flags.autoConfirmAction);
 			} catch (err) {
 				this.log(err.message);
-				this.error('Unable to import the files in the mesh config. Check the file and try again.');
+				this.error(
+					'Unable to import the files in the mesh config. Please check the file and try again.',
+				);
 			}
 		}
 
@@ -123,7 +125,7 @@ class UpdateCommand extends Command {
 				data.secrets = encryptedSecrets;
 			} catch (err) {
 				this.log(err.message);
-				this.error('Unable to import secrets. Check the file and try again.');
+				this.error('Unable to import secrets. Please check the file and try again.');
 			}
 		}
 
@@ -139,7 +141,7 @@ class UpdateCommand extends Command {
 			if (shouldContinue) {
 				try {
 					const response = await updateMesh(
-						imsOrgCode,
+						imsOrgId,
 						projectId,
 						workspaceId,
 						workspaceName,
@@ -167,7 +169,7 @@ class UpdateCommand extends Command {
 					this.log(error.message);
 
 					this.error(
-						`Unable to update the mesh. Check the mesh configuration file and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
+						`Unable to update the mesh. Please check the mesh configuration file and try again. If the error persists please contact support. RequestId: ${global.requestId}`,
 					);
 				}
 			} else {

package/src/constants.js

@@ -9,7 +9,6 @@ const StageConstants = {
 	AIO_CLI_API_KEY: 'aio-cli-console-auth-stage',
 	SMS_BASE_URL: 'https://graph-stage.adobe.io/api-admin',
 	MESH_BASE_URL: 'https://edge-stage-graph.adobe.io/api',
-	SMS_API_KEY: 'adobe-graph-stage-onboarding',
 };
 
 const ProdConstants = {
@@ -20,7 +19,6 @@ const ProdConstants = {
 	SMS_BASE_URL: 'https://graph.adobe.io/api-admin',
 	MESH_BASE_URL: 'https://edge-graph.adobe.io/api',
 	MESH_SANDBOX_BASE_URL: 'https://edge-sandbox-graph.adobe.io/api',
-	SMS_API_KEY: 'adobe-graph-prod',
 };
 
 const envConstants = clientEnv === 'stage' ? StageConstants : ProdConstants;

package/src/cors.js

@@ -0,0 +1,28 @@
+/**
+ * Get default CORS options.
+ * @param env Environment.
+ */
+const getDefaultCorsOptions = env => {
+	return env.CORS_DEFAULT_URL
+		? {
+				origin: env.CORS_DEFAULT_URL,
+		  }
+		: {};
+};
+
+/**
+ * Get CORS options. Merges default CORS options with custom specific options if present in the mesh configuration.
+ * Custom CORS options overwrite the default options to ensure that specific requirements can be met without altering
+ * the default configuration.
+ * @param env Environment.
+ * @param meshConfig Mesh configuration.
+ */
+const getCorsOptions = (env, meshConfig) => {
+	const defaultCorsOptions = getDefaultCorsOptions(env);
+	return {
+		...defaultCorsOptions,
+		...meshConfig.responseConfig?.CORS,
+	};
+};
+
+module.exports = { getCorsOptions };

package/src/fixPlugins.js

@@ -0,0 +1,28 @@
+/* eslint-disable no-console */
+const fs = require('fs');
+/**
+ * Modifies `index.js` of a mesh artifact to mutate plugin references for edge compatibility. Current forces
+ * `@graphql-mesh/plugin-http-details-extensions` to resolve to local fork instead.
+ */
+async function fixPlugins(meshArtifactPath) {
+	try {
+		console.log('Modifying mesh artifact to fix plugins for edge compatibility.');
+		const data = fs.readFileSync(meshArtifactPath, 'utf8');
+		const updatedData = data.replace(
+			/@graphql-mesh\/plugin-http-details-extensions/g,
+			'../src/plugins/httpDetailsExtensions',
+		);
+		fs.writeFileSync(meshArtifactPath, updatedData, 'utf8');
+	} catch (err) {
+		console.error(err);
+	}
+}
+
+// Execute fixPlugins if run directly from CLI
+if (require.main === module) {
+	fixPlugins();
+}
+
+module.exports = {
+	fixPlugins,
+};

package/src/index.js

@@ -0,0 +1,44 @@
+import { ServedTier, addServedHeader } from './served';
+import { bindedlogger as logger } from './utils/logger';
+import { getRequestId } from './utils/requestId';
+import { buildServer } from './wranglerServer';
+
+let server;
+
+export default {
+	setServer(newServer) {
+		server = newServer;
+	},
+	/**
+	 * Fetch.
+	 * @param request Request.
+	 * @param env Environment.
+	 * @param ctx Event context.
+	 */
+	async fetch(request, env, ctx) {
+		const requestId = getRequestId(request);
+		// Retrieve environment variables
+		const { MESH_ID: meshId, LOG_LEVEL: logLevel } = env;
+		const loggerInstance = logger({ logLevel, meshId, requestId });
+		const meshArtifacts = await import('../.mesh');
+		const rawMesh = await import('../.mesh/.meshrc.json');
+
+		if (!server) {
+			server = await this.buildAndCacheServer(env, loggerInstance, meshArtifacts, rawMesh);
+		}
+
+		loggerInstance.debug('WORKER HOT: Fetching via worker');
+		const response = await server.fetch(request, ctx);
+		addServedHeader(response, ServedTier.WORKER_HOT);
+		return response;
+	},
+	/**
+	 * Build and cache mesh instance/server in global variable.
+	 * @param env
+	 * @param loggerInstance
+	 */
+	async buildAndCacheServer(env, loggerInstance, meshArtifacts, meshConfig) {
+		server = await buildServer(loggerInstance, env, meshArtifacts, meshConfig);
+		return server;
+	},
+};

package/src/lib/devConsole.js

@@ -12,7 +12,7 @@ const exec = util.promisify(require('child_process').exec);
 const contentDisposition = require('content-disposition');
 const chalk = require('chalk');
 
-const { DEV_CONSOLE_TRANSPORTER_API_KEY, SMS_BASE_URL, SMS_API_KEY } = CONSTANTS;
+const { DEV_CONSOLE_TRANSPORTER_API_KEY, SMS_BASE_URL } = CONSTANTS;
 
 const { objToString, getDevConsoleConfig } = require('../helpers');
 
@@ -113,7 +113,7 @@ const describeMesh = async (organizationId, projectId, workspaceId, workspaceNam
  * @returns
  */
 const listLogs = async (organizationCode, projectId, workspaceId, meshId, fileName) => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { accessToken, apiKey } = await getDevConsoleConfig();
 	const url = `${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/logs/list`;
 	const config = {
 		method: 'get',
@@ -121,7 +121,7 @@ const listLogs = async (organizationCode, projectId, workspaceId, meshId, fileNa
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'x-api-key': SMS_API_KEY,
+			'X-Api-Key': apiKey,
 		},
 	};
 
@@ -142,21 +142,20 @@ const listLogs = async (organizationCode, projectId, workspaceId, meshId, fileNa
 };
 
 const getMesh = async (organizationId, projectId, workspaceId, workspaceName, meshId) => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
-		url: `${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
+		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
 			'workspaceName': workspaceName,
-			'x-api-key': SMS_API_KEY,
 		},
 	};
 
 	logger.info(
 		'Initiating GET %s',
-		`${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
+		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
 	);
 
 	try {
@@ -233,10 +232,10 @@ const createMesh = async (
 	projectName,
 	data,
 ) => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'post',
-		url: `${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes`,
+		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes?API_KEY=${apiKey}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'Content-Type': 'application/json',
@@ -244,14 +243,13 @@ const createMesh = async (
 			'workspaceName': workspaceName,
 			'orgName': orgName,
 			'projectName': projectName,
-			'x-api-key': SMS_API_KEY,
 		},
 		data: JSON.stringify(data),
 	};
 
 	logger.info(
 		'Initiating POST %s',
-		`${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes`,
+		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes?API_KEY=${apiKey}`,
 	);
 
 	try {
@@ -345,10 +343,10 @@ const updateMesh = async (
 	meshId,
 	data,
 ) => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'put',
-		url: `${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
+		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'Content-Type': 'application/json',
@@ -356,14 +354,13 @@ const updateMesh = async (
 			'workspaceName': workspaceName,
 			'orgName': orgName,
 			'projectName': projectName,
-			'x-api-key': SMS_API_KEY,
 		},
 		data: JSON.stringify(data),
 	};
 
 	logger.info(
 		'Initiating PUT %s',
-		`${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
+		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
 	);
 
 	try {
@@ -436,20 +433,19 @@ const updateMesh = async (
 };
 
 const deleteMesh = async (organizationId, projectId, workspaceId, meshId) => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'delete',
-		url: `${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
+		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'x-api-key': SMS_API_KEY,
 		},
 	};
 
 	logger.info(
 		'Initiating DELETE %s',
-		`${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}`,
+		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}?API_KEY=${apiKey}`,
 	);
 
 	try {
@@ -521,24 +517,23 @@ const deleteMesh = async (organizationId, projectId, workspaceId, meshId) => {
 	}
 };
 
-const getMeshId = async (organizationCode, projectId, workspaceId, workspaceName) => {
-	const { accessToken } = await getDevConsoleConfig();
+const getMeshId = async (organizationId, projectId, workspaceId, workspaceName) => {
+	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
 	logger.info('Initiating Mesh ID request');
 
 	const config = {
 		method: 'get',
-		url: `${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/mesh`,
+		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/describe?API_KEY=${apiKey}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
 			'workspaceName': workspaceName,
-			'x-api-key': SMS_API_KEY,
 		},
 	};
 
 	logger.info(
 		'Initiating GET %s',
-		`${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/mesh`,
+		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/describe?API_KEY=${apiKey}`,
 	);
 
 	try {
@@ -810,22 +805,21 @@ const unsubscribeCredentialFromMeshService = async (
 };
 
 const getMeshArtifact = async (organizationId, projectId, workspaceId, workspaceName, meshId) => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { baseUrl: devConsoleUrl, accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
-		url: `${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/artifact`,
+		url: `${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/artifact?API_KEY=${apiKey}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
 			'workspaceName': workspaceName,
-			'x-api-key': SMS_API_KEY,
 		},
 		responseType: 'arraybuffer',
 	};
 
 	logger.info(
 		'Initiating GET %s',
-		`${SMS_BASE_URL}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/artifact`,
+		`${devConsoleUrl}/organizations/${organizationId}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/artifact?API_KEY=${apiKey}`,
 	);
 
 	try {
@@ -868,14 +862,14 @@ const getMeshArtifact = async (organizationId, projectId, workspaceId, workspace
  * @returns {Promise<Object>}
  */
 const getTenantFeatures = async organizationCode => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
 		url: `${SMS_BASE_URL}/organizations/${organizationCode}/features`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'x-api-key': SMS_API_KEY,
+			'X-Api-Key': apiKey,
 		},
 	};
 
@@ -923,14 +917,14 @@ const getTenantFeatures = async organizationCode => {
  * @returns {Promise<Object>}
  */
 const getMeshDeployments = async (organizationCode, projectId, workspaceId, meshId) => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
 		url: `${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/deployments/latest`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'x-api-key': SMS_API_KEY,
+			'X-Api-Key': apiKey,
 		},
 	};
 
@@ -979,14 +973,14 @@ const getMeshDeployments = async (organizationCode, projectId, workspaceId, mesh
  * @returns string
  */
 const getPublicEncryptionKey = async organizationCode => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
 		url: `${SMS_BASE_URL}/organizations/${organizationCode}/getPublicKey`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'x-api-key': SMS_API_KEY,
+			'X-Api-Key': apiKey,
 		},
 	};
 	logger.info(
@@ -1024,14 +1018,14 @@ const getPresignedUrls = async (
 	startTime,
 	endTime,
 ) => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
 		url: `${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/logs?startDateTime=${startTime}&endDateTime=${endTime}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'x-api-key': SMS_API_KEY,
+			'X-Api-Key': apiKey,
 		},
 	};
 
@@ -1063,14 +1057,14 @@ const getPresignedUrls = async (
 };
 
 const getLogsByRayId = async (organizationCode, projectId, workspaceId, meshId, rayId) => {
-	const { accessToken } = await getDevConsoleConfig();
+	const { accessToken, apiKey } = await getDevConsoleConfig();
 	const config = {
 		method: 'get',
 		url: `${SMS_BASE_URL}/organizations/${organizationCode}/projects/${projectId}/workspaces/${workspaceId}/meshes/${meshId}/logs/${rayId}`,
 		headers: {
 			'Authorization': `Bearer ${accessToken}`,
 			'x-request-id': global.requestId,
-			'x-api-key': SMS_API_KEY,
+			'X-Api-Key': apiKey,
 		},
 	};