foreman_scc_manager 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '080706b89aa725bfe63ec6286dd1bf726c4d4291efb017a7ba5fe2a0ce640d2f'
-  data.tar.gz: 20f9c023ba1e08bc3cf2b53f379f968fdf48ef39cd6260367f0d39a4f32fc2c1
+  metadata.gz: 1a29f70bc667b2d96113d1852e32f0eb58acabb875ec0c8285008e058ee67d43
+  data.tar.gz: 80db612f6a5aef4dcd1bdaf707f8a8cb6f5c60abf68066b2254a80d323c7a189
 SHA512:
-  metadata.gz: 1b56f046622f08e5e127cd905523f298d34f8edf7dbb8b08a810e856bf43e82999a2fd6b8ffa8a035bace60800974625e0f0b7e3edae4e489c82a8ab66a8c864
-  data.tar.gz: 4c245d75e023d29d1588b7b29cfb62db9e154c3ae2f95647a6ffb74e2d7ba4014cc9f03243abe640f3cea6323759c3e42a1f714386304a70af02a2fc24011707
+  metadata.gz: e440f952a3259ac4875b93f463ce338fd8932dfc71bd001d66dea2e5ec60022974a0547143101b0be306db168a5db48dd4b8e7d1c34a7a3ba58a7c0f9f3d6b87
+  data.tar.gz: 49c2168e1c593f18f227e7cad45d097330b5f52e35b45a94351f81fc750a6b6d237fecb55df0307fa76db48374696a9639c496bb30858e5b450f37be01b90666

data/README.md

@@ -11,7 +11,8 @@ for how to install Foreman plugins
 
 | Foreman Version | Katello Version | Plugin Version |
 | --------------- | --------------- | -------------- |
-| 1.20            | 3.9             | ~> 1.5.1       |
+| 1.21            | 3.10            | ~> 1.6.0       |
+| 1.20            | 3.9             | ~> 1.6.0       |
 | 1.19            | 3.8             | ~> 1.5.1       |
 | 1.18            | 3.7             | ~> 1.5.0       |
 | 1.17            | 3.6             | >= 1.3.1       |

data/app/controllers/scc_accounts_controller.rb

@@ -63,7 +63,7 @@ class SccAccountsController < ApplicationController
   def sync
     sync_task = ForemanTasks.async_task(::Actions::SccManager::Sync, @scc_account)
     @scc_account.update! sync_task: sync_task
-    notice _('Sync task started.')
+    success _('Sync task started.')
   rescue ::Foreman::Exception => e
     error _('Failed to add task to queue: %s') % e.to_s
   rescue ForemanTasks::Lock::LockConflict => e
@@ -80,9 +80,9 @@ class SccAccountsController < ApplicationController
       ForemanTasks.async_task(::Actions::BulkAction,
                               ::Actions::SccManager::SubscribeProduct,
                               scc_products_to_subscribe)
-      notice _('Task to subscribe products started.')
+      success _('Task to subscribe products started.')
     else
-      notice _('No products selected.')
+      warning _('No products selected.')
     end
   rescue ::Foreman::Exception => e
     error _('Failed to add task to queue: %s') % e.to_s

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

@@ -72,7 +72,7 @@ module Actions
         repository = product.add_repo(repo_param)
         repository.mirror_on_sync = true
         repository.verify_ssl_on_sync = true
-        trigger(::Actions::Katello::Repository::Create, repository, false, false)
+        trigger(::Actions::Katello::Repository::CreateRoot, repository)
       end
     end
   end

data/app/models/scc_product.rb

@@ -32,7 +32,7 @@ class SccProduct < ApplicationRecord
     ForemanTasks.sync_task(::Actions::Katello::Product::Create, new_product, scc_account.organization)
     new_product.reload
     scc_repositories.each do |repo|
-      uniq_repo_name = uniq_name + ' ' + repo.description
+      uniq_repo_name = repo.uniq_name(self)
       label = Katello::Util::Model.labelize(uniq_repo_name)
       unprotected = true
       gpg_key = new_product.gpg_key

data/app/models/scc_repository.rb

@@ -11,11 +11,15 @@ class SccRepository < ApplicationRecord
     token.blank? ? url : url + '?' + token
   end
 
+  def uniq_name(scc_product)
+    scc_product.uniq_name + ' ' + description
+  end
+
   def token_changed_callback
     User.current ||= User.anonymous_admin
     scc_products.where.not(product: nil).find_each do |sp|
-      reponame = sp.friendly_name + ' ' + description
-      repository = sp.product.repositories.find_by(name: reponame)
+      reponame = uniq_name(sp)
+      repository = sp.product.root_repositories.find_by(name: reponame)
       unless repository.url == full_url
         ::Foreman::Logging.logger('foreman_scc_manager').info "Update URL-token for repository '#{reponame}'."
         ForemanTasks.async_task(::Actions::Katello::Repository::Update, repository, url: full_url)

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc