foreman_scc_manager 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6dd28243aa51ff11edf70f4679107d0327a021442f361b3e7a5a33b652f563a
-  data.tar.gz: bf08fc7303d79042037e36241676202acaef29f172ef0124fb14f5c78d7b593b
+  metadata.gz: 0fa5a1408caba6e4ca5d6e2c634020444f644ab964f7448ff36ede9f2fe48ff4
+  data.tar.gz: 0a641b367ce578003d72c7b05fd0e4a2d10dc7856d3ecbf80b333d723f5edaa1
 SHA512:
-  metadata.gz: '0813af8e7f9fbfa54e7b1826a9f552038b43975e6deb4c1138b91be202614a5e892b9e1eaca33474437a13b068e1ed49c568cbf693f4d66f7f627a941c2d59fd'
-  data.tar.gz: 47bd09d7e3bf94d7d12f9af306a24ed610bc6afa63b7b7736fade9ab0dc2e3b6967e0131c1f22201c369cc7710688c0c24921e2e66aba16291f42354f4803997
+  metadata.gz: 767cf999eb62e84fe53ca718515e1e9655dee77f614ebd178cc3d52eb1e8568bad6924efca15c81cfb8fa796a30fb7f2162aa116d731121b7341480b50255334
+  data.tar.gz: e2117f9f03baf0d70a0b1514fc7533f0d3656b12c22150260a3f58fb4708176e87a9b35a46bc10d1aa9caa7bf13d34d498dcfdeddde42dbba5283d479fbb5cbc

data/README.md

@@ -13,7 +13,7 @@ for how to install Foreman plugins
 
 | Foreman Version | Katello Version | Plugin Version |
 | --------------- | --------------- | -------------- |
-| 1.24            | 3.14            | ~> 1.7.1       |
+| 1.24            | 3.14            | ~> 1.8.0       |
 | 1.22            | 3.12            | ~> 1.7.0       |
 | 1.21            | 3.10            | ~> 1.6.0       |
 | 1.20            | 3.9             | ~> 1.6.0       |

data/app/assets/javascripts/foreman_scc_manager/scc_accounts.js.coffee

@@ -26,7 +26,7 @@ $ ->
     $('#connection_test_result')[0].innerHTML = ''
     $('#test_scc_connection_indicator').show()
     $.ajax event.target.parentNode.dataset['url'],
-      type: 'POST'
+      type: 'PUT'
       dataType: 'JSON'
       data: $('form').serialize()
       success: (result) ->

data/app/lib/actions/scc_manager/sync_products.rb

@@ -1,15 +1,12 @@
 module Actions
   module SccManager
     class SyncProducts < Actions::EntryAction
-      include EncryptValue
-
       def plan(scc_account)
         action_subject(scc_account)
-        password = encrypt_field(scc_account.password)
         plan_self(id: scc_account.id,
                   base_url: scc_account.base_url,
                   login: scc_account.login,
-                  password: password)
+                  password: scc_account.password)
       end
 
       def run
@@ -18,11 +15,9 @@ module Actions
           products = ::SccManager.get_scc_data(input.fetch(:base_url),
                                                '/connect/organizations/products',
                                                input.fetch(:login),
-                                               decrypt_field(input.fetch(:password)))
+                                               input.fetch(:password))
           output[:data] = ::SccManager.sanitize_products(products).values
-        rescue StandardError => e
-          ::Foreman::Logging.logger('foreman_scc_manager').error "Error while syncronizing SCC-Products: #{e}"
-          output[:error] = e.to_s
+        rescue StandardError
           output[:status] = 'FAILURE'
         end
       end
@@ -39,6 +34,10 @@ module Actions
         _('Sync SUSE subscriptions (Products)')
       end
 
+      def humanized_input
+        input.dup.update(password: '***')
+      end
+
       def humanized_output
         output.dup.update(data: 'Trimmed')
       end

data/app/lib/actions/scc_manager/sync_repositories.rb

@@ -1,14 +1,11 @@
 module Actions
   module SccManager
     class SyncRepositories < Actions::EntryAction
-      include EncryptValue
-
       def plan(scc_account)
         action_subject(scc_account)
-        password = encrypt_field(scc_account.password)
         plan_self(base_url: scc_account.base_url,
                   login: scc_account.login,
-                  password: password)
+                  password: scc_account.password)
       end
 
       def run
@@ -17,11 +14,9 @@ module Actions
           output[:data] = ::SccManager.get_scc_data(input[:base_url],
                                                     '/connect/organizations/repositories',
                                                     input[:login],
-                                                    decrypt_field(input[:password]))
+                                                    input[:password])
           output[:status] = 'SUCCESS'
-        rescue StandardError => e
-          ::Foreman::Logging.logger('foreman_scc_manager').error "Error while syncronizing SCC-Repositories: #{e}"
-          output[:error] = e.to_s
+        rescue StandardError
           output[:status] = 'FAILURE'
         end
       end
@@ -38,6 +33,10 @@ module Actions
         _('Sync SUSE subscriptions (Repositories)')
       end
 
+      def humanized_input
+        input.dup.update(password: '***')
+      end
+
       def humanized_output
         output.dup.update(data: "Trimmed (got #{output[:data]&.length} repositories")
       end

data/app/lib/scc_manager.rb

@@ -8,8 +8,8 @@ module SccManager
       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]
-      uri.password = proxy_config[:password] if uri.user.present?
+      uri.user = proxy_config[:user].try(:to_s)
+      uri.password = proxy_config[:password].try(:to_s)
 
       RestClient.proxy = uri.to_s
     end

data/app/models/scc_account.rb

@@ -166,8 +166,7 @@ class SccAccount < ApplicationRecord
   def test_connection
     get_scc_data('/connect/organizations/subscriptions')
     true
-  rescue StandardError => e
-    ::Foreman::Logging.logger('foreman_scc_manager').warn "Error occurred while testing SCC-Connection to Account #{self}: #{e}"
+  rescue StandardError
     false
   end
 
@@ -186,10 +185,10 @@ class SccAccount < ApplicationRecord
       cached_repository.save!
       upstream_repo_ids << ur['id']
     end
-    ::Foreman::Logging.logger('foreman_scc_manager').debug "Found #{upstream_repo_ids.length} repositories"
+    logger.debug "Found #{upstream_repo_ids.length} repositories"
     # delete repositories beeing removed upstream
     to_delete = scc_repositories.where.not(scc_id: upstream_repo_ids)
-    ::Foreman::Logging.logger('foreman_scc_manager').debug "Deleting #{to_delete.count} old repositories"
+    logger.debug "Deleting #{to_delete.count} old repositories"
     to_delete.destroy_all
   end
 
@@ -209,10 +208,10 @@ class SccAccount < ApplicationRecord
       cached_product.save!
       upstream_product_ids << up['id']
     end
-    ::Foreman::Logging.logger('foreman_scc_manager').debug "Found #{upstream_product_ids.length} products"
+    logger.debug "Found #{upstream_product_ids.length} products"
     # delete products beeing removed upstream
     to_delete = scc_products.where.not(scc_id: upstream_product_ids)
-    ::Foreman::Logging.logger('foreman_scc_manager').debug "Deleting #{to_delete.count} old products"
+    logger.debug "Deleting #{to_delete.count} old products"
     to_delete.destroy_all
     # rewire product to product relationships
     upstream_products.each do |up|
@@ -220,7 +219,7 @@ class SccAccount < ApplicationRecord
       begin
         scc_products.find_by!(scc_id: up['id']).update!(scc_extensions: extensions)
       rescue ActiveRecord::RecordNotFound
-        ::Foreman::Logging.logger('foreman_scc_manager').info "Failed to find parent scc_product '#{up['name']}'."
+        logger.info "Failed to find parent scc_product '#{up['name']}'."
       end
     end
   end

data/app/views/scc_accounts/_form.html.erb

@@ -13,8 +13,7 @@
         <%= text_f f, :login, :help_block => _("Use your 'Organization credentials' obtained from the SUSE Customer Center.") %>
         <%= password_f f, :password %>
         <%= text_f f, :base_url, label: _('Base URL') %>
-        <%= selectable_f f, :interval, SccAccount::TYPES, {},
-            { :label => _('Sync interval'), :help_block => _("The sync interval is used to periodically update the SCC authentication tokens of any imported products.") } %>
+        <%= selectable_f f, :interval, SccAccount::TYPES, label: _('Interval') %>
         <%= field f, :sync_date, label: _('Sync Date') do
           f.datetime_field :sync_date, placeholder: Time.now
         end %>
@@ -26,7 +25,7 @@
                                    id: 'test_scc_connection_btn',
                                    spinner_id: 'test_scc_connection_indicator',
                                    class: 'btn-default',
-                                   'data-url': @scc_account.id ? test_connection_scc_account_path : test_connection_scc_accounts_path ) %>
+                                   'data-url': test_connection_scc_accounts_path(scc_account_id: @scc_account)) %>
             </div>
             <div class='col-md-2'>
               <span id='connection_test_result'></span>

data/config/routes.rb

@@ -2,11 +2,10 @@ Rails.application.routes.draw do
   resources :scc_accounts do
     collection do
       post 'test_connection'
-      put 'test_connection'
       get 'auto_complete_search'
     end
     member do
-      patch 'test_connection'
+      put 'test_connection'
       put 'sync'
       put 'bulk_subscribe'
     end

data/lib/foreman_scc_manager/engine.rb

@@ -10,7 +10,7 @@ module ForemanSccManager
     config.autoload_paths += Dir["#{config.root}/app/overrides"]
 
     config.to_prepare do
-      ForemanTasks::RecurringLogic.send :include, Concerns::RecurringLogicExtensions
+      ForemanTasks::RecurringLogic.include Concerns::RecurringLogicExtensions
     end
 
     # Add any db migrations
@@ -56,9 +56,7 @@ module ForemanSccManager
         end
 
         # Add a new role called 'SccManager' if it doesn't exist
-        role 'SccManager',
-             %i[view_scc use_scc new_scc edit_scc delete_scc sync_scc],
-             'Role granting permissons to manage SUSE Subscriptions'
+        role 'SccManager', %i[view_scc use_scc new_scc edit_scc delete_scc sync_scc]
 
         # add menu entry
         menu :top_menu, :scc_manager,

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.7.1'.freeze
+  VERSION = '1.8.0'.freeze
 end

data/locale/de/foreman_scc_manager.po

@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the foreman_scc_manager package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 # Translators:
 # Wiederoder <stefanwiederoder@googlemail.com>, 2019
 # Bryan Kearney <bryan.kearney@gmail.com>, 2019
@@ -11,11 +11,13 @@
 # Michael Moll, 2019
 # Lukas K. <kallies@puzzle.ch>, 2019
 # Markus Bucher <bucher@atix.de>, 2019
-#
+# 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: foreman_scc_manager 1.7.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-10-22 13:59+0000\n"
 "PO-Revision-Date: 2019-10-17 13:28+0000\n"
 "Last-Translator: Markus Bucher <bucher@atix.de>, 2019\n"
 "Language-Team: German (https://www.transifex.com/foreman/teams/114/de/)\n"
@@ -25,173 +27,168 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Actions"
-msgstr "Aktionen"
+#: ../app/controllers/scc_accounts_controller.rb:64
+msgid "Sync task started."
+msgstr "Sync Job gestartet."
 
-msgid "Add SCC account"
-msgstr "SCC Konto hinzufügen"
+#: ../app/controllers/scc_accounts_controller.rb:66
+#: ../app/controllers/scc_accounts_controller.rb:86
+msgid "Failed to add task to queue: %s"
+msgstr "Aufgabe konnte nicht in die Warteschlange gestellt werden: %s"
 
-msgid "Add SUSE Customer Center Account"
-msgstr "SUSE Customer Center Konto hinzufügen"
+#: ../app/controllers/scc_accounts_controller.rb:68
+#: ../app/controllers/scc_accounts_controller.rb:88
+msgid "Lock on SCC account already taken: %s"
+msgstr "Lock für SCC Zugang bereits vergeben: %s"
 
-msgid "Base URL"
-msgstr "Basis URL"
+#: ../app/controllers/scc_accounts_controller.rb:81
+msgid "Task to subscribe products started."
+msgstr "Job zum abonnieren von Produkten gestartet."
 
-msgid "Bulk subscription of scc_products for scc_account"
-msgstr ""
+#: ../app/controllers/scc_accounts_controller.rb:83
+msgid "No products selected."
+msgstr "Keine Produkte ausgewählt."
 
-msgid "Create an scc_account"
-msgstr ""
+#: ../app/lib/actions/scc_manager/subscribe_product.rb:5
+msgid "Product already subscribed!"
+msgstr "Produkt wurde bereits abonniert!"
 
-msgid "Cron expression is not valid!"
-msgstr "Cron-Ausdruck ungültig!"
+#: ../app/lib/actions/scc_manager/subscribe_product.rb:35 action_names.rb:1
+msgid "Subscribe SCC Product"
+msgstr "SCC Produkt abonnieren"
 
-msgid "Delete %s?"
-msgstr "%s löschen?"
+#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:2
+msgid "Sync SUSE subscriptions"
+msgstr "SUSE Abonnements synchronisieren"
 
-msgid "Delete scc_account"
-msgstr ""
+#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:31
+msgid "Update SUSE repositories %s"
+msgstr "SUSE Repositorien %s aktualisieren"
 
-msgid "Edit %s"
-msgstr "%s bearbeiten"
+#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:31
+msgid "Unknown"
+msgstr "Unbekannt"
 
-msgid "Failed to add task to queue: %s"
-msgstr "Aufgabe konnte nicht in die Warteschlange gestellt werden: %s"
+#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:33
+#: action_names.rb:3
+msgid "Update SUSE repositories"
+msgstr "SUSE Repositorien aktualisieren"
 
-msgid "Foreman plugin to sync SUSE Customer Center products and repositories into Katello."
-msgstr "Foreman Plugin um SUSE Customer Center Produkte und Repositorien in Katello zu importieren."
+#: ../app/lib/actions/scc_manager/sync_products.rb:34 action_names.rb:4
+msgid "Sync SUSE subscriptions (Products)"
+msgstr "SUSE Abonnements (Produkte) synchronisieren"
+
+#: ../app/lib/actions/scc_manager/sync_repositories.rb:33 action_names.rb:5
+msgid "Sync SUSE subscriptions (Repositories)"
+msgstr "SUSE Abonnements (Repositorien) synchronisieren"
 
+#: ../app/models/scc_account.rb:58
+msgid "never synced"
+msgstr "Nie synchronisiert"
+
+#: ../app/models/scc_account.rb:105
 msgid "Interval cannot be nil"
 msgstr "Intervall darf nicht Null sein"
 
-msgid "Interval for syncing scc_account"
-msgstr ""
-
+#: ../app/models/scc_account.rb:112
 msgid "Interval not set correctly"
 msgstr "Intervall nicht richtig gesetzt"
 
-msgid "Last Sync time of scc_account"
-msgstr ""
+#: ../app/models/scc_account.rb:117
+msgid "Cron expression is not valid!"
+msgstr "Cron-Ausdruck ungültig!"
 
-msgid "Last synced"
-msgstr "Letzte Synchronisation"
+#: ../app/models/scc_account_sync_plan_task_group.rb:5
+msgid "SUSE Subscription"
+msgstr "SUSE Abonnement"
 
-msgid "List all products for scc_account"
+#: ../app/views/scc_account_sync_plan_task_groups/_scc_account_sync_plan_task_groups.html.erb:1
+msgid "SUSE Subscription: "
 msgstr ""
 
-msgid "List all scc_accounts"
+#: ../app/views/scc_accounts/_form.html.erb:6
+msgid "SUSE Customer Center account"
+msgstr "SUSE Customer Center Konto"
+
+#: ../app/views/scc_accounts/_form.html.erb:13
+msgid ""
+"Use your 'Organization credentials' obtained from the SUSE Customer Center."
 msgstr ""
+"Verwenden Sie die \"Organisationszugangsdaten\" aus dem SUSE Customer "
+"Center."
 
-msgid "Lock on SCC account already taken: %s"
-msgstr "Lock für SCC Zugang bereits vergeben: %s"
+#: ../app/views/scc_accounts/_form.html.erb:15
+msgid "Base URL"
+msgstr "Basis URL"
 
-msgid "Login id of scc_account"
-msgstr ""
+#: ../app/views/scc_accounts/_form.html.erb:16
+msgid "Interval"
+msgstr "Intervall"
 
-msgid "Name of the scc_account"
-msgstr ""
+#: ../app/views/scc_accounts/_form.html.erb:17
+msgid "Sync Date"
+msgstr "Synchronisationsdatum"
 
-msgid "No products selected."
-msgstr "Keine Produkte ausgewählt."
+#: ../app/views/scc_accounts/_form.html.erb:24
+msgid "Test Connection"
+msgstr "Verbindung testen"
 
-msgid "Password of scc_account"
-msgstr ""
+#: ../app/views/scc_accounts/edit.html.erb:1
+msgid "Edit %s"
+msgstr "%s bearbeiten"
 
-msgid "Please sync your SUSE subscriptions first."
-msgstr "Bitte synchronisieren Sie zuerst Ihre SUSE Abonnements."
+#: ../app/views/scc_accounts/index.html.erb:2
+msgid "SUSE subscriptions"
+msgstr "SUSE Abonnements"
 
-msgid "Product already subscribed!"
-msgstr "Produkt wurde bereits abonniert!"
+#: ../app/views/scc_accounts/index.html.erb:3
+msgid "Add SCC account"
+msgstr "SCC Konto hinzufügen"
 
+#: ../app/views/scc_accounts/index.html.erb:9
 msgid "Products"
 msgstr "Produkte"
 
-msgid "SUSE Customer Center"
-msgstr "SUSE Customer Center"
-
-msgid "SUSE Customer Center account"
-msgstr "SUSE Customer Center Konto"
-
-msgid "SUSE Subscription"
-msgstr "SUSE Abonnement"
-
-msgid "SUSE Subscription: "
-msgstr "SUSE Abonnement:"
-
-msgid "SUSE Subscriptions"
-msgstr "SUSE Abonnements"
+#: ../app/views/scc_accounts/index.html.erb:10
+msgid "Last synced"
+msgstr "Letzte Synchronisation"
 
-msgid "SUSE subscriptions"
-msgstr "SUSE Abonnements"
+#: ../app/views/scc_accounts/index.html.erb:11
+msgid "Actions"
+msgstr "Aktionen"
 
+#: ../app/views/scc_accounts/index.html.erb:24
 msgid "Select products"
 msgstr "Produkte auswählen"
 
-msgid "Show an scc_account product"
-msgstr ""
-
-msgid "Show scc_account"
-msgstr ""
-
-msgid "Subscribe SCC Product"
-msgstr "SCC Produkt abonnieren"
-
-msgid "Subscribe product"
-msgstr ""
-
+#: ../app/views/scc_accounts/index.html.erb:25
 msgid "Sync"
 msgstr "Synchronisation"
 
-msgid "Sync Date"
-msgstr "Synchronisationsdatum"
-
-msgid "Sync SUSE subscriptions"
-msgstr "SUSE Abonnements synchronisieren"
-
-msgid "Sync SUSE subscriptions (Products)"
-msgstr "SUSE Abonnements (Produkte) synchronisieren"
-
-msgid "Sync SUSE subscriptions (Repositories)"
-msgstr "SUSE Abonnements (Repositorien) synchronisieren"
-
-msgid "Sync interval"
-msgstr ""
-
-msgid "Sync scc_account"
-msgstr ""
-
-msgid "Sync task started."
-msgstr "Sync Job gestartet."
-
-msgid "Task to subscribe products started."
-msgstr "Job zum abonnieren von Produkten gestartet."
-
-msgid "Test Connection"
-msgstr "Verbindung testen"
-
-msgid "Test connection for scc_account"
-msgstr ""
-
-msgid "The sync interval is used to periodically update the SCC authentication tokens of any imported products."
-msgstr ""
+#: ../app/views/scc_accounts/index.html.erb:28
+msgid "Delete %s?"
+msgstr "%s löschen?"
 
-msgid "URL of SUSE for scc_account"
-msgstr ""
+#: ../app/views/scc_accounts/new.html.erb:1
+msgid "Add SUSE Customer Center Account"
+msgstr "SUSE Customer Center Konto hinzufügen"
 
-msgid "Unknown"
-msgstr "Unbekannt"
+#: ../app/views/scc_accounts/show.html.erb:25
+msgid "SUSE Customer Center"
+msgstr "SUSE Customer Center"
 
-msgid "Update SUSE repositories"
-msgstr "SUSE Repositorien aktualisieren"
+#: ../app/views/scc_accounts/show.html.erb:36
+msgid "Please sync your SUSE subscriptions first."
+msgstr "Bitte synchronisieren Sie zuerst Ihre SUSE Abonnements."
 
-msgid "Update SUSE repositories %s"
-msgstr "SUSE Repositorien %s aktualisieren"
+#: ../lib/foreman_scc_manager/engine.rb:45
+msgid "SUSE Subscriptions"
+msgstr "SUSE Abonnements"
 
-msgid "Update scc_account"
+#: gemspec.rb:2
+msgid ""
+"Foreman plugin to sync SUSE Customer Center products and repositories into "
+"Katello."
 msgstr ""
-
-msgid "Use your 'Organization credentials' obtained from the SUSE Customer Center."
-msgstr "Verwenden Sie die \"Organisationszugangsdaten\" aus dem SUSE Customer Center."
-
-msgid "never synced"
-msgstr "Nie synchronisiert"
+"Foreman Plugin um SUSE Customer Center Produkte und Repositorien in Katello "
+"zu importieren."

data/locale/en/foreman_scc_manager.po

@@ -17,173 +17,226 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
-msgid "Actions"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:15
+msgid "List all scc_accounts"
 msgstr ""
 
-msgid "Add SCC account"
-msgstr "Add SCC account"
-
-msgid "Add SUSE Customer Center Account"
-msgstr "Add SUSE Customer Center Account"
-
-msgid "Base URL"
-msgstr "Base URL"
-
-msgid "Bulk subscription of scc_products for scc_account"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:24
+msgid "Show scc_account"
 msgstr ""
 
-msgid "Create an scc_account"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:32
+msgid "Name of the scc_account"
 msgstr ""
 
-msgid "Cron expression is not valid!"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:33 ../app/controllers/api/v2/scc_accounts_controller.rb:64
+msgid "Login id of scc_account"
 msgstr ""
 
-msgid "Delete %s?"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:34 ../app/controllers/api/v2/scc_accounts_controller.rb:65
+msgid "Password of scc_account"
 msgstr ""
 
-msgid "Delete scc_account"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:35 ../app/controllers/api/v2/scc_accounts_controller.rb:66
+msgid "URL of SUSE for scc_account"
 msgstr ""
 
-msgid "Edit %s"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:36
+msgid "Interval for syncing scc_account"
 msgstr ""
 
-msgid "Failed to add task to queue: %s"
-msgstr "Failed to add task to queue: %s"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:37
+msgid "Last Sync time of scc_account"
+msgstr ""
 
-msgid "Foreman plugin to sync SUSE Customer Center products and repositories into Katello."
-msgstr "Foreman plugin to sync SUSE Customer Center products and repositories into Katello."
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:41
+msgid "Create an scc_account"
+msgstr ""
 
-msgid "Interval cannot be nil"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:48
+msgid "Update scc_account"
 msgstr ""
 
-msgid "Interval for syncing scc_account"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:55
+msgid "Delete scc_account"
 msgstr ""
 
-msgid "Interval not set correctly"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:61 ../app/controllers/api/v2/scc_accounts_controller.rb:62
+msgid "Test connection for scc_account"
 msgstr ""
 
-msgid "Last Sync time of scc_account"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:89
+msgid "Sync scc_account"
 msgstr ""
 
-msgid "Last synced"
-msgstr "Last synced"
+#: ../app/controllers/api/v2/scc_accounts_controller.rb:103
+msgid "Bulk subscription of scc_products for scc_account"
+msgstr ""
 
+#: ../app/controllers/api/v2/scc_products_controller.rb:15
 msgid "List all products for scc_account"
 msgstr ""
 
-msgid "List all scc_accounts"
+#: ../app/controllers/api/v2/scc_products_controller.rb:24
+msgid "Show an scc_account product"
+msgstr ""
+
+#: ../app/controllers/api/v2/scc_products_controller.rb:29
+msgid "Subscribe product"
 msgstr ""
 
+#: ../app/controllers/scc_accounts_controller.rb:64
+msgid "Sync task started."
+msgstr "Sync task started."
+
+#: ../app/controllers/scc_accounts_controller.rb:66 ../app/controllers/scc_accounts_controller.rb:86
+msgid "Failed to add task to queue: %s"
+msgstr "Failed to add task to queue: %s"
+
+#: ../app/controllers/scc_accounts_controller.rb:68 ../app/controllers/scc_accounts_controller.rb:88
 msgid "Lock on SCC account already taken: %s"
 msgstr "Lock on SCC account already taken: %s"
 
-msgid "Login id of scc_account"
-msgstr ""
-
-msgid "Name of the scc_account"
+#: ../app/controllers/scc_accounts_controller.rb:81
+msgid "Task to subscribe products started."
 msgstr ""
 
+#: ../app/controllers/scc_accounts_controller.rb:83
 msgid "No products selected."
 msgstr ""
 
-msgid "Password of scc_account"
-msgstr ""
-
-msgid "Please sync your SUSE subscriptions first."
-msgstr "Please sync your SUSE subscriptions first."
-
+#: ../app/lib/actions/scc_manager/subscribe_product.rb:5
 msgid "Product already subscribed!"
 msgstr "Product already subscribed!"
 
-msgid "Products"
-msgstr ""
+#: ../app/lib/actions/scc_manager/subscribe_product.rb:35 action_names.rb:21
+msgid "Subscribe SCC Product"
+msgstr "Subscribe SCC Product"
 
-msgid "SUSE Customer Center"
-msgstr "SUSE Customer Center"
+#: ../app/lib/actions/scc_manager/sync.rb:27 action_names.rb:22
+msgid "Sync SUSE subscriptions"
+msgstr "Sync SUSE subscriptions"
 
-msgid "SUSE Customer Center account"
-msgstr "SUSE Customer Center account"
+#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:31
+msgid "Update SUSE repositories %s"
+msgstr ""
 
-msgid "SUSE Subscription"
+#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:31
+msgid "Unknown"
 msgstr ""
 
-msgid "SUSE Subscription: "
+#: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:33 action_names.rb:71
+msgid "Update SUSE repositories"
 msgstr ""
 
-msgid "SUSE Subscriptions"
-msgstr "SUSE Subscriptions"
+#: ../app/lib/actions/scc_manager/sync_products.rb:34 action_names.rb:72
+msgid "Sync SUSE subscriptions (Products)"
+msgstr "Sync SUSE subscriptions (Products)"
 
-msgid "SUSE subscriptions"
-msgstr "SUSE subscriptions"
+#: ../app/lib/actions/scc_manager/sync_repositories.rb:33 action_names.rb:73
+msgid "Sync SUSE subscriptions (Repositories)"
+msgstr "Sync SUSE subscriptions (Repositories)"
 
-msgid "Select products"
+#: ../app/models/scc_account.rb:59
+msgid "never synced"
 msgstr ""
 
-msgid "Show an scc_account product"
+#: ../app/models/scc_account.rb:106
+msgid "Interval cannot be nil"
 msgstr ""
 
-msgid "Show scc_account"
+#: ../app/models/scc_account.rb:113
+msgid "Interval not set correctly"
 msgstr ""
 
-msgid "Subscribe SCC Product"
-msgstr "Subscribe SCC Product"
-
-msgid "Subscribe product"
+#: ../app/models/scc_account.rb:118
+msgid "Cron expression is not valid!"
 msgstr ""
 
-msgid "Sync"
-msgstr "Sync"
-
-msgid "Sync Date"
+#: ../app/models/scc_account_sync_plan_task_group.rb:5
+msgid "SUSE Subscription"
 msgstr ""
 
-msgid "Sync SUSE subscriptions"
-msgstr "Sync SUSE subscriptions"
-
-msgid "Sync SUSE subscriptions (Products)"
-msgstr "Sync SUSE subscriptions (Products)"
+#: ../app/views/scc_account_sync_plan_task_groups/_scc_account_sync_plan_task_groups.html.erb:1
+msgid "SUSE Subscription: "
+msgstr ""
 
-msgid "Sync SUSE subscriptions (Repositories)"
-msgstr "Sync SUSE subscriptions (Repositories)"
+#: ../app/views/scc_accounts/_form.html.erb:6
+msgid "SUSE Customer Center account"
+msgstr "SUSE Customer Center account"
 
-msgid "Sync interval"
+#: ../app/views/scc_accounts/_form.html.erb:13
+msgid "Use your 'Organization credentials' obtained from the SUSE Customer Center."
 msgstr ""
 
-msgid "Sync scc_account"
-msgstr ""
+#: ../app/views/scc_accounts/_form.html.erb:15
+msgid "Base URL"
+msgstr "Base URL"
 
-msgid "Sync task started."
-msgstr "Sync task started."
+#: ../app/views/scc_accounts/_form.html.erb:16
+msgid "Interval"
+msgstr ""
 
-msgid "Task to subscribe products started."
+#: ../app/views/scc_accounts/_form.html.erb:17
+msgid "Sync Date"
 msgstr ""
 
+#: ../app/views/scc_accounts/_form.html.erb:24
 msgid "Test Connection"
 msgstr "Test Connection"
 
-msgid "Test connection for scc_account"
+#: ../app/views/scc_accounts/edit.html.erb:1
+msgid "Edit %s"
 msgstr ""
 
-msgid "The sync interval is used to periodically update the SCC authentication tokens of any imported products."
-msgstr ""
+#: ../app/views/scc_accounts/index.html.erb:2
+msgid "SUSE subscriptions"
+msgstr "SUSE subscriptions"
 
-msgid "URL of SUSE for scc_account"
-msgstr ""
+#: ../app/views/scc_accounts/index.html.erb:3
+msgid "Add SCC account"
+msgstr "Add SCC account"
 
-msgid "Unknown"
+#: ../app/views/scc_accounts/index.html.erb:9
+msgid "Products"
 msgstr ""
 
-msgid "Update SUSE repositories"
-msgstr ""
+#: ../app/views/scc_accounts/index.html.erb:10
+msgid "Last synced"
+msgstr "Last synced"
 
-msgid "Update SUSE repositories %s"
+#: ../app/views/scc_accounts/index.html.erb:11
+msgid "Actions"
 msgstr ""
 
-msgid "Update scc_account"
+#: ../app/views/scc_accounts/index.html.erb:24
+msgid "Select products"
 msgstr ""
 
-msgid "Use your 'Organization credentials' obtained from the SUSE Customer Center."
-msgstr ""
+#: ../app/views/scc_accounts/index.html.erb:25
+msgid "Sync"
+msgstr "Sync"
 
-msgid "never synced"
+#: ../app/views/scc_accounts/index.html.erb:28
+msgid "Delete %s?"
 msgstr ""
+
+#: ../app/views/scc_accounts/new.html.erb:1
+msgid "Add SUSE Customer Center Account"
+msgstr "Add SUSE Customer Center Account"
+
+#: ../app/views/scc_accounts/show.html.erb:25
+msgid "SUSE Customer Center"
+msgstr "SUSE Customer Center"
+
+#: ../app/views/scc_accounts/show.html.erb:36
+msgid "Please sync your SUSE subscriptions first."
+msgstr "Please sync your SUSE subscriptions first."
+
+#: ../lib/foreman_scc_manager/engine.rb:64
+msgid "SUSE Subscriptions"
+msgstr "SUSE Subscriptions"
+
+#: gemspec.rb:2
+msgid "Foreman plugin to sync SUSE Customer Center products and repositories into Katello."
+msgstr "Foreman plugin to sync SUSE Customer Center products and repositories into Katello."

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: 2019-11-12 12:27+0000\n"
+"PO-Revision-Date: 2019-11-12 12:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -116,11 +116,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:35 action_names.rb:21
 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:22
 msgid "Sync SUSE subscriptions"
 msgstr ""
 
@@ -133,15 +133,15 @@ msgid "Unknown"
 msgstr ""
 
 #: ../app/lib/actions/scc_manager/sync_plan_account_repositories.rb:33
-#: action_names.rb:70
+#: action_names.rb:71
 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:34 action_names.rb:72
 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:33 action_names.rb:73
 msgid "Sync SUSE subscriptions (Repositories)"
 msgstr ""
 
@@ -182,21 +182,15 @@ msgstr ""
 msgid "Base URL"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:17
-msgid "Sync interval"
+#: ../app/views/scc_accounts/_form.html.erb:16
+msgid "Interval"
 msgstr ""
 
 #: ../app/views/scc_accounts/_form.html.erb:17
-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
 msgid "Sync Date"
 msgstr ""
 
-#: ../app/views/scc_accounts/_form.html.erb:25
+#: ../app/views/scc_accounts/_form.html.erb:24
 msgid "Test Connection"
 msgstr ""
 
@@ -248,7 +242,7 @@ msgstr ""
 msgid "Please sync your SUSE subscriptions first."
 msgstr ""
 
-#: ../lib/foreman_scc_manager/engine.rb:66
+#: ../lib/foreman_scc_manager/engine.rb:64
 msgid "SUSE Subscriptions"
 msgstr ""
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: 0.75.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
+        version: 0.75.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency