There is a security vulnerability in SSH key-generation using GitKraken < v8.0.1. If you used this tool to create SSH keys, please update GitKraken and regenerate. If you need help with this, contact forum-support@opengroup.org

Commit 0c303783 authored by Walter D's avatar Walter D
Browse files

converted des context path to env variables

parent 69fc9d0e
Pipeline #51355 passed with stages
in 11 minutes and 34 seconds
...@@ -54,6 +54,11 @@ export class IbmConfig extends Config { ...@@ -54,6 +54,11 @@ export class IbmConfig extends Config {
// Logger // Logger
public static LOGGER_LEVEL; public static LOGGER_LEVEL;
// DES context path
public static ENTITLEMENT_CONTEXT_PATH: string;
public static COMPLIANCE_CONTEXT_PATH: string;
public static STORAGE_CONTEXT_PATH: string;
public async init(): Promise<void> { public async init(): Promise<void> {
// data ecosystem host url and appkey // data ecosystem host url and appkey
...@@ -62,6 +67,11 @@ export class IbmConfig extends Config { ...@@ -62,6 +67,11 @@ export class IbmConfig extends Config {
IbmConfig.DES_SERVICE_HOST_STORAGE = process.env.DES_SERVICE_HOST_STORAGE; IbmConfig.DES_SERVICE_HOST_STORAGE = process.env.DES_SERVICE_HOST_STORAGE;
IbmConfig.IMP_SERVICE_ACCOUNT_SIGNER = process.env.IMP_SERVICE_ACCOUNT_SIGNER; IbmConfig.IMP_SERVICE_ACCOUNT_SIGNER = process.env.IMP_SERVICE_ACCOUNT_SIGNER;
// DES service context path
IbmConfig.ENTITLEMENT_CONTEXT_PATH = process.env.ENTITLEMENT_CONTEXT_PATH
IbmConfig.COMPLIANCE_CONTEXT_PATH = process.env.COMPLIANCE_CONTEXT_PATH
IbmConfig.STORAGE_CONTEXT_PATH = process.env.STORAGE_CONTEXT_PATH
// DES_SERVICE_HOST replaced by new variable ENTITLEMENT_HOST // DES_SERVICE_HOST replaced by new variable ENTITLEMENT_HOST
IbmConfig.ENTITLEMENT_HOST = process.env.ENTITLEMENT_HOST; IbmConfig.ENTITLEMENT_HOST = process.env.ENTITLEMENT_HOST;
IbmConfig.LEGAL_HOST = process.env.LEGAL_HOST;// DES_SERVICE_HOST replaced by new variable LEGAL_HOST IbmConfig.LEGAL_HOST = process.env.LEGAL_HOST;// DES_SERVICE_HOST replaced by new variable LEGAL_HOST
......
...@@ -7,6 +7,7 @@ import { ...@@ -7,6 +7,7 @@ import {
IDESEntitlementGroupMembersModel IDESEntitlementGroupMembersModel
} from '../../dataecosystem'; } from '../../dataecosystem';
import { logger } from './logger'; import { logger } from './logger';
import { IbmConfig } from './config';
@DataEcosystemCoreFactory.register('ibm') @DataEcosystemCoreFactory.register('ibm')
export class IbmDataEcosystemServices extends AbstractDataEcosystemCore { export class IbmDataEcosystemServices extends AbstractDataEcosystemCore {
...@@ -57,7 +58,7 @@ export class IbmDataEcosystemServices extends AbstractDataEcosystemCore { ...@@ -57,7 +58,7 @@ export class IbmDataEcosystemServices extends AbstractDataEcosystemCore {
public getComplianceBaseUrlPath(): string { public getComplianceBaseUrlPath(): string {
logger.info('in IbmDataEcosystemServices.getComplianceBaseUrlPath. Returning..'); logger.info('in IbmDataEcosystemServices.getComplianceBaseUrlPath. Returning..');
return '/api/legal/v1'; return IbmConfig.COMPLIANCE_CONTEXT_PATH;
}; };
public getDataPartitionIDRestHeaderName(): string { public getDataPartitionIDRestHeaderName(): string {
...@@ -67,12 +68,12 @@ export class IbmDataEcosystemServices extends AbstractDataEcosystemCore { ...@@ -67,12 +68,12 @@ export class IbmDataEcosystemServices extends AbstractDataEcosystemCore {
public getEntitlementBaseUrlPath(): string { public getEntitlementBaseUrlPath(): string {
logger.info('in IbmDataEcosystemServices.getEntitlementBaseUrlPath. Returning..'); logger.info('in IbmDataEcosystemServices.getEntitlementBaseUrlPath. Returning..');
return '/api/entitlements/v1'; return IbmConfig.ENTITLEMENT_CONTEXT_PATH;
}; };
public getStorageBaseUrlPath(): string { public getStorageBaseUrlPath(): string {
logger.info('in IbmDataEcosystemServices.getStorageBaseUrlPath. Returning..'); logger.info('in IbmDataEcosystemServices.getStorageBaseUrlPath. Returning..');
return '/api/storage/v2'; return IbmConfig.STORAGE_CONTEXT_PATH;
}; };
public getUserAddBodyRequest(userEmail: string, role: string): { email: string, role: string } | string[] { public getUserAddBodyRequest(userEmail: string, role: string): { email: string, role: string } | string[] {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment