From 3557a4fa9bc6fa0ee5f44fd9a5095f4847e1aaa4 Mon Sep 17 00:00:00 2001
From: Bassel Zeidan <zeid@de.ibm.com>
Date: Wed, 4 Oct 2017 19:31:53 +0200
Subject: [PATCH] set up hadoop config

---
 r/sparkr/R/osconfig.R | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/r/sparkr/R/osconfig.R b/r/sparkr/R/osconfig.R
index 688af33..185ef09 100644
--- a/r/sparkr/R/osconfig.R
+++ b/r/sparkr/R/osconfig.R
@@ -140,12 +140,33 @@ CloudObjectStorage <- setRefClass("CloudObjectStorage",
           # bind config name
           .self$configName = configurationName
 
-          # set prefix for hadoop config
+          # set up hadoop config
           prefix = paste("fs.cos", getConfigName(), sep='.')
           hConf = SparkR:::callJMethod(sparkContext, "hadoopConfiguration")
+
           SparkR:::callJMethod(hConf, "set", paste(prefix, "endpoint", sep='.'), credentials['endpoint'][[1]])
-          SparkR:::callJMethod(hConf, "set", paste(prefix, "access.key", sep='.'), credentials['accessKey'][[1]])
-          SparkR:::callJMethod(hConf, "set", paste(prefix, "secret.key", sep='.'), credentials['secretKey'][[1]])
+
+          if (cosType == "softlayer_cos") {
+            # softlayer COS case
+            SparkR:::callJMethod(hConf, "set", paste(prefix, "access.key", sep='.'), credentials['accessKey'][[1]])
+            SparkR:::callJMethod(hConf, "set", paste(prefix, "secret.key", sep='.'), credentials['secretKey'][[1]])
+          } else if (cosType == "bluemix_cos") {
+            # bluemix COS case
+            SparkR:::callJMethod(hConf, "set", paste(prefix, "iam.service.id", sep='.'), credentials['serviceId'][[1]])
+            if (authMethod == "api_key") {
+              SparkR:::callJMethod(hConf, "set", paste(prefix, "iam.api.key", sep='.'), credentials['apiKey'][[1]])
+            } else if (authMethod == "iam_token") {
+              SparkR:::callJMethod(hConf, "set", paste(prefix, "iam.token", sep='.'), credentials['iamToken'][[1]])
+            }
+
+            if ("iamServiceEndpoint" %in% credentials {
+              SparkR:::callJMethod(hConf, "set", paste(prefix, "iam.endpoint", sep='.'), credentials['iamServiceEndpoint'][[1]])
+            }
+
+            if ("v2SignerType" %in% credentials) {
+              SparkR:::callJMethod(hConf, "set", paste(prefix, "v2.signer.type", sep='.'), credentials['v2SignerType'][[1]])
+            }
+          }
       },
 
       getConfigName = function() {
@@ -164,7 +185,6 @@ CloudObjectStorage <- setRefClass("CloudObjectStorage",
               stop("Invalid input: missing required input [" + key + "]!")
           }
         }
-
       },
 
       get_required_key_array = function (cosType, authMethod) {