ibm_cloud_sdk_core 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98e7c5e7a5e78cc4f561a8b7fddbe026b201d5c18365354236f8b7cd185e2e2e
-  data.tar.gz: 97490e5521edbc772cd9a1932099ac4243ed70a2b712813e9cd4d1ef65e77073
+  metadata.gz: 6c6d79aace47898352195c90bf0370d3aa0701d119ad3ee36ee824942923cea5
+  data.tar.gz: b1f487702b107da90008af40bc2340907e605896dbc5e4e685c2d9dba57be5d5
 SHA512:
-  metadata.gz: e6bb9065154371294ed94a910c3e3400f8b41723f4fcee4f6656f8ab8e015c5a2817ff9503e23176ab59ee9d7e92e530274c94f4a8cb376e1293aec6ac681a45
-  data.tar.gz: 177559d12ccfe34ad297774558e1c6d2ac2139a97fd66f71ece0c736b61a1806b12f4a60ca9fc3008957ada9a2b81e0b050e7cf01f8aeb8362e795b291ef18bc
+  metadata.gz: 436285acaf7458850cd949be3d72bce3ba3665909ce2149a4de7b2ac96aac93ee867f56620256fe39db56d81e83eba8bb76f7c0411d8378e7a83c960b70335b0
+  data.tar.gz: 109f48faa8e6e3f47a0450dc171d3f766a0477d25a92863fe4dffa4daed807ed2da643732b446ea874369a13932b46e7c40e6ead718858c25d8ab346838b43c3

data/lib/ibm_cloud_sdk_core/base_service.rb

@@ -45,37 +45,13 @@ module IBMCloudSdkCore
       @icp4d_url = vars[:icp4d_url]
       @iam_url = vars[:iam_url]
       @iam_apikey = vars[:iam_apikey]
+      @iam_access_token = vars[:iam_access_token]
       @token_manager = nil
       @authentication_type = vars[:authentication_type].downcase unless vars[:authentication_type].nil?
       @temp_headers = nil
       @disable_ssl_verification = false
       @display_name = vars[:display_name]
 
-      if @authentication_type == "iam" || ((!vars[:iam_access_token].nil? || !vars[:iam_apikey].nil?) && !@icp_prefix)
-        iam_token_manager(iam_apikey: vars[:iam_apikey], iam_access_token: vars[:iam_access_token],
-                          iam_url: vars[:iam_url], iam_client_id: vars[:iam_client_id],
-                          iam_client_secret: vars[:iam_client_secret])
-      elsif !vars[:iam_apikey].nil? && @icp_prefix
-        @username = "apikey"
-        @password = vars[:iam_apikey]
-      elsif @authentication_type == "icp4d" || !vars[:icp4d_access_token].nil?
-        icp4d_token_manager(icp4d_access_token: vars[:icp4d_access_token], icp4d_url: vars[:icp4d_url],
-                            username: vars[:username], password: vars[:password])
-      elsif !vars[:username].nil? && !vars[:password].nil?
-        if vars[:username] == "apikey" && !@icp_prefix
-          iam_apikey(iam_apikey: vars[:password])
-        else
-          @username = vars[:username]
-          @password = vars[:password]
-        end
-      end
-
-      if @display_name && !@username && !@iam_apikey
-        service_name = @display_name.sub(" ", "_").downcase
-        load_from_credential_file(service_name)
-        @icp_prefix = @password&.start_with?("icp-") || @iam_apikey&.start_with?("icp-") ? true : false
-      end
-
       if vars[:use_vcap_services] && !@username && !@iam_apikey
         @vcap_service_credentials = load_from_vcap_services(service_name: vars[:vcap_services_name])
         if !@vcap_service_credentials.nil? && @vcap_service_credentials.instance_of?(Hash)
@@ -91,6 +67,31 @@ module IBMCloudSdkCore
         end
       end
 
+      if @display_name && !@username && !@iam_apikey
+        service_name = @display_name.sub(" ", "_").downcase
+        load_from_credential_file(service_name)
+        @icp_prefix = @password&.start_with?("icp-") || @iam_apikey&.start_with?("icp-") ? true : false
+      end
+
+      if @authentication_type == "iam" || ((!@iam_access_token.nil? || !@iam_apikey.nil?) && !@icp_prefix)
+        iam_token_manager(iam_apikey: @iam_apikey, iam_access_token: @iam_access_token,
+                          iam_url: @iam_url, iam_client_id: @iam_client_id,
+                          iam_client_secret: @iam_client_secret)
+      elsif !@iam_apikey.nil? && @icp_prefix
+        @username = "apikey"
+        @password = vars[:iam_apikey]
+      elsif @authentication_type == "icp4d" || !@icp4d_access_token.nil?
+        icp4d_token_manager(icp4d_access_token: @icp4d_access_token, icp4d_url: @icp4d_url,
+                            username: @username, password: @password)
+      elsif !@username.nil? && !@password.nil?
+        if @username == "apikey" && !@icp_prefix
+          iam_apikey(iam_apikey: @password)
+        else
+          @username = @username
+          @password = @password
+        end
+      end
+
       raise ArgumentError.new('The username shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your username') if check_bad_first_or_last_char(@username)
       raise ArgumentError.new('The password shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your password') if check_bad_first_or_last_char(@password)
       raise ArgumentError.new('The url shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your url') if check_bad_first_or_last_char(@url)
@@ -110,7 +111,7 @@ module IBMCloudSdkCore
 
       # Home directory
       if credential_file_path.nil?
-        file_path = ENV["HOME"] + DEFAULT_CREDENTIALS_FILE_NAME
+        file_path = ENV["HOME"] + "/" + DEFAULT_CREDENTIALS_FILE_NAME
         credential_file_path = file_path if File.exist?(file_path)
       end
 

data/lib/ibm_cloud_sdk_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IBMCloudSdkCore
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_cloud_sdk_core
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Mamoon Raja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -265,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Official IBM Cloud SDK core library