foreman_scc_manager 1.8.13 → 1.8.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d3ef9cc3c2af2f26b0da68c6abbb88491361ff689ddeb66061dc574f9604b6
-  data.tar.gz: f4a1152c05a14eab317d058f551a738c2e2f676d570e1810b747e05192382c3a
+  metadata.gz: 4d5ff33d39add7e5f2977ff1a48e4cf80ff7dbdf2975362c8c53c67a3f7259a7
+  data.tar.gz: aeefb0d7ef8ea9d83bd617335781dadf90c5f17eea8ae5bc1322b6659460bdfe
 SHA512:
-  metadata.gz: a5f96e7074f6372e072b99c6a49ec300d151e9f0c9b013b254f70ed1f92011849adbe3c5fa9b2c84658f9919030784ced02116682d5f77ca38b316c17bcb8665
-  data.tar.gz: 39d1e30b2ac55968f70fe1653e2f0e32127e5cec6cb3f5072e8c5936980f0df4c53b7fde847c00f0d5f5961d72b8207e43fe2df0d56f77137a38881d47ce2bc4
+  metadata.gz: 6016a5bec42de9c7a09fc3b03267ff53f48e5ad9f065d367faf599f2a36dc7fa5060ce20555ef5d92c986cb333c051989603fdbbf98843c2c7a51b5fd7cbcc64
+  data.tar.gz: 0ccb001c57fcdedb3a343878f033761a854349e1f1a66a38cd0183b2b286e7b70beb576ce067803452122ffe4480fb055705d5ad46bcda170700e69a894a37b9

data/app/controllers/scc_accounts_controller.rb

@@ -101,7 +101,11 @@ class SccAccountsController < ApplicationController
 
   def find_available_gpg_keys
     @scc_account ? org = @scc_account.organization : org = @organization
-    @selectable_gpg_keys = ::Katello::GpgKey.where(organization: org).collect { |p| [p.name, p.id] }.unshift ['None', nil]
+    if ::Katello.const_defined?(:ContentCredential)
+      @selectable_gpg_keys = ::Katello::ContentCredential.where(organization: org).collect { |p| [p.name, p.id] }.unshift ['None', nil]
+    else
+      @selectable_gpg_keys = ::Katello::GpgKey.where(organization: org).collect { |p| [p.name, p.id] }.unshift ['None', nil]
+    end
   end
 
   def find_organization

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

@@ -54,7 +54,11 @@ module Actions
       def create_sub_plans
         product = ::Katello::Product.new
         product.name = input[:product_name]
-        product.gpg_key = ::Katello::GpgKey.find_by(id: input[:gpg_key], organization: input[:organization_id])
+        if ::Katello.const_defined?(:ContentCredential)
+          product.gpg_key = ::Katello::ContentCredential.find_by(id: input[:gpg_key], organization: input[:organization_id])
+        else
+          product.gpg_key = ::Katello::GpgKey.find_by(id: input[:gpg_key], organization: input[:organization_id])
+        end
         product.description = input[:product_description]
         trigger(::Actions::Katello::Product::Create,
                 product,

data/db/migrate/20201119084201_add_gpg_key_to_scc_account.rb

@@ -1,6 +1,10 @@
 class AddGpgKeyToSccAccount < ActiveRecord::Migration[5.2]
   def change
-    add_column :scc_accounts, :katello_gpg_key_id, :integer,  null: true
-    add_foreign_key :scc_accounts, :katello_gpg_keys, column: :katello_gpg_key_id, on_delete: :nullify
+    add_column :scc_accounts, :katello_gpg_key_id, :integer, null: true
+    if ::Katello.const_defined?(:ContentCredential)
+      add_foreign_key :scc_accounts, :katello_content_credentials, column: :katello_gpg_key_id, on_delete: :nullify
+    else
+      add_foreign_key :scc_accounts, :katello_gpg_keys, column: :katello_gpg_key_id, on_delete: :nullify
+    end
   end
 end

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.8.13'.freeze
+  VERSION = '1.8.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.8.13
+  version: 1.8.15
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -165,7 +165,6 @@ 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/20211022100718_add_product_class_to_scc_product.rb
 - lib/foreman_scc_manager.rb
 - lib/foreman_scc_manager/engine.rb
 - lib/foreman_scc_manager/version.rb
@@ -174,38 +173,28 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/de/LC_MESSAGES/foreman_scc_manager.mo
-- locale/de/foreman_scc_manager.edit.po
 - locale/de/foreman_scc_manager.po
-- locale/de/foreman_scc_manager.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_scc_manager.mo
-- locale/en/foreman_scc_manager.edit.po
 - locale/en/foreman_scc_manager.po
-- locale/en/foreman_scc_manager.po.time_stamp
 - locale/foreman_scc_manager.pot
 - locale/gemspec.rb
 - test/actions/sync_test.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/controllers/scc_accounts_controller_test2.rb
 - test/factories/foreman_scc_manager_factories.rb
 - test/features/sync_test.rb
 - test/fixtures/files/data_products_page1.json
 - test/fixtures/files/data_products_page2.json
 - test/fixtures/files/data_repositories.json
 - test/fixtures/files/data_subscriptions.json
-- test/fixtures/models/katello_products.yml.bak
 - test/fixtures/models/scc_accounts.yml
-- test/fixtures/models/scc_extendings.yml
 - test/fixtures/models/scc_products.yml
 - test/fixtures/models/scc_repositories.yml
-- test/models/katello_products.rb
 - test/models/scc_account_test.rb
 - test/models/scc_product_test.rb
 - test/support/fixtures_support.rb
-- test/test_controller_helper.rb
 - test/test_plugin_helper.rb
-- test/unit/access_permissions_test.rb
 - test/unit/foreman_scc_manager_test.rb
 homepage: https://www.orcharhino.com/
 licenses:
@@ -231,25 +220,19 @@ signing_key:
 specification_version: 4
 summary: Suse Customer Center plugin for Foreman
 test_files:
-- test/unit/access_permissions_test.rb
 - test/unit/foreman_scc_manager_test.rb
-- test/test_controller_helper.rb
 - test/features/sync_test.rb
 - test/models/scc_product_test.rb
-- test/models/katello_products.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_test2.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/fixtures/models/katello_products.yml.bak
 - test/fixtures/models/scc_repositories.yml
 - test/fixtures/models/scc_products.yml
-- test/fixtures/models/scc_extendings.yml
 - test/fixtures/files/data_products_page2.json
 - test/fixtures/files/data_products_page1.json
 - test/fixtures/files/data_subscriptions.json

data/db/migrate/20211022100718_add_product_class_to_scc_product.rb

@@ -1,5 +0,0 @@
-class AddProductClassToSccProduct < ActiveRecord::Migration[6.0]
-  def change
-    add_column :scc_products, :product_class, :string
-  end
-end