ibm_cloud_sdk_core 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 552a7ea5d30afc2a3e9764b365e6a1ea1666852e7eefe54e01e63dc949cfdf02
-  data.tar.gz: 5acfc4a1cfd2f358096bf4c6153282ad39761ed9535ee283dfb28a3f499c7858
+  metadata.gz: 2199b7e854aa1782e0a5f75e89ed01033c93eba058a7143213668625ebf6a9ce
+  data.tar.gz: 0175abf279e3d455ccc8b9fd226024d4a9ab0052720e3644661f0cdb40bcf96d
 SHA512:
-  metadata.gz: 967664c0155975c23714884c142259824a74e363df6134bbfaff7236701f61ef3ec5b37950509cd78fcbb37b185e75eda451891fdc88f02f5f9766b9e7c040ed
-  data.tar.gz: e9005fe810d53199e88963ff13a4099c09c624e7f7664243aae7be405bd5bf77d71639cf8a0ace8f61a55beb569eb14343f430bbc8e689abdd8ab42c86003c96
+  metadata.gz: c003a64cb4671105912a4d7428098b25230ad04d63a04b6a0304e7117f3f5b22c01f4bd9348e8fa9e423f75a2bc8b4fd47d3dc5cafa2a81cc22e17d660593bb4
+  data.tar.gz: 93670092b8bd6d66fd4c607e01590cb9f1bfbb6f4b7e245dc8fb702cbb8c1083cd5ba323bd7b65ce790112f787d5af94ab22303c1c38685229f359a2d9f01455

data/lib/ibm_cloud_sdk_core/authenticators/basic_authenticator.rb

@@ -24,7 +24,6 @@ module IBMCloudSdkCore
     def authenticate(headers)
       base64_authentication = Base64.strict_encode64("#{@username}:#{@password}")
       headers["Authorization"] = "Basic #{base64_authentication}"
-      headers
     end
 
     # Checks if all the inputs needed are present

data/lib/ibm_cloud_sdk_core/authenticators/bearer_token_authenticator.rb

@@ -21,7 +21,6 @@ module IBMCloudSdkCore
     # Adds the Authorization header, if possible
     def authenticate(headers)
       headers["Authorization"] = "Bearer #{@bearer_token}"
-      headers
     end
 
     # Checks if all the inputs needed are present

data/lib/ibm_cloud_sdk_core/authenticators/config_based_authenticator_factory.rb

@@ -26,6 +26,8 @@ module IBMCloudSdkCore
       else
         auth_type = config[:auth_type]
       end
+      config.delete(:url) unless config[:url].nil?
+      config[:url] = config[:auth_url] unless config[:auth_url].nil?
       return BasicAuthenticator.new(config) if auth_type.casecmp(AUTH_TYPE_BASIC).zero?
       return BearerTokenAuthenticator.new(config) if auth_type.casecmp(AUTH_TYPE_BEARER_TOKEN).zero?
       return CloudPakForDataAuthenticator.new(config) if auth_type.casecmp(AUTH_TYPE_CP4D).zero?

data/lib/ibm_cloud_sdk_core/base_service.rb

@@ -23,21 +23,21 @@ end
 module IBMCloudSdkCore
   # Class for interacting with the API
   class BaseService
-    attr_accessor :display_name, :service_url, :disable_ssl_verification
+    attr_accessor :service_name, :service_url, :disable_ssl_verification
     attr_reader :conn, :authenticator
     def initialize(vars)
       defaults = {
         authenticator: nil,
         disable_ssl_verification: false,
-        display_name: nil
+        service_name: nil
       }
       vars = defaults.merge(vars)
       @service_url = vars[:service_url]
       @authenticator = vars[:authenticator]
       @disable_ssl_verification = vars[:disable_ssl_verification]
-      @display_name = vars[:display_name]
-      @service_name = @display_name.tr(" ", "_").downcase unless @display_name.nil?
-      @authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: @service_name) if @authenticator.nil?
+      @service_name = vars[:service_name]
+
+      raise ArgumentError.new("authenticator must be provided") if @authenticator.nil?
 
       if @service_name && !@service_url
         config = get_service_properties(@service_name)
@@ -75,9 +75,9 @@ module IBMCloudSdkCore
 
       conn = @conn
 
-      @authenticator.authenticate(@temp_headers)
+      @authenticator.authenticate(args[:headers])
       args[:headers] = args[:headers].merge(@temp_headers) unless @temp_headers.nil?
-      @temp_headers = nil unless @temp_headers.nil?
+      @temp_headers = {} unless @temp_headers.nil?
 
       raise ArgumentError.new("service_url must be provided") if @service_url.nil?
       raise ArgumentError.new('The service_url 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(@service_url)

data/lib/ibm_cloud_sdk_core/utils.rb

@@ -20,15 +20,15 @@ end
 def load_from_credential_file(service_name, separator = "=")
   credential_file_path = ENV["IBM_CREDENTIALS_FILE"]
 
-  # Home directory
+  # Top-level directory of the project
   if credential_file_path.nil?
-    file_path = ENV["HOME"] + "/" + DEFAULT_CREDENTIALS_FILE_NAME
+    file_path = File.join(File.dirname(__FILE__), "/../../" + DEFAULT_CREDENTIALS_FILE_NAME)
     credential_file_path = file_path if File.exist?(file_path)
   end
 
-  # Top-level directory of the project
+  # Home directory
   if credential_file_path.nil?
-    file_path = File.join(File.dirname(__FILE__), "/../../" + 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 = "1.0.0.rc3"
+  VERSION = "1.0.0.rc4"
 end

data/test/unit/test_base_service.rb

@@ -48,10 +48,11 @@ class BaseServiceTest < Minitest::Test
     ENV["IBM_CREDENTIALS_FILE"] = file_path
     authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "red_sox")
     service = IBMCloudSdkCore::BaseService.new(
-      display_name: "Assistant",
+      service_name: "assistant",
       authenticator: authenticator
     )
     refute_nil(service)
+    ENV.delete("IBM_CREDENTIALS_FILE")
   end
 
   def test_correct_creds_and_headers
@@ -60,7 +61,7 @@ class BaseServiceTest < Minitest::Test
       password: "password"
     )
     service = IBMCloudSdkCore::BaseService.new(
-      display_name: "Assistant",
+      service_name: "assistant",
       authenticator: authenticator
     )
     service.add_default_headers(
@@ -85,7 +86,7 @@ class BaseServiceTest < Minitest::Test
     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: "leo_messi")
-    service = IBMCloudSdkCore::BaseService.new(display_name: "Leo Messi", url: "some.url", authenticator: authenticator)
+    service = IBMCloudSdkCore::BaseService.new(service_name: "leo_messi", url: "some.url", authenticator: authenticator)
     assert_equal(authenticator.authentication_type, "bearerToken")
     refute_nil(service)
   end
@@ -93,9 +94,9 @@ class BaseServiceTest < Minitest::Test
   def test_vcap_services
     ENV["VCAP_SERVICES"] = JSON.parse(File.read(Dir.getwd + "/resources/vcap-testing.json")).to_json
     authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "salah")
-    service = IBMCloudSdkCore::BaseService.new(display_name: "salah", authenticator: authenticator)
+    service = IBMCloudSdkCore::BaseService.new(service_name: "salah", authenticator: authenticator)
     assert_equal(authenticator.username, "mo")
-    assert_equal(service.display_name, "salah")
+    assert_equal(service.service_name, "salah")
   end
 
   def test_dummy_request
@@ -107,7 +108,7 @@ class BaseServiceTest < Minitest::Test
         }
       ).to_return(status: 200, body: "", headers: {})
     authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "salah")
-    service = IBMCloudSdkCore::BaseService.new(display_name: "Salah", authenticator: authenticator, service_url: "https://we.the.best")
+    service = IBMCloudSdkCore::BaseService.new(service_name: "salah", authenticator: authenticator, service_url: "https://we.the.best")
     service_response = service.request(method: "GET", url: "/music", headers: {})
     assert_equal("", service_response.result)
   end
@@ -115,7 +116,7 @@ class BaseServiceTest < Minitest::Test
   def test_dummy_request_form_data
     authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(bearer_token: "token")
     service = IBMCloudSdkCore::BaseService.new(
-      display_name: "Assistant",
+      service_name: "assistant",
       authenticator: authenticator,
       service_url: "https://gateway.watsonplatform.net/"
     )
@@ -150,7 +151,7 @@ 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(display_name: "Salah", authenticator: authenticator, service_url: "https://we.the.best")
+    service = IBMCloudSdkCore::BaseService.new(service_name: "salah", authenticator: authenticator, service_url: "https://we.the.best")
     assert_raises IBMCloudSdkCore::ApiException do
       service.request(method: "GET", url: "/music", headers: {})
     end
@@ -176,7 +177,7 @@ class BaseServiceTest < Minitest::Test
       password: "icp-xyz"
     )
     service = IBMCloudSdkCore::BaseService.new(
-      display_name: "Assistant",
+      service_name: "assistant",
       authenticator: authenticator,
       service_url: "https://we.the.best"
     )

data/test/unit/test_iam_authenticator.rb

@@ -140,4 +140,46 @@ class IamAuthenticatorTest < Minitest::Test
     authenticator.authenticate(headers)
     assert_equal(headers, authenticated_headers)
   end
+
+  def test_iam_authenticator_auth_url
+    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
+    ENV["IBM_CREDENTIALS_FILE"] = file_path
+    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://my.link/identity/token")
+      .with(
+        body: {
+          "apikey" => "mesSi",
+          "grant_type" => "urn:ibm:params:oauth:grant-type:apikey",
+          "response_type" => "cloud_iam"
+        },
+        headers: {
+          "Connection" => "close",
+          "Host" => "my.link",
+          "User-Agent" => "http.rb/4.1.1"
+        }
+      )
+      .to_return(status: 200, body: response.to_json, headers: {})
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "my_service")
+    refute_nil(authenticator)
+    assert_equal(authenticator.instance_variable_get(:@token_manager).access_token, token)
+    ENV.delete("IBM_CREDENTIALS_FILE")
+  end
 end

data/test/unit/test_jwt_token_manager.rb

@@ -125,7 +125,7 @@ class JWTTokenManagerTest < Minitest::Test
       disable_ssl_verification: true
     )
     IBMCloudSdkCore::BaseService.new(
-      display_name: "Assistant",
+      service_name: "assistant",
       service_url: "http://the.com",
       authenticator: authenticator
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_cloud_sdk_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Mamoon Raja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby