katello 3.14.0 → 3.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4753e9076eca5c39d6930c003dd67a5cbd01bbbd97b47bef6e81a74d6e576ceb
-  data.tar.gz: 561e374445d3f901344a42d4e08701b8bd5d48ce57802bb477a296959ccfc0f3
+  metadata.gz: 40ea2dd0117ec5d25205f3868df5ebcb700767dcc7a6eda96f6aa2c30c0c7da3
+  data.tar.gz: 2084af6536db98b8525ec9c790bd00b8c3186897a469716d4bf2b52b36057ae0
 SHA512:
-  metadata.gz: 8741afc15f04b339ca2fd45f537bea05e9ae8bc1b5de956620702781cda16ca95d64cb88641dd2118a4247585d656d0075738af58ddca50e959d123482ccd29d
-  data.tar.gz: b18ce1b57e91ca577393412f27f20718683abbc1f53ed3645e9df47c3bd762f63f0221b5b1a118b3101d0f4cbe1ee69a4a65cba460a76f33cb92d2411c43eaec
+  metadata.gz: 38b703df376f2b4dadbbbfc64aac8a399de28e4cb39762bffd6c3d126dc110f89e7b1bb6ea9d925e31b8ee33ea72386ba3db2e47ce18e5830b764eb663d49d46
+  data.tar.gz: 38234d68e96fd389181b11533e1705b3558b0fa4bd198a37da14ddea4074511d06e5698d6f9bd6611065500d49a4bfcd3bb411fbc33e7c4c6cb7e2a25c85ad44

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

@@ -49,15 +49,9 @@ module Katello
         activation_key.organization = @organization
         activation_key.user = current_user
       end
-      sync_task(::Actions::Katello::ActivationKey::Create, @activation_key)
+      sync_task(::Actions::Katello::ActivationKey::Create, @activation_key, service_level: activation_key_params['service_level'])
       @activation_key.reload
 
-      sync_task(::Actions::Katello::ActivationKey::Update, @activation_key,
-                  :service_level   => activation_key_params[:service_level],
-                  :release_version => activation_key_params[:release_version],
-                  :auto_attach     => activation_key_params[:auto_attach]
-               )
-
       respond_for_create(:resource => @activation_key)
     end
 

data/app/lib/actions/candlepin/activation_key/create.rb

@@ -4,6 +4,8 @@ module Actions
       input_format do
         param :organization_label
         param :auto_attach
+        param :service_level
+        param :release_version
         param :purpose_role
         param :purpose_usage
         param :purpse_addons
@@ -13,6 +15,8 @@ module Actions
         output[:response] = ::Katello::Resources::Candlepin::ActivationKey.create(::Katello::Util::Model.uuid,
                                                                                   input[:organization_label],
                                                                                   input[:auto_attach],
+                                                                                  input[:service_level],
+                                                                                  input[:release_version],
                                                                                   input[:purpose_role],
                                                                                   input[:purpose_usage],
                                                                                   input[:purpose_addons])

data/app/lib/actions/katello/activation_key/create.rb

@@ -2,12 +2,14 @@ module Actions
   module Katello
     module ActivationKey
       class Create < Actions::EntryAction
-        def plan(activation_key)
+        def plan(activation_key, params = {})
           activation_key.save!
           if ::SETTINGS[:katello][:use_cp]
             cp_create = plan_action(Candlepin::ActivationKey::Create,
                                     organization_label: activation_key.organization.label,
                                     auto_attach: activation_key.auto_attach,
+                                    service_level: params[:service_level],
+                                    release_version: activation_key.release_version,
                                     purpose_role: activation_key.purpose_role,
                                     purpose_usage: activation_key.purpose_usage,
                                     purpose_addons: activation_key.purpose_addons.pluck(:name))

data/app/lib/katello/resources/candlepin/activation_key.rb

@@ -10,9 +10,20 @@ module Katello
             ::Katello::Util::Data.array_with_indifferent_access akeys
           end
 
-          def create(name, owner_key, auto_attach, purpose_role, purpose_usage, purpose_addons)
+          # rubocop:disable Metrics/ParameterLists
+          def create(name, owner_key, auto_attach, service_level, release_version, purpose_role, purpose_usage, purpose_addons)
             url = "/candlepin/owners/#{owner_key}/activation_keys"
-            JSON.parse(self.post(url, {:name => name, :autoAttach => auto_attach, :role => purpose_role, :usage => purpose_usage, :addOns => purpose_addons}.to_json, self.default_headers).body).with_indifferent_access
+            params = {
+              name: name,
+              autoAttach: auto_attach,
+              serviceLevel: service_level,
+              releaseVer: release_version,
+              role: purpose_role,
+              usage: purpose_usage,
+              addOns: purpose_addons
+            }
+            response = self.post(url, params.to_json, self.default_headers)
+            JSON.parse(response.body).with_indifferent_access
           end
 
           # rubocop:disable Metrics/ParameterLists

data/app/lib/katello/resources/candlepin/product.rb

@@ -72,8 +72,12 @@ module Katello
 
           def create_unlimited_subscription(owner_key, product_id, start_date)
             start_date ||= Time.now
-            # End it 100 years from now
-            end_date ||= start_date + 10_950.days
+
+            # Subscription-manager (python-rhsm) can't read the certificate with end date beyond
+            # 2049 year correctly. Refer the links below for more details:
+            # https://bugzilla.redhat.com/show_bug.cgi?id=1789654
+            # https://github.com/candlepin/candlepin/blob/5b87865f304555c112982af4fbc83a1c463d37b2/server/src/main/java/org/candlepin/model/UeberCertificateGenerator.java#L247
+            end_date = Time.parse('2049-12-01 00:00:00 +0000')
 
             pool = {
               'startDate' => start_date,

data/app/lib/katello/util/support.rb

@@ -78,12 +78,12 @@ module Katello
         logger.error(e.message)
         logger.error("Lost database connection. Attempting reconnect.")
 
-        active_record_retry_connect
+        active_record_retry_connect(logger)
 
         retry
       end
 
-      def self.active_record_retry_connect
+      def self.active_record_retry_connect(logger)
         sleep 3
         ActiveRecord::Base.connection.reconnect!
       rescue

data/app/models/katello/rhsm_fact_parser.rb

@@ -66,7 +66,7 @@ module Katello
     end
 
     def os_release_name(os_name)
-      if os_name.match(::Operatingsystem::FAMILIES['Debian'])
+      if os_name&.match(::Operatingsystem::FAMILIES['Debian'])
         facts['distribution.id']&.split&.first&.downcase
       end
     end

data/app/services/katello/candlepin/consumer.rb

@@ -152,6 +152,10 @@ module Katello
           'Debian'
         elsif name =~ /ubuntu/
           'Ubuntu'
+        elsif name =~ /oracle/
+          'OracleLinux'
+        else
+          'Unknown'
         end
       end
     end

data/app/services/katello/event_daemon.rb

@@ -9,7 +9,9 @@ module Katello
         error = nil
         status = nil
         loop do
-          check_services(error, status)
+          Rails.application.executor.wrap do
+            check_services(error, status)
+          end
           sleep 15
         end
       end
@@ -21,7 +23,7 @@ module Katello
           rescue => error
             Rails.logger.error("Error occurred while pinging #{service_class}")
             Rails.logger.error(error.message)
-            Rails.logger.error(error.backtrace.join('\n'))
+            Rails.logger.error(error.backtrace.join("\n"))
           ensure
             if error || !status&.dig(:running)
               begin
@@ -30,7 +32,7 @@ module Katello
               rescue => error
                 Rails.logger.error("Error occurred while starting #{service_class}")
                 Rails.logger.error(error.message)
-                Rails.logger.error(error.backtrace.join('\n'))
+                Rails.logger.error(error.backtrace.join("\n"))
               ensure
                 error = nil
               end

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

@@ -242,8 +242,7 @@ module Katello
             remove = clause_gen.remove_clause
             remove_clauses = {filters: {unit: remove}} if remove
           else
-            non_modular_rpms = ::Katello::Rpm.in_repositories(repo).non_modular.pluck(:filename)
-            copy_clauses = non_modular_rpms.blank? ? nil : {filters: {unit: ContentViewPackageFilter.generate_rpm_clauses(non_modular_rpms)}}
+            copy_clauses = {}
             remove_clauses = nil
           end
 

data/engines/bastion/README.md

@@ -262,7 +262,7 @@ npm WARN unmet dependency /usr/lib/node_modules/block-stream requires inherits@'
 npm WARN unmet dependency undefined
 ```
 
-Running `sudo npm update -g phantomjs bower grunt-cli` should fix the issue.
+Running `sudo npm update -g bower grunt-cli` should fix the issue.
 
 #### Fixing Dependency Errors ####
 
@@ -277,7 +277,7 @@ version of a component has been bumped.
 [See also *Installing a New Dependency*](#installing-a-new-dependency) as well as the related section
 [*Updating a New Dependency*](#updating-a-new-dependency)
 
-- `sudo npm update -g phantomjs bower grunt-cli`
+- `sudo npm update -g bower grunt-cli`
 - `npm install`
 - `grunt bower:dev`
 

data/lib/katello/version.rb

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

data/webpack/redux/actions/RedHatRepositories/__tests__/enabled.test.js

@@ -2,6 +2,7 @@ import thunk from 'redux-thunk';
 import Immutable from 'seamless-immutable';
 import configureMockStore from 'redux-mock-store';
 import { disableRepository, loadEnabledRepos } from '../enabled.js';
+import { mock as mockApi } from '../../../../mockRequest';
 import {
   ENABLED_REPOSITORIES_REQUEST,
   DISABLE_REPOSITORY_REQUEST,
@@ -14,11 +15,13 @@ describe('RedHatRepositories enabled actions', () => {
   describe('disableRepository', () => {
     it('dispatches DISABLE_REPOSITORY_REQUEST', async () => {
       const mockRepo = { // don't need actual values because just checking that the action matches
-        productId: null,
-        contentId: null,
-        basearch: null,
-        releasever: null,
+        productId: 'some-product-id',
+        contentId: 'some-content-id',
+        basearch: 'some-base-search',
+        releasever: 'some-releasever',
       };
+      mockApi.onPut(`/products/${mockRepo.productId}/repository_sets/${mockRepo.contentId}/disable`).reply(200, []);
+
       await store.dispatch(disableRepository(mockRepo));
       expect(store.getActions()).toContainEqual({
         type: DISABLE_REPOSITORY_REQUEST,
@@ -28,6 +31,8 @@ describe('RedHatRepositories enabled actions', () => {
   });
   describe('loadEnabledRepos', () => {
     it('dispatches ENABLED_REPOSITORIES_REQUEST', async () => {
+      mockApi.onGet('/repositories').reply(200, []);
+
       await store.dispatch(loadEnabledRepos());
       expect(store.getActions()).toContainEqual({
         type: ENABLED_REPOSITORIES_REQUEST,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.14.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails