Merge pull request #23 from enoodle/openshift_container_image_class_p…

…rocessing Adding openshift_container_images
ManageIQ · Jul 20, 2017 · 8f1ab78 · 8f1ab78
2 parents 51eb435 + ad5ac8a
commit 8f1ab78
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/app/models/manageiq/providers/openshift/container_manager/container_image.rb b/app/models/manageiq/providers/openshift/container_manager/container_image.rb
@@ -0,0 +1,10 @@
+class ManageIQ::Providers::Openshift::ContainerManager::ContainerImage < ContainerImage
+  def annotate_deny_execution(causing_policy)
+    ext_management_system.annotate(
+      "image",
+      digest,
+      "security.manageiq.org/failed-policy" => causing_policy,
+      "images.openshift.io/deny-execution"  => "true"
+    )
+  end
+end
diff --git a/app/models/manageiq/providers/openshift/container_manager/refresh_parser.rb b/app/models/manageiq/providers/openshift/container_manager/refresh_parser.rb
@@ -204,6 +204,8 @@ def parse_openshift_image(openshift_image)
           :ref => "#{ContainerImage::DOCKER_PULLABLE_PREFIX}#{id}",
         }
 
+        new_result[:type] = 'ManageIQ::Providers::Openshift::ContainerManager::ContainerImage'
+
         if openshift_image[:dockerImageManifest].present?
           begin
             json = JSON.parse(openshift_image[:dockerImageManifest])

diff --git a/spec/models/manageiq/providers/openshift/container_manager/refresh_parser_spec.rb b/spec/models/manageiq/providers/openshift/container_manager/refresh_parser_spec.rb
@@ -17,7 +17,8 @@
       RecursiveOpenStruct.new(
         :metadata             => {
           :name              => image_digest,
-          :creationTimestamp => '2015-08-17T09:16:46Z'
+          :creationTimestamp => '2015-08-17T09:16:46Z',
+          :uid               => '123'
         },
         :dockerImageReference => "#{image_registry}:#{image_registry_port}/#{image_name}@#{image_digest}",
         :dockerImageManifest  => '{"name": "%s", "tag": "%s"}' % [image_name, image_tag],
@@ -72,6 +73,7 @@
                          image_from_openshift)).to eq(
                            :name                     => image_name,
                            :registered_on            => Time.parse('2015-08-17T09:16:46Z').utc,
+                           :type                     => 'ManageIQ::Providers::Openshift::ContainerManager::ContainerImage',
                            :digest                   => image_digest,
                            :image_ref                => image_ref,
                            :tag                      => image_tag,
@@ -105,7 +107,8 @@
                            :digest                   => nil,
                            :image_ref                => "docker-pullable://sha256:abcdefg",
                            :name                     => "sha256",
-                           :tag                      => "abcdefg"
+                           :tag                      => "abcdefg",
+                           :type                     => "ManageIQ::Providers::Openshift::ContainerManager::ContainerImage",
                          )
     end
 
@@ -123,6 +126,7 @@
                            :docker_version           => nil,
                            :size                     => nil,
                            :labels                   => [],
+                           :type                     => "ManageIQ::Providers::Openshift::ContainerManager::ContainerImage",
                          )
     end
 
@@ -145,7 +149,8 @@
                            :environment_variables    => {},
                            :size                     => nil,
                            :labels                   => [],
-                           :docker_labels            => []
+                           :docker_labels            => [],
+                           :type                     => "ManageIQ::Providers::Openshift::ContainerManager::ContainerImage",
                          )
     end
 

diff --git a/spec/models/manageiq/providers/openshift/container_manager/refresher_spec.rb b/spec/models/manageiq/providers/openshift/container_manager/refresher_spec.rb
@@ -1,6 +1,7 @@
 describe ManageIQ::Providers::Openshift::ContainerManager::Refresher do
   let(:all_images_count) { 40 } # including /oapi/v1/images data
   let(:pod_images_count) { 12 } # only images mentioned by pods
+  let(:images_managed_by_openshift_count) { 32 } # only images from /oapi/v1/images
 
   before(:each) do
     allow(MiqServer).to receive(:my_zone).and_return("default")
@@ -249,6 +250,7 @@ def assert_table_counts
     expect(ContainerTemplate.count).to eq(26)
     expect(ContainerImage.count).to eq(all_images_count)
     expect(ContainerImage.joins(:containers).distinct.count).to eq(pod_images_count)
+    expect(ManageIQ::Providers::Openshift::ContainerManager::ContainerImage.count).to eq(images_managed_by_openshift_count)
   end
 
   def assert_ems