ibm_cloud_sdk_core 1.0.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca58ef3d25ee02da45482dda4dfd00f3c3271c8374963ba4062dc4b202321be5
-  data.tar.gz: f9420fee2e7ddf2b694e9b03bf31e71038da04cb4ada8e508a8ff3daeddabc09
+  metadata.gz: 0c9b7ef0229991386edba6b798b8dfbe46863a789cf3e224e4a4dd1a3a0c77b9
+  data.tar.gz: 78f9a4edfe95f69a19ecf88a7c914f34beb7d8f6776ee6fec87464fcd03c889b
 SHA512:
-  metadata.gz: 880bbdf1443b486eece94359d223aaae1b597996744a26a2359d476ce20bb0b8483ca0bf5248543a47eb397c05a85b7465047c68505d5516d6068454e69bc130
-  data.tar.gz: dd994f5342fb05e25684e5abec41aec7fb87de1ff6d072b99734c55d06a22f55d828e5371d8ea57560c385fae4bc3f1355d2778adbbcc8f040093ea2ab6bd461
+  metadata.gz: f3496ff88377fcf4bf3efea81161642ba457d09c8c755da289afdae16597cfbb8d1f6e488fa259b3152c2cceb48329e1dc058dddf9ebd4d5f00d6e6f4cfd0072
+  data.tar.gz: fd308b61b2aa884f3110d125733024306ef06b15c416b4d12730a700a6ab17ffac79c459b076655e407ca11f4b7ef7cc7c59f9a45c53fa7cf35cf124130223b4

data/README.md

@@ -1,5 +1,5 @@
-[![Build Status](https://travis-ci.com/IBM/ruby-sdk-core.svg?branch=master)](https://travis-ci.com/IBM/ruby-sdk-core)
-[![codecov](https://codecov.io/gh/IBM/ruby-sdk-core/branch/master/graph/badge.svg)](https://codecov.io/gh/IBM/ruby-sdk-core)
+[![Build Status](https://travis-ci.com/IBM/ruby-sdk-core.svg?branch=main)](https://travis-ci.com/IBM/ruby-sdk-core)
+[![codecov](https://codecov.io/gh/IBM/ruby-sdk-core/branch/main/graph/badge.svg)](https://codecov.io/gh/IBM/ruby-sdk-core)
 [![Gem Version](https://badge.fury.io/rb/ibm_cloud_sdk_core.svg)](https://rubygems.org/gems/ibm_cloud_sdk_core)
 
 # ruby-sdk-core

data/lib/ibm_cloud_sdk_core/api_exception.rb

@@ -26,8 +26,8 @@ module IBMCloudSdkCore
         @info = info
         # :nocov:
       end
-      @transaction_id = transaction_id
-      @global_transaction_id = global_transaction_id
+      @transaction_id = transaction_id || response.headers["X-Dp-Watson-Tran-Id"]
+      @global_transaction_id = global_transaction_id || response.headers["X-Global-Transaction-Id"]
     end
 
     def to_s

data/lib/ibm_cloud_sdk_core/authenticators/no_auth_authenticator.rb

@@ -10,7 +10,7 @@ module IBMCloudSdkCore
       @authentication_type = AUTH_TYPE_NO_AUTH
     end
 
-    def authenticate
+    def authenticate(*)
       nil
     end
 

data/lib/ibm_cloud_sdk_core/base_service.rb

@@ -39,16 +39,11 @@ module IBMCloudSdkCore
 
       raise ArgumentError.new("authenticator must be provided") if @authenticator.nil?
 
-      if @service_name && !@service_url
-        config = get_service_properties(@service_name)
-        @service_url = config[:url] unless config.nil?
-      end
-
-      configure_http_client(disable_ssl_verification: @disable_ssl_verification)
-      @temp_headers = {}
       @conn = HTTP::Client.new(
         headers: {}
       ).use normalize_uri: { normalizer: NORMALIZER }
+      configure_service(@service_name)
+      @temp_headers = {}
     end
 
     def disable_ssl_verification=(disable_ssl_verification)
@@ -61,6 +56,15 @@ module IBMCloudSdkCore
       headers.each_pair { |k, v| @conn.default_options.headers.add(k, v) }
     end
 
+    def configure_service(service_name)
+      config = get_service_properties(service_name) if service_name
+
+      @service_url = config[:url] unless config.nil? || config[:url].nil?
+      disable_ssl_verification = explicitly_true(config[:disable_ssl]) unless config.nil? || config[:disable_ssl].nil?
+      # configure the http client if ssl is disabled
+      configure_http_client(disable_ssl_verification: disable_ssl_verification) if disable_ssl_verification
+    end
+
     # @return [DetailedResponse]
     def request(args)
       defaults = { method: nil, url: nil, accept_json: false, headers: nil, params: nil, json: {}, data: nil }
@@ -143,8 +147,6 @@ module IBMCloudSdkCore
         ssl_context = OpenSSL::SSL::SSLContext.new
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
         @conn.default_options = { ssl_context: ssl_context }
-
-        @token_manager&.ssl_verification(true)
       end
       add_proxy(proxy) unless proxy.empty? || !proxy.dig(:address).is_a?(String) || !proxy.dig(:port).is_a?(Integer)
       add_timeout(timeout) unless timeout.empty? || (!timeout.key?(:per_operation) && !timeout.key?(:global))

data/lib/ibm_cloud_sdk_core/utils.rb

@@ -16,6 +16,13 @@ def check_bad_first_or_last_char(str)
   return str.start_with?("{", "\"") || str.end_with?("}", "\"") unless str.nil?
 end
 
+# checks if the provided value is truthy
+def explicitly_true(value)
+  return value.to_s.casecmp("true").zero? unless value.nil?
+
+  false
+end
+
 # Initiates the credentials based on the credential file
 def load_from_credential_file(service_name, separator = "=")
   credential_file_path = ENV["IBM_CREDENTIALS_FILE"]
@@ -37,8 +44,8 @@ def load_from_credential_file(service_name, separator = "=")
   file_contents = File.open(credential_file_path, "r")
   config = {}
   file_contents.each_line do |line|
-    key_val = line.strip.split(separator)
-    unless line.start_with?("#") && key.length == 2
+    key_val = line.strip.split(separator, 2)
+    if key_val.length == 2 && !line.start_with?("#")
       key = parse_key(key_val[0].downcase, service_name) unless key_val[0].nil?
       config.store(key.to_sym, key_val[1]) unless key.nil?
     end
@@ -63,10 +70,20 @@ def load_from_vcap_services(service_name)
   vcap_services = ENV["VCAP_SERVICES"]
   unless vcap_services.nil?
     services = JSON.parse(vcap_services)
+    credentials = ""
+    # search for matching inner name value
+    services.each do |_key, val|
+      service = val.detect { |item| item["name"] == service_name }
+      credentials = service["credentials"] unless service.nil?
+      break unless credentials.nil? || credentials.empty?
+    end
     config = {}
-    credentials = services[service_name][0]["credentials"] if services.key?(service_name)
-    return config if credentials.nil?
-
+    # if no matching inner key is found, then search outer keys
+    if credentials.nil? || credentials.empty?
+      credentials = services[service_name][0]["credentials"] if services.key?(service_name) && !services[service_name].empty?
+      return config if credentials.nil? || credentials.empty?
+    end
+    # store credentials
     credentials.each do |key, val|
       config.store(key.to_sym, val)
     end

data/lib/ibm_cloud_sdk_core/version.rb

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

data/test/unit/test_base_service.rb

@@ -26,6 +26,7 @@ class BaseServiceTest < Minitest::Test
     assert_raises do
       IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "wrong")
     end
+    ENV.delete("IBM_CREDENTIALS_FILE")
   end
 
   def test_wrong_url
@@ -82,6 +83,47 @@ class BaseServiceTest < Minitest::Test
     ENV.delete("IBM_CREDENTIALS_FILE")
   end
 
+  def test_set_credentials_from_path_invalid_auth_type_value
+    token_layout = {
+      "username": "dummy",
+      "role": "Admin",
+      "permissions": %w[administrator manage_catalog],
+      "sub": "admin",
+      "iss": "sss",
+      "aud": "sss",
+      "uid": "sss",
+      "iat": Time.now.to_i + 3600,
+      "exp": Time.now.to_i
+    }
+    token = JWT.encode token_layout, "secret", "HS256"
+    response = {
+      "access_token" => token,
+      "token_type" => "Bearer",
+      "expires_in" => 3600,
+      "expiration" => 1_524_167_011,
+      "refresh_token" => "jy4gl91BQ"
+    }
+    stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
+      .with(
+        body: {
+          "apikey" => "sadio",
+          "grant_type" => "urn:ibm:params:oauth:grant-type:apikey",
+          "response_type" => "cloud_iam"
+        },
+        headers: {
+          "Connection" => "close",
+          "Host" => "iam.cloud.ibm.com",
+          "User-Agent" => "http.rb/4.4.1"
+        }
+      )
+      .to_return(status: 200, body: response.to_json, headers: {})
+    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
+    ENV["IBM_CREDENTIALS_FILE"] = file_path
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "mane")
+    assert_equal(authenticator.authentication_type, "iam")
+    ENV.delete("IBM_CREDENTIALS_FILE")
+  end
+
   def test_set_credentials_from_path_in_env_bearer_token
     file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
     ENV["IBM_CREDENTIALS_FILE"] = file_path
@@ -89,6 +131,7 @@ class BaseServiceTest < Minitest::Test
     service = IBMCloudSdkCore::BaseService.new(service_name: "leo_messi", url: "some.url", authenticator: authenticator)
     assert_equal(authenticator.authentication_type, "bearerToken")
     refute_nil(service)
+    ENV.delete("IBM_CREDENTIALS_FILE")
   end
 
   def test_vcap_services
@@ -97,6 +140,7 @@ class BaseServiceTest < Minitest::Test
     service = IBMCloudSdkCore::BaseService.new(service_name: "salah", authenticator: authenticator)
     assert_equal(authenticator.username, "mo")
     assert_equal(service.service_name, "salah")
+    ENV.delete("VCAP_SERVICES")
   end
 
   def test_dummy_request
@@ -108,24 +152,26 @@ class BaseServiceTest < Minitest::Test
         }
       ).to_return(status: 200, body: "", headers: {})
     authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "salah")
-    service = IBMCloudSdkCore::BaseService.new(service_name: "salah", authenticator: authenticator, service_url: "https://we.the.best")
+    service = IBMCloudSdkCore::BaseService.new(service_name: "salah", authenticator: authenticator)
+    service.service_url = "https://we.the.best"
     service_response = service.request(method: "GET", url: "/music", headers: {})
     assert_equal("", service_response.result)
+    ENV.delete("VCAP_SERVICES")
   end
 
   def test_dummy_request_form_data
     authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(bearer_token: "token")
     service = IBMCloudSdkCore::BaseService.new(
       service_name: "assistant",
-      authenticator: authenticator,
-      service_url: "https://gateway.watsonplatform.net/"
+      authenticator: authenticator
     )
+    service.service_url = "https://gateway.watsonplatform.net/assistant/api/"
     form_data = {}
     file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
     filename = file.path if filename.nil? && file.respond_to?(:path)
     form_data[:file] = HTTP::FormData::File.new(file, content_type: "application/octet-stream", filename: filename)
 
-    stub_request(:post, "https://gateway.watsonplatform.net/").with do |req|
+    stub_request(:post, "https://gateway.watsonplatform.net/assistant/api/dummy/endpoint").with do |req|
       # Test the headers.
       assert_equal(req.headers["Accept"], "application/json")
       assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
@@ -134,7 +180,7 @@ class BaseServiceTest < Minitest::Test
       method: "POST",
       form: form_data,
       headers: { "Accept" => "application/json" },
-      url: ""
+      url: "dummy/endpoint"
     )
   end
 
@@ -151,10 +197,12 @@ class BaseServiceTest < Minitest::Test
         }
       ).to_return(status: 500, body: response.to_json, headers: {})
     authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "salah")
-    service = IBMCloudSdkCore::BaseService.new(service_name: "salah", authenticator: authenticator, service_url: "https://we.the.best")
+    service = IBMCloudSdkCore::BaseService.new(service_name: "salah", authenticator: authenticator)
+    service.service_url = "https://we.the.best"
     assert_raises IBMCloudSdkCore::ApiException do
       service.request(method: "GET", url: "/music", headers: {})
     end
+    ENV.delete("VCAP_SERVICES")
   end
 
   def test_dummy_request_icp
@@ -169,7 +217,8 @@ class BaseServiceTest < Minitest::Test
     stub_request(:get, "https://we.the.best/music")
       .with(
         headers: {
-          "Host" => "we.the.best"
+          "Host" => "we.the.best",
+          "Authorization" => "Basic YXBpa2V5OmljcC14eXo="
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
     authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
@@ -178,10 +227,109 @@ class BaseServiceTest < Minitest::Test
     )
     service = IBMCloudSdkCore::BaseService.new(
       service_name: "assistant",
-      authenticator: authenticator,
-      service_url: "https://we.the.best"
+      authenticator: authenticator
     )
+    service.service_url = "https://we.the.best"
     service_response = service.request(method: "GET", url: "/music", headers: {})
     assert_equal(response, service_response.result)
   end
+
+  def test_configure_service_using_credentials_in_env
+    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
+    ENV["IBM_CREDENTIALS_FILE"] = file_path
+
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+      username: "apikey",
+      password: "icp-xyz"
+    )
+    service = IBMCloudSdkCore::BaseService.new(
+      authenticator: authenticator,
+      service_name: "visual_recognition"
+    )
+    service.configure_service("visual_recognition")
+
+    assert_equal("https://gateway.ronaldo.com", service.service_url)
+    assert(service.disable_ssl_verification)
+    ENV.delete("IBM_CREDENTIALS_FILE")
+  end
+
+  def test_configure_service_using_credentials_in_vcap_match_outer_key
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+      username: "apikey",
+      password: "icp-xyz"
+    )
+    service = IBMCloudSdkCore::BaseService.new(
+      authenticator: authenticator,
+      service_name: "key_to_service_entry_1"
+    )
+    ENV["VCAP_SERVICES"] = JSON.parse(File.read(Dir.getwd + "/resources/vcap-testing.json")).to_json
+    service.configure_service("key_to_service_entry_1")
+
+    assert_equal("https://on.the.toolchainplatform.net/devops-insights/api", service.service_url)
+    ENV.delete("VCAP_SERVICES")
+  end
+
+  def test_configure_service_using_credentials_in_vcap_match_inner_key
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+      username: "apikey",
+      password: "icp-xyz"
+    )
+    service = IBMCloudSdkCore::BaseService.new(
+      authenticator: authenticator,
+      service_name: "devops_insights"
+    )
+    ENV["VCAP_SERVICES"] = JSON.parse(File.read(Dir.getwd + "/resources/vcap-testing.json")).to_json
+    service.configure_service("devops_insights")
+
+    assert_equal("https://ibmtesturl.net/devops_insights/api", service.service_url)
+    ENV.delete("VCAP_SERVICES")
+  end
+
+  def test_configure_service_using_credentials_in_vcap_no_matching_key
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+      username: "apikey",
+      password: "icp-xyz"
+    )
+    service = IBMCloudSdkCore::BaseService.new(
+      authenticator: authenticator,
+      service_name: "different_name_two"
+    )
+    ENV["VCAP_SERVICES"] = JSON.parse(File.read(Dir.getwd + "/resources/vcap-testing.json")).to_json
+    service.configure_service("different_name_two")
+
+    assert_equal("https://gateway.watsonplatform.net/different-name-two/api", service.service_url)
+    ENV.delete("VCAP_SERVICES")
+  end
+
+  def test_configure_service_using_credentials_in_vcap_empty_entry
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+      username: "apikey",
+      password: "icp-xyz"
+    )
+    service = IBMCloudSdkCore::BaseService.new(
+      authenticator: authenticator,
+      service_name: "empty_service"
+    )
+    ENV["VCAP_SERVICES"] = JSON.parse(File.read(Dir.getwd + "/resources/vcap-testing.json")).to_json
+    service.configure_service("empty_service")
+
+    assert_nil(service.service_url)
+    ENV.delete("VCAP_SERVICES")
+  end
+
+  def test_configure_service_using_credentials_in_vcap_no_creds
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+      username: "apikey",
+      password: "icp-xyz"
+    )
+    service = IBMCloudSdkCore::BaseService.new(
+      authenticator: authenticator,
+      service_name: "no-creds-service-two"
+    )
+    ENV["VCAP_SERVICES"] = JSON.parse(File.read(Dir.getwd + "/resources/vcap-testing.json")).to_json
+    service.configure_service("no-creds-service-two")
+
+    assert_nil(service.service_url)
+    ENV.delete("VCAP_SERVICES")
+  end
 end

data/test/unit/test_cp4d_authenticator.rb

@@ -37,7 +37,7 @@ class Cp4dAuthenticatorTest < Minitest::Test
           "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Connection" => "close",
           "Host" => "icp.com",
-          "User-Agent" => "http.rb/4.1.1"
+          "User-Agent" => "http.rb/4.4.1"
         }
       )
       .to_return(status: 200, body: response.to_json, headers: {})
@@ -77,7 +77,7 @@ class Cp4dAuthenticatorTest < Minitest::Test
           "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Connection" => "close",
           "Host" => "icp.com",
-          "User-Agent" => "http.rb/4.1.1"
+          "User-Agent" => "http.rb/4.4.1"
         }
       )
       .to_return(status: 200, body: response.to_json, headers: {})

data/test/unit/test_iam_authenticator.rb

@@ -41,7 +41,7 @@ class IamAuthenticatorTest < Minitest::Test
         headers: {
           "Connection" => "close",
           "Host" => "iam.cloud.ibm.com",
-          "User-Agent" => "http.rb/4.1.1"
+          "User-Agent" => "http.rb/4.4.1"
         }
       )
       .to_return(status: 200, body: response.to_json, headers: {})
@@ -83,7 +83,7 @@ class IamAuthenticatorTest < Minitest::Test
           "Connection" => "close",
           "Authorization" => "Basic Yng6Yng=",
           "Host" => "iam.cloud.ibm.com",
-          "User-Agent" => "http.rb/4.1.1"
+          "User-Agent" => "http.rb/4.4.1"
         }
       )
       .to_return(status: 200, body: response.to_json, headers: {})
@@ -126,7 +126,7 @@ class IamAuthenticatorTest < Minitest::Test
         headers: {
           "Connection" => "close",
           "Host" => "iam.cloud.ibm.com",
-          "User-Agent" => "http.rb/4.1.1"
+          "User-Agent" => "http.rb/4.4.1"
         }
       )
       .to_return(status: 200, body: response.to_json, headers: {})
@@ -173,7 +173,7 @@ class IamAuthenticatorTest < Minitest::Test
         headers: {
           "Connection" => "close",
           "Host" => "my.link",
-          "User-Agent" => "http.rb/4.1.1"
+          "User-Agent" => "http.rb/4.4.1"
         }
       )
       .to_return(status: 200, body: response.to_json, headers: {})

data/test/unit/test_jwt_token_manager.rb

@@ -114,7 +114,7 @@ class JWTTokenManagerTest < Minitest::Test
           "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Connection" => "close",
           "Host" => "icp.com",
-          "User-Agent" => "http.rb/4.1.1"
+          "User-Agent" => "http.rb/4.4.1"
         }
       )
       .to_return(status: 200, body: response.to_json, headers: {})

data/test/unit/test_utils.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+require("json")
+require("jwt")
+require_relative("./../test_helper.rb")
+require_relative("./../../lib/ibm_cloud_sdk_core/authenticators/basic_authenticator")
+require_relative("./../../lib/ibm_cloud_sdk_core/authenticators/config_based_authenticator_factory")
+require("webmock/minitest")
+
+WebMock.disable_net_connect!(allow_localhost: true)
+
+# Unit tests for the utility methods
+class UtilsTest < Minitest::Test
+  def test_explicitly_true
+    assert(explicitly_true("true"))
+    assert(explicitly_true("True"))
+    assert(explicitly_true(true))
+
+    assert_equal(explicitly_true("false"), false)
+    assert_equal(explicitly_true("False"), false)
+    assert_equal(explicitly_true("someothervalue"), false)
+    assert_equal(explicitly_true(""), false)
+    assert_equal(explicitly_true(false), false)
+    assert_equal(explicitly_true(nil), false)
+  end
+
+  def test_get_configuration_credential_file
+    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
+    ENV["IBM_CREDENTIALS_FILE"] = file_path
+    # get properties
+    config = get_service_properties("service_1")
+    auth_type = config[:auth_type] unless config.nil?
+    apikey = config[:apikey] unless config.nil?
+    auth_url = config[:auth_url] unless config.nil?
+    client_id = config[:client_id] unless config.nil?
+    client_secret = config[:client_secret] unless config.nil?
+    service_url = config[:url] unless config.nil?
+
+    assert !auth_type.nil?
+    assert !apikey.nil?
+    assert !auth_url.nil?
+    assert !client_id.nil?
+    assert !client_secret.nil?
+    assert !service_url.nil?
+
+    assert_equal("iam", auth_type)
+    assert_equal("V4HXmoUtMjohnsnow=KotN", apikey)
+    assert_equal("https://iamhost/iam/api=", auth_url)
+    assert_equal("somefake========id", client_id)
+    assert_equal("==my-client-secret==", client_secret)
+    assert_equal("service1.com/api", service_url)
+    ENV.delete("IBM_CREDENTIALS_FILE")
+  end
+
+  def test_get_configuration_from_env
+    # Service1 auth properties configured with IAM and a token containing '='
+    ENV["SERVICE_1_AUTH_TYPE"] = "iam"
+    ENV["SERVICE_1_APIKEY"] = "V4HXmoUtMjohnsnow=KotN"
+    ENV["SERVICE_1_CLIENT_ID"] = "somefake========id"
+    ENV["SERVICE_1_CLIENT_SECRET"] = "==my-client-secret=="
+    ENV["SERVICE_1_AUTH_URL"] = "https://iamhost/iam/api="
+    # Service1 service properties
+    ENV["SERVICE_1_URL"] = "service1.com/api"
+    # get properties
+    config = get_service_properties("service_1")
+    auth_type = config[:auth_type] unless config.nil?
+    apikey = config[:apikey] unless config.nil?
+    auth_url = config[:auth_url] unless config.nil?
+    client_id = config[:client_id] unless config.nil?
+    client_secret = config[:client_secret] unless config.nil?
+    service_url = config[:url] unless config.nil?
+
+    assert !auth_type.nil?
+    assert !apikey.nil?
+    assert !auth_url.nil?
+    assert !client_id.nil?
+    assert !client_secret.nil?
+    assert !service_url.nil?
+
+    assert_equal("iam", auth_type)
+    assert_equal("V4HXmoUtMjohnsnow=KotN", apikey)
+    assert_equal("https://iamhost/iam/api=", auth_url)
+    assert_equal("somefake========id", client_id)
+    assert_equal("==my-client-secret==", client_secret)
+    assert_equal("service1.com/api", service_url)
+
+    ENV.delete("SERVICE_1_AUTH_TYPE")
+    ENV.delete("SERVICE_1_APIKEY")
+    ENV.delete("SERVICE_1_CLIENT_ID")
+    ENV.delete("SERVICE_1_CLIENT_SECRET")
+    ENV.delete("SERVICE_1_AUTH_URL")
+    ENV.delete("SERVICE_1_URL")
+  end
+
+  def test_get_configuration_from_vcap
+    ENV["VCAP_SERVICES"] = JSON.parse(File.read(Dir.getwd + "/resources/vcap-testing.json")).to_json
+    # get properties
+    config = get_service_properties("equals-sign-test")
+    auth_type = config[:auth_type] unless config.nil?
+    apikey = config[:apikey] unless config.nil?
+    iam_url = config[:iam_url] unless config.nil?
+    service_url = config[:url] unless config.nil?
+
+    assert !auth_type.nil?
+    assert !apikey.nil?
+    assert !iam_url.nil?
+    assert !service_url.nil?
+
+    assert_equal("iam", auth_type)
+    assert_equal("V4HXmoUtMjohnsnow=KotN", apikey)
+    assert_equal("https://iamhost/iam/api=", iam_url)
+    assert_equal("https://gateway.watsonplatform.net/testService", service_url)
+
+    ENV.delete("VCAP_SERVICES")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_cloud_sdk_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Mamoon Raja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -253,6 +253,7 @@ files:
 - test/unit/test_iam_authenticator.rb
 - test/unit/test_iam_token_manager.rb
 - test/unit/test_jwt_token_manager.rb
+- test/unit/test_utils.rb
 homepage: https://www.github.com/IBM
 licenses:
 - Apache-2.0
@@ -275,8 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Official IBM Cloud SDK core library