katello 3.14.0.rc2 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdc69d79c80c2099fe91eff58b35861a0cebf3dd5ac4affa128d2b8751619769
-  data.tar.gz: 41cc9a3b3b657e44325274002b19884ae4c5b993c106ff191bfccf749d5a9a6c
+  metadata.gz: 4753e9076eca5c39d6930c003dd67a5cbd01bbbd97b47bef6e81a74d6e576ceb
+  data.tar.gz: 561e374445d3f901344a42d4e08701b8bd5d48ce57802bb477a296959ccfc0f3
 SHA512:
-  metadata.gz: b28ea4eeb0db67f2b2bdba025b9191a57c54830e928f222b5c6f281eb1fc51a89cbb15d18f17eed853e914765ea57d9f1577f04a604fcc697786fe4c3b4217fd
-  data.tar.gz: e94f4bc8c64f672d5886ac900df8e13cc7322338fa048ec8eedcce1181adbaeb5c749119ebc86df734e021a014f89142554b236457fcb80819b535a2c60716dd
+  metadata.gz: 8741afc15f04b339ca2fd45f537bea05e9ae8bc1b5de956620702781cda16ca95d64cb88641dd2118a4247585d656d0075738af58ddca50e959d123482ccd29d
+  data.tar.gz: b18ce1b57e91ca577393412f27f20718683abbc1f53ed3645e9df47c3bd762f63f0221b5b1a118b3101d0f4cbe1ee69a4a65cba460a76f33cb92d2411c43eaec

data/app/controllers/katello/api/v2/subscriptions_controller.rb

@@ -77,8 +77,9 @@ module Katello
     def show
       org_id = Organization.current&.id
       @resource = Katello::Pool.with_identifier(params[:id])
-      if @resource.organization_id != org_id
-        fail ActiveRecord::RecordNotFound, N_('This subscription is not relevant to the current organization.')
+      fail ActiveRecord::RecordNotFound, N_('Subscription not found') unless @resource
+      if @resource.organization_id != org_id && !User.current.organizations&.pluck(:id)&.include?(@resource.organization_id)
+        fail ActiveRecord::RecordNotFound, N_('This subscription is not relevant to the current user and organization.')
       end
       respond(:resource => @resource)
     end

data/app/models/katello/ping.rb

@@ -2,7 +2,6 @@ module Katello
   class Ping
     OK_RETURN_CODE = 'ok'.freeze
     FAIL_RETURN_CODE = 'FAIL'.freeze
-    WARN_RETURN_CODE = 'WARN'.freeze
     PACKAGES = %w(katello candlepin pulp qpid foreman tfm hammer).freeze
 
     class << self
@@ -33,7 +32,7 @@ module Katello
         # set overall status result code
         result = {:services => result}
         result[:services].each_value do |v|
-          result[:status] = [OK_RETURN_CODE, WARN_RETURN_CODE].include?(v[:status]) ? OK_RETURN_CODE : FAIL_RETURN_CODE
+          result[:status] = v[:status] == OK_RETURN_CODE ? OK_RETURN_CODE : FAIL_RETURN_CODE
         end
         result
       end
@@ -45,31 +44,28 @@ module Katello
         }
       end
 
-      def daemon_status_message(status)
-        "#{status[:processed_count]} Processed, #{status[:failed_count]} Failed, #{status[:queue_depth]} in queue"
+      def event_daemon_status(status, result)
+        running = status&.dig(:running)
+
+        if running
+          result[:message] = "#{status[:processed_count]} Processed, #{status[:failed_count]} Failed"
+        else
+          result[:status] = FAIL_RETURN_CODE
+          result[:message] = _("Not running")
+        end
       end
 
       def ping_katello_events(result)
         exception_watch(result) do
-          status = Katello::EventMonitor::PollerThread.status
-
-          if status[:queue_depth] && status[:queue_depth] > 1000
-            result[:status] = WARN_RETURN_CODE
-          end
-
-          result[:message] = daemon_status_message(status)
+          status = Katello::EventMonitor::PollerThread.status(refresh: false)
+          event_daemon_status(status, result)
         end
       end
 
       def ping_candlepin_events(result)
         exception_watch(result) do
-          status = Katello::CandlepinEventListener.status
-
-          if status[:queue_depth] && status[:queue_depth] > 1000
-            result[:status] = WARN_RETURN_CODE
-          end
-
-          result[:message] = daemon_status_message(status)
+          status = Katello::CandlepinEventListener.status(refresh: false)
+          event_daemon_status(status, result)
         end
       end
 

data/app/services/katello/candlepin_event_listener.rb

@@ -1,8 +1,6 @@
 module Katello
   class CandlepinEventListener
-    PROCESSED_COUNT_CACHE_KEY = 'candlepin_events_processed'.freeze
-    FAILED_COUNT_CACHE_KEY = 'candlepin_events_failed'.freeze
-    AMQP_QUEUE_NAME = 'event.org.candlepin.audit.AMQPBusPublisher'.freeze
+    STATUS_CACHE_KEY = 'candlepin_events_status'.freeze
 
     CandlepinEvent = Struct.new(:message_id, :subject, :content)
 
@@ -10,38 +8,17 @@ module Katello
     @failed_count = 0
     @processed_count = 0
 
-    def self.start_service
-      loop do
-        begin
-          result = Katello::CandlepinListeningService.instance.start
-
-          break if result == :connected
-
-          @logger.info("Attempting to restart Candlepin Listening Service")
-          sleep 5
-        end
-      end
-    end
-
     def self.run
-      @thread.kill if @thread
+      initialize_listening_service
 
-      # run in own thread so connecting to qpid won't block the main process
-      @thread = Thread.new do
-        Rails.application.executor.wrap do
-          initialize_listening_service
-          start_service
+      result = Katello::CandlepinListeningService.instance.start
+      return unless result == :connected
 
-          Katello::CandlepinListeningService.instance.poll_for_messages do |message|
-            if message[:result]
-              result = message[:result]
-              event = CandlepinEvent.new(result.message_id, result.subject, result.content)
-              act_on_event(event)
-            elsif message[:error]
-              @logger.error("Disconnected from Candlepin Listening Service, reconnecting")
-              start_service
-            end
-          end
+      Katello::CandlepinListeningService.instance.poll_for_messages do |message|
+        if message[:result]
+          result = message[:result]
+          event = CandlepinEvent.new(result.message_id, result.subject, result.content)
+          act_on_event(event)
         end
       end
     rescue => e
@@ -50,17 +27,20 @@ module Katello
       raise e
     end
 
-    def self.status
-      {
-        processed_count: Rails.cache.fetch(PROCESSED_COUNT_CACHE_KEY) { @processed_count },
-        failed_count: Rails.cache.fetch(FAILED_COUNT_CACHE_KEY) { @failed_count },
-        queue_depth: Katello::Resources::Candlepin::Admin.queue_depth(AMQP_QUEUE_NAME)
-      }
+    def self.status(refresh: true)
+      Rails.cache.fetch(STATUS_CACHE_KEY, force: refresh) do
+        {
+          processed_count: @processed_count,
+          failed_count: @failed_count,
+          running: Katello::CandlepinListeningService.instance&.running? || false
+        }
+      end
     end
 
     def self.reset_status
-      Rails.cache.write(PROCESSED_COUNT_CACHE_KEY, 0)
-      Rails.cache.write(FAILED_COUNT_CACHE_KEY, 0)
+      @processed_count = 0
+      @failed_count = 0
+      Rails.cache.delete(STATUS_CACHE_KEY)
     end
 
     def self.act_on_event(event)
@@ -68,11 +48,8 @@ module Katello
         ::Katello::Candlepin::EventHandler.new(@logger).handle(event)
       end
       @processed_count += 1
-
-      Rails.cache.write(PROCESSED_COUNT_CACHE_KEY, @processed_count, expires_in: 24.hours)
     rescue => e
       @failed_count += 1
-      Rails.cache.write(FAILED_COUNT_CACHE_KEY, @failed_count, expires_in: 24.hours)
       @logger.error("Error handling Candlepin event")
       @logger.error(e.message)
       @logger.error(e.backtrace.join("\n"))
@@ -99,7 +76,6 @@ module Katello
 
     def self.close
       Katello::CandlepinListeningService.close
-      @thread.kill if @thread
       reset_status
     end
   end

data/app/services/katello/candlepin_listening_service.rb

@@ -64,10 +64,13 @@ module Katello
         @receiver = @session.create_receiver(@address)
         @logger.info("Candlepin Event Listener started")
       end
-
       :connected
     rescue => e
-      raise e unless e.class.name.include? "TransportFailure"
+      @logger.error("Unable to establish candlepin events connection: #{e.message}")
+    end
+
+    def running?
+      @connection.open? && @thread&.status || false
     end
 
     def fetch_message
@@ -83,7 +86,7 @@ module Katello
           message = fetch_message
           yield(message) if block_given?
 
-          sleep SLEEP_INTERVAL if message[:result].nil? && message[:error].nil?
+          sleep SLEEP_INTERVAL if message[:result].nil?
         end
       end
     end

data/app/services/katello/event_daemon.rb

@@ -1,5 +1,45 @@
 module Katello
   class EventDaemon
+    class Monitor
+      def initialize(service_classes)
+        @service_classes = service_classes
+      end
+
+      def start
+        error = nil
+        status = nil
+        loop do
+          check_services(error, status)
+          sleep 15
+        end
+      end
+
+      def check_services(error, status)
+        @service_classes.each do |service_class|
+          begin
+            status = service_class.status
+          rescue => error
+            Rails.logger.error("Error occurred while pinging #{service_class}")
+            Rails.logger.error(error.message)
+            Rails.logger.error(error.backtrace.join('\n'))
+          ensure
+            if error || !status&.dig(:running)
+              begin
+                service_class.close
+                service_class.run
+              rescue => error
+                Rails.logger.error("Error occurred while starting #{service_class}")
+                Rails.logger.error(error.message)
+                Rails.logger.error(error.backtrace.join('\n'))
+              ensure
+                error = nil
+              end
+            end
+          end
+        end
+      end
+    end
+
     class << self
       def initialize
         FileUtils.touch(lock_file)
@@ -37,6 +77,7 @@ module Katello
 
       def stop
         return unless pid == Process.pid
+        @monitor_thread.kill
         services.values.each(&:close)
         File.unlink(pid_file) if pid_file && File.exist?(pid_file)
       end
@@ -49,7 +90,7 @@ module Katello
           lockfile.flock(File::LOCK_EX)
           return if started? # ensure it wasn't started while we waited for the lock
 
-          start_services
+          start_monitor_thread
           write_pid_file
 
           at_exit do
@@ -69,8 +110,10 @@ module Katello
         false
       end
 
-      def start_services
-        services.values.each(&:run)
+      def start_monitor_thread
+        @monitor_thread = Thread.new do
+          Monitor.new(services.values).start
+        end
       end
 
       def runnable?

data/app/services/katello/event_monitor/poller_thread.rb

@@ -2,8 +2,7 @@ module Katello
   module EventMonitor
     class PollerThread
       SLEEP_INTERVAL = 3
-      PROCESSED_COUNT_CACHE_KEY = 'katello_events_processed'.freeze
-      FAILED_COUNT_CACHE_KEY = 'katello_events_failed'.freeze
+      STATUS_CACHE_KEY = 'katello_events_status'.freeze
 
       cattr_accessor :instance
 
@@ -25,17 +24,14 @@ module Katello
         instance.poll_for_events
       end
 
-      def self.status
-        {
-          processed_count: Rails.cache.fetch(PROCESSED_COUNT_CACHE_KEY) { 0 },
-          failed_count: Rails.cache.fetch(FAILED_COUNT_CACHE_KEY) { 0 },
-          queue_depth: Katello::EventQueue.queue_depth
-        }
+      def self.status(refresh: true)
+        Rails.cache.fetch(STATUS_CACHE_KEY, force: refresh) do
+          instance&.status
+        end
       end
 
       def self.reset_status
-        Rails.cache.write(PROCESSED_COUNT_CACHE_KEY, 0)
-        Rails.cache.write(FAILED_COUNT_CACHE_KEY, 0)
+        Rails.cache.delete(STATUS_CACHE_KEY)
       end
 
       def initialize(logger = nil)
@@ -49,6 +45,18 @@ module Katello
         @thread.kill if @thread
       end
 
+      def running?
+        @thread&.status || false
+      end
+
+      def status
+        {
+          processed_count: @processed_count,
+          failed_count: @failed_count,
+          running: running?
+        }
+      end
+
       def run_event(event)
         @logger.debug("event_queue_event: type=#{event.event_type}, object_id=#{event.object_id}")
 
@@ -60,8 +68,6 @@ module Katello
           end
         rescue => e
           @failed_count += 1
