katello 3.5.1.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58fe4c573c3d98f121ceaf5e70a9f66d997e1d23
-  data.tar.gz: 7158cda305566eeca84c46d165c6f851e98d7bfc
+  metadata.gz: bf8e8e75ea66a068954c0f1c81c467d8502b581d
+  data.tar.gz: 107669c4de9f0cab916fd4bc4c3c805d3ac06f06
 SHA512:
-  metadata.gz: 55958b5b84e983b6e208cdf75bddebd7e0d54c3528f0d55642ef0356ffaedb3345e4d4a3b338c6d992410d92025686d967f3f7b89196978fccc31c93bec9230e
-  data.tar.gz: b493dc0e535f9077115062340bad57acf19bb46a6dc9e2477aba5f9c21d94ad378ba1e00650330ba28c27f7cb6adbb0b0c6385dd114544d57713312209c27ea1
+  metadata.gz: e5f7a21ec394886599dc847e2e8da9caaee88ab41d6efaaa287b824ca2b9f941aa72141290527c10ea7ab8316201c423b29d75353e0e55ee00d380eabaf3de0c
+  data.tar.gz: 73a610d722cd161c032e659c37948786c107d52ff1f31548abc08d9b605d527badf22228f1e0d92e6c2387b9efc3c523f6266892ed363001539248459baf6b0d

data/app/lib/actions/katello/repository/clear.rb

@@ -7,6 +7,7 @@ module Actions
            Pulp::Repository::RemoveErrata,
            Pulp::Repository::RemovePackageGroup,
            Pulp::Repository::RemoveDistribution,
+           Pulp::Repository::RemoveYumMetadataFile,
            Pulp::Repository::RemoveFile,
            Pulp::Repository::RemovePuppetModule,
            Pulp::Repository::RemoveDockerManifest].each do |action_class|

data/app/lib/actions/katello/repository/clone_to_environment.rb

@@ -11,7 +11,8 @@ module Actions
             if clone.new_record?
               plan_action(Repository::Create, clone, true, false)
             else
-              plan_action(Repository::Clear, clone)
+              #only clear if it should be empty, but its not
+              plan_action(Repository::Clear, clone) if (!clone.yum? || !clone.empty_in_pulp?)
               clone.copy_library_instance_attributes
               clone.save!
 

data/app/lib/actions/katello/repository/clone_yum_metadata.rb

@@ -0,0 +1,28 @@
+module Actions
+  module Katello
+    module Repository
+      class CloneYumMetadata < Actions::Base
+        def plan(source_repo, target_repo, options = {})
+          sequence do
+            # Check for matching content before indexing happens, the content in pulp is
+            # actually updated, but it is not reflected in the database yet.
+            output = {}
+            if !target_repo.previous_changes.include?(:unprotected) &&
+                target_repo.environment && !options[:force_yum_metadata_regeneration]
+              output = plan_action(Katello::Repository::CheckMatchingContent,
+                                   :source_repo_id => source_repo.id,
+                                   :target_repo_id => target_repo.id).output
+            end
+
+            plan_action(Katello::Repository::IndexContent, id: target_repo.id)
+
+            plan_action(Katello::Repository::MetadataGenerate,
+                        target_repo,
+                        :source_repository => source_repo,
+                        :matching_content => output[:matching_content])
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/repository/sync.rb

@@ -15,7 +15,7 @@ module Actions
         # @param repo
         # @param pulp_sync_task_id in case the sync was triggered outside
         #   of Katello and we just need to finish the rest of the orchestration
-        def plan(repo, pulp_sync_task_id = nil, options = {})
+        def plan(repo, pulp_sync_task_id = nil, options = {}) # rubocop:disable MethodLength
           action_subject(repo)
 
           source_url = options.fetch(:source_url, nil)
@@ -34,6 +34,9 @@ module Actions
           fail ::Katello::Errors::InvalidActionOptionError, _("Cannot skip metadata check on non-yum repositories.") if skip_metadata_check && !repo.yum?
 
           sequence do
+            # clear yum metadata if validate_contents is on (to avoid metadata corruption issues)
+            plan_action(Pulp::Repository::RemoveYumMetadataFile, :pulp_id => repo.pulp_id) if validate_contents
+
             sync_args = {:pulp_id => repo.pulp_id, :task_id => pulp_sync_task_id, :source_url => source_url, :options => pulp_sync_options}
             output = plan_action(Pulp::Repository::Sync, sync_args).output
 

data/app/lib/actions/pulp/repository/remove_yum_metadata_file.rb

@@ -0,0 +1,11 @@
+module Actions
+  module Pulp
+    module Repository
+      class RemoveYumMetadataFile < Pulp::Repository::AbstractRemoveContent
+        def content_extension
+          pulp_extensions.yum_repo_metadata_file
+        end
+      end
+    end
+  end
+end

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

@@ -44,8 +44,9 @@ module Katello
       class CandlepinResource < HttpResource
         cfg = SETTINGS[:katello][:candlepin]
         url = cfg[:url]
-        self.prefix = URI.parse(url).path
-        self.site = url.gsub(self.prefix, "")
+        uri = URI.parse(url)
+        self.prefix = uri.path
+        self.site = "#{uri.scheme}://#{uri.host}:#{uri.port}"
         self.consumer_secret = cfg[:oauth_secret]
         self.consumer_key = cfg[:oauth_key]
         self.ca_cert_file = cfg[:ca_cert_file]

data/app/models/katello/authorization/content_view_history.rb

@@ -1,7 +1,6 @@
 module Katello
   module Authorization::ContentViewHistory
     extend ActiveSupport::Concern
-    include Authorizable
 
     module ClassMethods
       def readable

data/app/models/katello/authorization/pool.rb

@@ -2,8 +2,6 @@ module Katello
   module Authorization::Pool
     extend ActiveSupport::Concern
 
-    include Authorizable
-
     module ClassMethods
       def readable
         where(:subscription_id => Katello::Subscription.authorized(:view_subscriptions))

data/app/models/katello/authorization/repository.rb

@@ -2,8 +2,6 @@ module Katello
   module Authorization::Repository
     extend ActiveSupport::Concern
 
-    include Authorizable
-
     delegate :editable?, to: :product
 
     def deletable?

data/app/models/katello/glue/pulp/repo.rb

@@ -125,6 +125,10 @@ module Katello
           ostree_branches.count != pulp_counts['ostree'].to_i
       end
 
+      def empty_in_pulp?
+        pulp_repo_facts[:content_unit_counts].values.all? { |value| value == 0 }
+      end
+
       def create_pulp_repo
         #if we are in library, no need for an distributor, but need to sync
         if self.environment.try(:library?)

data/app/models/katello/host/subscription_facet.rb

@@ -192,7 +192,7 @@ module Katello
 
       def self.find_host(facts, organization)
         host_name = propose_existing_hostname(facts)
-        hosts = ::Host.where(:name => host_name)
+        hosts = ::Host.unscoped.where(:name => host_name)
 
         return nil if hosts.empty? #no host exists
         if hosts.where("organization_id = #{organization.id} OR organization_id is NULL").empty? #not in the correct org

data/app/models/katello/repository.rb

@@ -515,7 +515,7 @@ module Katello
     end
 
     def exist_for_environment?(environment, content_view, attribute = nil)
-      if environment.present?
+      if environment.present? && content_view.in_environment?(environment)
         repos = content_view.version(environment).repos(environment)
 
         repos.any? do |repo|

data/app/views/foreman/unattended/kickstart-katello.erb

@@ -68,6 +68,10 @@ yum
 dhclient
 ntp
 wget
+<% if host_param('kt_activation_keys') -%>
+<% # if you want to use subscription manager you need to install it now, in %post it would rely on upstream mirror -%>
+subscription-manager
+<% end -%>
 @Core
 <%= section_end -%>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.js

@@ -134,7 +134,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModa
                 $scope.packageActionFormValues.remoteAction = 'package_' + action;
             }
 
