foreman_scc_manager 1.8.19 → 1.8.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94924eef8de5143907ca81d9ea6c41915d51c931d394356497e7168b8ffbe09e
-  data.tar.gz: 49d822f0d3c70abd53a0d818c3dc7c2102c9e12e8c325a3580f9e966bf50dd61
+  metadata.gz: 39d299a2ed13146bd47fda51bfe3b47cccc78a2fe3984f5070b38acfa1d54bb0
+  data.tar.gz: eb22cc8040b485c69aa0dffd09b91a5ba926e89c9d124f4d9a32800a8db7546f
 SHA512:
-  metadata.gz: c26c8d840bd3a97a3cbc99e84dc53bc17c48a8175dd026cfd618d5597cbf934373ed048c978e5805db1942ef0b3b4ef9283ee60b8e36b26e5d3a886e48f20067
-  data.tar.gz: 6599cad1358b63afba7824ca2d8f7328d30c8f2d851814b681be2b7ec4de42116e9e3160680cd814f960cb49b65fd09edda863a7383e5fabd93925791bd6600e
+  metadata.gz: bf8c718efe53da5e8f8b417e249bfb3826a080f328331bee932af7108b0fea3da7a0f6b2fc5f581dc0c9f1588e056ae19d1dad83a2e3f45e2ba776763f672a1a
+  data.tar.gz: 83665d655bb8fa02fa9140115b3d6a604c7e18bde4c1bb4cc5d0bda505c2e1df7cb8c34fc515c62894e0964edc78ca0c773ca5ec34ed1d821ffe87304ecdd0b3

data/app/controllers/api/v2/scc_accounts_controller.rb

@@ -33,7 +33,7 @@ module Api
           param :login, String, :required => true, :desc => N_('Login id of scc_account')
           param :password, String, :required => true, :desc => N_('Password of scc_account')
           param :base_url, String, :required => false, :desc => N_('URL of SUSE for scc_account')
-          param :interval, ['never', 'daily', 'weekly', 'monthy'], :desc => N_('Interval for syncing scc_account')
+          param :interval, ['never', 'daily', 'weekly', 'monthly'], :desc => N_('Interval for syncing scc_account')
           param :sync_date, String, :desc => N_('Date and time relative to which the sync interval is run')
           param :katello_gpg_key_id, :identifier, :required => false, :desc => N_('Associated GPG key of scc_account')
         end

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

@@ -19,7 +19,8 @@ module Actions
                                              :product_id => product_create_action.output[:product_id],
                                              :uniq_name => repo.uniq_name(scc_product),
                                              :pretty_repo_name => repo.pretty_name,
-                                             :url => repo.full_url,
+                                             :url => repo.url,
+                                             :token => repo.token,
                                              :arch => arch)
             katello_repos[repo.id] = repo_create_action.output[:katello_root_repository_id]
           end
@@ -37,8 +38,7 @@ module Actions
         scc_product.update!(product: product)
         # extract Katello repo ids from input hash and store to database
         input[:katello_repos].each do |scc_repo_id, katello_root_repository_id|
-          scc_repo = SccRepository.find(scc_repo_id)
-          scc_repo.update!(katello_root_repository_id: katello_root_repository_id)
+          SccKatelloRepository.find_or_create_by(scc_repository_id: scc_repo_id, katello_root_repository_id: katello_root_repository_id)
         end
       end
 
@@ -79,7 +79,6 @@ module Actions
         gpg_key = product.gpg_key
         repo_param = { :label => label,
                        :name => input[:pretty_repo_name],
-                       :url => input[:url],
                        :content_type => 'yum',
                        :unprotected => unprotected,
                        :gpg_key => gpg_key,
@@ -91,6 +90,13 @@ module Actions
         else
           repository.mirroring_policy = ::Katello::RootRepository::MIRRORING_POLICY_CONTENT
         end
+        if repository.has_attribute?('upstream_authentication_token')
+          repository.url = input[:url]
+          repository.upstream_authentication_token = input[:token]
+        else
+          repository.url = input[:token].blank? ? input[:url] : "#{input[:url]}?#{input[:token]}"
+        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_account.rb

@@ -194,12 +194,13 @@ class SccAccount < ApplicationRecord
 
     # all scc repos that are kept but not available upstream need to be marked invalid
     # subscription_valid can be set to nil
-    to_invalidate = invalidated_repos.select { |ir| ir.katello_root_repository_id.present? && !ir.subscription_valid }
+    to_invalidate = invalidated_repos.select { |ir| ir.katello_root_repositories.count > 0 && !ir.subscription_valid }
     ::Foreman::Logging.logger('foreman_scc_manager').debug "Invalidating #{to_invalidate.count} expired repositories"
     invalidate_subscription_status(to_invalidate, save_record: true)
 
     # delete repositories being removed upstream and that are not subscribed to
-    to_delete = scc_repositories.where.not(scc_id: upstream_repo_ids)
+    to_delete = scc_repositories.where.not(scc_id: upstream_repo_ids).includes(:scc_katello_repositories).where(scc_katello_repositories: { id: nil })
+
     ::Foreman::Logging.logger('foreman_scc_manager').debug "Deleting #{to_delete.count} old repositories"
     to_delete.destroy_all
   end

data/app/models/scc_katello_repository.rb

@@ -0,0 +1,4 @@
+class SccKatelloRepository < ApplicationRecord
+  belongs_to :scc_repository
+  belongs_to :katello_root_repository, class_name: 'Katello::RootRepository'
+end

data/app/models/scc_product.rb

@@ -56,13 +56,19 @@ class SccProduct < ApplicationRecord
       label = Katello::Util::Model.labelize(uniq_repo_name)
       unprotected = true
       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 = new_product.add_repo(label, uniq_repo_name, repo.url, 'yum', unprotected, gpg_key)
       new_repo.arch = arch || 'noarch'
       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
+      if new_repo.has_attribute?('upstream_authentication_token')
+        new_repo.upstream_authentication_token = repo.token
+        new_repo.url = repo.url
+      else
+        new_repo.url = repo.full_url
+      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

@@ -4,7 +4,8 @@ class SccRepository < ApplicationRecord
   self.include_root_in_json = false
 
   belongs_to :scc_account
-  belongs_to :katello_root_repository, class_name: 'Katello::RootRepository'
+  has_many :scc_katello_repositories
+  has_many :katello_root_repositories, through: :scc_katello_repositories
   has_one :organization, through: :scc_account
   has_and_belongs_to_many :scc_products
 
@@ -27,9 +28,16 @@ class SccRepository < ApplicationRecord
     # 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)
+      if repo.has_attribute?('upstream_authentication_token')
+        unless repo.url == url && repo.upstream_authentication_token == token
+          ForemanTasks.async_task(::Actions::Katello::Repository::Update, repo, url: url, upstream_authentication_token: token)
+          ::Foreman::Logging.logger('foreman_scc_manager').info "Update URL and authentication token for repository '#{repo.name}'."
+        end
+      else
+        unless repo.url == full_url
+          ForemanTasks.async_task(::Actions::Katello::Repository::Update, repo, url: full_url)
+          ::Foreman::Logging.logger('foreman_scc_manager').info "Update URL-token for repository '#{repo.name}'."
+        end
       end
     end
   end

data/db/migrate/20220425132605_add_scc_katello_repository_relation.rb

@@ -0,0 +1,10 @@
+class AddSccKatelloRepositoryRelation < ActiveRecord::Migration[6.0]
+  def change
+    create_table(:scc_katello_repositories) do |t|
+      t.references :scc_repository, null: false, foreign_key: { on_delete: :cascade }
+      t.references :katello_root_repository, null: false, foreign_key: { on_delete: :cascade }
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20220429100843_remove_root_repository_id_from_scc_repository.rb

@@ -0,0 +1,6 @@
+class RemoveRootRepositoryIdFromSccRepository < ActiveRecord::Migration[6.0]
+  def change
+    remove_foreign_key :scc_repositories, :katello_root_repositories, column: :katello_root_repository_id, on_delete: :nullify
+    remove_column :scc_repositories, :katello_root_repository_id, :integer, index: true, null: true
+  end
+end

data/db/migrate/20220429102717_populate_scc_katello_repositories.rb

@@ -0,0 +1,16 @@
+class PopulateSccKatelloRepositories < ActiveRecord::Migration[6.0]
+  class SccProduct < ApplicationRecord
+    belongs_to :product, class_name: 'Katello::Product'
+    has_and_belongs_to_many :scc_repositories
+  end
+
+  def up
+    SccProduct.where.not(product_id: nil).each do |scc_p|
+      scc_p.scc_repositories.each do |scc_r|
+        # find all Katello repositories that were derived from that SCC repository
+        katello_repos = Katello::RootRepository.where('label like ?', "%#{::Katello::Util::Model.labelize(scc_r.description)}%")
+        scc_r.update!(katello_root_repositories: katello_repos)
+      end
+    end
+  end
+end

data/db/migrate/20220513132652_populate_upstream_authentication_token.rb

@@ -0,0 +1,23 @@
+class PopulateUpstreamAuthenticationToken < ActiveRecord::Migration[6.0]
+  def up
+    return unless ActiveRecord::Base.connection.column_exists?('katello_root_repositories', 'upstream_authentication_token')
+
+    scc_repositories = SccRepository.includes(:scc_katello_repositories).where.not(scc_katello_repositories: { id: nil })
+    scc_repositories.each do |scc_repo|
+      scc_repo.katello_root_repositories.each do |katello_repo|
+        katello_repo.update!(url: scc_repo.url, upstream_authentication_token: scc_repo.token)
+      end
+    end
+  end
+
+  def down
+    return if ActiveRecord::Base.connection.column_exists?('katello_root_repositories', 'upstream_authentication_token')
+
+    scc_repositories = SccRepository.includes(:scc_katello_repositories).where.not(scc_katello_repositories: { id: nil })
+    scc_repositories.each do |scc_repo|
+      scc_repo.katello_root_repositories.each do |katello_repo|
+        katello_repo.update!(url: scc_repo.full_url)
+      end
+    end
+  end
+end

data/lib/foreman_scc_manager/version.rb

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

data/lib/tasks/setup_authentication_token.rake

@@ -0,0 +1,27 @@
+begin
+  require 'rubocop/rake_task'
+
+  namespace :foreman_scc_manager do
+    desc 'Set up authentication tokens for Katello 4.3.'
+    task :setup_authentication_tokens => ['environment'] do
+      unless ActiveRecord::Base.connection.column_exists?('katello_root_repositories', 'upstream_authentication_token')
+        puts 'Your Katello version needs to be at 4.3 and up to run this task.'
+        return
+      end
+      begin
+        scc_repositories = SccRepository.includes(:scc_katello_repositories).where.not(scc_katello_repositories: { id: nil })
+        scc_repositories.each do |scc_repo|
+          scc_repo.katello_root_repositories.each do |katello_repo|
+            katello_repo.update!(url: scc_repo.url, upstream_authentication_token: scc_repo.token)
+          end
+        end
+        puts 'Authentication tokens created successfully.'
+      rescue StandardError => e
+        puts 'There was an error while creating the authentication tokens.'
+        puts e.to_s
+      end
+    end
+  end
+rescue LoadError
+  puts 'Rubocop not loaded.'
+end

data/test/fixtures/models/katello_root_repositories.yml

@@ -0,0 +1,44 @@
+sles12_sp4_updates:
+  name:                 SLES12-SP4-Updates for sle-12-x86_64
+  content_type:         yum
+  label:                1759_SLES12-SP4-Updates_for_sle-12-x86_64_description
+  product_id:           <%= ActiveRecord::FixtureSet.identify(:suse) %>
+  url:                  www.not-valid.com
+  download_policy:      immediate
+<% if ActiveRecord::Base.connection.column_exists? :katello_root_repositories, :mirroring_policy %>
+  mirroring_policy:     "mirror_content_only"
+<% else %>
+  mirror_on_sync:       "true"
+<% end %>
+  created_at:           <%= Time.now %>
+  updated_at:           <%= Time.now %>
+
+sles12_sp4_installer_updates:
+  name:                 SLES12-SP4-Installer-Updates for sle-12-x86_64
+  content_type:         yum
+  label:                1759_product_name_SLES12-SP4-Installer-Updates_for_sle-12-x86_64_description
+  product_id:           <%= ActiveRecord::FixtureSet.identify(:suse) %>
+  url:                  www.not-valid.com
+  download_policy:      on_demand
+<% if ActiveRecord::Base.connection.column_exists? :katello_root_repositories, :mirroring_policy %>
+  mirroring_policy:     "mirror_content_only"
+<% else %>
+  mirror_on_sync:       "true"
+<% end %>
+  created_at:           <%= Time.now %>
+  updated_at:           <%= Time.now %>
+
+sles12_sp4_installer_updates_2:
+  name:                 SLES12-SP4-Installer-Updates for sle-12-x86_64
+  content_type:         yum
+  label:                1760_product_name_SLES12-SP4-Installer-Updates_for_sle-12-x86_64_description
+  product_id:           <%= ActiveRecord::FixtureSet.identify(:suse) %>
+  url:                  www.not-valid.com
+  download_policy:      on_demand
+<% if ActiveRecord::Base.connection.column_exists? :katello_root_repositories, :mirroring_policy %>
+  mirroring_policy:     "mirror_content_only"
+<% else %>
+  mirror_on_sync:       "true"
+<% end %>
+  created_at:           <%= Time.now %>
+  updated_at:           <%= Time.now %>

data/test/fixtures/models/scc_repositories.yml

@@ -25,5 +25,39 @@ repo_9:
   autorefresh: true
   installer_updates: false
 
+sles12_updates:
+  id:                   10
+  scc_account_id:       1
+  scc_id:               1
+  name:                 SLES12-SP4-Updates for sle-12-x86_64
+  distro_target:        sles_12
+  description:          SLES12-SP4-Updates for sle-12-x86_64
+  url:                  www.not-valid.com
+  token:                token_10
+  autorefresh:          true
+  installer_updates:    false
 
 
+sles12_installer_updates:
+  id:                   11
+  scc_account_id:       1
+  scc_id:               2
+  name:                 SLES12-SP4-Installer-Updates for sle-12-x86_64
+  distro_target:        sles_12
+  description:          SLES12-SP4-Installer-Updates for sle-12-x86_64
+  url:                  www.not-valid.com
+  token:                token_11
+  autorefresh:          true
+  installer_updates:    false
+
+sles12_installer_updates_2:
+  id:                   12
+  scc_account_id:       1
+  scc_id:               3
+  name:                 SLES12-SP4-Installer-Updates for sle-12-x86_64_2
+  distro_target:        sles_9
+  description:          SLES12-SP4-Installer-Updates for sle-12-x86_64_2
+  url:                  www.not-valid.com
+  token:                token_12
+  autorefresh:          true
+  installer_updates:    false

data/test/support/fixtures_support.rb

@@ -3,7 +3,9 @@ module ForemanSccManager
     FIXTURE_CLASSES = {
       scc_accounts: ::SccAccount,
       scc_products: ::SccProduct,
-      scc_repositories: ::SccRepository
+      scc_repositories: ::SccRepository,
+      katello_root_repositories: ::Katello::RootRepository,
+      scc_katello_repositories: SccKatelloRepository
     }.freeze
 
     def self.set_fixture_classes(test_class)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.8.19
+  version: 1.8.20
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -128,6 +128,7 @@ files:
 - app/models/scc_account.rb
 - app/models/scc_account_sync_plan_task_group.rb
 - app/models/scc_extending.rb
+- app/models/scc_katello_repository.rb
 - app/models/scc_product.rb
 - app/models/scc_repository.rb
 - app/views/api/v2/scc_accounts/base.json.rabl
@@ -165,10 +166,15 @@ files:
 - db/migrate/20210210104407_add_root_repository_id_to_scc_repository.rb
 - db/migrate/20210224095050_connect_katello_root_repository_to_scc_repository.rb
 - db/migrate/20210713092440_add_permissions.rb
+- db/migrate/20220425132605_add_scc_katello_repository_relation.rb
+- db/migrate/20220429100843_remove_root_repository_id_from_scc_repository.rb
+- db/migrate/20220429102717_populate_scc_katello_repositories.rb
+- db/migrate/20220513132652_populate_upstream_authentication_token.rb
 - lib/foreman_scc_manager.rb
 - lib/foreman_scc_manager/engine.rb
 - lib/foreman_scc_manager/version.rb
 - lib/tasks/rubocop.rake
+- lib/tasks/setup_authentication_token.rake
 - lib/tasks/test.rake
 - locale/Makefile
 - locale/action_names.rb
@@ -188,6 +194,7 @@ files:
 - test/fixtures/files/data_products_page2.json
 - test/fixtures/files/data_repositories.json
 - test/fixtures/files/data_subscriptions.json
+- test/fixtures/models/katello_root_repositories.yml
 - test/fixtures/models/scc_accounts.yml
 - test/fixtures/models/scc_products.yml
 - test/fixtures/models/scc_repositories.yml
@@ -229,6 +236,7 @@ test_files:
 - test/models/scc_account_test.rb
 - test/features/sync_test.rb
 - test/fixtures/models/scc_repositories.yml
+- test/fixtures/models/katello_root_repositories.yml
 - test/fixtures/models/scc_accounts.yml
 - test/fixtures/models/scc_products.yml
 - test/fixtures/files/data_products_page1.json