kubeclient 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b03781d0875698e18791018710eb4c84dce1bf
-  data.tar.gz: bff15e091daf39f5663b3cac73a28f92a3ed0cc2
+  metadata.gz: 06875bb69db97a971297a9623c7dddc960311aa7
+  data.tar.gz: e6fabf77ca3e62b6bbe8a4de5046bdbcacf4c91a
 SHA512:
-  metadata.gz: f7f8e2ae7884ea7afbca1725905c764b5858d25dce119115b610e4707ec82312fc4e9f710466754fac05edf6da9a2e771422d254162ce7764dce5375e1ce35c2
-  data.tar.gz: 3041056407fdc8d777bd7e5c32c55298d1c54919c3a10d5daa4e17d6aeb04069f9b12ba74680558768aac2a783bb4d110c77e4aa7cd35bddc4fbbb7c97ffd2ee
+  metadata.gz: cd8718be9eeff6a72038e92aade155552a4199ef13d7c8adbf94a4b4e828fee49098cfbf2fa69b997957ad138ec78d358c684036598c5118bd62d5d562c572ef
+  data.tar.gz: 6a257ee339f7268225e66e671401e54cc7c9179e31f3f44374a648d8eb5005e8c1fb4b2a746628bb5ab396f9b3bb4a43053472858533a0bd775093128d9ef282

data/README.md

@@ -64,13 +64,18 @@ For testing and development purpose you can disable the ssl check with:
 client.ssl_options(verify_ssl: OpenSSL::SSL::VERIFY_NONE)
 ```
 
-If you are using bearer tokens for authentication as described
-[here](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/authentication.md) then you can specify the
-bearer token to use for authentication:
+If you are using basic authentication or bearer tokens as described
+[here](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/authentication.md) then you can specify one
+of the following:
 
 ```ruby
 client.bearer_token('MDExMWJkMjItOWY1Ny00OGM5LWJlNDEtMjBiMzgxODkxYzYz')
 ```
+<br>
+or <br>
+```ruby
+client.basic_auth('username', 'password')
+```
 
 If you are running your app using kubeclient inside a Kubernetes cluster, then you can have a bearer token file
 mounted inside your pod by using a

data/lib/kubeclient/common.rb

@@ -71,7 +71,9 @@ module Kubeclient
           verify_ssl: @ssl_options[:verify_ssl],
           ssl_client_cert: @ssl_options[:client_cert],
           ssl_client_key: @ssl_options[:client_key],
-          bearer_token: @bearer_token
+          bearer_token: @bearer_token,
+          user: @basic_auth_user,
+          password: @basic_auth_password
         }
         RestClient::Resource.new(@api_endpoint.merge(path).to_s, options)
       end
@@ -100,7 +102,9 @@ module Kubeclient
           verify_mode: @ssl_options[:verify_ssl],
           cert: @ssl_options[:client_cert],
           key: @ssl_options[:client_key],
-          bearer_token: @bearer_token
+          bearer_token: @bearer_token,
+          basic_auth_user: @basic_auth_user,
+          basic_auth_password: @basic_auth_password
         }
 
         WatchStream.new(uri, options)
@@ -224,6 +228,11 @@ module Kubeclient
           req['authorization'] = "Bearer #{@bearer_token}"
         end
       end
+
+      def basic_auth(user, password)
+        @basic_auth_user = user
+        @basic_auth_password = password
+      end
     end
   end
 end

data/lib/kubeclient/version.rb

@@ -1,4 +1,4 @@
 # Kubernetes REST-API Client
 module Kubeclient
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

data/lib/kubeclient/watch_stream.rb

@@ -15,11 +15,7 @@ module Kubeclient
         @http = Net::HTTP.start(@uri.host, @uri.port, @options)
 
         buffer = ''
-        request = Net::HTTP::Get.new(@uri)
-
-        if @options[:bearer_token]
-          request['authorization'] = "Bearer #{@options[:bearer_token]}"
-        end
+        request = generate_request
 
         @http.request(request) do |response|
           unless response.is_a? Net::HTTPSuccess
@@ -36,6 +32,19 @@ module Kubeclient
         raise unless @finished
       end
 
+      def generate_request
+        request = Net::HTTP::Get.new(@uri)
+        if @options[:basic_auth_user] && @options[:basic_auth_password]
+          request.basic_auth @options[:basic_auth_user],
+                             @options[:basic_auth_password]
+        end
+
+        if @options[:bearer_token]
+          request['authorization'] = "Bearer #{@options[:bearer_token]}"
+        end
+        request
+      end
+
       def finish
         @finished = true
         @http.finish if !@http.nil? && @http.started?

data/test/test_kubeclient.rb

@@ -245,6 +245,7 @@ class KubeClientTest < MiniTest::Test
 
     assert_equal('Pod', pods.kind)
     assert_equal(1, pods.size)
+    RestClient.reset_before_execution_procs
   end
 
   def test_api_bearer_token_failure
@@ -261,6 +262,41 @@ class KubeClientTest < MiniTest::Test
     exception = assert_raises(KubeException) { client.get_pods }
     assert_equal(403, exception.error_code)
     assert_equal(error_message, exception.message)
+    RestClient.reset_before_execution_procs
+  end
+
+  def test_api_basic_auth_success
+    stub_request(:get, 'http://username:password@localhost:8080/api/v1beta3/pods')
+      .to_return(body: open_test_json_file('pod_list_b3.json'),
+                 status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/'
+    client.basic_auth('username', 'password')
+
+    pods = client.get_pods
+
+    assert_equal('Pod', pods.kind)
+    assert_equal(1, pods.size)
+    assert_requested(:get,
+                     'http://username:password@localhost:8080/api/v1beta3/pods',
+                     times: 1)
+  end
+
+  def test_api_basic_auth_failure
+    error_message = 'HTTP status code 401, 401 Unauthorized'
+
+    stub_request(:get, 'http://username:password@localhost:8080/api/v1beta3/pods')
+      .to_raise(KubeException.new(401, error_message))
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/'
+    client.basic_auth('username', 'password')
+
+    exception = assert_raises(KubeException) { client.get_pods }
+    assert_equal(401, exception.error_code)
+    assert_equal(error_message, exception.message)
+    assert_requested(:get,
+                     'http://username:password@localhost:8080/api/v1beta3/pods',
+                     times: 1)
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler