kubeclient 4.0.0 → 4.1.0

data/test/test_helper.rb

@@ -10,3 +10,8 @@ require 'kubeclient'
 def open_test_file(name)
   File.new(File.join(File.dirname(__FILE__), name.split('.').last, name))
 end
+
+def stub_core_api_list
+  stub_request(:get, %r{/api/v1$})
+    .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
+end

data/test/test_kubeclient.rb

@@ -208,6 +208,7 @@ class KubeclientTest < MiniTest::Test
 
     refute_empty(services)
     assert_instance_of(Kubeclient::Common::EntityList, services)
+    # Stripping of 'List' in collection.kind RecursiveOpenStruct mode only is historic.
     assert_equal('Service', services.kind)
     assert_equal(2, services.size)
     assert_instance_of(Kubeclient::Resource, services[0])
@@ -234,6 +235,7 @@ class KubeclientTest < MiniTest::Test
 
     response = client.get_services(as: :parsed)
     assert_equal Hash, response.class
+    assert_equal 'ServiceList', response['kind']
     assert_equal %w[metadata spec status], response['items'].first.keys
   end
 
@@ -243,6 +245,7 @@ class KubeclientTest < MiniTest::Test
 
     response = client.get_services(as: :parsed_symbolized)
     assert_equal Hash, response.class
+    assert_equal 'ServiceList', response[:kind]
     assert_equal %i[metadata spec status], response[:items].first.keys
   end
 
@@ -469,10 +472,7 @@ class KubeclientTest < MiniTest::Test
   end
 
   def test_api_bearer_token_success
-    stub_request(:get, %r{/api/v1$})
-      .to_return(
-        body: open_test_file('core_api_resource_list.json'), status: 200
-      )
+    stub_core_api_list
     stub_request(:get, 'http://localhost:8080/api/v1/pods')
       .with(headers: { Authorization: 'Bearer valid_token' })
       .to_return(
@@ -839,11 +839,6 @@ class KubeclientTest < MiniTest::Test
       .to_return(body: open_test_file('entity_list.json'), status: 200)
   end
 
-  def stub_core_api_list
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
-  end
-
   def client
     @client ||= Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
   end

data/test/test_limit_range.rb

@@ -3,9 +3,7 @@ require_relative 'test_helper'
 # LimitRange tests
 class TestLimitRange < MiniTest::Test
   def test_get_from_json_v1
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
-
+    stub_core_api_list
     stub_request(:get, %r{/limitranges})
       .to_return(body: open_test_file('limit_range.json'), status: 200)
 

data/test/test_missing_methods.rb

@@ -3,10 +3,7 @@ require_relative 'test_helper'
 # Test method_missing, respond_to? and respond_to_missing behaviour
 class TestMissingMethods < MiniTest::Test
   def test_missing
-    stub_request(:get, %r{/api/v1$}).to_return(
-      body: open_test_file('core_api_resource_list.json'),
-      status: 200
-    )
+    stub_core_api_list
     client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
     assert_equal(true, client.respond_to?(:get_pod))
     assert_equal(true, client.respond_to?(:get_pods))
@@ -31,6 +28,10 @@ class TestMissingMethods < MiniTest::Test
       status: 404
     ) # If discovery fails we expect the below raise an exception
     client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
+    assert_raises(Kubeclient::HttpError) do
+      client.discover
+    end
+    client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
     assert_raises(Kubeclient::HttpError) do
       client.method(:get_pods)
     end
@@ -39,4 +40,29 @@ class TestMissingMethods < MiniTest::Test
       client.respond_to?(:get_pods)
     end
   end
+
+  def test_irregular_names
+    stub_core_api_list
+    client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
+    assert_equal(true, client.respond_to?(:get_endpoint))
+    assert_equal(true, client.respond_to?(:get_endpoints))
+
+    stub_request(:get, %r{/apis/security.openshift.io/v1$}).to_return(
+      body: open_test_file('security.openshift.io_api_resource_list.json'),
+      status: 200
+    )
+    client = Kubeclient::Client.new('http://localhost:8080/apis/security.openshift.io', 'v1')
+    assert_equal(true, client.respond_to?(:get_security_context_constraint))
+    assert_equal(true, client.respond_to?(:get_security_context_constraints))
+  end
+
+  def test_lowercase_kind
+    stub_request(:get, %r{/apis/config.istio.io/v1alpha2$}).to_return(
+      body: open_test_file('config.istio.io_api_resource_list.json'),
+      status: 200
+    )
+    client = Kubeclient::Client.new('http://localhost:8080/apis/config.istio.io', 'v1alpha2')
+    assert_equal(true, client.respond_to?(:get_servicecontrolreport))
+    assert_equal(true, client.respond_to?(:get_servicecontrolreports))
+  end
 end

data/test/test_namespace.rb

@@ -3,8 +3,7 @@ require_relative 'test_helper'
 # Namespace entity tests
 class TestNamespace < MiniTest::Test
   def test_get_namespace_v1
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
+    stub_core_api_list
     stub_request(:get, %r{/namespaces})
       .to_return(body: open_test_file('namespace.json'), status: 200)
 
@@ -29,8 +28,7 @@ class TestNamespace < MiniTest::Test
     our_namespace.metadata = {}
     our_namespace.metadata.name = 'staging'
 
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
+    stub_core_api_list
     stub_request(:delete, %r{/namespaces})
       .to_return(body: open_test_file('namespace.json'), status: 200)
     client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
@@ -45,8 +43,7 @@ class TestNamespace < MiniTest::Test
   end
 
   def test_create_namespace
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
+    stub_core_api_list
     stub_request(:post, %r{/namespaces})
       .to_return(body: open_test_file('created_namespace.json'), status: 201)
 

data/test/test_node.rb

@@ -3,10 +3,9 @@ require_relative 'test_helper'
 # Node entity tests
 class TestNode < MiniTest::Test
   def test_get_from_json_v1
+    stub_core_api_list
     stub_request(:get, %r{/nodes})
       .to_return(body: open_test_file('node.json'), status: 200)
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
 
     client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
     node = client.get_node('127.0.0.1')
@@ -32,10 +31,9 @@ class TestNode < MiniTest::Test
   end
 
   def test_get_from_json_v1_raw
+    stub_core_api_list
     stub_request(:get, %r{/nodes})
       .to_return(body: open_test_file('node.json'), status: 200)
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
 
     client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
     response = client.get_node('127.0.0.1', nil, as: :raw)

data/test/test_persistent_volume.rb

@@ -3,10 +3,9 @@ require_relative 'test_helper'
 # PersistentVolume tests
 class TestPersistentVolume < MiniTest::Test
   def test_get_from_json_v1
+    stub_core_api_list
     stub_request(:get, %r{/persistentvolumes})
       .to_return(body: open_test_file('persistent_volume.json'), status: 200)
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
 
     client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
     volume = client.get_persistent_volume('pv0001')

data/test/test_persistent_volume_claim.rb

@@ -3,11 +3,9 @@ require_relative 'test_helper'
 # PersistentVolumeClaim tests
 class TestPersistentVolumeClaim < MiniTest::Test
   def test_get_from_json_v1
+    stub_core_api_list
     stub_request(:get, %r{/persistentvolumeclaims})
       .to_return(body: open_test_file('persistent_volume_claim.json'), status: 200)
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
-
     client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
     claim = client.get_persistent_volume_claim('myclaim-1', 'default')
 

data/test/test_pod.rb

@@ -3,10 +3,9 @@ require_relative 'test_helper'
 # Pod entity tests
 class TestPod < MiniTest::Test
   def test_get_from_json_v1
+    stub_core_api_list
     stub_request(:get, %r{/pods})
       .to_return(body: open_test_file('pod.json'), status: 200)
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
 
     client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
     pod = client.get_pod('redis-master-pod', 'default')
@@ -26,4 +25,57 @@ class TestPod < MiniTest::Test
       times: 1
     )
   end
+
+  def test_get_chunks
+    stub_core_api_list
+    stub_request(:get, %r{/pods})
+      .to_return(body: open_test_file('pods_1.json'), status: 200)
+
+    client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
+    pods = client.get_pods(limit: 2)
+
+    assert_equal(2, pods.count)
+    assert_equal('eyJ2IjoibWV0YS5rOHMua', pods.continue)
+
+    continue = pods.continue
+
+    stub_request(:get, %r{/pods})
+      .to_return(body: open_test_file('pods_2.json'), status: 200)
+
+    pods = client.get_pods(limit: 2, continue: continue)
+    assert_equal(2, pods.count)
+    assert_nil(pods.continue)
+
+    assert_requested(
+      :get,
+      'http://localhost:8080/api/v1',
+      times: 1
+    )
+    assert_requested(
+      :get,
+      'http://localhost:8080/api/v1/pods?limit=2',
+      times: 1
+    )
+    assert_requested(
+      :get,
+      "http://localhost:8080/api/v1/pods?continue=#{continue}&limit=2",
+      times: 1
+    )
+  end
+
+  def test_get_chunks_410_gone
+    stub_core_api_list
+    stub_request(:get, %r{/pods})
+      .to_return(body: open_test_file('pods_410.json'), status: 410)
+
+    client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
+
+    err = assert_raises Kubeclient::HttpError do
+      client.get_pods(limit: 2, continue: 'eyJ2IjoibWV0YS5')
+    end
+
+    assert_equal(err.message,
+                 "The provided from parameter is too old to display a consistent list result. \
+You must start a new list without the from.")
+  end
 end

data/test/test_replication_controller.rb

@@ -3,9 +3,7 @@ require_relative 'test_helper'
 # Replication Controller entity tests
 class TestReplicationController < MiniTest::Test
   def test_get_from_json_v1
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     stub_request(:get, %r{/replicationcontrollers})
       .to_return(body: open_test_file('replication_controller.json'),
                  status: 200)
@@ -26,10 +24,7 @@ class TestReplicationController < MiniTest::Test
   end
 
   def test_delete_replicaset_cascade
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
-
+    stub_core_api_list
     client = Kubeclient::Client.new('http://localhost:8080/api/', 'v1')
     opts = Kubeclient::Resource.new(
       apiVersion: 'meta/v1',

data/test/test_resource_quota.rb

@@ -3,9 +3,7 @@ require_relative 'test_helper'
 # ResourceQuota tests
 class TestResourceQuota < MiniTest::Test
   def test_get_from_json_v1
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     stub_request(:get, %r{/resourcequotas})
       .to_return(body: open_test_file('resource_quota.json'),
                  status: 200)

data/test/test_secret.rb

@@ -3,10 +3,7 @@ require_relative 'test_helper'
 # Namespace entity tests
 class TestSecret < MiniTest::Test
   def test_get_secret_v1
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
-
+    stub_core_api_list
     stub_request(:get, %r{/secrets})
       .to_return(body: open_test_file('created_secret.json'),
                  status: 200)
@@ -26,10 +23,7 @@ class TestSecret < MiniTest::Test
   end
 
   def test_delete_secret_v1
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
-
+    stub_core_api_list
     stub_request(:delete, %r{/secrets})
       .to_return(status: 200, body: open_test_file('created_secret.json'))
 
@@ -43,10 +37,7 @@ class TestSecret < MiniTest::Test
   end
 
   def test_create_secret_v1
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
-
+    stub_core_api_list
     stub_request(:post, %r{/secrets})
       .to_return(body: open_test_file('created_secret.json'),
                  status: 201)

data/test/test_security_context_constraint.rb

@@ -0,0 +1,62 @@
+require_relative 'test_helper'
+
+# kind: 'SecurityContextConstraints' entity tests.
+# This is one of the unusual `kind`s that are already plural (https://github.com/kubernetes/kubernetes/issues/8115).
+# We force singular in method names like 'create_endpoint',
+# but `kind` should remain plural as in kubernetes.
+class TestSecurityContextConstraints < MiniTest::Test
+  def test_create_security_context_constraint
+    stub_request(:get, %r{/apis/security.openshift.io/v1$}).to_return(
+      body: open_test_file('security.openshift.io_api_resource_list.json'),
+      status: 200
+    )
+
+    testing_scc = Kubeclient::Resource.new(
+      metadata: {
+        name: 'teleportation'
+      },
+      runAsUser: {
+        type: 'MustRunAs'
+      },
+      seLinuxContext: {
+        type: 'MustRunAs'
+      }
+    )
+    req_body = '{"metadata":{"name":"teleportation"},"runAsUser":{"type":"MustRunAs"},' \
+      '"seLinuxContext":{"type":"MustRunAs"},' \
+      '"kind":"SecurityContextConstraints","apiVersion":"security.openshift.io/v1"}'
+
+    stub_request(:post, 'http://localhost:8080/apis/security.openshift.io/v1/securitycontextconstraints')
+      .with(body: req_body)
+      .to_return(body: open_test_file('created_security_context_constraint.json'), status: 201)
+
+    client = Kubeclient::Client.new('http://localhost:8080/apis/security.openshift.io', 'v1')
+    created_scc = client.create_security_context_constraint(testing_scc)
+    assert_equal('SecurityContextConstraints', created_scc.kind)
+    assert_equal('security.openshift.io/v1', created_scc.apiVersion)
+
+    client = Kubeclient::Client.new('http://localhost:8080/apis/security.openshift.io', 'v1',
+                                    as: :parsed_symbolized)
+    created_scc = client.create_security_context_constraint(testing_scc)
+    assert_equal('SecurityContextConstraints', created_scc[:kind])
+    assert_equal('security.openshift.io/v1', created_scc[:apiVersion])
+  end
+
+  def test_get_security_context_constraints
+    stub_request(:get, %r{/apis/security.openshift.io/v1$}).to_return(
+      body: open_test_file('security.openshift.io_api_resource_list.json'),
+      status: 200
+    )
+    stub_request(:get, %r{/securitycontextconstraints})
+      .to_return(body: open_test_file('security_context_constraint_list.json'), status: 200)
+    client = Kubeclient::Client.new('http://localhost:8080/apis/security.openshift.io', 'v1')
+
+    collection = client.get_security_context_constraints(as: :parsed_symbolized)
+    assert_equal('SecurityContextConstraintsList', collection[:kind])
+    assert_equal('security.openshift.io/v1', collection[:apiVersion])
+
+    # Stripping of 'List' in collection.kind RecursiveOpenStruct mode only is historic.
+    collection = client.get_security_context_constraints
+    assert_equal('SecurityContextConstraints', collection.kind)
+  end
+end

data/test/test_service.rb

@@ -25,10 +25,7 @@ class TestService < MiniTest::Test
                  hash[:metadata][:labels][:name])
 
     expected_url = 'http://localhost:8080/api/v1/namespaces/staging/services'
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
-
+    stub_core_api_list
     stub_request(:post, expected_url)
       .to_return(body: open_test_file('created_service.json'), status: 201)
 
@@ -67,9 +64,7 @@ class TestService < MiniTest::Test
     }
 
     expected_url = 'http://localhost:8080/api/v1/namespaces/staging/services'
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     stub_request(:post, expected_url)
       .to_return(body: open_test_file('created_service.json'), status: 201)
 
@@ -101,9 +96,7 @@ class TestService < MiniTest::Test
       }]
     }
 
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     expected_url = 'http://localhost:8080/api/v1/namespaces/staging/services'
     stub_request(:post, %r{namespaces/staging/services})
       .to_return(body: open_test_file('created_service.json'), status: 201)
@@ -122,9 +115,7 @@ class TestService < MiniTest::Test
   end
 
   def test_conversion_from_json_v1
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     stub_request(:get, %r{/services})
       .to_return(body: open_test_file('service.json'),
                  status: 200)
@@ -160,9 +151,7 @@ class TestService < MiniTest::Test
     our_service.labels.component = 'apiserver'
     our_service.labels.provider = 'kubernetes'
 
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     stub_request(:delete, %r{/namespaces/default/services})
       .to_return(body: open_test_file('service.json'), status: 200)
 
@@ -176,9 +165,7 @@ class TestService < MiniTest::Test
   end
 
   def test_get_service_no_ns
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     # when not specifying namespace for entities which
     # are not node or namespace, the request will fail
     stub_request(:get, %r{/services/redis-slave})
@@ -193,9 +180,7 @@ class TestService < MiniTest::Test
   end
 
   def test_get_service
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     stub_request(:get, %r{/namespaces/development/services/redis-slave})
       .to_return(body: open_test_file('service.json'),
                  status: 200)
@@ -217,9 +202,7 @@ class TestService < MiniTest::Test
     service.metadata.name      = name
     service.metadata.namespace = 'development'
 
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     expected_url = "http://localhost:8080/api/v1/namespaces/development/services/#{name}"
     stub_request(:put, expected_url)
       .to_return(body: open_test_file('service_update.json'), status: 201)
@@ -244,9 +227,7 @@ class TestService < MiniTest::Test
       'namespace' => 'development'
     }
 
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     expected_url = "http://localhost:8080/api/v1/namespaces/development/services/#{name}"
     stub_request(:put, expected_url)
       .to_return(body: open_test_file('service_update.json'), status: 201)
@@ -270,9 +251,7 @@ class TestService < MiniTest::Test
     service.metadata.name      = name
     service.metadata.namespace = 'development'
 
-    stub_request(:get, %r{/api/v1$})
-      .to_return(body: open_test_file('core_api_resource_list.json'),
-                 status: 200)
+    stub_core_api_list
     expected_url = "http://localhost:8080/api/v1/namespaces/development/services/#{name}"
     stub_request(:patch, expected_url)
       .to_return(body: open_test_file('service_patch.json'), status: 200)