-            $scope.packageActionFormValues.hostIds = selectedHosts.included.ids.join(',');
+            if (selectedHosts.included.ids) {
+                $scope.packageActionFormValues.hostIds = selectedHosts.included.ids.join(',');
+            }
+
             $scope.packageActionFormValues.search = selectedHosts.included.search;
 
             $timeout(function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html

@@ -30,14 +30,14 @@
       </ul>
     </span>
 
-    <div ng-form id="packageActionForm" name="packageActionForm" class="form" method="post" action="/katello/remote_execution">
+    <form id="packageActionForm" name="packageActionForm" class="form" method="post" action="/katello/remote_execution">
       <input type="hidden" name="name" ng-value="content.content"/>
       <input type="hidden" name="remote_action" ng-value="packageActionFormValues.remoteAction"/>
       <input type="hidden" name="scoped_search" ng-value="packageActionFormValues.search"/>
       <input type="hidden" name="host_ids" ng-value="packageActionFormValues.hostIds"/>
       <input type="hidden" name="authenticity_token" ng-value="packageActionFormValues.authenticityToken"/>
       <input type="hidden" name="customize" ng-value="packageActionFormValues.customize"/>
-    </div>
+    </form>
 
     <div ng-form name="systemContentForm" class="form" ng-hide="content.workingMode || denied('edit_hosts')" novalidate>
       <div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html

@@ -31,6 +31,14 @@
     </p>
   </div>
 
+  <form id="errataActionForm" method="post" action="/katello/remote_execution">
+    <input type="hidden" name="remote_action" value="errata_install"/>
+    <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
+    <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
+    <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
+    <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
+  </form>
+
   <div data-extend-template="layouts/partials/table.html">
     <span data-block="search-filter" bst-feature-flag="remote_actions">
       <label class="sr-only" translate>
@@ -44,14 +52,6 @@
       </select>
     </span>
 
-    <form id="errataActionForm" method="post" action="/katello/remote_execution">
-      <input type="hidden" name="remote_action" value="errata_install"/>
-      <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
-      <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
-      <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
-      <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
-    </form>
-
     <span data-block="list-actions" ng-hide="contentHost.readonly">
       <div bst-modal="applySelected()" model="host">
         <div data-block="modal-header" translate>Apply Errata to Content Host "{{host.name}}"?</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/date-type-errata-filter.controller.js

@@ -15,8 +15,13 @@ angular.module('Bastion.content-views').controller('DateTypeErrataFilterControll
     ['$scope', 'translate', 'Rule', 'Notification', function ($scope, translate, Rule, Notification) {
 
         function convertRuleStringsToDates() {
-            $scope.rule['start_date'] = new Date($scope.rule['start_date']);
-            $scope.rule['end_date'] = new Date($scope.rule['end_date']);
+            if ($scope.rule['start_date']) {
+                $scope.rule['start_date'] = new Date($scope.rule['start_date']);
+            }
+
+            if ($scope.rule['end_date']) {
+                $scope.rule['end_date'] = new Date($scope.rule['end_date']);
+            }
         }
 
         function success() {
@@ -66,8 +71,13 @@ angular.module('Bastion.content-views').controller('DateTypeErrataFilterControll
             var params;
 
             // Remove any hours from the dates
-            rule['start_date'].setHours(0, 0, 0, 0);
-            rule['end_date'].setHours(0, 0, 0, 0);
+            if (rule['start_date']) {
+                rule['start_date'].setHours(0, 0, 0, 0);
+            }
+
+            if (rule['end_date']) {
+                rule['end_date'].setHours(0, 0, 0, 0);
+            }
 
             params = {filterId: filter.id, ruleId: rule.id};
             rule.$update(params, success, failure);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/erratum-content-hosts.controller.js

@@ -15,7 +15,7 @@
 angular.module('Bastion.errata').controller('ErratumContentHostsController',
     ['$scope', 'Nutupane', 'Host', 'IncrementalUpdate', 'Environment', 'CurrentOrganization',
     function ($scope, Nutupane, Host, IncrementalUpdate, Environment, CurrentOrganization) {
-        var nutupane, params, nutupaneParams = {
+        var nutupane, params, searchString, nutupaneParams = {
             'overrideAutoLoad': true
         };
 
@@ -27,9 +27,8 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
         };
 
         nutupane = new Nutupane(Host, params, 'postIndex', nutupaneParams);
-        $scope.controllerName = 'hosts';
-        nutupane.masterOnly = true;
         nutupane.enableSelectAllResults();
+        $scope.controllerName = 'hosts';
 
         $scope.nutupane = nutupane;
         $scope.table = nutupane.table;
@@ -43,9 +42,12 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
             }
 
             if (term === "" || angular.isUndefined(term)) {
-                return addition;
+                searchString = addition;
+            } else {
+                searchString = term + ' and ' + addition;
             }
-            return term + ' and ' + addition;
+
+            return searchString;
         };
 
         Environment.queryUnpaged(function (response) {
@@ -58,7 +60,7 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
 
         $scope.errataSearchString = function(installable) {
             var searchTerm = installable ? 'installable_errata' : 'applicable_errata',
-                searchStatements, errataIds;
+                searchStatements, errataIds, hostSearchString;
 
             if ($scope.errata) {
                 errataIds = [$scope.errata['errata_id']];
@@ -69,7 +71,10 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
             searchStatements = _.map(errataIds, function(errataId) {
                 return searchTerm + ' = "' + errataId + '"';
             });
-            return searchStatements.join(" or ");
+
+            hostSearchString = searchStatements.join(" or ");
+
+            return hostSearchString;
         };
         nutupane.load();
 
@@ -79,7 +84,8 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
         };
 
         $scope.goToNextStep = function () {
-            IncrementalUpdate.setBulkContentHosts(nutupane.getAllSelectedResults());
+            var bulkContentHosts = nutupane.getAllSelectedResults();
+
             if ($scope.errata) {
                 IncrementalUpdate.setErrataIds([$scope.errata['errata_id']]);
             }
@@ -89,6 +95,14 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
             } else {
                 $scope.transitionTo('apply-errata.confirm');
             }
+
+            if ($scope.table.allResultsSelected) {
+                bulkContentHosts.included.search = searchString;
+            } else {
+                bulkContentHosts.included.search = null;
+            }
+
+            IncrementalUpdate.setBulkContentHosts(bulkContentHosts);
         };
 
         $scope.incrementalUpdates = IncrementalUpdate.getIncrementalUpdates();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-content-hosts.html

@@ -46,7 +46,9 @@
       <span translate>The Content View or Lifecycle Environment needs to be updated in order to make errata available to these hosts.</span>
     </p>
 
-    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+    <div data-extend-template="layouts/select-all-results.html"></div>
+
+    <table class="table table-striped table-bordered">
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="name"><span translate>Name</span></th>
@@ -70,7 +72,5 @@
         </tr>
       </tbody>
     </table>
-
-    <div data-block="footer-actions" class="footer-actions"></div>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/incremental-update.service.js

@@ -8,7 +8,7 @@
      *   Provides a helper service for Incremental Updates.
      *
      */
-    function IncrementalUpdate($q, Task, CurrentOrganization) {
+    function IncrementalUpdate($q, $httpParamSerializer, Task, CurrentOrganization) {
         var getIdsFromBulk;
 
         getIdsFromBulk = function (bulkResource) {
@@ -66,6 +66,7 @@
          * Allows setting the Bulk Content Hosts.
          *
          * @param {Object} bulkContentHosts the bulk selection of the content hosts.
+         * @param {Array} errataIds the errata IDs to add to the bulk search
          *
          * @returns {Boolean}
          */
@@ -133,6 +134,6 @@
 
     angular.module('Bastion.errata').service('IncrementalUpdate', IncrementalUpdate);
 
-    IncrementalUpdate.$inject = ['$q', 'Task', 'CurrentOrganization'];
+    IncrementalUpdate.$inject = ['$q', '$httpParamSerializer', 'Task', 'CurrentOrganization'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html

@@ -16,12 +16,23 @@
   <h3 ng-show="errata" translate>Apply {{ errata.errata_id }}</h3>
 
   <section ng-hide="updates.length > 0">
-    <p translate ng-show="errata">
-      Apply {{ errata.errata_id }} to {{ contentHostIds.length  }} Content Host(s)?
-    </p>
-    <p translate ng-hide="errata">
-      Apply {{ errataIds.length }} Errata to {{ contentHostIds.length }} Content Host(s)?
-    </p>
+    <div ng-show="errata">
+      <p translate ng-show="contentHostIds.length === 0">
+        Apply {{ errata.errata_id }} to all Content Host(s)?
+      </p>
+      <p translate ng-hide="contentHostIds.length === 0">
+        Apply {{ errata.errata_id }} to {{ contentHostIds.length  }} Content Host(s)?
+      </p>
+    </div>
+
+    <div ng-hide="errata">
+      <p translate ng-show="contentHostIds.length === 0">
+        Apply {{ errataIds.length }} Errata to all Content Host(s)?
+      </p>
+      <p translate ng-hide="contentHostIds.length === 0">
+        Apply {{ errataIds.length }} Errata to {{ contentHostIds.length }} Content Host(s)?
+      </p>
+    </div>
   </section>
 
   <section ng-show="updates.length > 0">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-details.controller.js

@@ -53,6 +53,6 @@ angular.module('Bastion.subscriptions').controller('SubscriptionDetailsControlle
             return "";
         };
 
-        $scope.virtWhoToolTip = translate("If the virt-who field is Yes then the subscription requires the use of virt-who. Learn how to configure and use this tool in the <a href=\"https://access.redhat.com/documentation/en/red-hat-satellite/6.2/single/virtual-instances-guide/\">Virtual Instances Guide</a>.");
+        $scope.virtWhoToolTip = translate("If the virt-who field is Yes then the subscription requires the use of virt-who. Learn how to configure and use this tool at the <a href=\"https://access.redhat.com/articles/subscription-management-satellite-6\">Subscription Management Home Page</a>.");
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import.html

@@ -78,7 +78,7 @@
 
   <div bst-alert="info" ng-if="details.virt_who">
     <span translate>
-      The uploaded manifest contains subscriptions that require the use of virt-who. Learn how to configure and use this tool in the <a href="https://access.redhat.com/documentation/en/red-hat-satellite/6.2/single/virtual-instances-guide/">Virtual Instances Guide</a>.
+      The uploaded manifest contains subscriptions that require the use of virt-who. Learn how to configure and use this tool at the <a href="https://access.redhat.com/articles/subscription-management-satellite-6">Subscription Management Home Page</a>.
     </span>
   </div>
 </section>

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.5.1.1".freeze
+  VERSION = "3.5.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.5.1.1
+  version: 3.5.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -662,6 +662,7 @@ files:
 - app/lib/actions/katello/repository/clone_to_environment.rb
 - app/lib/actions/katello/repository/clone_to_version.rb
 - app/lib/actions/katello/repository/clone_yum_content.rb
+- app/lib/actions/katello/repository/clone_yum_metadata.rb
 - app/lib/actions/katello/repository/correct_checksum.rb
 - app/lib/actions/katello/repository/create.rb
 - app/lib/actions/katello/repository/destroy.rb
@@ -761,6 +762,7 @@ files:
 - app/lib/actions/pulp/repository/remove_puppet_module.rb
 - app/lib/actions/pulp/repository/remove_rpm.rb
 - app/lib/actions/pulp/repository/remove_schedule.rb
+- app/lib/actions/pulp/repository/remove_yum_metadata_file.rb
 - app/lib/actions/pulp/repository/sync.rb
 - app/lib/actions/pulp/repository/update_importer.rb
 - app/lib/actions/pulp/repository/update_schedule.rb
@@ -2100,7 +2102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: ''