foreman_scc_manager 1.8.16 → 1.8.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd540b3e5ecde9d0174c474698db985365681fc85eede30117eb2663f51f2158
-  data.tar.gz: 9a44579a7948089c9a708dee17f6ac7d7805c68d995feeaf6f5a3e46babda35b
+  metadata.gz: 94924eef8de5143907ca81d9ea6c41915d51c931d394356497e7168b8ffbe09e
+  data.tar.gz: 49d822f0d3c70abd53a0d818c3dc7c2102c9e12e8c325a3580f9e966bf50dd61
 SHA512:
-  metadata.gz: 1b6c6e4a370f1e8a2d133a6891ba5b4493ecab019e4d32df920be9cfacc220ff86bcf69080c57c073d07015d916065260999ff9cc2e01ea2542947bfad400dcf
-  data.tar.gz: 5f6afa5a1e2899643779855270b38a31df1d6a4bc2ba49ddc3643529add32ad8b4129a642aa570f4498a847ccdc90c21b0ad7c22497e8e6328dc5037de5724a7
+  metadata.gz: c26c8d840bd3a97a3cbc99e84dc53bc17c48a8175dd026cfd618d5597cbf934373ed048c978e5805db1942ef0b3b4ef9283ee60b8e36b26e5d3a886e48f20067
+  data.tar.gz: 6599cad1358b63afba7824ca2d8f7328d30c8f2d851814b681be2b7ec4de42116e9e3160680cd814f960cb49b65fd09edda863a7383e5fabd93925791bd6600e

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

@@ -84,9 +84,13 @@ module Actions
                        :unprotected => unprotected,
                        :gpg_key => gpg_key,
                        :arch => input[:arch],
-                       :download_policy => ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE }
+                       :download_policy => Setting[:default_download_policy] }
         repository = product.add_repo(repo_param)
-        repository.mirror_on_sync = true
+        if repository.has_attribute?('mirror_on_sync')
+          repository.mirror_on_sync = true
+        else
+          repository.mirroring_policy = ::Katello::RootRepository::MIRRORING_POLICY_CONTENT
+        end
         repository.verify_ssl_on_sync = true
         trigger(::Actions::Katello::Repository::CreateRoot, repository).tap do
           output[:katello_root_repository_id] = repository.id

data/app/models/scc_product.rb

@@ -58,7 +58,11 @@ class SccProduct < ApplicationRecord
       gpg_key = new_product.gpg_key
       new_repo = new_product.add_repo(label, uniq_repo_name, repo.full_url, 'yum', unprotected, gpg_key)
       new_repo.arch = arch || 'noarch'
-      new_repo.mirror_on_sync = true
+      if new_repo.has_attribute?('mirror_on_sync')
+        new_repo.mirror_on_sync = true
+      else
+        new_repo.mirroring_policy = ::Katello::RootRepository::MIRRORING_POLICY_CONTENT
+      end
       new_repo.verify_ssl_on_sync = true
       ForemanTasks.sync_task(::Actions::Katello::Repository::Create, new_repo, false, false)
     end

data/app/models/scc_repository.rb

@@ -22,10 +22,15 @@ class SccRepository < ApplicationRecord
 
   def token_changed_callback
     User.current ||= User.anonymous_admin
-    repo = self.katello_root_repository
-    return if repo.nil? || repo.url == full_url
 
-    ::Foreman::Logging.logger('foreman_scc_manager').info "Update URL-token for repository '#{repo.name}'."
-    ForemanTasks.async_task(::Actions::Katello::Repository::Update, repo, url: full_url)
+    # get all Katello repos that were derived from this SCC repo
+    # as uniq_name was changed, we need to look for repo labels that end with the repo name
+    katello_repos = Katello::RootRepository.where('label like ?', "%#{::Katello::Util::Model.labelize(self.description)}%")
+    katello_repos.each do |repo|
+      unless repo.url == full_url
+        ::Foreman::Logging.logger('foreman_scc_manager').info "Update URL-token for repository '#{repo.name}'."
+        ForemanTasks.async_task(::Actions::Katello::Repository::Update, repo, url: full_url)
+      end
+    end
   end
 end

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

@@ -25,7 +25,7 @@
             display_link_if_authorized(_("Sync"), hash_for_sync_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer),
                                        :method => :put),
             display_delete_if_authorized(hash_for_scc_account_path(:id => scc_account).merge(:auth_object => scc_account, :authorizer => authorizer, :permission => 'delete_scc_accounts'),
-                                         :data => { :confirm => _("Delete %s?") % scc_account.to_s })
+                                         :data => { :confirm => _("WARNING: If you want to switch SCC accounts and retain the synchronized content, DO NOT delete your old SCC account, even if it is expired. Please change the login and password of your SCC account, instead.\n\nIf you delete your old SCC account, you CANNOT reuse existing repositories, products, content views, and composite content views.\n\nReally delete SCC account %s?") % scc_account.to_s })
 
           ) %>
         </td>

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.8.16'.freeze
+  VERSION = '1.8.19'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.8.16
+  version: 1.8.19
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -220,21 +220,21 @@ signing_key:
 specification_version: 4
 summary: Suse Customer Center plugin for Foreman
 test_files:
+- test/support/fixtures_support.rb
 - test/unit/foreman_scc_manager_test.rb
-- test/features/sync_test.rb
+- test/actions/sync_test.rb
+- test/test_plugin_helper.rb
+- test/factories/foreman_scc_manager_factories.rb
 - test/models/scc_product_test.rb
 - test/models/scc_account_test.rb
-- test/factories/foreman_scc_manager_factories.rb
-- test/controllers/api/v2/scc_accounts_test.rb
-- test/controllers/api/v2/scc_products_test.rb
-- test/controllers/scc_accounts_controller_test.rb
-- test/actions/sync_test.rb
-- test/support/fixtures_support.rb
-- test/fixtures/models/scc_accounts.yml
+- test/features/sync_test.rb
 - test/fixtures/models/scc_repositories.yml
+- test/fixtures/models/scc_accounts.yml
 - test/fixtures/models/scc_products.yml
-- test/fixtures/files/data_products_page2.json
 - test/fixtures/files/data_products_page1.json
 - test/fixtures/files/data_subscriptions.json
+- test/fixtures/files/data_products_page2.json
 - test/fixtures/files/data_repositories.json
-- test/test_plugin_helper.rb
+- test/controllers/scc_accounts_controller_test.rb
+- test/controllers/api/v2/scc_products_test.rb
+- test/controllers/api/v2/scc_accounts_test.rb