katello 3.14.0.rc1 → 3.14.0.rc2

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.14.0.rc1".freeze
+  VERSION = "3.14.0.rc2".freeze
 end

data/locale/bn/katello.po

@@ -1288,7 +1288,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/cs/katello.po

@@ -1344,7 +1344,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/de/katello.po

@@ -1325,8 +1325,8 @@ msgstr "ID des GPG-Schlüssels, der diesem neuen Repository zugewiesen wird"
 msgid "true if this repository can be published via HTTP"
 msgstr "\"true\", falls dieses Repository mittels HTTP veröffentlicht werden kann"
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
-msgstr "Typ des Repositorys (entweder \"yum\", \"puppet\" oder \"docker\")"
+msgid "type of repo"
+msgstr "Typ des Repositorys"
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"
 msgstr "Prüfsumme des Repositorys, derzeit werden \"sha1\" und \"sha256\" unterstützt."

data/locale/en/katello.po

@@ -1249,7 +1249,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/es/katello.po

@@ -1314,8 +1314,8 @@ msgstr "ID de la clave GPG que se asignará al nuevo repositorio"
 msgid "true if this repository can be published via HTTP"
 msgstr "verdadero, si este repositorio se puede publicar mediante HTTP"
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
-msgstr "el tipo de repositorio (sea 'yum'. 'puppet' o 'docker')"
+msgid "type of repo"
+msgstr "el tipo de repositorio"
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"
 msgstr ""

data/locale/fr/katello.po

@@ -1326,8 +1326,8 @@ msgstr "id de la clé gpg qui sera assignée au nouveau référentiel"
 msgid "true if this repository can be published via HTTP"
 msgstr "vrai si ce référentiel peut être publié via HTTP"
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
-msgstr "type de référentiel ('yum', 'puppet' ou 'docker')"
+msgid "type of repo"
+msgstr "type de référentiel"
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"
 msgstr ""

data/locale/gu/katello.po

@@ -1289,7 +1289,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/hi/katello.po

@@ -1287,7 +1287,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/it/katello.po

@@ -1325,8 +1325,8 @@ msgstr "id della chiave gpg da assegnare al nuovo repositorio"
 msgid "true if this repository can be published via HTTP"
 msgstr "vero se questo repositorio può essere pubblicato tramite HTTP"
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
-msgstr "tipo di repo ('yum', 'puppet' o 'docker')"
+msgid "type of repo"
+msgstr "tipo di repo"
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"
 msgstr "checksum del repository, attualmente 'sha1' & 'sha256' sono supportati.'"

data/locale/ja/katello.po

@@ -1278,8 +1278,8 @@ msgstr "新規リポジトリーに割り当てられる GPG キーの ID"
 msgid "true if this repository can be published via HTTP"
 msgstr "このリポジトリーが HHTP 経由で公開できる場合は true"
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
-msgstr "リポジトリーのタイプ ('yum'、'puppet' または 'docker' のいずれか)"
+msgid "type of repo"
+msgstr "リポジトリーのタイプ"
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"
 msgstr "リポジトリーのチェックサムです。現在、'sha1' & 'sha256' がサポートされています。"

data/locale/katello.pot

@@ -2804,7 +2804,7 @@ msgid "Product the repository belongs to"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:62
-msgid "type of repo (either 'yum', 'deb', 'puppet', 'docker', or 'ostree')"
+msgid "type of repo"
 msgstr ""
 
 #: ../app/controllers/katello/api/v2/repositories_controller.rb:65

data/locale/kn/katello.po

@@ -1289,7 +1289,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/ko/katello.po

@@ -1260,8 +1260,8 @@ msgstr "새 리포지터리에 할당할 GPG 키 ID"
 msgid "true if this repository can be published via HTTP"
 msgstr "리포지터리가 HTTP를 통해 공개할 수 있는 경우 true"
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
-msgstr "리포지터리 유형 ('yum', 'puppet', 'docker'중 하나)"
+msgid "type of repo"
+msgstr "리포지터리 유형"
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"
 msgstr "리포지터리의 체크섬입니다. 현재 'sha1' & 'sha256'이 지원되고 있습니다."

data/locale/mr/katello.po

@@ -1285,7 +1285,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/or/katello.po

@@ -1288,7 +1288,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/pa/katello.po

@@ -1287,7 +1287,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/pt/katello.po

@@ -1302,7 +1302,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/pt_BR/katello.po

@@ -1313,8 +1313,8 @@ msgstr "Id de uma chave gpg que será atribuído ao novo repositório "
 msgid "true if this repository can be published via HTTP"
 msgstr "verdadeiro se este repositório puder ser publicado via HTTP"
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
-msgstr "tipo de repo ('yum', 'puppet' ou 'docker')"
+msgid "type of repo"
+msgstr "tipo de repo"
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"
 msgstr "checksum do repositório, atualmente 'sha1' & 'sha256' são suportados.'"

data/locale/ru/katello.po

@@ -1280,8 +1280,8 @@ msgstr "идентификатор ключа GPG для нового репоз
 msgid "true if this repository can be published via HTTP"
 msgstr "«True», если репозиторий может быть доступен по HTTP"
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
-msgstr "тип репозитория (yum, puppet или docker)"
+msgid "type of repo"
+msgstr "тип репозитория"
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"
 msgstr "контрольная сумма репозитория (SHA1 или SHA256)"

data/locale/ta/katello.po

@@ -1285,7 +1285,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/te/katello.po

@@ -1287,7 +1287,7 @@ msgstr ""
 msgid "true if this repository can be published via HTTP"
 msgstr ""
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
+msgid "type of repo"
 msgstr ""
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"

data/locale/zh_CN/katello.po

@@ -1255,8 +1255,8 @@ msgstr "要为新库分配的 gpg 密钥 id"
 msgid "true if this repository can be published via HTTP"
 msgstr "如果可通过 HTTP 发布则为 true"
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
-msgstr "repo 类型（可以是 'yum'、'puppet' 或者 'docker'）"
+msgid "type of repo"
+msgstr "repo 类型"
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"
 msgstr "库的 checksum，目前支持 'sha1' & 'sha256'。"

data/locale/zh_TW/katello.po

@@ -1267,8 +1267,8 @@ msgstr "要指定給新軟體庫的GPG 金鑰之 ID"
 msgid "true if this repository can be published via HTTP"
 msgstr "如果此軟體庫可以透過 HTTP 出版，設為真"
 
-msgid "type of repo (either 'yum', 'puppet' or 'docker')"
-msgstr "軟體庫類型（'yum'、'puppet' 或是 'docker'）"
+msgid "type of repo"
+msgstr "軟體庫類型"
 
 msgid "checksum of the repository, currently 'sha1' & 'sha256' are supported.'"
 msgstr "軟體庫的 checksum，目前支援 'sha1' 和 'sha256'。"

data/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap

@@ -7,7 +7,7 @@ exports[`Content Details Info should render and contain appropriate components 1
     loadingText="Loading"
     timeout={300}
   >
-    <Uncontrolled(TabContainer)
+    <ForwardRef
       defaultActiveKey={1}
       id="content-tabs-container"
     >
@@ -131,7 +131,7 @@ exports[`Content Details Info should render and contain appropriate components 1
           </TabPane>
         </TabContent>
       </Grid>
-    </Uncontrolled(TabContainer)>
+    </ForwardRef>
   </LoadingState>
 </div>
 `;

data/webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepository.js

@@ -55,8 +55,8 @@ class EnabledRepository extends Component {
   };
 
   disableRepository = async () => {
-    await this.props.disableRepository(this.repoForAction());
-    this.reloadAndNotify();
+    const result = await this.props.disableRepository(this.repoForAction());
+    this.reloadAndNotify(result);
   };
 
   render() {

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository/RepositorySetRepository.js

@@ -48,7 +48,7 @@ class RepositorySetRepository extends Component {
   };
 
   reloadAndNotify = async (result) => {
-    if (result.success) {
+    if (result && result.success) {
       await this.reloadEnabledRepos();
       await this.setEnabled();
       await this.notifyEnabled(result.data);
@@ -56,8 +56,8 @@ class RepositorySetRepository extends Component {
   };
 
   enableRepository = async () => {
-    await this.props.enableRepository(this.repoForAction());
-    this.reloadAndNotify();
+    const result = await this.props.enableRepository(this.repoForAction());
+    this.reloadAndNotify(result);
   };
 
   render() {

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap

@@ -24,7 +24,7 @@ exports[`subscriptions details page should render and contain appropiate compone
     }
     onSwitcherItemClick={[Function]}
   />
