kubeclient 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 780e4ae994bf298d7316518d27110c3a336820c5
-  data.tar.gz: fabcc8d9f9f7900495f9dd75d8e15b3d41b34db8
+  metadata.gz: c1a9d1c94899f80aff5f5785eba76960e53aadd9
+  data.tar.gz: b0b6a866ec05f67b6128adf1567f1439c574c6dd
 SHA512:
-  metadata.gz: dc85e7d93e8a3a042830d67ceb852ba3c946fec3636d69151382f8d5abafac415567d36ca82453ec3aca6c12df5e25d32dcde82cd2bfd4e5d27a2752bde50503
-  data.tar.gz: 9b029e85c7b33b2d606c39cf87204c0c418e2e79acc613e8262bed142e06297aa6945352667ea72f3a9ec0c75f03ba9750e221ec540fadea227f7c0913239712
+  metadata.gz: 4dec2bc2ebb2dbf0155b84ec0c58da5fe4a8b7c03b05b2f6831243c08cc7d313d265c63a39a377a25a2ea27d1237d2beb65a6727d9195aa4fe710c3760acfd0e
+  data.tar.gz: ec7a46482a877e8329a011a4cab8705f5e839dab07dc9fbbe8c579563bd84cda46e2410b69d61d0e9095d9885306f61c67b1baf665d9ca9ddeaf7b6c7b706c8e

data/lib/kubeclient/common.rb

@@ -207,17 +207,23 @@ module Kubeclient
     end
 
     def create_entity(entity_type, entity_config, klass)
-      # to_hash should be called because of issue #9 in recursive open
-      # struct
+      # Duplicate the entity_config to a hash so that when we assign
+      # kind and apiVersion, this does not mutate original entity_config obj.
       hash = entity_config.to_hash
 
-      ns_prefix = build_namespace_prefix(entity_config.metadata['table'][:namespace])
+      ns_prefix = build_namespace_prefix(hash[:metadata][:namespace])
 
       # TODO: temporary solution to add "kind" and apiVersion to request
       # until this issue is solved
       # https://github.com/GoogleCloudPlatform/kubernetes/issues/6439
-      hash['kind'] = entity_type
-      hash['apiVersion'] = @api_version
+      # TODO: #2 solution for
+      # https://github.com/kubernetes/kubernetes/issues/8115
+      if entity_type.eql? 'Endpoint'
+        hash[:kind] = resource_name(entity_type).capitalize
+      else
+        hash[:kind] = entity_type
+      end
+      hash[:apiVersion] = @api_version
       response = handle_exception do
         rest_client[ns_prefix + resource_name(entity_type)]
         .post(hash.to_json, @headers)
@@ -227,14 +233,11 @@ module Kubeclient
     end
 
     def update_entity(entity_type, entity_config)
-      name = entity_config.metadata.name
-      # to_hash should be called because of issue #9 in recursive open
-      # struct
-      hash = entity_config.to_hash
-      ns_prefix = build_namespace_prefix(entity_config.metadata['table'][:namespace])
+      name      = entity_config[:metadata][:name]
+      ns_prefix = build_namespace_prefix(entity_config[:metadata][:namespace])
       handle_exception do
         rest_client[ns_prefix + resource_name(entity_type) + "/#{name}"]
-          .put(hash.to_json, @headers)
+          .put(entity_config.to_h.to_json, @headers)
       end
     end
 

data/lib/kubeclient/version.rb

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

data/test/json/created_endpoint.json

@@ -0,0 +1,28 @@
+{
+  "kind": "Endpoints",
+  "apiVersion": "v1",
+  "metadata": {
+    "name": "myendpoint",
+    "namespace": "default",
+    "selfLink": "/api/v1/namespaces/default/endpoints/myendpoint",
+    "uid": "59d05b48-dadb-11e5-937e-18037327aaeb",
+    "resourceVersion": "393",
+    "creationTimestamp": "2016-02-24T09:45:34Z"
+  },
+  "subsets": [
+    {
+      "addresses": [
+        {
+          "ip": "172.17.0.25"
+        }
+      ],
+      "ports": [
+        {
+          "name": "https",
+          "port": 6443,
+          "protocol": "TCP"
+        }
+      ]
+    }
+  ]
+}

data/test/test_endpoint.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+# Endpoint entity tests
+class TestEndpoint < MiniTest::Test
+  def test_create_endpoint
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
+    testing_ep = Kubeclient::Endpoint.new
+    testing_ep.metadata = {}
+    testing_ep.metadata.name = 'myendpoint'
+    testing_ep.metadata.namespace = 'default'
+    testing_ep.subsets = [{ 'addresses' => [{ 'ip' => '172.17.0.25' }], 'ports' =>
+                              [{ 'name' => 'https',
+                                 'port' => 6443,
+                                 'protocol' => 'TCP' }] }]
+
+    req_body = "{\"metadata\":{\"name\":\"myendpoint\",\"namespace\":\"default\"}," \
+        "\"subsets\":[{\"addresses\":[{\"ip\":\"172.17.0.25\"}],\"ports\":[{\"name\":\"https\"," \
+    "\"port\":6443,\"protocol\":\"TCP\"}]}],\"kind\":\"Endpoints\",\"apiVersion\":\"v1\"}"
+
+    stub_request(:post, 'http://localhost:8080/api/v1/namespaces/default/endpoints')
+      .with(body: req_body)
+      .to_return(body: open_test_file('created_endpoint.json'), status: 201)
+
+    created_ep = client.create_endpoint testing_ep
+    assert_equal('Endpoints', created_ep.kind)
+  end
+end

data/test/test_service.rb

@@ -23,9 +23,9 @@ class TestService < MiniTest::Test
     assert_equal our_service.metadata.labels.name,
                  hash[:metadata][:labels][:name]
 
-    stub_request(:post, %r{namespaces/staging/services})
-      .to_return(body: open_test_file('created_service.json'),
-                 status: 201)
+    expected_url = 'http://localhost:8080/api/v1/namespaces/staging/services'
+    stub_request(:post, expected_url)
+      .to_return(body: open_test_file('created_service.json'), status: 201)
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/'
     created = client.create_service our_service
@@ -33,6 +33,81 @@ class TestService < MiniTest::Test
     assert_instance_of(Kubeclient::Service, created)
     assert_equal(created.metadata.name, our_service.metadata.name)
     assert_equal(created.spec.ports.size, our_service.spec.ports.size)
+
+    # Check that original entity_config is not modified by kind/apiVersion patches:
+    assert_equal(our_service.kind, nil)
+
+    assert_requested(:post, expected_url, times: 1) do |req|
+      data = JSON.parse(req.body)
+      data['kind'] == 'Service' &&
+        data['apiVersion'] == 'v1' &&
+        data['metadata']['name'] == 'guestbook' &&
+        data['metadata']['namespace'] == 'staging'
+    end
+  end
+
+  def test_construct_service_from_symbol_keys
+    service = Kubeclient::Service.new
+    service.metadata = {
+      labels: { tier: 'frontend' },
+      name: 'test-service',
+      namespace: 'staging'
+    }
+    service.spec = {
+      ports: [{
+        port: 3000,
+        targetPort: 'http-server',
+        protocol: 'TCP'
+      }]
+    }
+
+    expected_url = 'http://localhost:8080/api/v1/namespaces/staging/services'
+    stub_request(:post, expected_url)
+      .to_return(body: open_test_file('created_service.json'), status: 201)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/'
+    client.create_service service
+
+    assert_requested(:post, expected_url, times: 1) do |req|
+      data = JSON.parse(req.body)
+      data['kind'] == 'Service' &&
+        data['apiVersion'] == 'v1' &&
+        data['metadata']['name'] == 'test-service' &&
+        data['metadata']['labels']['tier'] == 'frontend' &&
+        data['metadata']['namespace'] == 'staging'
+    end
+  end
+
+  def test_construct_service_from_string_keys
+    service = Kubeclient::Service.new
+    service.metadata = {
+      'labels' => { 'tier' => 'frontend' },
+      'name' => 'test-service',
+      'namespace' => 'staging'
+    }
+    service.spec = {
+      'ports' => [{
+        'port' => 3000,
+        'targetPort' => 'http-server',
+        'protocol' => 'TCP'
+      }]
+    }
+
+    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)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/'
+    client.create_service service
+
+    assert_requested(:post, expected_url, times: 1) do |req|
+      data = JSON.parse(req.body)
+      data['kind'] == 'Service' &&
+        data['apiVersion'] == 'v1' &&
+        data['metadata']['name'] == 'test-service' &&
+        data['metadata']['labels']['tier'] == 'frontend' &&
+        data['metadata']['namespace'] == 'staging'
+    end
   end
 
   def test_conversion_from_json_v1
@@ -111,26 +186,47 @@ class TestService < MiniTest::Test
   end
 
   def test_update_service
-    entity = 'service'
-    object = Kubeclient::Service.new
+    service = Kubeclient::Service.new
+    name = 'my_service'
+
+    service.metadata = {}
+    service.metadata.name      = name
+    service.metadata.namespace = 'development'
+
+    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)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
+    client.update_service service
+
+    assert_requested(:put, expected_url, times: 1) do |req|
+      data = JSON.parse(req.body)
+      data['metadata']['name'] == name &&
+        data['metadata']['namespace'] == 'development'
+    end
+  end
+
+  def test_update_service_with_string_keys
+    service = Kubeclient::Service.new
     name = 'my_service'
-    object.metadata = {
-      'name' => name
+
+    service.metadata = {
+      'name' => name,
+      'namespace' => 'development'
     }
 
-    stub_request(:put, %r{/services/#{name}})\
-      .to_return(
-        body: open_test_file('service_update.json'),
-        status: 200
-      )
+    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)
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1'
-    client.update_entity entity, object
+    client.update_service service
 
-    assert_requested(
-      :put,
-      "http://localhost:8080/api/v1/services/#{name}",
-      times: 1
-    )
+    assert_requested(:put, expected_url, times: 1) do |req|
+      data = JSON.parse(req.body)
+      data['metadata']['name'] == name &&
+        data['metadata']['namespace'] == 'development'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,6 +189,7 @@ files:
 - test/cassettes/kubernetes_guestbook.yml
 - test/json/component_status.json
 - test/json/component_status_list.json
+- test/json/created_endpoint.json
 - test/json/created_namespace.json
 - test/json/created_secret.json
 - test/json/created_service.json
@@ -224,6 +225,7 @@ files:
 - test/json/versions_list.json
 - test/json/watch_stream.json
 - test/test_component_status.rb
+- test/test_endpoint.rb
 - test/test_guestbook_go.rb
 - test/test_helper.rb
 - test/test_kubeclient.rb
@@ -270,6 +272,7 @@ test_files:
 - test/cassettes/kubernetes_guestbook.yml
 - test/json/component_status.json
 - test/json/component_status_list.json
+- test/json/created_endpoint.json
 - test/json/created_namespace.json
 - test/json/created_secret.json
 - test/json/created_service.json
@@ -305,6 +308,7 @@ test_files:
 - test/json/versions_list.json
 - test/json/watch_stream.json
 - test/test_component_status.rb
+- test/test_endpoint.rb
 - test/test_guestbook_go.rb
 - test/test_helper.rb
 - test/test_kubeclient.rb