openshift_client 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd75c26f571a0cb7106c740bace79553dcd9d9a7
-  data.tar.gz: c05b766c6f2f70bdcdb1de106ef603e9285fb9bb
+  metadata.gz: 7ecd1935db85caf1bdf07140b21687832c0d2286
+  data.tar.gz: 0ff849a505f7cdb6571b121f4bd373598857242b
 SHA512:
-  metadata.gz: dadf908747a83d4b92f09b80a5e5e31f299e6da346918c0b0a81497b47f0a7bdcccca63a6353219f04d8c134fb00e36b0c4ce08b0338d1927c9df3d940dc19f7
-  data.tar.gz: 3bb873806082cba5215b4c672b54f0e557b414c7fcde45d3f2dd9286cfc9b77439b590ab9016cd47a3e13a50a700f9e7d852ba86e1bb91da81846adff7658ad2
+  metadata.gz: 437ffe72d0d5fca6c3096dd30d23bd9f6d7c6ac7d0b36f5d7d8dee3f8003c0f57be381fb89a2f1e776421f52555d04445a1bdc05c64ca37d6731f0a5dad5eea5
+  data.tar.gz: 1232ab29fa5eef4071839756d232750bf4f0ef6371dfe77e2e297b2a27c249a4c693db69e74bc6520e7607c272487ee29d6c2dad7c6f5a47d95f3cd7a6850d55

data/.rubocop.yml

@@ -6,3 +6,5 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/LineLength:
   Max: 100
+Metrics/ParameterLists:
+  Max: 8

data/lib/openshift_client.rb

@@ -16,7 +16,8 @@ module OpenshiftClient
     # 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(Project Route ClusterRoleBinding Build BuildConfig).map do |et|
+    ENTITY_TYPES = %w(Project Route ClusterRoleBinding Build BuildConfig Image
+                      ImageStream).map do |et|
       [OpenshiftClient.const_set(et, Class.new(RecursiveOpenStruct)), et]
     end
 
@@ -36,9 +37,14 @@ module OpenshiftClient
                      password:          nil,
                      bearer_token:      nil,
                      bearer_token_file: nil
+                   },
+                   socket_options: {
+                     socket_class:     nil,
+                     ssl_socket_class: nil
                    }
                   )
-      initialize_client(uri, path, version, ssl_options: ssl_options, auth_options: auth_options)
+      initialize_client(uri, path, version, ssl_options: ssl_options, auth_options: auth_options,
+                                            socket_options: socket_options)
     end
 
     def all_entities

data/lib/openshift_client/version.rb

@@ -1,4 +1,4 @@
 # Openshift REST-API Client
 module OpenshiftClient
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/openshift_client.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'rubocop', '= 0.30.0'
-  spec.add_dependency 'kubeclient', '~> 1.0.0'
+  spec.add_dependency 'kubeclient', '~> 1.1.0'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'recursive-open-struct', '= 1.0.0'
 end

data/test/json/image.json

@@ -0,0 +1,63 @@
+{
+  "kind": "Image",
+  "apiVersion": "v1",
+  "metadata": {
+    "name": "sha256:9b214cc086795a08f41b55553e21a311bda2408cee537a40c4d785b44bd24",
+    "selfLink": "/oapi/v1/images/sha256:9b214cc086795a08f41b55553e21a311bda2408cee537a40c4d785b44bd24",
+    "uid": "256f00dd-7b37-11e5-8942-28d2447dcefe",
+    "resourceVersion": "194",
+    "creationTimestamp": "2015-10-25T16:40:48Z"
+  },
+  "dockerImageReference": "openshift/ruby-20-centos7@sha256:9b214cc086795a08f41b55553e21a311bda2408cee537a40c4d785b44bd24",
+  "dockerImageMetadata": {
+    "kind": "DockerImage",
+    "apiVersion": "1.0",
+    "Id": "sha256:9b214cc086795a08f41b55553e21a311bda2408cee537a40c4d785b44bd24",
+    "Parent": "980c4802b0fa001cd0fec081afedfee041ec49438a1670e05350c6a25610ac03",
+    "Created": "2015-10-23T20:21:41Z",
+    "ContainerConfig": {},
+    "DockerVersion": "1.7.1",
+    "Author": "SoftwareCollections.org \u003csclorg@redhat.com\u003e",
+    "Config": {
+      "User": "1001",
+      "ExposedPorts": {
+        "8080/tcp": {}
+      },
+      "Env": [
+        "PATH=/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+        "STI_SCRIPTS_URL=image:///usr/libexec/s2i",
+        "STI_SCRIPTS_PATH=/usr/libexec/s2i",
+        "HOME=/opt/app-root/src",
+        "BASH_ENV=/opt/app-root/etc/scl_enable",
+        "ENV=/opt/app-root/etc/scl_enable",
+        "PROMPT_COMMAND=. /opt/app-root/etc/scl_enable",
+        "RUBY_VERSION=2.0"
+      ],
+      "Cmd": [
+        "/bin/sh",
+        "-c",
+        "$STI_SCRIPTS_PATH/usage"
+      ],
+      "Image": "980c4802b0fa001cd0fec081afedfee041ec49438a1670e05350c6a25610ac03",
+      "WorkingDir": "/opt/app-root/src",
+      "Entrypoint": [
+        "container-entrypoint"
+      ],
+      "Labels": {
+        "License": "GPLv2",
+        "Vendor": "CentOS",
+        "io.k8s.description": "Platform for building and running Ruby 2.0 applications",
+        "io.k8s.display-name": "Ruby 2.0",
+        "io.openshift.builder-base-version": "f5bfa20",
+        "io.openshift.builder-version": "33dadac",
+        "io.openshift.expose-services": "8080:http",
+        "io.openshift.s2i.scripts-url": "image:///usr/libexec/s2i",
+        "io.openshift.tags": "builder,ruby,ruby20",
+        "io.s2i.scripts-url": "image:///usr/libexec/s2i"
+      }
+    },
+    "Architecture": "amd64",
+    "Size": 53514887
+  },
+  "dockerImageMetadataVersion": "1.0"
+}

data/test/json/image_stream.json

@@ -0,0 +1,21 @@
+{
+  "kind": "ImageStream",
+  "apiVersion": "v1",
+  "metadata": {
+    "name": "eng-boss-image-inspector",
+    "namespace": "default",
+    "selfLink": "/oapi/v1/namespaces/default/imagestreams/eng-boss-image-inspector",
+    "uid": "f4499f16-b7bc-11e5-a0a4-001a4a231290",
+    "resourceVersion": "2836367",
+    "creationTimestamp": "2016-01-10T17:09:48Z",
+    "annotations": {
+      "openshift.io/image.dockerRepositoryCheck": "the registry \"https://rcm-img-docker01.build.eng.bos.redhat.com:5001\" could not be reached"
+    }
+  },
+  "spec": {
+    "dockerImageRepository": "rcm-img-docker01.build.eng.bos.redhat.com:5001/openshift3/image-inspector"
+  },
+  "status": {
+    "dockerImageRepository": "172.30.107.74:5000/default/eng-boss-image-inspector"
+  }
+}

data/test/json/image_streams_list.json

@@ -0,0 +1,29 @@
+{
+  "kind": "ImageStreamList",
+  "apiVersion": "v1",
+  "metadata": {
+    "selfLink": "/oapi/v1/imagestreams",
+    "resourceVersion": "4544663"
+  },
+  "items": [
+    {
+      "metadata": {
+        "name": "eng-boss-image-inspector",
+        "namespace": "default",
+        "selfLink": "/oapi/v1/namespaces/default/imagestreams/eng-boss-image-inspector",
+        "uid": "f4499f16-b7bc-11e5-a0a4-001a4a231290",
+        "resourceVersion": "2836367",
+        "creationTimestamp": "2016-01-10T17:09:48Z",
+        "annotations": {
+          "openshift.io/image.dockerRepositoryCheck": "the registry \"https://rcm-img-docker01.build.eng.bos.redhat.com:5001\" could not be reached"
+        }
+      },
+      "spec": {
+        "dockerImageRepository": "rcm-img-docker01.build.eng.bos.redhat.com:5001/openshift3/image-inspector"
+      },
+      "status": {
+        "dockerImageRepository": "172.30.107.74:5000/default/eng-boss-image-inspector"
+      }
+    }
+  ]
+}

data/test/json/images_list.json

@@ -0,0 +1,71 @@
+{
+  "kind": "ImageList",
+  "apiVersion": "v1",
+  "metadata": {
+    "selfLink": "/oapi/v1/images",
+    "resourceVersion": "1041755"
+  },
+  "items": [
+    {
+      "metadata": {
+        "name": "sha256:9b214cc086795a08f41b55553e21a311bda2408cee537a40c4d785b44bd24",
+        "selfLink": "/oapi/v1/images/sha256:9b214cc086795a08f41b55553e21a311bda2408cee537a40c4d785b44bd24",
+        "uid": "256f00dd-7b37-11e5-8942-28d2447dcefe",
+        "resourceVersion": "194",
+        "creationTimestamp": "2015-10-25T16:40:48Z"
+      },
+      "dockerImageReference": "openshift/ruby-20-centos7@sha256:9b214cc086795a08f41b55553e21a311bda2408cee537a40c4d785b44bd24",
+      "dockerImageMetadata": {
+        "kind": "DockerImage",
+        "apiVersion": "1.0",
+        "Id": "sha256:9b214cc086795a08f41b55553e21a311bda2408cee537a40c4d785b44bd24",
+        "Parent": "980c4802b0fa001cd0fec081afedfee041ec49438a1670e05350c6a25610ac03",
+        "Created": "2015-10-23T20:21:41Z",
+        "ContainerConfig": {},
+        "DockerVersion": "1.7.1",
+        "Author": "SoftwareCollections.org \u003csclorg@redhat.com\u003e",
+        "Config": {
+          "User": "1001",
+          "ExposedPorts": {
+            "8080/tcp": {}
+          },
+          "Env": [
+            "PATH=/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+            "STI_SCRIPTS_URL=image:///usr/libexec/s2i",
+            "STI_SCRIPTS_PATH=/usr/libexec/s2i",
+            "HOME=/opt/app-root/src",
+            "BASH_ENV=/opt/app-root/etc/scl_enable",
+            "ENV=/opt/app-root/etc/scl_enable",
+            "PROMPT_COMMAND=. /opt/app-root/etc/scl_enable",
+            "RUBY_VERSION=2.0"
+          ],
+          "Cmd": [
+            "/bin/sh",
+            "-c",
+            "$STI_SCRIPTS_PATH/usage"
+          ],
+          "Image": "980c4802b0fa001cd0fec081afedfee041ec49438a1670e05350c6a25610ac03",
+          "WorkingDir": "/opt/app-root/src",
+          "Entrypoint": [
+            "container-entrypoint"
+          ],
+          "Labels": {
+            "License": "GPLv2",
+            "Vendor": "CentOS",
+            "io.k8s.description": "Platform for building and running Ruby 2.0 applications",
+            "io.k8s.display-name": "Ruby 2.0",
+            "io.openshift.builder-base-version": "f5bfa20",
+            "io.openshift.builder-version": "33dadac",
+            "io.openshift.expose-services": "8080:http",
+            "io.openshift.s2i.scripts-url": "image:///usr/libexec/s2i",
+            "io.openshift.tags": "builder,ruby,ruby20",
+            "io.s2i.scripts-url": "image:///usr/libexec/s2i"
+          }
+        },
+        "Architecture": "amd64",
+        "Size": 53514887
+      },
+      "dockerImageMetadataVersion": "1.0"
+    }
+  ]
+}

data/test/test_build.rb

@@ -1,14 +1,10 @@
 require 'test_helper'
 
-def open_test_json_file(name)
-  File.new(File.join(File.dirname(__FILE__), 'json', name))
-end
-
 # Build entity tests
 class TestBuild < MiniTest::Test
   def test_get_builds
     stub_request(:get, %r{/builds})
-      .to_return(body: open_test_json_file('builds_list.json'),
+      .to_return(body: open_test_file('builds_list.json'),
                  status: 200)
 
     client = OpenshiftClient::Client.new 'https://localhost:8080'
@@ -25,7 +21,7 @@ class TestBuild < MiniTest::Test
 
   def test_get_build
     stub_request(:get, %r{/builds})
-      .to_return(body: open_test_json_file('build.json'),
+      .to_return(body: open_test_file('build.json'),
                  status: 200)
 
     client = OpenshiftClient::Client.new 'https://localhost:8080'

data/test/test_build_config.rb

@@ -1,14 +1,10 @@
 require 'test_helper'
 
-def open_test_json_file(name)
-  File.new(File.join(File.dirname(__FILE__), 'json', name))
-end
-
 # Buildconfig entity tests
 class TestBuildconfig < MiniTest::Test
   def test_get_buildconfigs
     stub_request(:get, %r{/buildconfigs})
-      .to_return(body: open_test_json_file('buildconfigs_list.json'),
+      .to_return(body: open_test_file('buildconfigs_list.json'),
                  status: 200)
 
     client = OpenshiftClient::Client.new 'https://localhost:8080'
@@ -25,7 +21,7 @@ class TestBuildconfig < MiniTest::Test
 
   def test_get_buildconfig
     stub_request(:get, %r{/buildconfigs})
-      .to_return(body: open_test_json_file('buildconfig.json'),
+      .to_return(body: open_test_file('buildconfig.json'),
                  status: 200)
 
     client = OpenshiftClient::Client.new 'https://localhost:8080'

data/test/test_cluster_role_binding.rb

@@ -1,14 +1,10 @@
 require 'test_helper'
 
-def open_test_json_file(name)
-  File.new(File.join(File.dirname(__FILE__), 'json', name))
-end
-
 # ClusterRoleBinding entity tests
 class TestClusterRoleBinding < MiniTest::Test
   def test_get_cluster_role_binding
     stub_request(:get, %r{/clusterrolebindings/cluster-admins})
-      .to_return(body: open_test_json_file('cluster_role_binding.json'),
+      .to_return(body: open_test_file('cluster_role_binding.json'),
                  status: 200)
 
     client = OpenshiftClient::Client.new 'https://localhost:8080/oapi'
@@ -22,7 +18,7 @@ class TestClusterRoleBinding < MiniTest::Test
 
   def test_get_cluster_role_bindings
     stub_request(:get, %r{/clusterrolebindings})
-      .to_return(body: open_test_json_file('cluster_role_bindings_list.json'),
+      .to_return(body: open_test_file('cluster_role_bindings_list.json'),
                  status: 200)
 
     client = OpenshiftClient::Client.new 'https://localhost:8080/oapi'

data/test/test_helper.rb

@@ -2,3 +2,9 @@ require 'minitest/autorun'
 require 'webmock/minitest'
 require 'json'
 require 'openshift_client'
+
+# Assumes test files will be in a subdirectory with the same name as the
+# file suffix.  e.g. a file named foo.json would be a "json" subdirectory.
+def open_test_file(name)
+  File.new(File.join(File.dirname(__FILE__), name.split('.').last, name))
+end

data/test/test_image.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+def open_test_json_file(name)
+  File.new(File.join(File.dirname(__FILE__), 'json', name))
+end
+
+# Image entity tests
+class TestImage < MiniTest::Test
+  def test_get_images
+    stub_request(:get, %r{/images})
+      .to_return(body: open_test_json_file('images_list.json'),
+                 status: 200)
+
+    client = OpenshiftClient::Client.new 'https://localhost:8080'
+    images = client.get_images
+
+    assert_instance_of(Kubeclient::Common::EntityList, images)
+
+    assert_equal(1, images.size)
+    assert_instance_of(OpenshiftClient::Image, images[0])
+    assert_requested(:get,
+                     'https://localhost:8080/oapi/v1/images',
+                     times: 1)
+  end
+
+  def test_get_image
+    stub_request(:get, %r{/images})
+      .to_return(body: open_test_json_file('image.json'),
+                 status: 200)
+
+    client = OpenshiftClient::Client.new 'https://localhost:8080'
+    image = client.get_image 'sha256:9b214cc086795a08f41b55553e21a311bda2408cee537a40c4d785b44bd24',
+                             'default'
+
+    assert_instance_of(OpenshiftClient::Image, image)
+    assert_equal(
+      'sha256:9b214cc086795a08f41b55553e21a311bda2408cee537a40c4d785b44bd24',
+      image.metadata.name)
+    assert_equal('v1', image.apiVersion)
+    assert_equal('DockerImage', image.dockerImageMetadata.kind)
+
+    assert_requested(:get,
+                     'https://localhost:8080/oapi/v1/namespaces/default/images/sha256:9b214cc0867'\
+                     '95a08f41b55553e21a311bda2408cee537a40c4d785b44bd24',
+                     times: 1)
+  end
+end

data/test/test_image_stream.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+def open_test_json_file(name)
+  File.new(File.join(File.dirname(__FILE__), 'json', name))
+end
+
+# ImageStream entity tests
+class TestImageStream < MiniTest::Test
+  def test_get_image_streams
+    stub_request(:get, %r{/imagestreams})
+      .to_return(body: open_test_json_file('image_streams_list.json'),
+                 status: 200)
+
+    client = OpenshiftClient::Client.new 'https://localhost:8080'
+    image_streams = client.get_image_streams
+
+    assert_instance_of(Kubeclient::Common::EntityList, image_streams)
+
+    assert_equal(1, image_streams.size)
+    assert_instance_of(OpenshiftClient::ImageStream, image_streams[0])
+    assert_requested(:get,
+                     'https://localhost:8080/oapi/v1/imagestreams',
+                     times: 1)
+  end
+
+  def test_get_image_stream
+    stub_request(:get, %r{/imagestreams})
+      .to_return(body: open_test_json_file('image_stream.json'),
+                 status: 200)
+
+    client = OpenshiftClient::Client.new 'https://localhost:8080'
+    image_stream = client.get_image_stream 'eng-boss-image-inspector', 'default'
+
+    assert_instance_of(OpenshiftClient::ImageStream, image_stream)
+    assert_equal('eng-boss-image-inspector', image_stream.metadata.name)
+    assert_equal('v1', image_stream.apiVersion)
+    assert_equal('172.30.107.74:5000/default/eng-boss-image-inspector',
+                 image_stream.status.dockerImageRepository)
+
+    assert_requested(:get,
+                     'https://localhost:8080/oapi/v1/namespaces/default/imagestreams/eng-boss-image-inspector',
+                     times: 1)
+  end
+end

data/test/test_project.rb

@@ -1,14 +1,10 @@
 require 'test_helper'
 
-def open_test_json_file(name)
-  File.new(File.join(File.dirname(__FILE__), 'json', name))
-end
-
 # Project entity tests
 class TestProject < MiniTest::Test
   def test_get_project
     stub_request(:get, %r{/projects})
-      .to_return(body: open_test_json_file('project_b1.json'),
+      .to_return(body: open_test_file('project_b1.json'),
                  status: 200)
 
     client = OpenshiftClient::Client.new 'https://localhost:8080/oapi'
@@ -23,7 +19,7 @@ class TestProject < MiniTest::Test
 
   def test_get_projects
     stub_request(:get, %r{/projects})
-      .to_return(body: open_test_json_file('project_list_b1.json'),
+      .to_return(body: open_test_file('project_list_b1.json'),
                  status: 200)
 
     client = OpenshiftClient::Client.new 'https://localhost:8080/oapi'

data/test/test_route.rb

@@ -1,14 +1,10 @@
 require 'test_helper'
 
-def open_test_json_file(name)
-  File.new(File.join(File.dirname(__FILE__), 'json', name))
-end
-
 # Project entity tests
 class TestRoute < MiniTest::Test
   def test_get_routes
     stub_request(:get, %r{/routes})
-      .to_return(body: open_test_json_file('route_b1.json'),
+      .to_return(body: open_test_file('route_b1.json'),
                  status: 200)
 
     client = OpenshiftClient::Client.new 'https://localhost:8080/oapi'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openshift_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,10 @@ files:
 - test/json/builds_list.json
 - test/json/cluster_role_binding.json
 - test/json/cluster_role_bindings_list.json
+- test/json/image.json
+- test/json/image_stream.json
+- test/json/image_streams_list.json
+- test/json/images_list.json
 - test/json/project_b1.json
 - test/json/project_list_b1.json
 - test/json/route_b1.json
@@ -153,6 +157,8 @@ files:
 - test/test_client.rb
 - test/test_cluster_role_binding.rb
 - test/test_helper.rb
+- test/test_image.rb
+- test/test_image_stream.rb
 - test/test_project.rb
 - test/test_route.rb
 homepage: https://github.com/abonas/openshift_client
@@ -186,6 +192,10 @@ test_files:
 - test/json/builds_list.json
 - test/json/cluster_role_binding.json
 - test/json/cluster_role_bindings_list.json
+- test/json/image.json
+- test/json/image_stream.json
+- test/json/image_streams_list.json
+- test/json/images_list.json
 - test/json/project_b1.json
 - test/json/project_list_b1.json
 - test/json/route_b1.json
@@ -194,5 +204,7 @@ test_files:
 - test/test_client.rb
 - test/test_cluster_role_binding.rb
 - test/test_helper.rb
+- test/test_image.rb
+- test/test_image_stream.rb
 - test/test_project.rb
 - test/test_route.rb