diff --git a/platform-modules/mimetype-manager/pom.xml b/platform-modules/mimetype-manager/pom.xml index eb25c58f12b374b42cb0cdfbe2d84ce30f110470..c97b9bbd224229225200d6946e08862697cbf58b 100644 --- a/platform-modules/mimetype-manager/pom.xml +++ b/platform-modules/mimetype-manager/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>org.sunbird</groupId> <artifactId>cloud-store-sdk</artifactId> - <version>1.3.0</version> + <version>1.4.0</version> </dependency> <dependency> <groupId>org.scala-lang</groupId> diff --git a/platform-modules/mimetype-manager/src/main/scala/org/sunbird/cloudstore/StorageService.scala b/platform-modules/mimetype-manager/src/main/scala/org/sunbird/cloudstore/StorageService.scala index 83fabffc8609a116991509a64ada519ca129122b..0045caf82998c42f02fec4e4435bd8a6454cab70 100644 --- a/platform-modules/mimetype-manager/src/main/scala/org/sunbird/cloudstore/StorageService.scala +++ b/platform-modules/mimetype-manager/src/main/scala/org/sunbird/cloudstore/StorageService.scala @@ -28,14 +28,17 @@ class StorageService { val storageKey = Platform.config.getString("aws_storage_key") val storageSecret = Platform.config.getString("aws_storage_secret") storageService = StorageServiceFactory.getStorageService(new StorageConfig(storageType, storageKey, storageSecret)) + } else if (StringUtils.equalsIgnoreCase(storageType, "gcloud")) { + val storageKey = Platform.config.getString("gcloud_client_key") + val storageSecret = Platform.config.getString("gcloud_private_secret") + storageService = StorageServiceFactory.getStorageService(new StorageConfig(storageType, storageKey, storageSecret)) } - else if (StringUtils.equalsIgnoreCase(storageType, "cephs3")) { - val storageKey = Platform.config.getString("cephs3_storage_key") - val storageSecret = Platform.config.getString("cephs3_storage_secret") - val endpoint = Platform.config.getString("cephs3_storage_endpoint") - storageService = StorageServiceFactory.getStorageService(new StorageConfig(storageType, storageKey, storageSecret, Option(endpoint))) - - } +// else if (StringUtils.equalsIgnoreCase(storageType, "cephs3")) { +// val storageKey = Platform.config.getString("cephs3_storage_key") +// val storageSecret = Platform.config.getString("cephs3_storage_secret") +// val endpoint = Platform.config.getString("cephs3_storage_endpoint") +// storageService = StorageServiceFactory.getStorageService(new StorageConfig(storageType, storageKey, storageSecret, Option(endpoint))) +// } else throw new ServerException("ERR_INVALID_CLOUD_STORAGE", "Error while initialising cloud storage") } storageService @@ -46,6 +49,8 @@ class StorageService { Platform.config.getString("azure_storage_container") else if (StringUtils.equalsIgnoreCase(storageType, "aws")) Platform.config.getString("aws_storage_container") + else if (StringUtils.equalsIgnoreCase(storageType, "gcloud")) + Platform.config.getString("gcloud_storage_bucket") else if (StringUtils.equalsIgnoreCase(storageType, "cephs3")) Platform.config.getString("cephs3_storage_container") else