From f9cc118b49fe40838fdc0afe366859dccb238d19 Mon Sep 17 00:00:00 2001 From: Diego Molteni Date: Fri, 29 Jan 2021 05:03:04 +0000 Subject: [PATCH 1/3] added multi des host support --- src/cloud/config.ts | 29 ++++++----- src/cloud/providers/azure/config.ts | 15 ++++-- src/cloud/providers/azure/dataecosystem.ts | 2 +- src/cloud/providers/google/config.ts | 5 +- src/cloud/providers/ibm/config.ts | 13 +++-- src/dataecosystem/compliance.ts | 12 +---- src/dataecosystem/entitlement.ts | 60 ++-------------------- src/dataecosystem/storage.ts | 36 ++----------- 8 files changed, 52 insertions(+), 120 deletions(-) diff --git a/src/cloud/config.ts b/src/cloud/config.ts index 1728219a..5de09003 100644 --- a/src/cloud/config.ts +++ b/src/cloud/config.ts @@ -30,7 +30,10 @@ export interface ConfigModel { DES_REDIS_INSTANCE_ADDRESS: string; DES_REDIS_INSTANCE_PORT: number; DES_REDIS_INSTANCE_KEY?: string; - DES_SERVICE_HOST: string; + DES_SERVICE_HOST_ENTITLEMENT: string; + DES_SERVICE_HOST_COMPLIANCE: string; + DES_SERVICE_HOST_STORAGE: string; + DES_SERVICE_HOST_PARTITION: string; DES_SERVICE_APPKEY: string; DES_GROUP_CHAR_LIMIT: number; JWKS_URL: string; @@ -94,14 +97,13 @@ export abstract class Config implements IConfig { public static DES_REDIS_INSTANCE_KEY: string; // DataEcosystem Configuration - public static DES_SERVICE_HOST: string; + public static DES_SERVICE_HOST_ENTITLEMENT: string; + public static DES_SERVICE_HOST_COMPLIANCE: string; + public static DES_SERVICE_HOST_STORAGE: string; + public static DES_SERVICE_HOST_PARTITION: string; public static DES_SERVICE_APPKEY: string; public static DES_GROUP_CHAR_LIMIT: number; public static DE_FORWARD_APPKEY = Symbol('seismic-dms-fw-caller-appkey'); - //IBM - public static DES_SERVICE_HOST_ENTITLEMENT: string;//IBM - public static DES_SERVICE_HOST_COMPLIANCE: string;//IBM - public static DES_SERVICE_HOST_STORAGE: string;//IBM // JWT Validation public static JWKS_URL: string; @@ -157,7 +159,10 @@ export abstract class Config implements IConfig { Config.FEATURE_FLAG_LOGGING = model.FEATURE_FLAG_LOGGING; Config.FEATURE_FLAG_STACKDRIVER_EXPORTER = model.FEATURE_FLAG_STACKDRIVER_EXPORTER; - Config.DES_SERVICE_HOST = model.DES_SERVICE_HOST; + Config.DES_SERVICE_HOST_ENTITLEMENT = model.DES_SERVICE_HOST_ENTITLEMENT; + Config.DES_SERVICE_HOST_COMPLIANCE = model.DES_SERVICE_HOST_COMPLIANCE; + Config.DES_SERVICE_HOST_STORAGE = model.DES_SERVICE_HOST_STORAGE; + Config.DES_SERVICE_HOST_PARTITION = model.DES_SERVICE_HOST_PARTITION; Config.DES_SERVICE_APPKEY = model.DES_SERVICE_APPKEY; Config.DES_GROUP_CHAR_LIMIT = model.DES_GROUP_CHAR_LIMIT; @@ -173,7 +178,10 @@ export abstract class Config implements IConfig { Config.checkRequiredConfig(Config.CLOUDPROVIDER, 'CLOUDPROVIDER'); Config.checkRequiredConfig(Config.SERVICE_ENV, 'SERVICE_ENV'); Config.checkRequiredConfig(Config.IMP_SERVICE_ACCOUNT_SIGNER, 'IMP_SERVICE_ACCOUNT_SIGNER'); - Config.checkRequiredConfig(Config.DES_SERVICE_HOST, 'DES_SERVICE_HOST'); + Config.checkRequiredConfig(Config.DES_SERVICE_HOST_ENTITLEMENT, 'DES_SERVICE_HOST_ENTITLEMENT'); + Config.checkRequiredConfig(Config.DES_SERVICE_HOST_COMPLIANCE, 'DES_SERVICE_HOST_COMPLIANCE'); + Config.checkRequiredConfig(Config.DES_SERVICE_HOST_STORAGE, 'DES_SERVICE_HOST_STORAGE'); + Config.checkRequiredConfig(Config.DES_SERVICE_HOST_PARTITION, 'DES_SERVICE_HOST_PARTITION'); Config.checkRequiredConfig(Config.DES_SERVICE_APPKEY, 'DES_SERVICE_APPKEY'); // JWT validation @@ -208,8 +216,3 @@ export class ConfigFactory extends CloudFactory { // Set the Utest flag correctly as sooon as the config class get loaded Config.UTEST = process.env.UTEST; - -//IBM DES base urls -Config.DES_SERVICE_HOST_ENTITLEMENT = process.env.DES_SERVICE_HOST_ENTITLEMENT; -Config.DES_SERVICE_HOST_COMPLIANCE = process.env.DES_SERVICE_HOST_COMPLIANCE; -Config.DES_SERVICE_HOST_STORAGE = process.env.DES_SERVICE_HOST_STORAGE; \ No newline at end of file diff --git a/src/cloud/providers/azure/config.ts b/src/cloud/providers/azure/config.ts index 5cf4b30e..415d3b62 100644 --- a/src/cloud/providers/azure/config.ts +++ b/src/cloud/providers/azure/config.ts @@ -48,9 +48,15 @@ export class AzureConfig extends Config { await Keyvault.loadSecrets(Keyvault.CreateSecretClient()); // data ecosystem host url and appkey - AzureConfig.DES_SERVICE_HOST = process.env.DES_SERVICE_HOST + AzureConfig.DES_SERVICE_HOST_COMPLIANCE = process.env.DES_SERVICE_HOST + AzureConfig.DES_SERVICE_HOST_ENTITLEMENT = process.env.DES_SERVICE_HOST + AzureConfig.DES_SERVICE_HOST_STORAGE = process.env.DES_SERVICE_HOST + AzureConfig.DES_SERVICE_HOST_PARTITION = process.env.DES_SERVICE_HOST AzureConfig.DES_SERVICE_APPKEY = 'undefined' - Config.checkRequiredConfig(AzureConfig.DES_SERVICE_HOST, 'DES_SERVICE_HOST'); + Config.checkRequiredConfig(AzureConfig.DES_SERVICE_HOST_COMPLIANCE, 'DES_SERVICE_HOST'); + Config.checkRequiredConfig(AzureConfig.DES_SERVICE_HOST_ENTITLEMENT, 'DES_SERVICE_HOST'); + Config.checkRequiredConfig(AzureConfig.DES_SERVICE_HOST_STORAGE, 'DES_SERVICE_HOST'); + Config.checkRequiredConfig(AzureConfig.DES_SERVICE_HOST_PARTITION, 'DES_SERVICE_HOST'); Config.checkRequiredConfig(AzureConfig.DES_SERVICE_APPKEY, 'DES_SERVICE_APPKEY'); // the email of the service identity used to sign an impersonation token @@ -74,7 +80,10 @@ export class AzureConfig extends Config { DES_REDIS_INSTANCE_ADDRESS: AzureConfig.DES_REDIS_INSTANCE_ADDRESS, DES_REDIS_INSTANCE_PORT: AzureConfig.DES_REDIS_INSTANCE_PORT, DES_REDIS_INSTANCE_KEY: AzureConfig.DES_REDIS_INSTANCE_KEY, - DES_SERVICE_HOST: AzureConfig.DES_SERVICE_HOST, + DES_SERVICE_HOST_COMPLIANCE: AzureConfig.DES_SERVICE_HOST_COMPLIANCE, + DES_SERVICE_HOST_ENTITLEMENT: AzureConfig.DES_SERVICE_HOST_ENTITLEMENT, + DES_SERVICE_HOST_STORAGE: AzureConfig.DES_SERVICE_HOST_STORAGE, + DES_SERVICE_HOST_PARTITION: AzureConfig.DES_SERVICE_HOST_PARTITION, DES_SERVICE_APPKEY: AzureConfig.DES_SERVICE_APPKEY, DES_GROUP_CHAR_LIMIT: AzureConfig.DES_GROUP_CHAR_LIMIT, JWKS_URL: process.env.JWKS_URL, diff --git a/src/cloud/providers/azure/dataecosystem.ts b/src/cloud/providers/azure/dataecosystem.ts index 724601d0..9fa0a6a9 100644 --- a/src/cloud/providers/azure/dataecosystem.ts +++ b/src/cloud/providers/azure/dataecosystem.ts @@ -97,7 +97,7 @@ export class AzureDataEcosystemServices extends AbstractDataEcosystemCore { AzureConfig.SP_TENANT_ID, AzureConfig.SP_APP_RESOURCE_ID)).access_token, 'Content-Type': 'application/json' }, - url: AzureConfig.DES_SERVICE_HOST + '/api/partition/v1/partitions/' + dataPartitionID + url: AzureConfig.DES_SERVICE_HOST_PARTITION + '/api/partition/v1/partitions/' + dataPartitionID }; try { return JSON.parse(await request.get(options)); diff --git a/src/cloud/providers/google/config.ts b/src/cloud/providers/google/config.ts index be814eda..b354694e 100644 --- a/src/cloud/providers/google/config.ts +++ b/src/cloud/providers/google/config.ts @@ -83,7 +83,10 @@ export class ConfigGoogle extends Config { DES_REDIS_INSTANCE_ADDRESS: process.env.DES_REDIS_INSTANCE_ADDRESS, DES_REDIS_INSTANCE_PORT: +process.env.DES_REDIS_INSTANCE_PORT, DES_REDIS_INSTANCE_KEY: process.env.DES_REDIS_INSTANCE_KEY, - DES_SERVICE_HOST: process.env.SEISTORE_DES_HOST, + DES_SERVICE_HOST_COMPLIANCE: process.env.SEISTORE_DES_HOST, + DES_SERVICE_HOST_ENTITLEMENT: process.env.SEISTORE_DES_HOST, + DES_SERVICE_HOST_STORAGE: process.env.SEISTORE_DES_HOST, + DES_SERVICE_HOST_PARTITION: process.env.SEISTORE_DES_HOST, DES_SERVICE_APPKEY: process.env.SEISTORE_DES_APPKEY, DES_GROUP_CHAR_LIMIT: ConfigGoogle.DES_GROUP_CHAR_LIMIT, JWKS_URL: process.env.JWKS_URL, diff --git a/src/cloud/providers/ibm/config.ts b/src/cloud/providers/ibm/config.ts index a5d0c24b..73cb1931 100644 --- a/src/cloud/providers/ibm/config.ts +++ b/src/cloud/providers/ibm/config.ts @@ -45,7 +45,9 @@ export class IbmConfig extends Config { public async init(): Promise { // data ecosystem host url and appkey - IbmConfig.DES_SERVICE_HOST = process.env.DES_SERVICE_HOST; + IbmConfig.DES_SERVICE_HOST_COMPLIANCE = process.env.DES_SERVICE_HOST_COMPLIANCE; + IbmConfig.DES_SERVICE_HOST_ENTITLEMENT = process.env.DES_SERVICE_HOST_ENTITLEMENT; + IbmConfig.DES_SERVICE_HOST_STORAGE = process.env.DES_SERVICE_HOST_STORAGE; IbmConfig.IMP_SERVICE_ACCOUNT_SIGNER = process.env.IMP_SERVICE_ACCOUNT_SIGNER; IbmConfig.ENTITLEMENT_HOST = process.env.ENTITLEMENT_HOST;//DES_SERVICE_HOST replaced by new variable ENTITLEMENT_HOST @@ -77,7 +79,9 @@ export class IbmConfig extends Config { IbmConfig.DOC_DB_QUERY_RESULT_LIMIT_VALUE = parseInt(process.env.DOC_DB_QUERY_RESULT_LIMIT_VALUE, 10); /////////////////////////////////////// IbmConfig.DES_SERVICE_APPKEY = 'na' - Config.checkRequiredConfig(IbmConfig.DES_SERVICE_HOST, 'DES_SERVICE_HOST'); + Config.checkRequiredConfig(IbmConfig.DES_SERVICE_HOST_COMPLIANCE, 'DES_SERVICE_HOST_COMPLIANCE'); + Config.checkRequiredConfig(IbmConfig.DES_SERVICE_HOST_ENTITLEMENT, 'DES_SERVICE_HOST_ENTITLEMENT'); + Config.checkRequiredConfig(IbmConfig.DES_SERVICE_HOST_STORAGE, 'DES_SERVICE_HOST_STORAGE'); Config.checkRequiredConfig(IbmConfig.DES_SERVICE_APPKEY, 'DES_SERVICE_APPKEY'); // redis cache port for locks (the port as env variable) @@ -102,7 +106,10 @@ export class IbmConfig extends Config { DES_REDIS_INSTANCE_ADDRESS: IbmConfig.DES_REDIS_INSTANCE_ADDRESS, DES_REDIS_INSTANCE_PORT: IbmConfig.DES_REDIS_INSTANCE_PORT, DES_REDIS_INSTANCE_KEY: IbmConfig.DES_REDIS_INSTANCE_KEY, - DES_SERVICE_HOST: IbmConfig.DES_SERVICE_HOST, + DES_SERVICE_HOST_COMPLIANCE: IbmConfig.DES_SERVICE_HOST_COMPLIANCE, + DES_SERVICE_HOST_ENTITLEMENT: IbmConfig.DES_SERVICE_HOST_ENTITLEMENT, + DES_SERVICE_HOST_STORAGE: IbmConfig.DES_SERVICE_HOST_STORAGE, + DES_SERVICE_HOST_PARTITION: 'TO DEFINE', DES_SERVICE_APPKEY: IbmConfig.DES_SERVICE_APPKEY, DES_GROUP_CHAR_LIMIT: IbmConfig.DES_GROUP_CHAR_LIMIT, JWKS_URL: process.env.JWKS_URL, diff --git a/src/dataecosystem/compliance.ts b/src/dataecosystem/compliance.ts index dbb6fa4f..07033c10 100644 --- a/src/dataecosystem/compliance.ts +++ b/src/dataecosystem/compliance.ts @@ -39,16 +39,6 @@ export class DESCompliance { if (res !== undefined && res) { return res }; const dataecosystem = DataEcosystemCoreFactory.build(Config.CLOUDPROVIDER); - let urlValue; - - if(Config.DES_SERVICE_HOST_COMPLIANCE) - { - urlValue = Config.DES_SERVICE_HOST_COMPLIANCE + dataecosystem.getComplianceBaseUrlPath() + '/legaltags:validate'; - } - else - { - urlValue = Config.DES_SERVICE_HOST + dataecosystem.getComplianceBaseUrlPath() + '/legaltags:validate'; - } const options = { headers: { @@ -57,7 +47,7 @@ export class DESCompliance { 'Content-Type': 'application/json' }, json: { names: [ltag] }, - url: urlValue, + url: Config.DES_SERVICE_HOST_COMPLIANCE, }; // tslint:disable-next-line: no-string-literal diff --git a/src/dataecosystem/entitlement.ts b/src/dataecosystem/entitlement.ts index 6a8a8a0e..0155bfec 100644 --- a/src/dataecosystem/entitlement.ts +++ b/src/dataecosystem/entitlement.ts @@ -28,16 +28,6 @@ export class DESEntitlement { prevCursor?: string): Promise<{ members: IDESEntitlementMemberModel[], nextCursor: string }> { const dataecosystem = DataEcosystemCoreFactory.build(Config.CLOUDPROVIDER); - let urlValue; - - if(Config.DES_SERVICE_HOST_ENTITLEMENT) - { - urlValue= Config.DES_SERVICE_HOST_ENTITLEMENT + dataecosystem.getEntitlementBaseUrlPath() + '/groups/' + group + '/members'; - } - else - { - urlValue= Config.DES_SERVICE_HOST + dataecosystem.getEntitlementBaseUrlPath() + '/groups/' + group + '/members'; - } const options = { headers: { @@ -46,7 +36,7 @@ export class DESEntitlement { 'Authorization': userToken.startsWith('Bearer') ? userToken : 'Bearer ' + userToken, 'Content-Type': 'application/json', }, - url: urlValue, + url: Config.DES_SERVICE_HOST_ENTITLEMENT, }; if (prevCursor !== undefined) { options.url += ('?cursor=' + prevCursor); } @@ -77,16 +67,6 @@ export class DESEntitlement { userToken: string, dataPartitionID: string, appkey: string): Promise { const dataecosystem = DataEcosystemCoreFactory.build(Config.CLOUDPROVIDER); - let urlValue; - - if(Config.DES_SERVICE_HOST_ENTITLEMENT) - { - urlValue = Config.DES_SERVICE_HOST_ENTITLEMENT + dataecosystem.getEntitlementBaseUrlPath() + '/groups'; - } - else - { - urlValue = Config.DES_SERVICE_HOST + dataecosystem.getEntitlementBaseUrlPath() + '/groups'; - } const options = { headers: { @@ -95,7 +75,7 @@ export class DESEntitlement { 'Authorization': userToken.startsWith('Bearer') ? userToken : 'Bearer ' + userToken, 'Content-Type': 'application/json' }, - url: urlValue, + url: Config.DES_SERVICE_HOST_ENTITLEMENT, }; options.headers[dataecosystem.getDataPartitionIDRestHeaderName()] = dataPartitionID; @@ -126,16 +106,6 @@ export class DESEntitlement { role: string, appkey: string) { const dataecosystem = DataEcosystemCoreFactory.build(Config.CLOUDPROVIDER); - let urlValue; - - if(Config.DES_SERVICE_HOST_ENTITLEMENT) - { - urlValue = Config.DES_SERVICE_HOST_ENTITLEMENT + dataecosystem.getEntitlementBaseUrlPath() + '/groups/' + groupName + '/members'; - } - else - { - urlValue = Config.DES_SERVICE_HOST + dataecosystem.getEntitlementBaseUrlPath() + '/groups/' + groupName + '/members'; - } const options = { headers: { @@ -145,7 +115,7 @@ export class DESEntitlement { 'Content-Type': 'application/json' }, json: undefined, - url: urlValue, + url: Config.DES_SERVICE_HOST_ENTITLEMENT, }; options.json = dataecosystem.getUserAddBodyRequest(userEmail, role); @@ -173,16 +143,6 @@ export class DESEntitlement { userToken: string, groupName: string, dataPartitionID: string, userEmail: string, appkey: string) { const dataecosystem = DataEcosystemCoreFactory.build(Config.CLOUDPROVIDER); - let urlValue; - - if(Config.DES_SERVICE_HOST_ENTITLEMENT) - { - urlValue = Config.DES_SERVICE_HOST_ENTITLEMENT + dataecosystem.getEntitlementBaseUrlPath() + '/groups/' + groupName + '/members/' + userEmail; - } - else - { - urlValue = Config.DES_SERVICE_HOST + dataecosystem.getEntitlementBaseUrlPath() + '/groups/' + groupName + '/members/' + userEmail; - } const options = { headers: { @@ -191,7 +151,7 @@ export class DESEntitlement { 'Authorization': userToken.startsWith('Bearer') ? userToken : 'Bearer ' + userToken, 'Content-Type': 'application/json' }, - url: urlValue, + url: Config.DES_SERVICE_HOST_ENTITLEMENT, }; options.headers[dataecosystem.getDataPartitionIDRestHeaderName()] = dataPartitionID; @@ -218,16 +178,6 @@ export class DESEntitlement { userToken: string, groupName: string, groupDesc: string, dataPartitionID: string, appkey: string) { const dataecosystem = DataEcosystemCoreFactory.build(Config.CLOUDPROVIDER); - let urlValue; - - if(Config.DES_SERVICE_HOST_ENTITLEMENT) - { - urlValue = Config.DES_SERVICE_HOST_ENTITLEMENT + dataecosystem.getEntitlementBaseUrlPath() + '/groups'; - } - else - { - urlValue = Config.DES_SERVICE_HOST + dataecosystem.getEntitlementBaseUrlPath() + '/groups'; - } const options = { headers: { @@ -240,7 +190,7 @@ export class DESEntitlement { description: groupDesc, name: groupName, }, - url: urlValue, + url: Config.DES_SERVICE_HOST_ENTITLEMENT, }; options.headers[dataecosystem.getDataPartitionIDRestHeaderName()] = dataPartitionID; diff --git a/src/dataecosystem/storage.ts b/src/dataecosystem/storage.ts index 7372b388..c1190825 100644 --- a/src/dataecosystem/storage.ts +++ b/src/dataecosystem/storage.ts @@ -27,16 +27,6 @@ export class DESStorage { userToken: string, seismicMeta: any, esd: string, appkey: string): Promise { const dataecosystem = DataEcosystemCoreFactory.build(Config.CLOUDPROVIDER); - let urlValue; - - if(Config.DES_SERVICE_HOST_STORAGE) - { - urlValue = Config.DES_SERVICE_HOST_STORAGE + dataecosystem.getStorageBaseUrlPath() + '/records'; - } - else - { - urlValue = Config.DES_SERVICE_HOST + dataecosystem.getStorageBaseUrlPath() + '/records' - } const options = { headers: { @@ -45,7 +35,7 @@ export class DESStorage { 'Content-Type': 'application/json' }, json: seismicMeta, - url: urlValue, + url: Config.DES_SERVICE_HOST_STORAGE, }; // tslint:disable-next-line: no-string-literal @@ -73,16 +63,6 @@ export class DESStorage { userToken: string, seismicUid: string, esd: string, appkey: string): Promise { const dataecosystem = DataEcosystemCoreFactory.build(Config.CLOUDPROVIDER); - let urlValue; - - if(Config.DES_SERVICE_HOST_STORAGE) - { - urlValue = Config.DES_SERVICE_HOST_STORAGE + dataecosystem.getStorageBaseUrlPath() + '/records/' + seismicUid + ':delete'; - } - else - { - urlValue = Config.DES_SERVICE_HOST + dataecosystem.getStorageBaseUrlPath() + '/records/' + seismicUid + ':delete'; - } const options = { headers: { @@ -90,7 +70,7 @@ export class DESStorage { 'AppKey': appkey || Config.DES_SERVICE_APPKEY, 'Content-Type': 'application/json', }, - url: urlValue, + url: Config.DES_SERVICE_HOST_STORAGE, }; // tslint:disable-next-line: no-string-literal @@ -118,23 +98,13 @@ export class DESStorage { userToken: string, seismicUid: string, esd: string, appkey: string): Promise { const dataecosystem = DataEcosystemCoreFactory.build(Config.CLOUDPROVIDER); - let urlValue; - - if(Config.DES_SERVICE_HOST_STORAGE) - { - urlValue = Config.DES_SERVICE_HOST_STORAGE + dataecosystem.getStorageBaseUrlPath() + '/records/' + seismicUid; - } - else - { - urlValue = Config.DES_SERVICE_HOST + dataecosystem.getStorageBaseUrlPath() + '/records/' + seismicUid; - } const options = { headers: { 'Accept': 'application/json', 'AppKey': appkey || Config.DES_SERVICE_APPKEY, }, - url: urlValue, + url: Config.DES_SERVICE_HOST_STORAGE, }; // tslint:disable-next-line: no-string-literal -- GitLab From c745e89d18393986d6ebed58d0cf51117a6d1822 Mon Sep 17 00:00:00 2001 From: Diego Molteni Date: Wed, 3 Feb 2021 08:28:57 +0000 Subject: [PATCH 2/3] added missed base url --- src/dataecosystem/compliance.ts | 3 ++- src/dataecosystem/entitlement.ts | 12 +++++++----- src/dataecosystem/storage.ts | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/dataecosystem/compliance.ts b/src/dataecosystem/compliance.ts index 07033c10..9876a42b 100644 --- a/src/dataecosystem/compliance.ts +++ b/src/dataecosystem/compliance.ts @@ -47,7 +47,8 @@ export class DESCompliance { 'Content-Type': 'application/json' }, json: { names: [ltag] }, - url: Config.DES_SERVICE_HOST_COMPLIANCE, + PORT: Config.DES_REDIS_INSTANCE_PORT, + url: Config.DES_SERVICE_HOST_COMPLIANCE + dataecosystem.getComplianceBaseUrlPath() + '/legaltags:validate' }; // tslint:disable-next-line: no-string-literal diff --git a/src/dataecosystem/entitlement.ts b/src/dataecosystem/entitlement.ts index 0155bfec..1bddc8b0 100644 --- a/src/dataecosystem/entitlement.ts +++ b/src/dataecosystem/entitlement.ts @@ -36,7 +36,7 @@ export class DESEntitlement { 'Authorization': userToken.startsWith('Bearer') ? userToken : 'Bearer ' + userToken, 'Content-Type': 'application/json', }, - url: Config.DES_SERVICE_HOST_ENTITLEMENT, + url: Config.DES_SERVICE_HOST_ENTITLEMENT + dataecosystem.getEntitlementBaseUrlPath() + '/groups/' + group + '/members', }; if (prevCursor !== undefined) { options.url += ('?cursor=' + prevCursor); } @@ -75,7 +75,7 @@ export class DESEntitlement { 'Authorization': userToken.startsWith('Bearer') ? userToken : 'Bearer ' + userToken, 'Content-Type': 'application/json' }, - url: Config.DES_SERVICE_HOST_ENTITLEMENT, + url: Config.DES_SERVICE_HOST_ENTITLEMENT + dataecosystem.getEntitlementBaseUrlPath() + '/groups', }; options.headers[dataecosystem.getDataPartitionIDRestHeaderName()] = dataPartitionID; @@ -115,7 +115,8 @@ export class DESEntitlement { 'Content-Type': 'application/json' }, json: undefined, - url: Config.DES_SERVICE_HOST_ENTITLEMENT, + url: Config.DES_SERVICE_HOST_ENTITLEMENT + + dataecosystem.getEntitlementBaseUrlPath() + '/groups/' + groupName + '/members', }; options.json = dataecosystem.getUserAddBodyRequest(userEmail, role); @@ -151,7 +152,8 @@ export class DESEntitlement { 'Authorization': userToken.startsWith('Bearer') ? userToken : 'Bearer ' + userToken, 'Content-Type': 'application/json' }, - url: Config.DES_SERVICE_HOST_ENTITLEMENT, + url: Config.DES_SERVICE_HOST_ENTITLEMENT + + dataecosystem.getEntitlementBaseUrlPath() + '/groups/' + groupName + '/members/' + userEmail, }; options.headers[dataecosystem.getDataPartitionIDRestHeaderName()] = dataPartitionID; @@ -190,7 +192,7 @@ export class DESEntitlement { description: groupDesc, name: groupName, }, - url: Config.DES_SERVICE_HOST_ENTITLEMENT, + url: Config.DES_SERVICE_HOST_ENTITLEMENT + dataecosystem.getEntitlementBaseUrlPath() + '/groups', }; options.headers[dataecosystem.getDataPartitionIDRestHeaderName()] = dataPartitionID; diff --git a/src/dataecosystem/storage.ts b/src/dataecosystem/storage.ts index c1190825..05f66c53 100644 --- a/src/dataecosystem/storage.ts +++ b/src/dataecosystem/storage.ts @@ -35,7 +35,7 @@ export class DESStorage { 'Content-Type': 'application/json' }, json: seismicMeta, - url: Config.DES_SERVICE_HOST_STORAGE, + url: Config.DES_SERVICE_HOST_STORAGE + dataecosystem.getStorageBaseUrlPath() + '/records', }; // tslint:disable-next-line: no-string-literal @@ -70,7 +70,7 @@ export class DESStorage { 'AppKey': appkey || Config.DES_SERVICE_APPKEY, 'Content-Type': 'application/json', }, - url: Config.DES_SERVICE_HOST_STORAGE, + url: Config.DES_SERVICE_HOST_STORAGE + dataecosystem.getStorageBaseUrlPath() + '/records/' + seismicUid + ':delete', }; // tslint:disable-next-line: no-string-literal @@ -104,7 +104,7 @@ export class DESStorage { 'Accept': 'application/json', 'AppKey': appkey || Config.DES_SERVICE_APPKEY, }, - url: Config.DES_SERVICE_HOST_STORAGE, + url: Config.DES_SERVICE_HOST_STORAGE + dataecosystem.getStorageBaseUrlPath() + '/records/' + seismicUid, }; // tslint:disable-next-line: no-string-literal -- GitLab From b512f9bc4301f8666b8eeb118b3fd1d914b561e6 Mon Sep 17 00:00:00 2001 From: Diego Molteni Date: Wed, 3 Feb 2021 08:32:09 +0000 Subject: [PATCH 3/3] removed wrong copied value --- src/dataecosystem/compliance.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dataecosystem/compliance.ts b/src/dataecosystem/compliance.ts index 9876a42b..a48aafac 100644 --- a/src/dataecosystem/compliance.ts +++ b/src/dataecosystem/compliance.ts @@ -47,8 +47,7 @@ export class DESCompliance { 'Content-Type': 'application/json' }, json: { names: [ltag] }, - PORT: Config.DES_REDIS_INSTANCE_PORT, - url: Config.DES_SERVICE_HOST_COMPLIANCE + dataecosystem.getComplianceBaseUrlPath() + '/legaltags:validate' + url: Config.DES_SERVICE_HOST_COMPLIANCE + dataecosystem.getComplianceBaseUrlPath() + '/legaltags:validate', }; // tslint:disable-next-line: no-string-literal -- GitLab