foreman_scc_manager 1.8.9 → 1.8.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab78f155bda869b47a6124ada7ebcdf9d067c6173c400dfd9c052c70227695f9
-  data.tar.gz: '009d1c1db82b1c52e4e0ab47ebdb1769dbb4ea0e71fb6a2a0b5b26fff5b0cb41'
+  metadata.gz: 4d5ff33d39add7e5f2977ff1a48e4cf80ff7dbdf2975362c8c53c67a3f7259a7
+  data.tar.gz: aeefb0d7ef8ea9d83bd617335781dadf90c5f17eea8ae5bc1322b6659460bdfe
 SHA512:
-  metadata.gz: da25af4b803899a68ef9b3fae9646901437051d5b69dd4b5c588cca5e0018ea0b797d32255ed4dc5ba6ccb5044a119c2d712bb3b35905aeb231182145f910878
-  data.tar.gz: 15b7aa5a3f7a05e3c517aa6aa41fcef1c9bee3fb00d5f49405166264d21a7857fc348940c06a0279d88330d29b7480e90d2f3e32025ee2bcba95c1acf84f1c7b
+  metadata.gz: 6016a5bec42de9c7a09fc3b03267ff53f48e5ad9f065d367faf599f2a36dc7fa5060ce20555ef5d92c986cb333c051989603fdbbf98843c2c7a51b5fd7cbcc64
+  data.tar.gz: 0ccb001c57fcdedb3a343878f033761a854349e1f1a66a38cd0183b2b286e7b70beb576ce067803452122ffe4480fb055705d5ad46bcda170700e69a894a37b9

data/README.md

@@ -1,13 +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
+This plugin installation is not supported by foreman-installer and has to be installed manually:
+
+```sh
+yum install tfm-rubygem-foreman_scc_manager
+
+foreman-installer
+```
 
 ## Compatibility
 
@@ -27,10 +34,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.
 
-A Hammer CLI extension is available for this plugin:
-https://github.com/ATIX-AG/hammer-cli-foreman-scc-manager
+[Plugin documentation](https://docs.orcharhino.com/or/docs/sources/usage_guides/managing_sles_systems_guide.html#mssg_installing_the_scc_manager_plugin)
+
+## Hammer CLI Extension
+
+[Hammer CLI for Foreman SCC Manager](https://github.com/ATIX-AG/hammer-cli-foreman-scc-manager)
 
 ## Contributing
 
@@ -38,7 +47,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) 2021 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
@@ -52,4 +61,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/Rakefile

@@ -35,13 +35,9 @@ end
 
 task default: :test
 
-begin
-  require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
-rescue StandardError => _e
-  puts 'Rubocop not loaded.'
-end
-
-task :default do
-  Rake::Task['rubocop'].execute
+class ForemanSccManager::Engine
+  def self.root
+    File.expand_path('__dir__')
+  end
 end
+import 'lib/tasks/rubocop.rake'

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

@@ -12,11 +12,22 @@ module Api
 
       before_action :find_resource, :only => [:show, :subscribe]
 
-      api :GET, '/scc_accounts/:scc_account_id/scc_products/', N_('List all products for scc_account')
+      def metadata_subtotal
+        if @scc_products.present?
+          @scc_products.count
+        else
+          super
+        end
+      end
+
+      api :GET, '/scc_accounts/:scc_account_id/scc_products/', N_('List products for an scc_account')
       param :scc_account_id, :identifier_dottable, :required => true
+      param :subscribed_only, :bool, :required => false, :desc => N_('Show subscribed products only')
       param_group :search_and_pagination, ::Api::V2::BaseController
+
       def index
         scope = resource_scope
+        scope = scope.where.not(:product_id => nil) if ::Foreman::Cast.to_bool(params[:subscribed_only])
         scope = scope.where(:organization => params[:organization_id]) if params[:organization_id].present?
         @scc_products = scope.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])
       end
@@ -47,8 +58,8 @@ module Api
       private
 
       def find_resource
-        @scc_account = ::SccAccount.find_by!(id: params[:scc_account_id])
-        @scc_product = @scc_account.scc_products.find_by!(id: params[:id])
+        @scc_account = ::SccAccount.find(params[:scc_account_id])
+        @scc_product = @scc_account.scc_products.find(params[:id])
       end
 
       def action_permission

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
@@ -37,7 +37,7 @@ class SccAccountsController < ApplicationController
   # POST /scc_accounts/test_connection
   def test_connection
     @scc_account = SccAccount.new(scc_account_params)
-    @scc_account.password = SccAccount.find_by!(id: params[:scc_account_id]).password if params[:scc_account_id].present? && scc_account_params[:password].empty?
+    @scc_account.password = SccAccount.find(params[:scc_account_id]).password if params[:scc_account_id].present? && scc_account_params[:password].empty?
     respond_to do |format|
       if @scc_account.test_connection
         format.json { render json: nil, status: :ok }
@@ -101,12 +101,16 @@ 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
     @organization = Organization.current
-    redirect_to '/select_organization?toState=' + request.path unless @organization
+    redirect_to "/select_organization?toState=#{request.path}" unless @organization
   end
 
   # Use callbacks to share common setup or constraints between actions.

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/app/lib/scc_manager.rb

@@ -1,21 +1,17 @@
 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
     end
 
     url = base_url + rest_url
-    auth_header = { Authorization: 'Basic ' + Base64.encode64("#{login}:#{password}").chomp,
+    credentials = Base64.encode64("#{login}:#{password}").chomp
+    auth_header = { Authorization: "Basic #{credentials}",
                     Accept: 'application/vnd.scc.suse.com.v4+json' }
     results = []
     loop do

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?
 
@@ -177,7 +172,7 @@ class SccAccount < ApplicationRecord
   def update_scc_repositories(upstream_repositories)
     upstream_repo_ids = []
     # initially invalidate all repositories and validate them during update
-    invalidated_repos = invalidate_subscription_status(scc_repositories)
+    invalidated_repos = invalidate_subscription_status(scc_repositories, save_record: false)
     # import repositories
     upstream_repositories.each do |ur|
       cached_repository = scc_repositories.find_or_initialize_by(scc_id: ur['id'])
@@ -201,7 +196,7 @@ class SccAccount < ApplicationRecord
     # subscription_valid can be set to nil
     to_invalidate = invalidated_repos.select { |ir| ir.katello_root_repository_id.present? && !ir.subscription_valid }
     ::Foreman::Logging.logger('foreman_scc_manager').debug "Invalidating #{to_invalidate.count} expired repositories"
-    invalidate_subscription_status(to_invalidate, true)
+    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)
@@ -212,7 +207,7 @@ class SccAccount < ApplicationRecord
   def update_scc_products(upstream_products)
     upstream_product_ids = []
     # initially invalidate all products and validate them during update
-    invalidated_products = invalidate_subscription_status(scc_products)
+    invalidated_products = invalidate_subscription_status(scc_products, save_record: false)
     # import products
     upstream_products.each do |up|
       cached_product = scc_products.find_or_initialize_by(scc_id: up['id'])
@@ -238,7 +233,7 @@ class SccAccount < ApplicationRecord
     # subscription_valid can be set to nil
     to_invalidate = invalidated_products.select { |ip| ip.product_id.present? && !ip.subscription_valid }
     ::Foreman::Logging.logger('foreman_scc_manager').debug "Invalidating #{to_invalidate.count} expired products"
-    invalidate_subscription_status(to_invalidate, true)
+    invalidate_subscription_status(to_invalidate, save_record: true)
 
     # delete products being removed upstream and that are not subscribed to
     to_delete = scc_products.where.not(scc_id: upstream_product_ids).where(product_id: nil)
@@ -271,9 +266,9 @@ class SccAccount < ApplicationRecord
 
   # set all products/repos invalid
   # params: items_to_invalidate: ActiveRecord_(*)
-  #         save_record: store in database or not (default)
+  #         save_record: store in database or not
   # return: ActiveRecord elements with invalidated subscription status
-  def invalidate_subscription_status(items_to_invalidate, save_record = false)
+  def invalidate_subscription_status(items_to_invalidate, save_record:)
     if items_to_invalidate.present?
       items_to_invalidate.each do |inv|
         inv.subscription_valid = false

data/app/models/scc_repository.rb

@@ -9,11 +9,11 @@ class SccRepository < ApplicationRecord
   has_and_belongs_to_many :scc_products
 
   def full_url
-    token.blank? ? url : url + '?' + token
+    token.blank? ? url : "#{url}?#{token}"
   end
 
   def uniq_name(scc_product)
-    scc_product.scc_id.to_s + ' ' + description
+    "#{scc_product.scc_id} #{description}"
   end
 
   def pretty_name

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/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/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

@@ -32,8 +32,8 @@ module ForemanSccManager
         # 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,
@@ -60,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.9'.freeze
+  VERSION = '1.8.15'.freeze
 end

data/test/actions/sync_test.rb

@@ -0,0 +1,24 @@
+require 'test_plugin_helper'
+
+class SccManagerActions < ActiveSupport::TestCase
+  include Dynflow::Testing
+
+  let(:action_class) { ::Actions::SccManager::Sync }
+
+  def setup
+    @scc_account = scc_accounts(:one)
+    # ensure we have an org label
+    get_organization
+  end
+
+  test 'plan sync action' do
+    action = create_action(action_class)
+    action.stubs(:action_subject).with(@scc_account)
+
+    assert_respond_to(action, :phase)
+    plan_action(action, @scc_account)
+
+    assert_action_planned_with(action, ::Actions::SccManager::SyncProducts, @scc_account)
+    assert_action_planned_with(action, ::Actions::SccManager::SyncRepositories, @scc_account)
+  end
+end

data/test/controllers/api/v2/scc_accounts_test.rb

@@ -208,13 +208,52 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     assert_response :ok
   end
 
-  test 'should refuse update scc_account' do
+  test 'should refuse update scc_account with invalid interval' do
     account = scc_accounts(:two)
     put :update, params: { id: account.id, :scc_account => { :interval => 'yearly' } }
     assert_equal 'yearly', assigns(:scc_account).interval
     assert_response :unprocessable_entity
   end
 
+  test 'should refuse update scc_account with empty date' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :interval => 'weekly', :sync_date => '' } }
+    assert_response :unprocessable_entity
+    assert_error_message 'Sync date must be a valid datetime'
+  end
+
+  test 'should fail to update scc_account with interval set and invalid date' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :sync_date => 'invalid_date', :interval => 'weekly' } }
+
+    assert_response :unprocessable_entity
+    assert_error_message 'Sync date must be a valid datetime'
+  end
+
+  test 'should fail to update scc_account with empty name' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :name => '', :sync_date => Time.now, :interval => 'weekly' } }
+
+    assert_response :unprocessable_entity
+    assert_error_message "Name can't be blank"
+  end
+
+  test 'should fail to update scc_account with empty login' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :login => '', :sync_date => Time.now, :interval => 'weekly' } }
+
+    assert_response :unprocessable_entity
+    assert_error_message "Login can't be blank"
+  end
+
+  test 'should fail to update scc_account with empty base_url' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :base_url => '', :sync_date => Time.now, :interval => 'weekly' } }
+
+    assert_response :unprocessable_entity
+    assert_error_message "Base url can't be blank"
+  end
+
   test 'new account SCC server connection-test' do
     scc_setup
     account = scc_accounts(:one)
@@ -305,4 +344,10 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     end
     assert_response :ok
   end
+
+  private
+
+  def assert_error_message(message)
+    assert_includes JSON.parse(response.body)['error']['full_messages'], message
+  end
 end

data/test/controllers/api/v2/scc_products_test.rb

@@ -5,7 +5,9 @@ class Api::V2::SccProductsControllerTest < ActionController::TestCase
     @scc_account = scc_accounts(:one)
     @scc_product1 = scc_products(:one)
     @scc_product2 = scc_products(:two)
-    @scc_account.scc_products = [@scc_product1, @scc_product2]
+    @scc_product3 = scc_products(:three)
+    @scc_product4 = scc_products(:four)
+    @scc_account.scc_products = [@scc_product1, @scc_product2, @scc_product3, @scc_product4]
   end
 
   test 'should get index' do
@@ -37,4 +39,22 @@ class Api::V2::SccProductsControllerTest < ActionController::TestCase
     put :subscribe, params: { :id => 'doest-not-exit', :scc_account_id => @scc_account.id }
     assert_response :not_found
   end
+
+  test 'show subscribed products only' do
+    get :index, params: { :scc_account_id => @scc_account.id, :subscribed_only => true }
+    assert_response :success
+    body = ActiveSupport::JSON.decode(@response.body)
+    assert_not_empty body
+    assert_equal 2, body['results'].count
+    assert_equal 2, body['subtotal']
+  end
+
+  test 'show all products if subscribed_only flag is set to false' do
+    get :index, params: { :scc_account_id => @scc_account.id, :subscribed_only => false }
+    assert_response :success
+    body = ActiveSupport::JSON.decode(@response.body)
+    assert_not_empty body
+    assert_equal 4, body['results'].count
+    assert_equal 4, body['subtotal']
+  end
 end

data/test/controllers/scc_accounts_controller_test.rb

@@ -69,8 +69,58 @@ class SccAccountsControllerTest < ActionController::TestCase
   test 'should update scc_account' do
     account = scc_accounts(:two)
     put :update, params: { id: account.id, :scc_account => { :sync_date => Time.now, :interval => 'weekly' } }, session: set_session_user
+    assert_redirected_to '/scc_accounts'
+    assert_equal 'weekly', SccAccount.find(account.id).interval
+  end
+
+  test 'should update scc_account with empty date if interval not set' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :name => 'new_name', :sync_date => '', :interval => 'never' } }, session: set_session_user
+
+    assert_equal 'new_name', SccAccount.find(account.id).name
+  end
+
+  test 'updates scc_account even if the date is invalid' do
+    # @todo reminder to fix this in the future
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :name => 'new_name', :sync_date => 'invalid_date', :interval => 'never' } }, session: set_session_user
+
+    assert_not_equal account.name, SccAccount.find(account.id).name
+  end
+
+  test 'should fail to update scc_account with interval set and empty date' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :sync_date => '', :interval => 'weekly' } }, session: set_session_user
+
+    assert_equal SccAccount.find(account.id).sync_date, account.sync_date
+  end
+
+  test 'should fail to update scc_account with interval set and invalid date' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :sync_date => 'invalid_date', :interval => 'weekly' } }, session: set_session_user
+
+    assert_equal SccAccount.find(account.id).sync_date, account.sync_date
+  end
+
+  test 'should fail to update scc_account with empty name' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :name => '', :sync_date => Time.now, :interval => 'weekly' } }, session: set_session_user
+
+    assert_equal account.name, SccAccount.find(account.id).name
+  end
+
+  test 'should fail to update scc_account with empty login' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :login => '', :sync_date => Time.now, :interval => 'weekly' } }, session: set_session_user
+
+    assert_equal account.login, SccAccount.find(account.id).login
+  end
+
+  test 'should fail to update scc_account with empty base url' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :base_url => '', :sync_date => Time.now, :interval => 'weekly' } }, session: set_session_user
 
-    assert_equal 'weekly', assigns(:scc_account).interval
+    assert_equal account.base_url, SccAccount.find(account.id).base_url
   end
 
   test 'SCC server sync products' do

data/test/fixtures/models/scc_accounts.yml

@@ -6,6 +6,7 @@ one:
   name: onename
   interval: never
   organization_id: <%= ActiveRecord::FixtureSet.identify(:empty_organization) %>
+  sync_date: Time.now
 
 two:
   login: twouser
@@ -14,6 +15,7 @@ two:
   name: twoname
   interval: never
   organization_id: <%= ActiveRecord::FixtureSet.identify(:empty_organization) %>
+  sync_date: 2021-07-05T21:33:49
 
 account_missing_url:
   login: fakeuser1

data/test/fixtures/models/scc_products.yml

@@ -10,6 +10,7 @@ one:
   description: "<p> lorem ipsum dolor sit amet </p>"
   product_type: base
   subscription_valid: nil
+  product_id: nil
 
 two:
   scc_account_id: test_account1
@@ -21,6 +22,7 @@ two:
   description: "<p> lorem ipsum dolor sit amet </p><p> lorem lorem lorem </p>"
   product_type: extras
   subscription_valid: true
+  product_id: nil
 
 three:
   scc_account_id: test_account1
@@ -32,18 +34,31 @@ three:
   description: lorem ipsum dolor sit amet
   product_type: base
   subscription_valid: nil
+  product_id: 1
+
+four:
+  scc_account_id: test_account1
+  scc_id: 444
+  name: four
+  version: 4
+  arch: x86_128
+  friendly_name: number four
+  description: lorem ipsum dolor sit amet
+  product_type: base
+  subscription_valid: nil
+  product_id: 2
 
 # create a couple of products as scc_extensions
 <% 1.upto(10) do |i| %>
 p_extension_<%= i %>:
   scc_account_id: test_account1
   scc_id: <%= i %>
-  name: p_ext_<%= i%> 
+  name: p_ext_<%= i%>
   version: 3
   arch: x86_128
-  friendly_name: number <%= i%> 
+  friendly_name: number <%= i%>
   description: lorem ipsum dolor sit amet
   product_type: extension
   subscription_valid: nil
+  product_id: nil
 <% end %>
-

data/test/models/scc_product_test.rb

@@ -30,7 +30,7 @@ end
 
 class SccProductSearchTest < ActiveSupport::TestCase
   test 'default ordered by name' do
-    product_names = ['one', 'two', 'three',
+    product_names = ['one', 'two', 'three', 'four',
                      'p_ext_1', 'p_ext_10', 'p_ext_2', 'p_ext_3',
                      'p_ext_4', 'p_ext_5', 'p_ext_6', 'p_ext_7',
                      'p_ext_8', 'p_ext_9']

data/test/test_plugin_helper.rb

@@ -1,6 +1,8 @@
 # This calls the main test_helper in Foreman-core
 require 'test_helper'
 
+require 'dynflow/testing'
+Dynflow::Testing.logger_adapter.level = 1
 require 'foreman_tasks/test_helpers'
 require "#{ForemanSccManager::Engine.root}/test/support/fixtures_support"