-          Rails.cache.write(FAILED_COUNT_CACHE_KEY, @failed_count, expires_in: 24.hours)
-
           @logger.error("event_queue_error: type=#{event.event_type}, object_id=#{event.object_id}")
           @logger.error(e.message)
           @logger.error(e.backtrace.join("\n"))
@@ -89,7 +95,6 @@ module Katello
                   until (event = ::Katello::EventQueue.next_event).nil?
                     run_event(event)
                     @processed_count += 1
-                    Rails.cache.write(PROCESSED_COUNT_CACHE_KEY, @processed_count, expires_in: 24.hours)
                   end
                 end
               end

data/app/services/katello/pulp/importer_comparison.rb

@@ -0,0 +1,28 @@
+module Katello
+  module Pulp
+    module ImporterComparison
+      def importer_matches?(generated_importer, capsule_importer)
+        if capsule_importer.try(:[], 'importer_type_id') != generated_importer.id
+          return false
+        end
+
+        generated_config = generated_importer.config
+        capsule_config = capsule_importer['config']
+        if generated_config['proxy_host'] == ""
+          proxy_keys = %w(proxy_host proxy_username proxy_password)
+          proxy_keys.each do |key|
+            generated_config.delete(key)
+            capsule_config.delete(key)
+          end
+        end
+
+        if generated_config['proxy_password'] == "" && capsule_config['proxy_password'] == "*****"
+          generated_config.delete('proxy_password')
+          capsule_config.delete('proxy_password')
+        end
+
+        generated_config.compact == capsule_config.compact
+      end
+    end
+  end
+end

data/app/services/katello/pulp/repository.rb

@@ -1,6 +1,7 @@
 module Katello
   module Pulp
     class Repository < ::Actions::Pulp::Abstract
+      include ImporterComparison
       attr_accessor :repo, :input
       attr_accessor :smart_proxy
       delegate :root, to: :repo
@@ -139,7 +140,7 @@ module Katello
         repo_details = backend_data
         return unless repo_details
         capsule_importer = repo_details["importers"][0]
-        !importer_matches?(capsule_importer)
+        !importer_matches?(generate_importer, capsule_importer)
       end
 
       def needs_distributor_updates?
@@ -319,12 +320,6 @@ module Katello
         generated.compact == actual.compact
       end
 
-      def importer_matches?(capsule_importer)
-        generated_importer = generate_importer
-        capsule_importer.try(:[], 'importer_type_id') == generated_importer.id &&
-            generated_importer.config.compact == capsule_importer['config'].compact
-      end
-
       def distributors_match?(capsule_distributors)
         generated_distributor_configs = generate_distributors
         generated_distributor_configs.all? do |gen_dist|

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/content-access-mode-banner.directive.js

@@ -0,0 +1,22 @@
+/**
+ * @ngdoc directive
+ * @name Bastion.subscriptions:contentAccessModeBanner
+ *
+ * @requires contentAccessMode
+ *
+ * @description
+ *   Component for showing information about content access mode (whether content is
+ *   allowed with or without a subscription)
+ */
+angular.module('Bastion.subscriptions').directive('contentAccessModeBanner',
+    ['contentAccessMode',
+    function (contentAccessMode) {
+        return {
+            restrict: 'AE',
+            controller: ['$scope', function ($scope) {
+                $scope.contentAccessMode = contentAccessMode;
+            }],
+            templateUrl: 'subscriptions/views/content-access-mode-banner.html'
+        };
+    }
+]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html

@@ -0,0 +1,5 @@
+<div bst-alert="info" ng-show="contentAccessMode === 'org_environment'">
+  <span translate>
+    Access to repositories is unrestricted in this organization. Hosts can consume all repositories available in the Content View they are registered to, regardless of subscription status.
+  </span>
+</div>

data/lib/katello/tasks/reimport.rake

@@ -24,7 +24,6 @@ namespace :katello do
               Katello::Srpm,
               Katello::ModuleStream,
               Katello::YumMetadataFile,
-              Katello::Deb,
               Katello::FileUnit,
               Katello::Subscription,
               Katello::Pool,
@@ -35,6 +34,7 @@ namespace :katello do
               Katello::Content]
 
     models << Katello::OstreeBranch if Katello::RepositoryTypeManager.find(Katello::Repository::OSTREE_TYPE).present?
+    models << Katello::Deb if Katello::RepositoryTypeManager.find(Katello::Repository::DEB_TYPE).present?
 
     models.each do |model|
       print "Importing #{model.name}\n"

data/lib/katello/version.rb

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

data/webpack/scenes/Subscriptions/__tests__/subscriptions.fixtures.js

@@ -183,6 +183,77 @@ export const quantitiesRequestSuccessResponse = Immutable({
   total: 3,
 });
 
+export const groupedSubscriptions = Immutable({
+  loading: false,
+  manifestModalOpened: false,
+  results: [
+    {
+      id: 3,
+      cp_id: 'ff8080815ea5ea44015ea617b1a5000b',
+      subscription_id: 3,
+      name: 'zoo',
+      start_date: '2017-09-21 16:18:44 -0400',
+      end_date: '2047-09-14 15:18:44 -0500',
+      available: -2,
+      quantity: -1,
+      consumed: 1,
+      account_number: null,
+      contract_number: null,
+      support_level: null,
+      product_id: '853987721546',
+      sockets: null,
+      cores: null,
+      ram: null,
+      instance_multiplier: 1,
+      stacking_id: null,
+      multi_entitlement: null,
+      type: 'NORMAL',
+      product_name: 'zoo',
+      unmapped_guest: false,
+      virt_only: false,
+      virt_who: false,
+    },
+    {
+      id: 4,
+      cp_id: 'ff8080815ea5ea44015ebb08e95a0024',
+      subscription_id: 3,
+      name: 'hsdfhsdh',
+      start_date: '2017-09-25 17:54:36 -0400',
+      end_date: '2047-09-18 16:54:36 -0500',
+      available: -1,
+      quantity: -1,
+      consumed: 0,
+      account_number: null,
+      contract_number: null,
+      support_level: null,
+      product_id: '853987721546',
+      sockets: null,
+      cores: null,
+      ram: null,
+      instance_multiplier: 1,
+      stacking_id: null,
+      multi_entitlement: null,
+      type: 'NORMAL',
+      product_name: 'hsdfhsdh',
+      unmapped_guest: false,
+      virt_only: false,
+      virt_who: false,
+    },
+  ],
+  searchIsActive: false,
+  search: undefined,
+  pagination: {
+    page: 1,
+    perPage: 2,
+  },
+  itemCount: 81,
+  quantitiesLoading: false,
+  availableQuantities: null,
+  tasks: [],
+  tableColumns: [],
+  selectedTableColumns: [],
+});
+
 export const successState = Immutable({
   loading: false,
   manifestModalOpened: false,
@@ -452,6 +523,7 @@ export const tableColumns = [
     value: true,
   },
 ];
+
 export const loadTableColumnsSuccessAction = [
   {
     type: 'UPDATE_SUBSCRIPTION_COLUMNS',

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

@@ -0,0 +1,23 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+
+export const subscriptionNameFormatter = (value, { rowData }) => {
+  let cellContent;
+
+  if (rowData.collapsible) {
+    cellContent = (rowData.name);
+  } else {
+    cellContent = (
+      <Link to={urlBuilder('subscriptions', '', rowData.id)}>{rowData.name}</Link>
+    );
+  }
+
+  return (
+    <td>
+      {cellContent}
+    </td>
+  );
+};
+
+export default subscriptionNameFormatter;

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

@@ -1,11 +1,10 @@
 /* eslint-disable import/prefer-default-export */
 import React from 'react';
 import { Icon } from 'patternfly-react';
-import { Link } from 'react-router-dom';
-import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { entitlementsInlineEditFormatter } from '../../../../move_to_foreman/components/common/table/formatters/EntitlementsInlineEditFormatter';
 import { subscriptionTypeFormatter } from './SubscriptionTypeFormatter';
+import { subscriptionNameFormatter } from './SubscriptionNameFormatter';
 import {
   headerFormatter,
   cellFormatter,
@@ -54,13 +53,8 @@ export const createSubscriptionsTableSchema = (
       formatters: [headerFormatter],
     },
     cell: {
-      formatters: [
-        (value, { rowData }) => (
-          <td>
-            <Link to={urlBuilder('subscriptions', '', rowData.id)}>{rowData.name}</Link>
-          </td>
-        ),
-      ],
+      formatters: [subscriptionNameFormatter]
+      ,
     },
   },
   {

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

@@ -4,7 +4,7 @@ import toJson from 'enzyme-to-json';
 import { MemoryRouter } from 'react-router-dom';
 import { translate as __ } from 'foremanReact/common/I18n';
 import SubscriptionsTable from '../SubscriptionsTable';
-import { successState, loadingState, emptyState } from '../../../__tests__/subscriptions.fixtures';
+import { successState, loadingState, emptyState, groupedSubscriptions } from '../../../__tests__/subscriptions.fixtures';
 import { loadSubscriptions, updateQuantity } from '../../../SubscriptionActions';
 
 jest.mock('foremanReact/components/Pagination/PaginationWrapper');
@@ -18,6 +18,26 @@ const tableColumns = [
   'end_date',
 ];
 describe('subscriptions table', () => {
+  it('should render subscription name without hyperlink for grouped subscriptions', async () => {
+    /* eslint-disable react/jsx-indent */
+
+    const page = render(<MemoryRouter>
+          <SubscriptionsTable
+            subscriptions={groupedSubscriptions}
+            groupedSubscriptions={groupedSubscriptions}
+            loadSubscriptions={loadSubscriptions}
+            tableColumns={tableColumns}
+            updateQuantity={updateQuantity}
+            subscriptionDeleteModalOpen={false}
+            onDeleteSubscriptions={() => {}}
+            onSubscriptionDeleteModalClose={() => { }}
+            toggleDeleteButton={() => {}}
+            emptyState={{}}
+          />
+                        </MemoryRouter>);
+    expect(toJson(page)).toMatchSnapshot();
+  });
+
   it('should render a table', async () => {
     // Wrapping SubscriptionTable in MemoryRouter here since it contains
     // a Link componenent, which can't be used outside a Router

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap

@@ -218,3 +218,95 @@ exports[`subscriptions table should render an empty state 1`] = `
   EmptyState: {"header":"Yay empty state","description":"There is nothing to see here"}
 </div>
 `;
+
+exports[`subscriptions table should render subscription name without hyperlink for grouped subscriptions 1`] = `
+<div>
+  <table
+    class="table table-striped table-bordered table-hover pf-table-inline-edit table-fixed"
+  >
+    <thead>
+      <tr
+        class=""
+      >
+        <th
+          aria-label="Select all rows"
+          class="table-view-pf-select"
+        >
+          <label
+            class="control-label sr-only"
+            for="selectAll"
+          >
+            Select all rows
+          </label>
+          <input
+            id="selectAll"
+            type="checkbox"
+          />
+        </th>
+        <th
+          class=""
+        >
+          Name
+        </th>
+        <th
+          class=""
+        >
+          SKU
+        </th>
+        <th
+          class=""
+        >
+          Contract
+        </th>
+        <th
+          class=""
+        >
+          Start Date
+        </th>
+        <th
+          class=""
+        >
+          End Date
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        class=""
+      >
+        <td
+          class="table-view-pf-select"
+        >
+          <span
+            aria-hidden="true"
+            class="fa fa-angle-right collapse-subscription-group-button"
+          />
+        </td>
+        <td>
+          hsdfhsdh
+        </td>
+        <td
+          class=""
+        >
+          853987721546
+        </td>
+        <td
+          class=""
+        >
+          NA
+        </td>
+        <td
+          class=""
+        >
+          NA
+        </td>
+        <td
+          class=""
+        >
+          NA
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+`;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.14.0.rc2
+  version: 3.14.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1250,6 +1250,7 @@ files:
 - app/services/katello/pulp/docker_tag.rb
 - app/services/katello/pulp/erratum.rb
 - app/services/katello/pulp/file_unit.rb
+- app/services/katello/pulp/importer_comparison.rb
 - app/services/katello/pulp/module_stream.rb
 - app/services/katello/pulp/ostree_branch.rb
 - app/services/katello/pulp/package_category.rb
@@ -3988,10 +3989,12 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/repository-sets/repository-sets.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/setting.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/settings.module.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/content-access-mode-banner.directive.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptionConsumed.filter.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions-helper.service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.module.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-add-products.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details-info.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details.controller.js
@@ -4521,6 +4524,7 @@ files:
 - webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsReducer.test.js.snap
 - webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsSelectors.test.js.snap
 - webpack/scenes/Subscriptions/__tests__/subscriptions.fixtures.js
+- webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionNameFormatter.js
 - webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionTypeFormatter.js
 - webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js
 - webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js
@@ -4569,9 +4573,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: