From 36ab241df691fc235c4e426fd63aae1fc72acc69 Mon Sep 17 00:00:00 2001 From: SowmyaDixit Date: Mon, 28 Sep 2020 17:26:24 +0530 Subject: [PATCH] Issue #TG-543 feat: Framework fix for getting azure keys --- .../ekstep/analytics/framework/FrameworkContext.scala | 2 +- .../org/ekstep/analytics/framework/conf/AppConf.scala | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/analytics-core/src/main/scala/org/ekstep/analytics/framework/FrameworkContext.scala b/analytics-core/src/main/scala/org/ekstep/analytics/framework/FrameworkContext.scala index 64093b5c..0fc7107a 100644 --- a/analytics-core/src/main/scala/org/ekstep/analytics/framework/FrameworkContext.scala +++ b/analytics-core/src/main/scala/org/ekstep/analytics/framework/FrameworkContext.scala @@ -44,7 +44,7 @@ class FrameworkContext { return null; } if (!storageContainers.contains(storageType + "|" + storageKey)) { - storageContainers.put(storageType + "|" + storageKey, StorageServiceFactory.getStorageService(org.sunbird.cloud.storage.factory.StorageConfig(storageType, AppConf.getConfig(storageKey), AppConf.getConfig(storageSecret)))); + storageContainers.put(storageType + "|" + storageKey, StorageServiceFactory.getStorageService(org.sunbird.cloud.storage.factory.StorageConfig(storageType, AppConf.getStorageKey(storageKey), AppConf.getStorageSecret(storageSecret)))); } storageContainers.get(storageType + "|" + storageKey).get } diff --git a/analytics-core/src/main/scala/org/ekstep/analytics/framework/conf/AppConf.scala b/analytics-core/src/main/scala/org/ekstep/analytics/framework/conf/AppConf.scala index 12f5e251..aa59b0cf 100644 --- a/analytics-core/src/main/scala/org/ekstep/analytics/framework/conf/AppConf.scala +++ b/analytics-core/src/main/scala/org/ekstep/analytics/framework/conf/AppConf.scala @@ -29,4 +29,14 @@ object AppConf { getConfig("aws_secret"); } + def getStorageKey(`type`: String): String = { + if (`type`.equals("azure")) getConfig("azure_storage_key"); + else ""; + } + + def getStorageSecret(`type`: String): String = { + if (`type`.equals("azure")) getConfig("azure_storage_secret"); + else ""; + } + } \ No newline at end of file