Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adobe/aio-cli-plugin-api-mesh",
"version": "5.3.0",
"version": "5.3.1",
"description": "Adobe I/O CLI plugin to develop and manage API mesh sources",
"keywords": [
"oclif-plugin"
Expand Down
16 changes: 15 additions & 1 deletion src/constants.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const { getCliEnv } = require('@adobe/aio-lib-env');
const dotenv = require('dotenv');

dotenv.config();
const clientEnv = getCliEnv();

const StageConstants = {
Expand All @@ -24,4 +26,16 @@ const ProdConstants = {
};

const envConstants = clientEnv === 'stage' ? StageConstants : ProdConstants;
module.exports = { ...envConstants };

// Export environment variables/constants
module.exports = {
DEV_CONSOLE_BASE_URL: process.env.DEV_CONSOLE_BASE_URL || envConstants.DEV_CONSOLE_BASE_URL,
DEV_CONSOLE_API_KEY: process.env.DEV_CONSOLE_API_KEY || envConstants.DEV_CONSOLE_API_KEY,
DEV_CONSOLE_TRANSPORTER_API_KEY:
process.env.DEV_CONSOLE_TRANSPORTER_API_KEY || envConstants.DEV_CONSOLE_TRANSPORTER_API_KEY,
AIO_CLI_API_KEY: process.env.AIO_CLI_API_KEY || envConstants.AIO_CLI_API_KEY,
SMS_BASE_URL: process.env.SMS_BASE_URL || envConstants.SMS_BASE_URL,
MESH_BASE_URL: process.env.MESH_BASE_URL || envConstants.MESH_BASE_URL,
MESH_SANDBOX_BASE_URL: process.env.MESH_SANDBOX_BASE_URL || envConstants.MESH_SANDBOX_BASE_URL,
SMS_API_KEY: process.env.SMS_API_KEY || envConstants.SMS_API_KEY,
};
4 changes: 1 addition & 3 deletions src/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -452,15 +452,13 @@ function initMetadata(config) {
const { version, plugins, userAgent, platform, arch } = config;
const currentIntalledVersion = getCurrentInstalledPluginVersion(plugins);

const metadataHeaders = {
global.metadataHeaders = {
'x-aio-cli-version': version,
'x-aio-cli-user-agent': userAgent,
'x-aio-cli-platform': platform,
'x-aio-cli-arch': arch,
'x-aio-cli-plugin-api-mesh-version': currentIntalledVersion,
};

global.metadataHeaders = metadataHeaders;
} catch (error) {
logger.error('Unable to initialize metadata headers');
logger.error(error.message);
Expand Down
Loading