image-inspector-client 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da60483c1212458eadf005485118b3a70d1a77e9
-  data.tar.gz: 753c4a38cf2d86553ead4c5e6ac740672323c690
+  metadata.gz: 1f4778a7b8967c1922993122ec7fe7e9403cdb8b
+  data.tar.gz: a1a68da7ab4c77b68fa53f4e90ac9b5cb9117484
 SHA512:
-  metadata.gz: d420f91f15721963b5b41ba1015135f93e5221e1f4cd53a14aec8792c631dfacb286240628143cdf877582300d7523a3f5004c05cd6b5c09624963a381feee3e
-  data.tar.gz: 9700a199ad7c28a5afee86713ef5ead0dabcfc3bb0f6fa9d86df2ec852a510004fc2012ff2d7116e587d19874c177f45bc3238042d709d748ffb9fec655b66dc
+  metadata.gz: 0e47c57379ab6a79ea5f1354bf43b9122c1c31762d5909f48c83ea2234edbdbeb6507c3eef40459bdc9fed2bfc65e3443f72db08cb918cd73b7436ed982d1a00
+  data.tar.gz: 27879e3e27617d90f072b4719afb0a4e67414feb243ea3f1fe2a7bd86fa3853f18f850843d034557eac2e5886c0137d0d7a8987b3a194f3f0ff54c112c819615

data/README.md

@@ -11,6 +11,12 @@ ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
   .fetch_metadata
   .ContainerConfig
   .Cmd
+
+
+Get OpenSCAP ARF as raw xml:
+ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+  .fetch_oscap_arf
+
 ```
 
 ## building from source

data/lib/image-inspector-client.rb

@@ -28,6 +28,12 @@ module ImageInspectorClient
       @headers = {}
     end
 
+    def fetch_oscap_arf
+      exception_handler do
+        RestClient::Resource.new(@endpoint, http_options)['openscap'].get(http_headers).body
+      end
+    end
+
     def fetch_metadata
       exception_handler do
         RecursiveOpenStruct.new(
@@ -48,7 +54,7 @@ module ImageInspectorClient
       rescue JSON::ParserError
         json_error_msg = {}
       end
-      err_message = json_error_msg['message'] || e.message
+      err_message = json_error_msg['message'] || e.to_s
       raise InspectorClientException.new(e.http_code, err_message)
     end
 

data/lib/image-inspector-client/version.rb

@@ -1,4 +1,4 @@
 # Client for image inspector: https://github.com/simon3z/image-inspector
 module ImageInspectorClient
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/test/test_openscap.rb

@@ -0,0 +1,61 @@
+require 'common'
+
+# Tests for fetch_oscap_arf call
+class TestOpenscap < MiniTest::Test
+  def test_openscap_happy_flow
+    stub_request(:get, %r{/openscap}).to_return(
+      body: open_test_file('openscap.xml'),
+      status: 200
+    )
+
+    md = ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+         .fetch_oscap_arf
+
+    assert_equal(File.read('test/xml/openscap.xml'), md)
+
+    assert_requested(
+      :get,
+      'http://localhost:8080/api/v1/openscap',
+      times: 1
+    )
+  end
+
+  def test_openscap_empty_body
+    stub_request(:get, %r{/openscap}).to_return(
+      body: '',
+      status: 200
+    )
+
+    md = ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+         .fetch_oscap_arf
+
+    assert_equal('', md)
+
+    assert_requested(
+      :get,
+      'http://localhost:8080/api/v1/openscap',
+      times: 1
+    )
+  end
+
+  def test_openscap_404
+    stub_request(:get, %r{/openscap}).to_return(
+      body: 'Openscap option was not chosen',
+      status: 404
+    )
+
+    e = assert_raises(ImageInspectorClient::InspectorClientException) do
+      ImageInspectorClient::Client.new('http://localhost:8080', 'v1')
+      .fetch_oscap_arf
+    end
+
+    assert_equal(404, e.error_code)
+    assert_match(/Openscap option was not chosen/, e.message)
+
+    assert_requested(
+      :get,
+      'http://localhost:8080/api/v1/openscap',
+      times: 1
+    )
+  end
+end

data/test/xml/openscap.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arf:asset-report-collection xmlns:arf="http://scap.nist.gov/schema/asset-reporting-format/1.1" xmlns:core="http://scap.nist.gov/schema/reporting-core/1.1" xmlns:ai="http://scap.nist.gov/schema/asset-identification/1.1">
+  <core:relationships xmlns:arfvocab="http://scap.nist.gov/specifications/arf/vocabulary/relationships/1.0#" xmlns:arfrel="http://scap.nist.gov/vocabulary/arf/relationships/1.0#">
+    <core:relationship type="arfvocab:createdFor" subject="xccdf1">
+      <core:ref>collection1</core:ref>
+    </core:relationship>
+    <core:relationship type="arfrel:isAbout" subject="xccdf1">
+      <core:ref>asset0</core:ref>
+    </core:relationship>
+  </core:relationships>
+  <arf:report-requests>
+    <arf:report-request id="collection1">
+      <arf:content>
+      </arf:content>
+    </arf:report>
+  </arf:reports>
+</arf:asset-report-collection>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image-inspector-client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mooli Tayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,8 @@ files:
 - test/json/metadata.json
 - test/test_client.rb
 - test/test_metadata.rb
+- test/test_openscap.rb
+- test/xml/openscap.xml
 homepage: https://github.com/moolitayer/image-inspector-client
 licenses:
 - MIT
@@ -163,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A client for image_inspector REST API
@@ -172,4 +174,5 @@ test_files:
 - test/json/metadata.json
 - test/test_client.rb
 - test/test_metadata.rb
-has_rdoc: 
+- test/test_openscap.rb
+- test/xml/openscap.xml