foreman_scc_manager 1.8.6 → 1.8.10

data/locale/en/foreman_scc_manager.po

@@ -17,6 +17,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
+msgid "(WARNING: Please check your SUSE subscription)"
+msgstr ""
+
 msgid "Actions"
 msgstr ""
 
@@ -26,6 +29,9 @@ msgstr "Add SCC account"
 msgid "Add SUSE Customer Center Account"
 msgstr "Add SUSE Customer Center Account"
 
+msgid "Associated GPG key of scc_account"
+msgstr ""
+
 msgid "Base URL"
 msgstr "Base URL"
 
@@ -38,6 +44,12 @@ msgstr ""
 msgid "Cron expression is not valid!"
 msgstr ""
 
+msgid "Date and time relative to which the sync interval is run"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
 msgid "Delete %s?"
 msgstr ""
 
@@ -62,9 +74,6 @@ msgstr ""
 msgid "Interval not set correctly"
 msgstr ""
 
-msgid "Last Sync time of scc_account"
-msgstr ""
-
 msgid "Last synced"
 msgstr "Last synced"
 
@@ -86,6 +95,9 @@ msgstr ""
 msgid "No products selected."
 msgstr ""
 
+msgid "None"
+msgstr ""
+
 msgid "Password of scc_account"
 msgstr ""
 
@@ -182,6 +194,12 @@ msgstr ""
 msgid "Update scc_account"
 msgstr ""
 
+msgid "Use GPG key for SUSE products"
+msgstr ""
+
+msgid "Use this setting if you want to automatically add a GPG key to your SUSE products upon subscription. You can change this setting in the 'Content' > 'Products' menu, later."
+msgstr ""
+
 msgid "Use your 'Organization credentials' obtained from the SUSE Customer Center."
 msgstr ""
 

data/locale/foreman_scc_manager.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_scc_manager 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-02 13:47+0000\n"
-"PO-Revision-Date: 2020-03-02 13:47+0000\n"
+"POT-Creation-Date: 2021-03-02 07:16+0000\n"
+"PO-Revision-Date: 2021-03-02 07:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -31,17 +31,17 @@ msgid "Name of the scc_account"
 msgstr ""
 
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:33
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:64
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:65
 msgid "Login id of scc_account"
 msgstr ""
 
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:34
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:65
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:66
 msgid "Password of scc_account"
 msgstr ""
 
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:35
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:66
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:67
 msgid "URL of SUSE for scc_account"
 msgstr ""
 
@@ -50,31 +50,35 @@ msgid "Interval for syncing scc_account"
 msgstr ""
 
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:37
-msgid "Last Sync time of scc_account"
+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"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:41
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:42
 msgid "Create an scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:48
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:49
 msgid "Update scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:55
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:56
 msgid "Delete scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:61
 #: ../app/controllers/api/v2/scc_accounts_controller.rb:62
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:63
 msgid "Test connection for scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:89
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:90
 msgid "Sync scc_account"
 msgstr ""
 
-#: ../app/controllers/api/v2/scc_accounts_controller.rb:103
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:104
 msgid "Bulk subscription of scc_products for scc_account"
 msgstr ""
 
@@ -90,25 +94,25 @@ msgstr ""
 msgid "Subscribe product"
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:64
+#: ../app/controllers/scc_accounts_controller.rb:71
 msgid "Sync task started."
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:66
-#: ../app/controllers/scc_accounts_controller.rb:86
+#: ../app/controllers/scc_accounts_controller.rb:73
+#: ../app/controllers/scc_accounts_controller.rb:93
 msgid "Failed to add task to queue: %s"
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:68
-#: ../app/controllers/scc_accounts_controller.rb:88
+#: ../app/controllers/scc_accounts_controller.rb:75
+#: ../app/controllers/scc_accounts_controller.rb:95
 msgid "Lock on SCC account already taken: %s"
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:81
+#: ../app/controllers/scc_accounts_controller.rb:88
 msgid "Task to subscribe products started."
 msgstr ""
 
-#: ../app/controllers/scc_accounts_controller.rb:83
+#: ../app/controllers/scc_accounts_controller.rb:90
 msgid "No products selected."
 msgstr ""
 
@@ -116,11 +120,11 @@ msgstr ""
 msgid "Product already subscribed!"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/subscribe_product.rb:35 action_names.rb:68
+#: ../app/lib/actions/scc_manager/subscribe_product.rb:46 action_names.rb:5
 msgid "Subscribe SCC Product"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:69
+#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:4
 msgid "Sync SUSE subscriptions"
 msgstr ""
 
@@ -133,31 +137,31 @@ msgid "Unknown"
 msgstr ""
 
 #: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:33
-#: action_names.rb:70
+#: action_names.rb:9
 msgid "Update SUSE repositories"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync_products.rb:34 action_names.rb:71
+#: ../app/lib/actions/scc_manager/sync_products.rb:36 action_names.rb:3
 msgid "Sync SUSE subscriptions (Products)"
 msgstr ""
 
-#: ../app/lib/actions/scc_manager/sync_repositories.rb:33 action_names.rb:72
+#: ../app/lib/actions/scc_manager/sync_repositories.rb:34 action_names.rb:2
 msgid "Sync SUSE subscriptions (Repositories)"
 msgstr ""
 
-#: ../app/models/scc_account.rb:59
+#: ../app/models/scc_account.rb:62
 msgid "never synced"
 msgstr ""
 
-#: ../app/models/scc_account.rb:106
+#: ../app/models/scc_account.rb:109
 msgid "Interval cannot be nil"
 msgstr ""
 
-#: ../app/models/scc_account.rb:113
+#: ../app/models/scc_account.rb:116
 msgid "Interval not set correctly"
 msgstr ""
 
-#: ../app/models/scc_account.rb:118
+#: ../app/models/scc_account.rb:121
 msgid "Cron expression is not valid!"
 msgstr ""
 
@@ -170,41 +174,48 @@ msgstr ""
 msgid "SUSE Subscription: "
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:6
+#: ../app/views/scc_accounts/_form.html.erb:7
 msgid "SUSE Customer Center account"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:13
+#: ../app/views/scc_accounts/_form.html.erb:14
 msgid "Use your 'Organization credentials' obtained from the SUSE Customer Center."
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:15
+#: ../app/views/scc_accounts/_form.html.erb:16
 msgid "Base URL"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:17
+#: ../app/views/scc_accounts/_form.html.erb:18
 msgid "Sync interval"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:17
+#: ../app/views/scc_accounts/_form.html.erb:18
 msgid ""
 "The sync interval is used to periodically update the SCC authentication tokens"
 " of any imported products."
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:22
-msgid "Use GPG key for SUSE products"
+#: ../app/views/scc_accounts/_form.html.erb:19
+msgid "Sync Date"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:22
-msgid "Use this setting if you want to automatically add a GPG key to your SUSE products upon subscription. You can change this setting in the 'Content' > 'Products' menu, later."
+#: ../app/views/scc_accounts/_form.html.erb:23
+msgid "None"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:18
-msgid "Sync Date"
+#: ../app/views/scc_accounts/_form.html.erb:24
+msgid "Use GPG key for SUSE products"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:25
+#: ../app/views/scc_accounts/_form.html.erb:26
+msgid ""
+"Use this setting if you want to automatically add a GPG key to your SUSE produ"
+"cts upon subscription. You can change this setting in the 'Content' > 'Product"
+"s' menu, later."
+msgstr ""
+
+#: ../app/views/scc_accounts/_form.html.erb:31
 msgid "Test Connection"
 msgstr ""
 
@@ -248,15 +259,23 @@ msgstr ""
 msgid "Add SUSE Customer Center Account"
 msgstr ""
 
-#: ../app/views/scc_accounts/show.html.erb:25
+#: ../app/views/scc_accounts/show.html.erb:1
+msgid "Product Selection for Account %s"
+msgstr ""
+
+#: ../app/views/scc_accounts/show.html.erb:17
+msgid "(WARNING: Please check your SUSE subscription)"
+msgstr ""
+
+#: ../app/views/scc_accounts/show.html.erb:33
 msgid "SUSE Customer Center"
 msgstr ""
 
-#: ../app/views/scc_accounts/show.html.erb:36
+#: ../app/views/scc_accounts/show.html.erb:44
 msgid "Please sync your SUSE subscriptions first."
 msgstr ""
 
-#: ../lib/foreman_scc_manager/engine.rb:66
+#: ../lib/foreman_scc_manager/engine.rb:77
 msgid "SUSE Subscriptions"
 msgstr ""
 

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