foreman_scc_manager 1.8.8 → 1.8.13

data/locale/en/foreman_scc_manager.edit.po

@@ -50,7 +50,7 @@ msgid "Date and time relative to which the sync interval is run"
 msgstr ""
 
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:38
-msgid "Associated gpg key of scc_account"
+msgid "Associated GPG key of scc_account"
 msgstr ""
 
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:42
@@ -113,11 +113,11 @@ msgstr ""
 msgid "Product already subscribed!"
 msgstr "Product already subscribed!"
 
-#: ../app/lib/actions/scc_manager/subscribe_product.rb:46 action_names.rb:5
+#: ../app/lib/actions/scc_manager/subscribe_product.rb:46 action_names.rb:78
 msgid "Subscribe SCC Product"
 msgstr "Subscribe SCC Product"
 
-#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:4
+#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:76
 msgid "Sync SUSE subscriptions"
 msgstr "Sync SUSE subscriptions"
 
@@ -129,31 +129,31 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:33 action_names.rb:9
+#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:33 action_names.rb:77
 msgid "Update SUSE repositories"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync_products.rb:36 action_names.rb:3
+#: ../app/lib/actions/scc_manager/sync_products.rb:36 action_names.rb:79
 msgid "Sync SUSE subscriptions (Products)"
 msgstr "Sync SUSE subscriptions (Products)"
 
-#: ../app/lib/actions/scc_manager/sync_repositories.rb:34 action_names.rb:2
+#: ../app/lib/actions/scc_manager/sync_repositories.rb:34 action_names.rb:75
 msgid "Sync SUSE subscriptions (Repositories)"
 msgstr "Sync SUSE subscriptions (Repositories)"
 
-#: ../app/models/scc_account.rb:62
+#: ../app/models/scc_account.rb:57
 msgid "never synced"
 msgstr ""
 
-#: ../app/models/scc_account.rb:109
+#: ../app/models/scc_account.rb:104
 msgid "Interval cannot be nil"
 msgstr ""
 
-#: ../app/models/scc_account.rb:116
+#: ../app/models/scc_account.rb:111
 msgid "Interval not set correctly"
 msgstr ""
 
-#: ../app/models/scc_account.rb:121
+#: ../app/models/scc_account.rb:116
 msgid "Cron expression is not valid!"
 msgstr ""
 
@@ -261,304 +261,300 @@ msgstr "SUSE Customer Center"
 msgid "Please sync your SUSE subscriptions first."
 msgstr "Please sync your SUSE subscriptions first."
 
-#: ../lib/foreman_scc_manager/engine.rb:77
+#: ../lib/foreman_scc_manager/engine.rb:79
 msgid "SUSE Subscriptions"
 msgstr "SUSE Subscriptions"
 
+#: action_names.rb:2
+msgid "Copy version units to library"
+msgstr ""
+
+#: action_names.rb:3
+msgid "Import"
+msgstr ""
+
+#: action_names.rb:4
+msgid "Export Library"
+msgstr ""
+
+#: action_names.rb:5
+msgid "Export"
+msgstr ""
+
 #: action_names.rb:6
-msgid "Action with sub plans"
+msgid "Hypervisors update"
 msgstr ""
 
 #: action_names.rb:7
-msgid "Import facts"
+msgid "Update for host"
 msgstr ""
 
 #: action_names.rb:8
-msgid "Import Puppet classes"
+msgid "Update Content Overrides"
+msgstr ""
+
+#: action_names.rb:9
+msgid "Remove subscriptions"
 msgstr ""
 
 #: action_names.rb:10
-msgid "Abstract async task"
+msgid "Hypervisors"
 msgstr ""
 
 #: action_names.rb:11
-msgid "Export"
+msgid "Install Applicable Errata"
 msgstr ""
 
 #: action_names.rb:12
-msgid "Import"
+msgid "Destroy Content Host"
 msgstr ""
 
 #: action_names.rb:13
-msgid "Copy version units to library"
+msgid "Auto attach subscriptions"
 msgstr ""
 
 #: action_names.rb:14
-msgid "Create"
+msgid "Attach subscriptions"
 msgstr ""
 
 #: action_names.rb:15
-msgid "Delete Activation Key"
+msgid "Update"
 msgstr ""
 
 #: action_names.rb:16
-msgid "Update"
+msgid "Publish Lifecycle Environment Repositories"
 msgstr ""
 
 #: action_names.rb:17
-msgid "Generate host applicability"
+msgid "Delete Package Group"
 msgstr ""
 
 #: action_names.rb:18
-msgid "Bulk generate applicability for hosts"
+msgid "Delete"
 msgstr ""
 
 #: action_names.rb:19
-msgid "Generate repository applicability"
+msgid "Create"
 msgstr ""
 
 #: action_names.rb:20
-msgid "Synchronize smart proxy"
+msgid "Delete Lifecycle Environment"
 msgstr ""
 
 #: action_names.rb:21
-msgid "Sync capsule"
+msgid "Republish Version Repositories"
 msgstr ""
 
 #: action_names.rb:22
-msgid "Delete"
+msgid "Synchronize"
 msgstr ""
 
 #: action_names.rb:23
-msgid "Errata mail"
+msgid "Remove Content"
 msgstr ""
 
 #: action_names.rb:24
-msgid "Incremental Update of  Content View Version(s) "
+msgid "Incremental Update"
 msgstr ""
 
 #: action_names.rb:25
-msgid "Promote"
+msgid "Import Default Content View"
 msgstr ""
 
 #: action_names.rb:26
-msgid "Promotion to Environment"
+msgid "Import Content View Version"
 msgstr ""
 
 #: action_names.rb:27
-msgid "Publish"
+msgid "Enable"
 msgstr ""
 
 #: action_names.rb:28
-msgid "Remove Versions and Associations"
+msgid "Disable"
 msgstr ""
 
 #: action_names.rb:29
-msgid "Remove from Environment"
+msgid "Verify checksum"
 msgstr ""
 
 #: action_names.rb:30
-msgid "Remove Version"
+msgid "Filtered index content"
 msgstr ""
 
 #: action_names.rb:31
-msgid "Auto attach subscriptions"
+msgid "Fetch pxe files"
 msgstr ""
 
 #: action_names.rb:32
-msgid "Destroy Content Host"
+msgid "Errata mail"
 msgstr ""
 
 #: action_names.rb:33
-msgid "Install Applicable Errata"
+msgid "Discover"
 msgstr ""
 
 #: action_names.rb:34
-msgid "Install erratum"
+msgid "Remove Version"
 msgstr ""
 
 #: action_names.rb:35
-msgid "Hypervisors"
+msgid "Remove from Environment"
 msgstr ""
 
 #: action_names.rb:36
-msgid "Import Content View Version"
+msgid "Remove Versions and Associations"
 msgstr ""
 
 #: action_names.rb:37
-msgid "Incremental Update"
+msgid "Publish"
 msgstr ""
 
 #: action_names.rb:38
-msgid "Republish Version Repositories"
+msgid "Promotion to Environment"
 msgstr ""
 
 #: action_names.rb:39
-msgid "Delete Lifecycle Environment"
+msgid "Product Create"
 msgstr ""
 
 #: action_names.rb:40
-msgid "Publish Lifecycle Environment Repositories"
+msgid "Destroy"
 msgstr ""
 
 #: action_names.rb:41
-msgid "Attach subscriptions"
+msgid "Create Import History"
 msgstr ""
 
 #: action_names.rb:42
-msgid "Remove subscriptions"
+msgid "Create Export History"
 msgstr ""
 
 #: action_names.rb:43
-msgid "Update Content Overrides"
+msgid "Update http proxy"
 msgstr ""
 
 #: action_names.rb:44
-msgid "Hypervisors update"
+msgid "Promote"
 msgstr ""
 
 #: action_names.rb:45
-msgid "Install package"
+msgid "Reindex subscriptions"
 msgstr ""
 
 #: action_names.rb:46
-msgid "Remove package"
+msgid "Delete Product"
 msgstr ""
 
 #: action_names.rb:47
-msgid "Update package"
+msgid "Instance update"
 msgstr ""
 
 #: action_names.rb:48
-msgid "Install package group"
+msgid "Index package groups"
 msgstr ""
 
 #: action_names.rb:49
-msgid "Remove package group"
+msgid "Index module streams"
 msgstr ""
 
 #: action_names.rb:50
-msgid "Updating System Purpose for host"
+msgid "Index errata"
 msgstr ""
 
 #: action_names.rb:51
-msgid "Package Profile Update"
+msgid "Index content"
 msgstr ""
 
 #: action_names.rb:52
-msgid "Update for host"
+msgid "Upload into"
 msgstr ""
 
 #: action_names.rb:53
-msgid "Update release version for host"
+msgid "Create Package Group"
 msgstr ""
 
 #: action_names.rb:54
-msgid "Combined Profile Update"
+msgid "Update redhat repository"
 msgstr ""
 
 #: action_names.rb:55
-msgid "Destroy"
+msgid "Update http proxy details"
 msgstr ""
 
 #: action_names.rb:56
-msgid "Run Sync Plan:"
+msgid "Update content urls"
 msgstr ""
 
 #: action_names.rb:57
-msgid "Product Create"
+msgid "Run Sync Plan:"
 msgstr ""
 
 #: action_names.rb:58
-msgid "Disable"
+msgid "Combined Profile Update"
 msgstr ""
 
 #: action_names.rb:59
-msgid "Delete Product"
+msgid "Package Profile Update"
 msgstr ""
 
 #: action_names.rb:60
-msgid "Enable"
+msgid "Updating System Purpose for host"
 msgstr ""
 
 #: action_names.rb:61
-msgid "Create Package Group"
+msgid "Update release version for host"
 msgstr ""
 
 #: action_names.rb:62
-msgid "Reindex subscriptions"
+msgid "Incremental Update of  Content View Version(s) "
 msgstr ""
 
 #: action_names.rb:63
-msgid "Verify checksum"
+msgid "Sync capsule"
 msgstr ""
 
 #: action_names.rb:64
-msgid "Upload into"
+msgid "Synchronize smart proxy"
 msgstr ""
 
 #: action_names.rb:65
-msgid "Upload errata into"
+msgid "Generate repository applicability"
 msgstr ""
 
 #: action_names.rb:66
-msgid "Update http proxy"
+msgid "Bulk generate applicability for hosts"
 msgstr ""
 
 #: action_names.rb:67
-msgid "Update redhat repository"
+msgid "Generate host applicability"
 msgstr ""
 
 #: action_names.rb:68
-msgid "Update http proxy details"
+msgid "Agent action"
 msgstr ""
 
 #: action_names.rb:69
-msgid "Update content urls"
+msgid "Delete Activation Key"
 msgstr ""
 
 #: action_names.rb:70
-msgid "Synchronize"
+msgid "Abstract async task"
 msgstr ""
 
 #: action_names.rb:71
-msgid "Remove Content"
+msgid "Remote action:"
 msgstr ""
 
 #: action_names.rb:72
-msgid "Delete Package Group"
+msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:73
-msgid "Discover"
+msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:74
-msgid "Instance update"
-msgstr ""
-
-#: action_names.rb:75
-msgid "Fetch pxe files"
-msgstr ""
-
-#: action_names.rb:76
-msgid "Index module streams"
-msgstr ""
-
-#: action_names.rb:77
-msgid "Index package groups"
-msgstr ""
-
-#: action_names.rb:78
-msgid "Filtered index content"
-msgstr ""
-
-#: action_names.rb:79
-msgid "Index errata"
-msgstr ""
-
-#: action_names.rb:80
-msgid "Index content"
+msgid "Action with sub plans"
 msgstr ""
 
 #: gemspec.rb:2

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/controllers/scc_accounts_controller_test2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class SccAccountsControllerTest2 < ActionDispatch::IntegrationTest

data/test/fixtures/models/katello_products.yml.bak

@@ -0,0 +1,10 @@
+p1:
+  id: 1
+  name: 'katello product 1'
+  provider_id: 1
+  created_at: Time.now
+p2:
+  id: 2
+  name: 'katello product 2'
+  provider_id: 1
+  created_at: Time.now

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