Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ED-2856 | Report upload fixes added #70

Merged
merged 1 commit into from
Sep 19, 2023
Merged

ED-2856 | Report upload fixes added #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 18 additions & 4 deletions lern-data-products/src/main/scala/org/sunbird/core/exhaust/BaseReportsJob.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,15 @@ trait BaseReportsJob {

val modelParams = config.modelParams.getOrElse(Map[String, Option[AnyRef]]());
val store = modelParams.getOrElse("store", "local").asInstanceOf[String];
val storageKey = modelParams.getOrElse("storageKeyConfig", "reports_storage_key").asInstanceOf[String];
val storageSecret = modelParams.getOrElse("storageSecretConfig", "reports_storage_secret").asInstanceOf[String];
val storageKeyConfig = modelParams.getOrElse("storageKeyConfig", "").asInstanceOf[String];
val storageSecretConfig = modelParams.getOrElse("storageSecretConfig", "").asInstanceOf[String];

val storageKey = if (storageKeyConfig.nonEmpty) {
AppConf.getConfig(storageKeyConfig)
} else "reports_storage_key"
val storageSecret = if (storageSecretConfig.nonEmpty) {
AppConf.getConfig(storageSecretConfig)
} else "reports_storage_secret"
CloudStorageProviders.setSparkCSPConfigurations(spark.sparkContext, AppConf.getConfig("cloud_storage_type"), Option(storageKey), Option(storageSecret))

}
Expand All @@ -58,8 +65,15 @@ trait BaseReportsJob {

val modelParams = config.modelParams.getOrElse(Map[String, Option[AnyRef]]());
val container = modelParams.getOrElse("storageContainer", "reports").asInstanceOf[String]
val storageKey = modelParams.getOrElse("storageKeyConfig", "reports_storage_key").asInstanceOf[String];
val storageSecret = modelParams.getOrElse("storageSecretConfig", "reports_storage_secret").asInstanceOf[String];
val storageKeyConfig = modelParams.getOrElse("storageKeyConfig", "").asInstanceOf[String];
val storageSecretConfig = modelParams.getOrElse("storageSecretConfig", "").asInstanceOf[String];

val storageKey = if (storageKeyConfig.nonEmpty) {
AppConf.getConfig(storageKeyConfig)
} else "reports_storage_key"
val storageSecret = if (storageSecretConfig.nonEmpty) {
AppConf.getConfig(storageSecretConfig)
} else "reports_storage_secret"
val store = modelParams.getOrElse("store", "local").asInstanceOf[String]
StorageConfig(store, container, key, Option(storageKey), Option(storageSecret));
}
Expand Down
22 changes: 15 additions & 7 deletions lern-data-products/src/main/scala/org/sunbird/lms/job/report/BaseReportsJob.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,28 @@ trait BaseReportsJob {
def setReportsStorageConfiguration(sc: SparkContext, config: JobConfig) {
val modelParams = config.modelParams.getOrElse(Map[String, Option[AnyRef]]())
val store = modelParams.getOrElse("store", "local").asInstanceOf[String];
val storageAccKey = modelParams.getOrElse("storageKeyConfig", "reports_storage_key").asInstanceOf[String];
val storageAccSecret = modelParams.getOrElse("storageSecretConfig", "reports_storage_secret").asInstanceOf[String];
CloudStorageProviders.setSparkCSPConfigurations(sc, AppConf.getConfig("cloud_storage_type"), Option(storageAccKey), Option(storageAccSecret))
val storageKeyConfig = modelParams.getOrElse("storageKeyConfig", "").asInstanceOf[String];
val storageSecretConfig = modelParams.getOrElse("storageSecretConfig", "").asInstanceOf[String];

val storageKey = if (storageKeyConfig.nonEmpty) {
AppConf.getConfig(storageKeyConfig)
} else "reports_storage_key"
val storageSecret = if (storageSecretConfig.nonEmpty) {
AppConf.getConfig(storageSecretConfig)
} else "reports_storage_secret"
CloudStorageProviders.setSparkCSPConfigurations(sc, AppConf.getConfig("cloud_storage_type"), Option(storageKey), Option(storageSecret))
}

// $COVERAGE-ON$ Enabling scoverage for all other functions

def getStorageConfig(container: String, key: String, config: JobConfig = JSONUtils.deserialize[JobConfig]("""{}""")): org.ekstep.analytics.framework.StorageConfig = {
val modelParams = config.modelParams.getOrElse(Map[String, Option[AnyRef]]())
val reportsStorageAccountKey = modelParams.getOrElse("storageKeyConfig", "reports_storage_key").asInstanceOf[String];
val reportsStorageAccountSecret = modelParams.getOrElse("storageSecretConfig", "reports_storage_secret").asInstanceOf[String];
val storageKeyConfig = modelParams.getOrElse("storageKeyConfig", "").asInstanceOf[String];
val storageSecretConfig = modelParams.getOrElse("storageSecretConfig", "").asInstanceOf[String];

val provider = AppConf.getConfig("cloud_storage_type")
if (reportsStorageAccountKey != null && reportsStorageAccountSecret.nonEmpty) {
org.ekstep.analytics.framework.StorageConfig(provider, container, key, Option(reportsStorageAccountKey), Option(reportsStorageAccountSecret))
if (storageKeyConfig != null && storageSecretConfig.nonEmpty) {
org.ekstep.analytics.framework.StorageConfig(provider, container, key, Option(AppConf.getConfig(storageKeyConfig)), Option(AppConf.getConfig(storageSecretConfig)))
} else {
org.ekstep.analytics.framework.StorageConfig(provider, container, key, Option(provider), Option(provider));
}
Expand Down