ibm_cloud_sdk_core 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aa7649a46616ff68df78f31bb96e4e3f446dbbb860de733539ae0fe33198be2
-  data.tar.gz: e277e383682e0e00ab70626e08a02484ebcac0e0fdddb75a4328203308b2dbc7
+  metadata.gz: 9ea5a5f7575d1adaba82982ad3467bb4a80c39bcc686d291dbb95e450b72e1c1
+  data.tar.gz: 870be154704bc0e75a215ba910be6f72aa110855f65961f73ee937ba650e1103
 SHA512:
-  metadata.gz: 1c88b1408600c23b95e93d9b236b2b7f1befefebce6c3af01c406a6d9cf8ee5ed319011ca7ee50ec7be3fd06a9d5e867ab41d3074181fa1a00b0b1f8ad115e12
-  data.tar.gz: 102d3450e5019d17efe1217e3d6c21a74dd4883690aba3bc8784995beb5609b61661bf177f6b0a978f92ae5f20560a45bac35996018b61f43c6b6663963819b6
+  metadata.gz: '081184cf6a07b9a48bdfcb7c20a97ff27871fb3f35e56defd88dc5e3baba9b71dc4e954ae9d1ec8c78b9929281a2133cd144967e3028463eb2a8287a9aff2560'
+  data.tar.gz: 1ec8854f91cabc79e2bd5e9dadd09278fc72fab8934daf1d9a30e903dd85bdc1ae8aa877beea3cc72ddb5f81b435740c2a5c1fdc93175d721869b198e5606d3c

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/utils.rb

@@ -44,7 +44,7 @@ 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)
+    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?

data/lib/ibm_cloud_sdk_core/version.rb

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

data/test/unit/test_utils.rb

@@ -23,4 +23,94 @@ class UtilsTest < Minitest::Test
     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.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mamoon Raja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -276,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