foreman_scc_manager 1.8.2 → 1.8.7

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,33 +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:18
+#: ../app/views/scc_accounts/_form.html.erb:19
 msgid "Sync Date"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:25
+#: ../app/views/scc_accounts/_form.html.erb:23
+msgid "None"
+msgstr ""
+
+#: ../app/views/scc_accounts/_form.html.erb:24
+msgid "Use GPG key for SUSE products"
+msgstr ""
+
+#: ../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 ""
 
@@ -240,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

@@ -236,7 +236,9 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     assert account
     post :test_connection, params: { :scc_account => { :login => account.login, :password => account.password, :base_url => account.base_url } }
     assert_response :not_found
-    assert_match response.body, '"Failed"'
+    body = ActiveSupport::JSON.decode(@response.body)
+    assert body.key? 'error'
+    assert_equal body['success'], false
   end
 
   test 'existing account SCC server connection-test' do
@@ -260,7 +262,9 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     assert account
     post :test_connection, params: { :id => account.id }
     assert_response :not_found
-    assert_match response.body, '"Failed"'
+    body = ActiveSupport::JSON.decode(@response.body)
+    assert body.key? 'error'
+    assert_equal body['success'], false
   end
 
   test 'SCC server sync products' do
@@ -289,7 +293,9 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     account.scc_products = [product1, product2]
     put :bulk_subscribe, params: { :id => account.id, :scc_subscribe_product_ids => [] }
     assert_response :expectation_failed
-    assert_match response.body, '"No Product selected"'
+    body = ActiveSupport::JSON.decode(@response.body)
+    assert body.key? 'error'
+    assert_match body['error'], 'No Product selected'
   end
 
   test 'should delete scc_account' do

data/test/controllers/scc_accounts_controller_test.rb

@@ -0,0 +1,104 @@
+require 'test_plugin_helper'
+
+class SccAccountsControllerTest < ActionController::TestCase
+  def setup
+    @scc_account = scc_accounts(:one)
+  end
+
+  def stub_custom_request(url, host = 'scc.example.com', auth = 'Basic b25ldXNlcjpvbmVwYXNz')
+    stub_request(:get, url)
+      .with(
+        headers: {
+          'Accept' => 'application/vnd.scc.suse.com.v4+json',
+          'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'Authorization' => auth,
+          'Host' => host,
+          'User-Agent' => "rest-client/2.1.0 (linux-gnu x86_64) ruby/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
+        }
+      )
+      .to_return(status: 200, body: '', headers: {})
+  end
+
+  test 'should get new' do
+    get :new, session: set_session_user
+    assert_response :success
+    assert_select 'title', 'Add SUSE Customer Center Account'
+  end
+
+  test 'should get edit' do
+    get :edit, params: { :id => @scc_account.id }, session: set_session_user
+    assert_response :success
+    assert_select 'title', "Edit #{@scc_account.name}"
+  end
+
+  test 'should get index' do
+    get :index, session: set_session_user
+    assert_response :success
+    assert_not_nil assigns(:scc_accounts)
+    body = @response.body
+    assert_not_empty body
+    assert_select 'title', 'SUSE subscriptions'
+  end
+
+  test 'should show scc_account' do
+    get :show, params: { :id => @scc_account.id }, session: set_session_user
+
+    assert_not_nil assigns(:scc_account)
+    assert_response :success
+    assert_select 'title', "Product Selection for Account #{@scc_account.name}"
+  end
+
+  test 'should 404 for unknown scc_account' do
+    get :show, params: { :id => 'does-not-exist' }, session: set_session_user
+
+    assert_response :not_found
+  end
+
+  test 'should create scc_account' do
+    account = scc_accounts(:two)
+    organization = get_organization
+    assert organization
+    assert account
+    assert_difference('SccAccount.count') do
+      post :create, params:
+                        { :scc_account => { :name => account.name, :login => account.login, :password => account.password, :organization_id => organization.id } },
+                    session: set_session_user
+    end
+  end
+
+  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_equal 'weekly', assigns(:scc_account).interval
+  end
+
+  test 'SCC server sync products' do
+    stub_custom_request('https://scc.example.com/connect/organizations/products')
+    stub_custom_request('https://scc.example.com/connect/organizations/repositories')
+
+    account = scc_accounts(:one)
+    assert account
+    put :sync, params: { :id => account.id }, session: set_session_user
+    assert_redirected_to '/scc_accounts'
+  end
+
+  test 'SCC server bulk subscribe products' do
+    stub_custom_request('https://scc.example.com/connect/organizations/repositories')
+
+    account = scc_accounts(:one)
+    product1 = scc_products(:one)
+    product2 = scc_products(:two)
+    account.scc_products = [product1, product2]
+    put :bulk_subscribe, params: { :id => account.id, :scc_account => { :scc_subscribe_product_ids => [product1.id, product2.id] } }, session: set_session_user
+
+    assert_redirected_to '/scc_accounts'
+  end
+
+  test 'should delete scc_account' do
+    account = scc_accounts(:two)
+    assert_difference 'SccAccount.count', -1 do
+      delete :destroy, params: { :id => account.id }, session: set_session_user
+    end
+  end
+end

data/test/controllers/scc_accounts_controller_test2.rb

@@ -0,0 +1,51 @@
+require 'test_plugin_helper'
+
+class SccAccountsControllerTest2 < ActionDispatch::IntegrationTest
+  setup do
+    @scc_account = scc_accounts(:one)
+  end
+
+  test 'should get index' do
+    get scc_accounts_url, session: set_session_user
+    # post path, params: { :id => "#{taxonomies(:empty_organization).id}-#{taxonomies(:empty_organization).name}" }
+    # post path, params: {:toState => scc_accounts_url, :bastion_page => "select_organization"}
+    # follow_redirect!
+    assert_response :success
+  end
+
+  test 'should get new' do
+    get new_scc_account_url
+    assert_response :success
+  end
+
+  test 'should create scc_account' do
+    assert_difference('SccAccount.count') do
+      post scc_accounts_url, params: { scc_account: {} }
+    end
+
+    assert_redirected_to scc_account_url(SccAccount.last)
+  end
+
+  test 'should show scc_account' do
+    get scc_account_url(@scc_account)
+    assert_response :success
+  end
+
+  test 'should get edit' do
+    get edit_scc_account_url(@scc_account)
+    assert_response :success
+  end
+
+  test 'should update scc_account' do
+    patch scc_account_url(@scc_account), params: { scc_account: {} }
+    assert_redirected_to scc_account_url(@scc_account)
+  end
+
+  test 'should destroy scc_account' do
+    assert_difference('SccAccount.count', -1) do
+      delete scc_account_url(@scc_account)
+    end
+
+    assert_redirected_to scc_accounts_url
+  end
+end