-  <Uncontrolled(TabContainer)
+  <ForwardRef
     defaultActiveKey={1}
     id="subscription-tabs-container"
   >
@@ -531,6 +531,6 @@ exports[`subscriptions details page should render and contain appropiate compone
         </Grid>
       </LoadingState>
     </div>
-  </Uncontrolled(TabContainer)>
+  </ForwardRef>
 </div>
 `;

data/webpack/scenes/Subscriptions/SubscriptionsPage.scss

@@ -42,3 +42,9 @@
   margin-top: 3px;
   width: 10px;
 }
+
+span.fa.fa-minus::before {
+  content: "\2014";
+  color: gray;
+  font-size: 1em;
+}

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js

@@ -37,7 +37,7 @@ const buildTableRow = (subscription, availableQuantities, updatedQuantity) => {
 const buildTableCollapseRow = (subscriptionGroup) => {
   const first = subscriptionGroup.subscriptions[0];
   const heading = {
-    id: 0,
+    id: first.product_id,
     collapsible: true,
     contract_number: 'NA',
     start_date: 'NA',

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTable.fixtures.js

@@ -64,7 +64,7 @@ export const genericRow = Immutable({
   contract_number: 'NA',
   end_date: 'NA',
   hypervisor: undefined,
-  id: 0,
+  id: 'RH00001',
   name: 'Alpha',
   product_id: 'RH00001',
   start_date: 'NA',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.14.0.rc1
+  version: 3.14.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -666,7 +666,6 @@ files:
 - app/lib/actions/candlepin/activation_key/destroy.rb
 - app/lib/actions/candlepin/activation_key/update.rb
 - app/lib/actions/candlepin/async_hypervisors.rb
-- app/lib/actions/candlepin/candlepin_listening_service.rb
 - app/lib/actions/candlepin/consumer/attach_subscription.rb
 - app/lib/actions/candlepin/consumer/auto_attach_subscriptions.rb
 - app/lib/actions/candlepin/consumer/hypervisors.rb
@@ -676,8 +675,6 @@ files:
 - app/lib/actions/candlepin/environment/create.rb
 - app/lib/actions/candlepin/environment/destroy.rb
 - app/lib/actions/candlepin/environment/set_content.rb
-- app/lib/actions/candlepin/import_pool_handler.rb
-- app/lib/actions/candlepin/listen_on_candlepin_events.rb
 - app/lib/actions/candlepin/owner/auto_attach.rb
 - app/lib/actions/candlepin/owner/create.rb
 - app/lib/actions/candlepin/owner/destroy.rb
@@ -734,6 +731,7 @@ files:
 - app/lib/actions/katello/content_view_puppet_module/destroy.rb
 - app/lib/actions/katello/content_view_version/after_promote_hook.rb
 - app/lib/actions/katello/content_view_version/before_promote_hook.rb
+- app/lib/actions/katello/content_view_version/create_repos.rb
 - app/lib/actions/katello/content_view_version/destroy.rb
 - app/lib/actions/katello/content_view_version/export.rb
 - app/lib/actions/katello/content_view_version/incremental_update.rb
@@ -741,9 +739,6 @@ files:
 - app/lib/actions/katello/environment/destroy.rb
 - app/lib/actions/katello/environment/library_create.rb
 - app/lib/actions/katello/environment/publish_repositories.rb
-- app/lib/actions/katello/event_queue/monitor.rb
-- app/lib/actions/katello/event_queue/poller_thread.rb
-- app/lib/actions/katello/event_queue/suspended_action.rb
 - app/lib/actions/katello/foreman/abstract.rb
 - app/lib/actions/katello/foreman/content_update.rb
 - app/lib/actions/katello/gpg_key/update.rb
@@ -964,6 +959,7 @@ files:
 - app/lib/katello/repo_discovery.rb
 - app/lib/katello/resources/candlepin.rb
 - app/lib/katello/resources/candlepin/activation_key.rb
+- app/lib/katello/resources/candlepin/admin.rb
 - app/lib/katello/resources/candlepin/c_p_user.rb
 - app/lib/katello/resources/candlepin/candlepin_ping.rb
 - app/lib/katello/resources/candlepin/consumer.rb
@@ -1228,9 +1224,14 @@ files:
 - app/services/katello/applicable_content_helper.rb
 - app/services/katello/authentication/client_authentication.rb
 - app/services/katello/candlepin/consumer.rb
+- app/services/katello/candlepin/event_handler.rb
 - app/services/katello/candlepin/message_handler.rb
 - app/services/katello/candlepin/pool_service.rb
 - app/services/katello/candlepin/system_purpose.rb
+- app/services/katello/candlepin_event_listener.rb
+- app/services/katello/candlepin_listening_service.rb
+- app/services/katello/event_daemon.rb
+- app/services/katello/event_monitor/poller_thread.rb
 - app/services/katello/event_queue.rb
 - app/services/katello/managed_content_medium_provider.rb
 - app/services/katello/product_content_finder.rb
@@ -4039,6 +4040,7 @@ files:
 - lib/katello.rb
 - lib/katello/apipie/validators.rb
 - lib/katello/engine.rb
+- lib/katello/middleware/event_daemon.rb
 - lib/katello/permission_creator.rb
 - lib/katello/permissions.rb
 - lib/katello/permissions/host_permissions.rb
@@ -4571,8 +4573,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman

data/app/lib/actions/candlepin/candlepin_listening_service.rb

@@ -1,114 +0,0 @@
-#
-module Actions
-  module Candlepin
-    class ConnectionError < StandardError
-    end
-
-    class CandlepinListeningService
-      RECONNECT_ATTEMPTS = 30
-      LOOP_RECEIVE_COUNT = 100
-      TIMEOUT = Qpid::Messaging::Duration::SECOND
-      NO_MESSAGE_AVAILABLE_ERROR_TYPE = 'NoMessageAvailable'.freeze
-
-      class << self
-        attr_reader :instance
-
-        def initialize(logger, url, address)
-          @instance = self.new(logger, url, address)
-        end
-
-        def close
-          @instance.close if @instance
-          @instance = nil
-        end
-      end
-
-      def initialize(logger, url, address)
-        @url = url
-        @address = address
-        @connection = create_connection
-        @logger = logger
-      end
-
-      def create_connection
-        Qpid::Messaging::Connection.new(:url => @url, :options => {:transport => 'ssl'})
-      end
-
-      def close
-        @thread.kill if @thread
-        @connection.close
-      end
-
-      def retrieve
-        result = @receiver.fetch(TIMEOUT)
-        result
-      rescue => e
-        if e.class.name.include? "TransportFailure"
-          raise ::Actions::Candlepin::ConnectionError, "failed to connect to #{@url}"
-        else
-          raise e unless e.class.name.include? NO_MESSAGE_AVAILABLE_ERROR_TYPE
-        end
-      ensure
-        safe_release(result) if result
-      end
-
-      def safe_release(message)
-        @session.acknowledge(:message => message, :sync => true)
-      rescue => e
-        @session.release(message)
-        raise e
-      end
-
-      def start(suspended_action)
-        unless @connection.open?
-          @connection.open
-          @session = @connection.create_session
-          @receiver = @session.create_receiver(@address)
-        end
-        if @connection.open?
-          suspended_action.notify_connected
-        else
-          suspended_action.notify_not_connected("Not Connected")
-        end
-      rescue => e
-        raise e unless e.class.name.include? "TransportFailure"
-        suspended_action.notify_not_connected(e.message)
-      end
-
-      def fetch_message
-        {:result => retrieve, :error => nil}
-      rescue ::Actions::Candlepin::ConnectionError => e
-        {:result => nil, :error => e.message}
-      end
-
-      def poll_for_messages(suspended_action)
-        @thread.kill if @thread
-        @thread = Thread.new do
-          count = 0
-          loop do
-            begin
-              message = fetch_message
-              if message[:result]
-                result = message[:result]
-                suspended_action.notify_message_received(result.message_id, result.subject, result.content)
-              elsif message[:error]
-                suspended_action.notify_not_connected(message[:error])
-                break
-              end
-
-              if count >= LOOP_RECEIVE_COUNT || (message[:result].nil? && message[:error].nil?)
-                sleep 1
-                count = 0
-              end
-            rescue => e
-              suspended_action.notify_fatal(e)
-              raise e
-            ensure
-              count += 1
-            end
-          end
-        end
-      end
-    end
-  end
-end