foreman_scc_manager 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a2884348925699e2aadc5796abe4ec48adee8458c577c035c564c1fbd9f950
-  data.tar.gz: 2ea193e0dbc07d41706f908870c610e1411ec200df1c6f10435f8ddc2dde0a4f
+  metadata.gz: 3e3ad336c2287deeae7ef60de582455927e1222e3a93c260550707275e61aa84
+  data.tar.gz: 243b0239ce5038274c764927b6b40a5e6fe1c96d1fef33908087cb075f68f84b
 SHA512:
-  metadata.gz: cbac716765fccb60766e4e3a6a205d596bbfd08b1349efe1e9ed56a70bb84696835895520d2b93c6bf079f8ae9d0aebab169d541b5d6291f9519f24347b407c9
-  data.tar.gz: 6419f3962cc8355300132eb6ea01719e5a912a66f18051922e2edc8db482a0d46d224f88bd6c5dbef501c06b877dbe6dc44cfc4e48d4438e62251c46cf6599c3
+  metadata.gz: 8466b8453d20e881d1c8601d3ca6a3a551124d2d24675e1e959c0afdab48df174e38a43c81103f4437ec00551f3d4f9dc796347337da85c0ae340c2d56cebcb8
+  data.tar.gz: b50739730c156e73a36491b9bfef5f2ab0220d9e771ceaf782b49d97d1b5b6b47550fda4f03385d8ce9097664be2f526c9995513032880997aeeba70a8238cd3

data/README.md

@@ -11,6 +11,7 @@ for how to install Foreman plugins
 
 | Foreman Version | Katello Version | Plugin Version |
 | --------------- | --------------- | -------------- |
+| 1.18            | 3.7             | ~> 1.5.0       |
 | 1.17            | 3.6             | >= 1.3.1       |
 | 1.16            | 3.5             | <= 1.3.0       |
 | 1.15            | 3.4             | ~> 1.1.0       |

data/app/lib/actions/scc_manager/sync_products.rb

@@ -12,10 +12,11 @@ module Actions
       def run
         output[:status] = 'SUCCESS'
         begin
-          output[:data] = ::SccManager.get_scc_data(input.fetch(:base_url),
-                                                    '/connect/organizations/products',
-                                                    input.fetch(:login),
-                                                    input.fetch(:password))
+          products = ::SccManager.get_scc_data(input.fetch(:base_url),
+                                               '/connect/organizations/products',
+                                               input.fetch(:login),
+                                               input.fetch(:password))
+          output[:data] = ::SccManager.sanitize_products(products).values
         rescue StandardError
           output[:status] = 'FAILURE'
         end
@@ -32,6 +33,14 @@ module Actions
       def humanized_name
         _('Sync SUSE subscriptions (Products)')
       end
+
+      def humanized_input
+        input.dup.update(password: '***')
+      end
+
+      def humanized_output
+        output.dup.update(data: 'Trimmed')
+      end
     end
   end
 end

data/app/lib/actions/scc_manager/sync_repositories.rb

@@ -31,6 +31,14 @@ module Actions
       def humanized_name
         _('Sync SUSE subscriptions (Repositories)')
       end
+
+      def humanized_input
+        input.dup.update(password: '***')
+      end
+
+      def humanized_output
+        output.dup.update(data: 'Trimmed')
+      end
     end
   end
 end

data/app/lib/scc_manager.rb

@@ -34,4 +34,15 @@ module SccManager
   ensure
     RestClient.proxy = ''
   end
+
+  # Cope for the very weird structure of SCC output
+  def self.sanitize_products(products, result = {})
+    products.reduce(result) do |res, product|
+      sanitize_products(product['extensions'].tap do |extensions|
+        product['extensions'] = extensions.map { |extension| { 'id' => extension['id'] } }
+        res[product['id']] = product.merge(result.fetch(product['id'], {}))
+        res[product['id']]['extensions'] |= product['extensions']
+      end, res)
+    end
+  end
 end

data/app/views/scc_accounts/show.html.erb

@@ -1,8 +1,8 @@
 <% javascript 'foreman_scc_manager/scc_accounts' %>
 <%= form_for([:bulk_subscribe, @scc_account], method: :put) do |f| %>
-  <% def render_list_node(f, scc_product, parent_id = nil) %>
+  <% def render_list_node(f, scc_product, parent_id = "") %>
     <li>
-      <span class="scc_product_checkbox" id="<%= "scc_product_span_#{scc_product.id}" %>" <%= "data-parent=scc_product_span_#{parent_id}" if parent_id %>>
+      <span class="scc_product_checkbox" id="<%= "scc_product_span_#{parent_id + "_" + scc_product.id.to_s}" %>" <%= "data-parent=scc_product_span_#{parent_id}" if parent_id != "" %>>
         <% if scc_product.product %>
           <%= check_box_tag("scc_account[scc_unsubscribe_product_ids][]", scc_product.id, true, disabled: true) %>
         <% else %>
@@ -13,7 +13,7 @@
       <% if scc_product.scc_extensions.any? %>
         <ul>
           <% scc_product.scc_extensions.order(:friendly_name).each do |scc_extension| %>
-            <% render_list_node(f, scc_extension, scc_product.id) %>
+            <% render_list_node(f, scc_extension, parent_id + "_" + scc_product.id.to_s) %>
           <% end %>
         </ul>
       <% end %>

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc