Commit ef22dfc2 authored by Diego Molteni's avatar Diego Molteni
Browse files

Merge branch 'dm3/fix-ibm-tls' into 'master'

fixed issue on wrong name usage

See merge request !16
parents 7e46c408 389f45bf
Pipeline #25881 failed with stages
in 10 minutes
......@@ -98,7 +98,7 @@ export abstract class Config implements IConfig {
public static DES_REDIS_INSTANCE_ADDRESS: string;
public static DES_REDIS_INSTANCE_PORT: number;
public static DES_REDIS_INSTANCE_KEY: string;
public static DES_REDIS_INSTANCE_KEY_TLS_DISABLE: boolean;
public static DES_REDIS_INSTANCE_TLS_DISABLE: boolean;
// DataEcosystem Configuration
public static DES_SERVICE_HOST_ENTITLEMENT: string;
......@@ -154,7 +154,7 @@ export abstract class Config implements IConfig {
model.DES_REDIS_INSTANCE_PORT || model.LOCKSMAP_REDIS_INSTANCE_PORT;
Config.DES_REDIS_INSTANCE_KEY =
model.DES_REDIS_INSTANCE_KEY || model.LOCKSMAP_REDIS_INSTANCE_KEY;
Config.DES_REDIS_INSTANCE_KEY_TLS_DISABLE =
Config.DES_REDIS_INSTANCE_TLS_DISABLE =
model.DES_REDIS_INSTANCE_TLS_DISABLE || model.LOCKSMAP_REDIS_INSTANCE_TLS_DISABLE;
Config.FEATURE_FLAG_AUTHORIZATION = model.FEATURE_FLAG_AUTHORIZATION;
......
......@@ -113,7 +113,7 @@ export class AzureDataEcosystemServices extends AbstractDataEcosystemCore {
ADDRESS: AzureConfig.DES_REDIS_INSTANCE_ADDRESS,
PORT: AzureConfig.DES_REDIS_INSTANCE_PORT,
KEY: AzureConfig.DES_REDIS_INSTANCE_KEY,
DISABLE_TLS: AzureConfig.DES_REDIS_INSTANCE_KEY_TLS_DISABLE,
DISABLE_TLS: AzureConfig.DES_REDIS_INSTANCE_TLS_DISABLE,
}, 'storage')
}
......@@ -139,7 +139,7 @@ export class AzureDataEcosystemServices extends AbstractDataEcosystemCore {
ADDRESS: AzureConfig.DES_REDIS_INSTANCE_ADDRESS,
PORT: AzureConfig.DES_REDIS_INSTANCE_PORT,
KEY: AzureConfig.DES_REDIS_INSTANCE_KEY,
DISABLE_TLS: AzureConfig.DES_REDIS_INSTANCE_KEY_TLS_DISABLE,
DISABLE_TLS: AzureConfig.DES_REDIS_INSTANCE_TLS_DISABLE,
}, 'cosmos')
}
......
......@@ -98,7 +98,7 @@ export class IbmConfig extends Config {
IbmConfig.DES_REDIS_INSTANCE_ADDRESS = process.env.DES_REDIS_INSTANCE_ADDRESS
IbmConfig.DES_REDIS_INSTANCE_PORT = +process.env.DES_REDIS_INSTANCE_PORT
IbmConfig.DES_REDIS_INSTANCE_KEY = process.env.DES_REDIS_INSTANCE_KEY
IbmConfig.DES_REDIS_INSTANCE_KEY_TLS_DISABLE =
IbmConfig.DES_REDIS_INSTANCE_TLS_DISABLE =
process.env.CACHE_TLS_DISABLE ? process.env.CACHE_TLS_DISABLE === 'true' : false;
//Logger
......@@ -119,7 +119,7 @@ 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_REDIS_INSTANCE_TLS_DISABLE: IbmConfig.DES_REDIS_INSTANCE_KEY_TLS_DISABLE,
DES_REDIS_INSTANCE_TLS_DISABLE: IbmConfig.DES_REDIS_INSTANCE_TLS_DISABLE,
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,
......
......@@ -32,7 +32,7 @@ export class DESCompliance {
ADDRESS: Config.DES_REDIS_INSTANCE_ADDRESS,
PORT: Config.DES_REDIS_INSTANCE_PORT,
KEY: Config.DES_REDIS_INSTANCE_KEY,
DISABLE_TLS: Config.DES_REDIS_INSTANCE_KEY_TLS_DISABLE,
DISABLE_TLS: Config.DES_REDIS_INSTANCE_TLS_DISABLE,
}, 'ltag')
}
......
Supports Markdown
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