foreman_scc_manager 1.8.7 → 1.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 843165a6092fcb04bf69d13131ae44acb02478ce347084c160a8f61891770eba
-  data.tar.gz: 892025747b9572a4b31d25f4c96ab28ea9af0099ef3302fe8c7aec07935b588b
+  metadata.gz: f09d1fba685e2d82d20dcc19d519dfce35a1b6bd04b6c64353e2e40519b30fc9
+  data.tar.gz: afdb4e0f4c17546b8984c7b29d3bebfce35fa9043fb308a60423c8f113df2b84
 SHA512:
-  metadata.gz: 0cb42eeb656e4a0cca5c93d7c83e0fed14fa73a9b0e7f2ad0ddcb07b007156405f0e91d968e4eb38aafd6376551f334340bda0a4ff9d632d13d4818766e7eb75
-  data.tar.gz: 700546d7abfdc1ff7fc12f452c69bb6ca8869c41b63ae4e37fef99541dc229bf2287de3435ecd8c09dee32cb79465b8c896af09c78b4d0d498209e35c8a347cf
+  metadata.gz: 93779edde27305d62942cdcce50ba8dd548af379f0ff9b88fd7fe800b79bb3de41c58f6e873b116451ba20fbd65c89f6ab0428fbe7f8c7f25f07bc26982054f1
+  data.tar.gz: 0c58463cfd08bf269ae9c3a6ba2b0c833f1327d5985038cf32b38ff60a3a307377498759ca6cb11734de7a31122b2743bd9a8cb84a454cc8b6167682925c14a4

data/README.md

@@ -1,18 +1,20 @@
-[![Build Status master](https://travis-ci.org/ATIX-AG/foreman_scc_manager.svg?branch=master)](https://travis-ci.org/ATIX-AG/foreman_scc_manager)
+![Rubocop](https://github.com/ATIX-AG/foreman_scc_manager/actions/workflows/rubocop.yaml/badge.svg)
+![Unit Tests](https://github.com/ATIX-AG/foreman_scc_manager/actions/workflows/unit_tests.yaml/badge.svg)
+[![Gem Version](https://badge.fury.io/rb/foreman_scc_manager.svg)](https://badge.fury.io/rb/foreman_scc_manager)
 
-# ForemanSccManager
+# Foreman SCC Manager
 
-Foreman plugin to sync SUSE Customer Center products and repositories into Katello
+Foreman plugin to sync SUSE Customer Center products and repositories into Katello.
 
 ## Installation
 
-See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
-for how to install Foreman plugins
+See [Foreman Manual](https://theforeman.org/plugins/#2.Installation) on how to install Foreman plugins.
 
 ## Compatibility
 
 | Foreman Version | Katello Version | Plugin Version |
 | --------------- | --------------- | -------------- |
+| 2.3             | 3.18            | ~> 1.8.9       |
 | 2.1             | 3.16            | ~> 1.8.5       |
 | 2.0             | 3.16            | ~> 1.8.4       |
 | 1.24            | 3.14            | ~> 1.8.0       |
@@ -26,7 +28,12 @@ for how to install Foreman plugins
 | 1.15            | 3.4             | ~> 1.1.0       |
 
 ## Documentation
-The plugin documentation can be found at https://docs.orcharhino.com/sources/management_ui/the_content_menu/suse_subscriptions.html.
+
+[Plugin documentation](https://docs.orcharhino.com/sources/management_ui/the_content_menu/suse_subscriptions.html)
+
+## Hammer CLI Extension
+
+[Hammer CLI for Foreman SCC Manager](https://github.com/ATIX-AG/hammer-cli-foreman-scc-manager)
 
 ## Contributing
 
@@ -34,7 +41,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) 2017 ATIX AG - http://www.atix.de
+Copyright (c) 2021 ATIX AG - https://atix.de
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -48,4 +55,3 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-

data/app/controllers/scc_accounts_controller.rb

@@ -2,7 +2,7 @@ class SccAccountsController < ApplicationController
   helper_method :scc_filtered_products
   before_action :find_organization
   before_action :find_resource, only: %i[show edit update destroy sync bulk_subscribe]
-  before_action :find_available_gpg_keys, only: %i[new edit]
+  before_action :find_available_gpg_keys, only: %i[new edit update create]
   include Foreman::Controller::AutoCompleteSearch
 
   # GET /scc_accounts

data/app/lib/scc_manager.rb

@@ -1,14 +1,9 @@
 module SccManager
   # adapted from https://github.com/SUSE/connect
   def self.get_scc_data(base_url, rest_url, login, password)
-    if SETTINGS[:katello][:cdn_proxy] && SETTINGS[:katello][:cdn_proxy][:host]
-      proxy_config = SETTINGS[:katello][:cdn_proxy]
-      uri = URI('')
-
-      uri.scheme = URI.parse(proxy_config[:host]).scheme
-      uri.host = URI.parse(proxy_config[:host]).host
-      uri.port = proxy_config[:port].try(:to_s)
-      uri.user = proxy_config[:user]
+    if (proxy_config = ::HttpProxy.default_global_content_proxy)
+      uri = URI(proxy_config[:url])
+      uri.user = proxy_config[:username]
       uri.password = proxy_config[:password] if uri.user.present?
 
       RestClient.proxy = uri.to_s

data/app/models/scc_account.rb

@@ -45,12 +45,7 @@ class SccAccount < ApplicationRecord
   end
 
   def sync_date_is_valid_datetime
-    errors.add(:sync_date, 'must be a valid datetime') if interval != NEVER &&
-                                                          sync_date.present? &&
-                                                          !sync_date.respond_to?(:min) &&
-                                                          !sync_date.respond_to?(:hour) &&
-                                                          !sync_date.respond_to?(:wday) &&
-                                                          !sync_date.respond_to?(:day)
+    errors.add(:sync_date, 'must be a valid datetime') if interval != NEVER && sync_date.blank?
   end
 
   def to_s
@@ -104,7 +99,7 @@ class SccAccount < ApplicationRecord
   end
 
   def add_recurring_logic(sync_date, interval)
-    sd = sync_date
+    sd = sync_date.presence || Time.now
 
     raise _('Interval cannot be nil') if interval.nil?
 

data/config/routes.rb

@@ -23,7 +23,7 @@ Rails.application.routes.draw do
                      :defaults => { :apiv => 'v2' },
                      :apiv => /v1|v2/,
                      :constraints => ApiConstraints.new(:version => 2, :default => true) do
-      resources :scc_accounts do
+      resources :scc_accounts, except: %i[new edit] do
         collection do
           post 'test_connection'
           get 'auto_complete_search'

data/db/migrate/20210224095050_connect_katello_root_repository_to_scc_repository.rb

@@ -1,4 +1,15 @@
 class ConnectKatelloRootRepositoryToSccRepository < ActiveRecord::Migration[5.2]
+  # add SccRepository class, because original one triggers the token_changed_callback
+  # which tried to update Katello root repositories
+  class SccRepository < ApplicationRecord
+    belongs_to :katello_root_repository, class_name: 'Katello::RootRepository'
+  end
+
+  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|
       # extract all katello root repository ids from subscribed products

data/db/migrate/20210713092440_add_permissions.rb

@@ -0,0 +1,19 @@
+class AddPermissions < ActiveRecord::Migration[6.0]
+  PRODUCT_PERMISSION_NAMES = [
+    'view_scc_products',
+    'subscribe_scc_products'
+  ].freeze
+
+  def up
+    Permission.create!(:name => 'test_connection_scc_accounts', :resource_type => 'SccAccount')
+    PRODUCT_PERMISSION_NAMES.each do |p|
+      Permission.create!(:name => p, :resource_type => SccProduct)
+    end
+  end
+
+  def down
+    (PRODUCT_PERMISSION_NAMES + ['test_connection_scc_accounts']).each do |p|
+      Permission.where(:name => p).destroy_all
+    end
+  end
+end

data/lib/foreman_scc_manager/engine.rb

@@ -22,16 +22,18 @@ module ForemanSccManager
 
     initializer 'foreman_scc_manager.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_scc_manager do
-        requires_foreman '>= 1.22'
-        requires_foreman_plugin 'katello', '>= 3.12.0'
+        requires_foreman '>= 2.1'
+        requires_foreman_plugin 'katello', '>= 3.16.0'
+
+        precompile_assets 'foreman_scc_manager/scc_accounts.js'
 
         apipie_documented_controllers ["#{ForemanSccManager::Engine.root}/app/controllers/api/v2/*.rb"]
 
         # Add permissions
         security_block :foreman_scc_manager do
           permission :view_scc_accounts,
-                     { :scc_accounts => [:show, :index],
-                       :'api/v2/scc_accounts' => [:show, :index] },
+                     { :scc_accounts => [:show, :index, :auto_complete_search],
+                       :'api/v2/scc_accounts' => [:show, :index, :auto_complete_search] },
                      :resource_type => 'SccAccount'
 
           permission :use_scc_accounts,
@@ -58,15 +60,33 @@ module ForemanSccManager
                      { :scc_accounts => [:sync],
                        :'api/v2/scc_accounts' => [:sync] },
                      :resource_type => 'SccAccount'
+
+          permission :test_connection_scc_accounts,
+                     { :scc_accounts => [:test_connection],
+                       :'api/v2/scc_accounts' => [:test_connection] },
+                     :resource_type => 'SccAccount'
+
+          permission :view_scc_products,
+                     { :scc_products => [:index, :show],
+                       :'api/v2/scc_products' => [:index, :show] },
+                     :resource_type => 'SccProduct'
+
+          permission :subscribe_scc_products,
+                     { :scc_products => [:subscribe, :unsubscribe],
+                       :'api/v2/scc_products' => [:subscribe, :unsibscribe] },
+                     :resource_type => 'SccProduct'
         end
 
         # Add a new role called 'SccManager' if it doesn't exist
         role 'SccManager',
-             %i[view_scc_accounts use_scc_accounts new_scc_accounts edit_scc_accounts delete_scc_accounts sync_scc_accounts],
+             %i[view_scc_accounts use_scc_accounts new_scc_accounts edit_scc_accounts
+                delete_scc_accounts sync_scc_accounts test_connection_scc_accounts
+                view_scc_products subscribe_scc_products],
              'Role granting permissons to manage SUSE Subscriptions'
 
         role 'SccViewer',
-             %i[view_scc_accounts use_scc_accounts sync_scc_accounts create_products view_products],
+             %i[view_scc_accounts use_scc_accounts sync_scc_accounts
+                create_products view_products subscribe_scc_products view_scc_products],
              'Role granting permissons to view and use SUSE Subscriptions'
 
         add_all_permissions_to_default_roles

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.8.7'.freeze
+  VERSION = '1.8.12'.freeze
 end