Merge pull request #7 from IBM/credential-file-iam-fix

Look for iam_apikey in credential file for IAM auth

Author: mediumTaj

BaseService.cs

@@ -17,8 +17,8 @@
 
 using IBM.Cloud.SDK.Utilities;
 using System;
-using System.Collections.Generic;
-
+using System.Collections.Generic;
+
 namespace IBM.Cloud.SDK
 {
     public class BaseService
@@ -40,7 +40,11 @@ public BaseService(string serviceId)
                     }
                 }
 
-                string ApiKey = Environment.GetEnvironmentVariable(serviceId.ToUpper() + "_APIKEY");
+                string ApiKey = Environment.GetEnvironmentVariable(serviceId.ToUpper() + "_IAM_APIKEY");
+                // check for old IAM API key name as well
+                if (string.IsNullOrEmpty(apiKey)) {
+                    apiKey = Environment.GetEnvironmentVariable(ServiceName.ToUpper() + "_APIKEY");
+                }
                 string Username = Environment.GetEnvironmentVariable(serviceId.ToUpper() + "_USERNAME");
                 string Password = Environment.GetEnvironmentVariable(serviceId.ToUpper() + "_PASSWORD");
                 string ServiceUrl = Environment.GetEnvironmentVariable(serviceId.ToUpper() + "_URL");
@@ -78,36 +82,36 @@ public BaseService(string versionDate, Credentials credentials, string serviceId
 
         public BaseService(Credentials credentials, string serviceId) { }
 
-        public void WithHeader(string name, string value)
+        public void WithHeader(string name, string value)
         {
-            if (!customRequestHeaders.ContainsKey(name))
-            {
-                customRequestHeaders.Add(name, value);
+            if (!customRequestHeaders.ContainsKey(name))
+            {
+                customRequestHeaders.Add(name, value);
+            }
+            else
+            {
+                customRequestHeaders[name] = value;
             }
-            else
-            {
-                customRequestHeaders[name] = value;
-            }
         }
 
-        public void WithHeaders(Dictionary<string, string> headers)
+        public void WithHeaders(Dictionary<string, string> headers)
         {
-            foreach (KeyValuePair<string, string> kvp in headers)
+            foreach (KeyValuePair<string, string> kvp in headers)
             {
-                if (!customRequestHeaders.ContainsKey(kvp.Key))
-                {
-                    customRequestHeaders.Add(kvp.Key, kvp.Value);
+                if (!customRequestHeaders.ContainsKey(kvp.Key))
+                {
+                    customRequestHeaders.Add(kvp.Key, kvp.Value);
+                }
+                else
+                {
+                    customRequestHeaders[kvp.Key] = kvp.Value;
                 }
-                else
-                {
-                    customRequestHeaders[kvp.Key] = kvp.Value;
-                }
-            }
+            }
         }
 
-        protected void ClearCustomRequestHeaders()
-        {
-            customRequestHeaders = new Dictionary<string, string>();
+        protected void ClearCustomRequestHeaders()
+        {
+            customRequestHeaders = new Dictionary<string, string>();
         }
     }
 }