kubeclient 0.3.0 → 4.9.2

data/lib/kubeclient/watch_stream.rb

@@ -1,53 +1,96 @@
 require 'json'
-require 'net/http'
+require 'http'
 module Kubeclient
   module Common
     # HTTP Stream used to watch changes on entities
     class WatchStream
-      def initialize(uri, options)
+      def initialize(uri, http_options, formatter:)
         @uri = uri
-        @http = nil
-        @options = options.merge(read_timeout: nil)
+        @http_client = nil
+        @http_options = http_options
+        @http_options[:http_max_redirects] ||= Kubeclient::Client::DEFAULT_HTTP_MAX_REDIRECTS
+        @formatter = formatter
       end
 
       def each
         @finished = false
-        @http = Net::HTTP.start(@uri.host, @uri.port, @options)
 
-        buffer = ''
-        request = generate_request
+        @http_client = build_client
+        response = @http_client.request(:get, @uri, build_client_options)
+        unless response.code < 300
+          raise Kubeclient::HttpError.new(response.code, response.reason, response)
+        end
 
-        @http.request(request) do |response|
-          unless response.is_a? Net::HTTPSuccess
-            fail KubeException.new(response.code, response.message)
-          end
-          response.read_body do |chunk|
-            buffer << chunk
-            while (line = buffer.slice!(/.+\n/))
-              yield WatchNotice.new(JSON.parse(line))
-            end
+        buffer = ''
+        response.body.each do |chunk|
+          buffer << chunk
+          while (line = buffer.slice!(/.+\n/))
+            yield @formatter.call(line.chomp)
           end
         end
-      rescue Errno::EBADF
+      rescue StandardError
         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]
+      def finish
+        @finished = true
+        @http_client.close unless @http_client.nil?
+      end
+
+      private
+
+      def max_hops
+        @http_options[:http_max_redirects] + 1
+      end
+
+      def follow_option
+        if max_hops > 1
+          { max_hops: max_hops }
+        else
+          # i.e. Do not follow redirects as we have set http_max_redirects to 0
+          # Setting `{ max_hops: 1 }` does not work FWIW
+          false
         end
+      end
+
+      def build_client
+        client = HTTP::Client.new(follow: follow_option)
 
-        @options[:headers].each do |header, value|
-          request[header.to_s] = value
+        if @http_options[:basic_auth_user] && @http_options[:basic_auth_password]
+          client = client.basic_auth(
+            user: @http_options[:basic_auth_user],
+            pass: @http_options[:basic_auth_password]
+          )
         end
-        request
+
+        client
       end
 
-      def finish
-        @finished = true
-        @http.finish if !@http.nil? && @http.started?
+      def using_proxy
+        proxy = @http_options[:http_proxy_uri]
+        return nil unless proxy
+        p_uri = URI.parse(proxy)
+        {
+          proxy_address: p_uri.hostname,
+          proxy_port: p_uri.port,
+          proxy_username: p_uri.user,
+          proxy_password: p_uri.password
+        }
+      end
+
+      def build_client_options
+        client_options = {
+          headers: @http_options[:headers],
+          proxy: using_proxy
+        }
+        if @http_options[:ssl]
+          client_options[:ssl] = @http_options[:ssl]
+          socket_option = :ssl_socket_class
+        else
+          socket_option = :socket_class
+        end
+        client_options[socket_option] = @http_options[socket_option] if @http_options[socket_option]
+        client_options
       end
     end
   end

data/lib/kubeclient.rb

@@ -1,92 +1,35 @@
-require 'kubeclient/version'
 require 'json'
 require 'rest-client'
-require 'active_support/inflector'
+
+require 'kubeclient/aws_eks_credentials'
+require 'kubeclient/common'
+require 'kubeclient/config'
 require 'kubeclient/entity_list'
-require 'kubeclient/kube_exception'
-require 'kubeclient/watch_notice'
+require 'kubeclient/exec_credentials'
+require 'kubeclient/gcp_auth_provider'
+require 'kubeclient/http_error'
+require 'kubeclient/missing_kind_compatibility'
+require 'kubeclient/oidc_auth_provider'
+require 'kubeclient/resource'
+require 'kubeclient/resource_not_found_error'
+require 'kubeclient/version'
 require 'kubeclient/watch_stream'
-require 'kubeclient/common'
 
 module Kubeclient
   # Kubernetes Client
-  class Client < Common::Client
-    attr_reader :api_endpoint
-
-    # Dynamically creating classes definitions (class Pod, class Service, etc.),
-    # The classes are extending RecursiveOpenStruct.
-    # This cancels the need to define the classes
-    # manually on every new entity addition,
-    # and especially since currently the class body is empty
-    ENTITY_TYPES = %w(Pod Service ReplicationController Node Event Endpoint
-                      Namespace Secret).map do |et|
-      clazz = Class.new(RecursiveOpenStruct) do
-        def initialize(hash = nil, args = {})
-          args.merge!(recurse_over_arrays: true)
-          super(hash, args)
-        end
-      end
-      [Kubeclient.const_set(et, clazz), et]
-    end
-
-    def initialize(uri,
-                   version = 'v1beta3',
-                   ssl_options: {
-                     client_cert: nil,
-                     client_key: nil,
-                     ca_file: nil,
-                     verify_ssl: OpenSSL::SSL::VERIFY_PEER
-                   },
-                   auth_options: {}
-                  )
-
-      fail ArgumentError, 'Missing uri' if uri.nil?
-
-      validate_auth_options(auth_options)
-
-      handle_uri(uri, '/api')
-      @api_version = version
-      @headers = {}
-      @ssl_options = ssl_options
-
-      if auth_options[:user]
-        @basic_auth_user = auth_options[:user]
-        @basic_auth_password = auth_options[:password]
-      elsif auth_options[:bearer_token]
-        bearer_token(auth_options[:bearer_token])
-      elsif auth_options[:bearer_token_file]
-        validate_bearer_token_file(auth_options[:bearer_token_file])
-        bearer_token(File.read(auth_options[:bearer_token_file]))
-      end
-    end
-
-    def all_entities
-      retrieve_all_entities(ENTITY_TYPES)
-    end
-
-    define_entity_methods(ENTITY_TYPES)
-
-    private
-
-    def validate_auth_options(opts)
-      exclusive_keys = [:bearer_token, :bearer_token_file, :user]
-
-      return if exclusive_keys.none? { |s| opts.key?(s) }
-
-      msg = 'Invalid auth options: specify only one of user/password,' \
-            ' bearer_token or bearer_token_file'
-      fail ArgumentError, msg unless exclusive_keys.one? { |s| opts.key?(s)  }
-
-      msg = 'Basic auth requires both user & password'
-      fail ArgumentError, msg if opts.key?(:user) && !opts.key?(:password)
-    end
-
-    def validate_bearer_token_file(bearer_token_file)
-      msg = "Token file #{bearer_token_file} does not exist"
-      fail ArgumentError, msg unless File.file?(bearer_token_file)
-
-      msg = "Cannot read token file #{bearer_token_file}"
-      fail ArgumentError, msg unless File.readable?(bearer_token_file)
+  class Client
+    include ClientMixin
+    def initialize(
+      uri,
+      version = 'v1',
+      **options
+    )
+      initialize_client(
+        uri,
+        '/api',
+        version,
+        **options
+      )
     end
   end
 end

metadata

@@ -1,69 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 4.9.2
 platform: ruby
 authors:
 - Alissa Bonas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-rg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -72,70 +100,124 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: googleauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.5.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: openid_connect
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: jsonpath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '5.0'
 description: A client for Kubernetes REST api
 email:
 - abonas@redhat.com
@@ -143,109 +225,53 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".github/workflows/actions.yml"
+- ".gitignore"
+- ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASING.md
 - Rakefile
 - kubeclient.gemspec
 - lib/kubeclient.rb
+- lib/kubeclient/aws_eks_credentials.rb
 - lib/kubeclient/common.rb
+- lib/kubeclient/config.rb
 - lib/kubeclient/entity_list.rb
-- lib/kubeclient/kube_exception.rb
+- lib/kubeclient/exec_credentials.rb
+- lib/kubeclient/gcp_auth_provider.rb
+- lib/kubeclient/gcp_command_credentials.rb
+- lib/kubeclient/google_application_default_credentials.rb
+- lib/kubeclient/http_error.rb
+- lib/kubeclient/missing_kind_compatibility.rb
+- lib/kubeclient/oidc_auth_provider.rb
+- lib/kubeclient/resource.rb
+- lib/kubeclient/resource_not_found_error.rb
 - lib/kubeclient/version.rb
-- lib/kubeclient/watch_notice.rb
 - lib/kubeclient/watch_stream.rb
-- test/json/created_namespace_b3.json
-- test/json/created_secret.json
-- test/json/created_service_b3.json
-- test/json/empty_pod_list_b3.json
-- test/json/endpoint_list_b3.json
-- test/json/entity_list_b3.json
-- test/json/event_list_b3.json
-- test/json/namespace_b3.json
-- test/json/namespace_exception_b3.json
-- test/json/namespace_list_b3.json
-- test/json/node_b3.json
-- test/json/node_list_b3.json
-- test/json/pod_b3.json
-- test/json/pod_list_b3.json
-- test/json/replication_controller_b3.json
-- test/json/replication_controller_list_b3.json
-- test/json/secret_list_b3.json
-- test/json/service_b3.json
-- test/json/service_illegal_json_404.json
-- test/json/service_list_b3.json
-- test/json/service_update_b3.json
-- test/json/versions_list.json
-- test/json/watch_stream_b3.json
-- test/test_helper.rb
-- test/test_kubeclient.rb
-- test/test_namespace.rb
-- test/test_node.rb
-- test/test_pod.rb
-- test/test_replication_controller.rb
-- test/test_secret.rb
-- test/test_service.rb
-- test/test_watch.rb
-- test/valid_token_file
 homepage: https://github.com/abonas/kubeclient
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A client for Kubernetes REST api
-test_files:
-- test/json/created_namespace_b3.json
-- test/json/created_secret.json
-- test/json/created_service_b3.json
-- test/json/empty_pod_list_b3.json
-- test/json/endpoint_list_b3.json
-- test/json/entity_list_b3.json
-- test/json/event_list_b3.json
-- test/json/namespace_b3.json
-- test/json/namespace_exception_b3.json
-- test/json/namespace_list_b3.json
-- test/json/node_b3.json
-- test/json/node_list_b3.json
-- test/json/pod_b3.json
-- test/json/pod_list_b3.json
-- test/json/replication_controller_b3.json
-- test/json/replication_controller_list_b3.json
-- test/json/secret_list_b3.json
-- test/json/service_b3.json
-- test/json/service_illegal_json_404.json
-- test/json/service_list_b3.json
-- test/json/service_update_b3.json
-- test/json/versions_list.json
-- test/json/watch_stream_b3.json
-- test/test_helper.rb
-- test/test_kubeclient.rb
-- test/test_namespace.rb
-- test/test_node.rb
-- test/test_pod.rb
-- test/test_replication_controller.rb
-- test/test_secret.rb
-- test/test_service.rb
-- test/test_watch.rb
-- test/valid_token_file
+test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - "2.0"
-  - "2.1"
-sudo: false
-cache: bundler

data/lib/kubeclient/kube_exception.rb

@@ -1,13 +0,0 @@
-# Kubernetes HTTP Exceptions
-class KubeException < StandardError
-  attr_reader :error_code, :message
-
-  def initialize(error_code, message)
-    @error_code = error_code
-    @message = message
-  end
-
-  def to_s
-    'HTTP status code ' + @error_code.to_s + ', ' + @message
-  end
-end

data/lib/kubeclient/watch_notice.rb

@@ -1,7 +0,0 @@
-require 'recursive_open_struct'
-module Kubeclient
-  module Common
-    class WatchNotice < RecursiveOpenStruct
-    end
-  end
-end

data/test/json/created_namespace_b3.json

@@ -1,20 +0,0 @@
-{
-"kind": "Namespace",
-"apiVersion": "v1beta3",
-"metadata": {
-"name": "development",
-"selfLink": "/api/v1beta3/namespaces/development",
-"uid": "13d820d6-df5b-11e4-bd42-f8b156af4ae1",
-"resourceVersion": "2533",
-"creationTimestamp": "2015-04-10T08:24:59Z"
-},
-"spec": {
-"finalizers": [
-"kubernetes"
-]
-},
-"status": {
-"phase": "Active"
-}
-}
-