foreman_scc_manager 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d296a7acbef13daa1e12d2f5fd87cde248487a46
-  data.tar.gz: 8d3377991fc0dded2f0b4e72498bbc90081d6ea8
+SHA256:
+  metadata.gz: 8c9b8504241cd3feed62bc340cf0db3c37bfc10943bf7db7ac9d119d154a1abc
+  data.tar.gz: 33c6c4286f16de71f6d3af9ad4d35bbaa741ddc5e66cbc164c95730256945778
 SHA512:
-  metadata.gz: 5c94a4f70faeab6138a5d3a41e65d5ea59e17cdea4c5df585ff402bc8118ba01ee9a51783d2213bc287534700ef9a430955b3a18016ebd53f61ffcdd23d24603
-  data.tar.gz: 91b77311d51017259a86f688b9de1491f00603d6cb8e932c2fc1b642be6c698c147a1cfb90611b3d80fc8fcd928eb4002fb7c017b13f1ffb6f5d03ccaa2172e1
+  metadata.gz: 729e90d1a64ee314ac3772346b19f3869a142431cbc2d932359c19ea8d9615bc10465b747efe8a7003bc8ae532d310e4a13dd077262fea05266f84059554a7f8
+  data.tar.gz: e0a3d085ea59df19371f774b48f83d229a970bde2fcf5b394b0c65ac0f9b27489b00530d3582fb4248488442894b3ceb72898fa592573ef2f87cd31170725a37

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

@@ -61,11 +61,18 @@ module Actions
         label = ::Katello::Util::Model.labelize(uniq_name)
         unprotected = true
         gpg_key = product.gpg_key
-        repository = product.add_repo(label, uniq_name, input[:url], 'yum', unprotected, gpg_key)
-        repository.arch = input[:arch]
+        repo_param = {  :label => label,
+                :name => uniq_name,
+                :url => input[:url],
+                :content_type => 'yum',
+                :unprotected => unprotected,
+                :gpg_key => gpg_key,
+                :arch => input[:arch],
+                :download_policy => ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE
+        }
+        repository = product.add_repo(repo_param)
         repository.mirror_on_sync = true
         repository.verify_ssl_on_sync = true
-        repository.download_policy = ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE
         trigger(::Actions::Katello::Repository::Create, repository, false, false)
       end
     end

data/app/models/scc_account.rb

@@ -1,4 +1,4 @@
-class SccAccount < ActiveRecord::Base
+class SccAccount < ApplicationRecord
   include Authorizable
   include Encryptable
   include ForemanTasks::Concerns::ActionSubject
@@ -50,52 +50,52 @@ class SccAccount < ActiveRecord::Base
 
   def update_scc_repositories(upstream_repositories)
     upstream_repo_ids = []
-    SccProduct.transaction do
-      # import repositories
-      upstream_repositories.each do |ur|
-        cached_repository = scc_repositories.find_or_initialize_by(scc_id: ur['id'])
-        cached_repository.name = ur['name']
-        cached_repository.distro_target = ur['distro_target']
-        cached_repository.description = ur['description']
-        cached_repository.url, cached_repository.token = ur['url'].split('?')
-        cached_repository.enabled = ur['enabled']
-        cached_repository.autorefresh = ur['autorefresh']
-        cached_repository.installer_updates = ur['installer_updates']
-        cached_repository.save!
-        upstream_repo_ids << cached_repository.id
-      end
-      # delete repositories beeing removed upstream
-      scc_repositories.where(id: scc_repository_ids - upstream_repo_ids).destroy_all.count
+    # import repositories
+    upstream_repositories.each do |ur|
+      cached_repository = scc_repositories.find_or_initialize_by(scc_id: ur['id'])
+      cached_repository.name = ur['name']
+      cached_repository.distro_target = ur['distro_target']
+      cached_repository.description = ur['description']
+      cached_repository.url, cached_repository.token = ur['url'].split('?')
+      cached_repository.enabled = ur['enabled']
+      cached_repository.autorefresh = ur['autorefresh']
+      cached_repository.installer_updates = ur['installer_updates']
+      cached_repository.save!
+      upstream_repo_ids << ur['id']
     end
+    # delete repositories beeing removed upstream (Active record seems to be wrong here...)
+    # scc_repositories.where.not(scc_id: upstream_repo_ids).delete_all
+    upstream_repo_ids_str = upstream_repo_ids.map{ |id| ActiveRecord::Base.sanitize(id) }.join(',')
+    ActiveRecord::Base.connection.execute("delete from scc_repositories where scc_repositories.scc_account_id = #{ActiveRecord::Base.sanitize(id)} and scc_repositories.scc_id not in (#{upstream_repo_ids_str});")
   end
 
   def update_scc_products(upstream_products)
     upstream_product_ids = []
-    SccProduct.transaction do
-      # import products
-      upstream_products.each do |up|
-        cached_product = scc_products.find_or_initialize_by(scc_id: up['id'])
-        cached_product.name = up['name']
-        cached_product.version = up['version']
-        cached_product.arch = up['arch']
-        cached_product.description = up['description']
-        cached_product.friendly_name = up['friendly_name']
-        cached_product.product_type = up['product_type']
-        cached_product.scc_repositories =
-          scc_repositories.where(scc_id: up['repositories'].map { |repo| repo['id'] })
-        cached_product.save!
-        upstream_product_ids << cached_product.id
-      end
-      # delete products beeing removed upstream
-      scc_products.where(id: scc_product_ids - upstream_product_ids).destroy_all.count
-      # rewire product to product relationships
-      upstream_products.each do |up|
-        extensions = scc_products.where(scc_id: up['extensions'].map { |ext| ext['id'] })
-        begin
-          scc_products.find_by!(scc_id: up['id']).update!(scc_extensions: extensions)
-        rescue ActiveRecord::RecordNotFound
-          logger.info "Failed to find parent scc_product '#{up['name']}'."
-        end
+    # import products
+    upstream_products.each do |up|
+      cached_product = scc_products.find_or_initialize_by(scc_id: up['id'])
+      cached_product.name = up['name']
+      cached_product.version = up['version']
+      cached_product.arch = up['arch']
+      cached_product.description = up['description']
+      cached_product.friendly_name = up['friendly_name']
+      cached_product.product_type = up['product_type']
+      cached_product.scc_repositories =
+        scc_repositories.where(scc_id: up['repositories'].map { |repo| repo['id'] })
+      cached_product.save!
+      upstream_product_ids << up['id']
+    end
+    # delete products beeing removed upstream (Active record seems to be wrong here...)
+    # scc_products.where.not(scc_id: upstream_product_ids).delete_all
+    upstream_product_ids_str = upstream_product_ids.map{ |id| ActiveRecord::Base.sanitize(id) }.join(',')
+    ActiveRecord::Base.connection.execute("delete from scc_products where scc_products.scc_account_id = #{ActiveRecord::Base.sanitize(id)} and scc_products.scc_id not in (#{upstream_product_ids_str});")
+    # rewire product to product relationships
+    upstream_products.each do |up|
+      extensions = scc_products.where(scc_id: up['extensions'].map { |ext| ext['id'] })
+      begin
+        scc_products.find_by!(scc_id: up['id']).update!(scc_extensions: extensions)
+      rescue ActiveRecord::RecordNotFound
+        logger.info "Failed to find parent scc_product '#{up['name']}'."
       end
     end
   end

data/app/models/scc_extending.rb

@@ -1,4 +1,4 @@
-class SccExtending < ActiveRecord::Base
+class SccExtending < ApplicationRecord
   belongs_to :scc_product, inverse_of: :scc_extendings
   belongs_to :scc_extension, class_name: :SccProduct, inverse_of: :inverse_scc_extendings
 end

data/app/models/scc_product.rb

@@ -1,4 +1,4 @@
-class SccProduct < ActiveRecord::Base
+class SccProduct < ApplicationRecord
   include Authorizable
   include ForemanTasks::Concerns::ActionSubject
 

data/app/models/scc_repository.rb

@@ -1,4 +1,4 @@
-class SccRepository < ActiveRecord::Base
+class SccRepository < ApplicationRecord
   after_commit :token_changed_callback
 
   self.include_root_in_json = false

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

@@ -15,19 +15,17 @@
     <% @scc_accounts.each do |scc_account| %>
       <tr>
         <td class="display-two-pane ellipsis">
-          <%= link_to_if_authorized(scc_account.name, hash_for_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer)) %>
-          <%= link_to_if_authorized('', hash_for_edit_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer), {visible: false, class: 'edit_deferree'}) %>
+          <%= link_to_if_authorized(scc_account.name, hash_for_edit_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer)) %>
         </td>
         <td><%= scc_account.scc_products.count.to_s %></td>
         <td><%= scc_account.get_sync_status %></td>
         <td>
           <%= action_buttons(
+            display_link_if_authorized(_("Select products"), hash_for_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer)),
             display_link_if_authorized(_("Sync"), hash_for_sync_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer),
-            :method => :put),
-            display_link_if_authorized(_("Edit"), hash_for_edit_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer),
-                                      class: 'edit_deferrer'),
+                                       :method => :put),
             display_delete_if_authorized(hash_for_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer),
-            :data => { :confirm => _("Delete %s?") % scc_account.to_s })
+                                         :data => { :confirm => _("Delete %s?") % scc_account.to_s })
           ) %>
         </td>
       </tr>

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

@@ -26,7 +26,7 @@
   </ul>
 
   <div class="tab-content">
-    <div class="tab-pane active pre-scrollable" id="primary">
+    <div class="tab-pane active" id="primary">
       <ul>
         <% if @scc_account.synced %>
           <% @scc_account.scc_products.where(product_type: 'base').order(:friendly_name).each do |scc_product| %>

data/db/migrate/20170303085304_add_organization_to_scc_account.rb

@@ -1,9 +1,9 @@
 class AddOrganizationToSccAccount < ActiveRecord::Migration
-  class SccAccount < ActiveRecord::Base
+  class SccAccount < ApplicationRecord
     belongs_to :organization
   end
 
-  class Organization < ActiveRecord::Base
+  class Organization < ApplicationRecord
   end
 
   def up

data/lib/foreman_scc_manager/engine.rb

@@ -18,8 +18,8 @@ module ForemanSccManager
 
     initializer 'foreman_scc_manager.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_scc_manager do
-        requires_foreman '>= 1.13'
-        requires_foreman_plugin 'katello', '>= 3.2.0'
+        requires_foreman '>= 1.16'
+        requires_foreman_plugin 'katello', '>= 3.5.0'
 
         # Add permissions
         security_block :foreman_scc_manager do

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 description: Foreman plugin to sync SUSE Customer Center products and repositories
   into Katello.
 email:
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Suse Customer Center plugin for Foreman