katello 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a69d7fd688dc60f6918570d9a46f180c5837b95b
-  data.tar.gz: f59ba04326eeec8fbb1582ff99b6b118ae04de3d
+  metadata.gz: 87cafa0ce4cb5fa431eb76d8fd7f7eb2b2c23f85
+  data.tar.gz: c62487b569a5bffafeb677c9336db52ba0c17531
 SHA512:
-  metadata.gz: 1ba9d1e9c4b60b6cbb207bfcf911c21b08fa705e661ce855104cf23d5bacaf843dc7a685cabc179f1f3cd8fbc80140147c551f499f097970de7e1f9a360b7822
-  data.tar.gz: 299af24880144ecdc9b3fd6215fb26170e3f08c94aa17150721289ecd4807c5b724244342b7f7cb2865e5652f7d8d641d05df1b5f6d2a71de6b4d3f852f412fd
+  metadata.gz: d1561efea66f466fd4632eb6370b6c2d6658f743134e33b2e64efde612b217146465c63f3fae99c34856d477979610238bab6e7871bcc3237b890ee4d962c740
+  data.tar.gz: 3d7b4d701f24976c24aea87e2a437fd9fefc39ada515e694f0eb5758af5efd0cc6f274ac8f73b04f9c3f46a634f646bf78fa4d58c9f297e1f70426918b75ae3b

data/app/lib/actions/katello/host/destroy.rb

@@ -34,6 +34,8 @@ module Actions
 
         def unregister(host)
           if host.content_facet
+            host.content_facet.bound_repositories = []
+            host.content_facet.applicable_errata = []
             host.content_facet.uuid = nil
             host.content_facet.save!
           end

data/app/lib/actions/katello/host/register.rb

@@ -55,20 +55,22 @@ module Actions
         end
 
         def finalize
-          host = ::Host.find(input[:host_id])
-          host.content_facet.uuid = input[:uuid]
-          host.subscription_facet.uuid = input[:uuid]
-
-          user = ::User.find(input[:user_id])
-          host.subscription_facet.user = user unless user.nil? || user.hidden?
-
-          host.content_facet.save!
-          host.subscription_facet.update_from_consumer_attributes(host.subscription_facet.candlepin_consumer.
-              consumer_attributes.except(:installedProducts, :guestIds, :facts))
-          host.subscription_facet.save!
-          host.subscription_facet.update_subscription_status
-          host.content_facet.update_errata_status
-          host.refresh_global_status!
+          User.as_anonymous_admin do
+            host = ::Host.find(input[:host_id])
+            host.content_facet.uuid = input[:uuid]
+            host.subscription_facet.uuid = input[:uuid]
+
+            user = ::User.find(input[:user_id])
+            host.subscription_facet.user = user unless user.nil? || user.hidden?
+
+            host.content_facet.save!
+            host.subscription_facet.update_from_consumer_attributes(host.subscription_facet.candlepin_consumer.
+                consumer_attributes.except(:installedProducts, :guestIds, :facts))
+            host.subscription_facet.save!
+            host.subscription_facet.update_subscription_status
+            host.content_facet.update_errata_status
+            host.refresh_global_status!
+          end
         end
 
         def rescue_strategy

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

@@ -42,7 +42,7 @@ module Actions
 
         def create_sub_plans
           trigger(Actions::Katello::Repository::MetadataGenerate,
-                  ::Katello::Repository.find(input[:repository_id]))
+                  ::Katello::Repository.find(input[:repository][:id]))
         end
 
         def resource_locks

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

@@ -538,8 +538,8 @@ module Katello
             self.delete(path(id), self.default_headers).code.to_i
           end
 
-          def entitlements(pool_id)
-            entitlement_json = self.get("#{path(pool_id)}/entitlements", self.default_headers).body
+          def entitlements(pool_id, included = [])
+            entitlement_json = self.get("#{path(pool_id)}/entitlements?#{included_list(included)}", self.default_headers).body
             JSON.parse(entitlement_json)
           end
 

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -52,7 +52,7 @@ module Katello
         scope :with_content, -> { with_features(PULP_FEATURE, PULP_NODE_FEATURE) }
 
         def self.default_capsule
-          with_features(PULP_FEATURE).first
+          unscoped.with_features(PULP_FEATURE).first
         end
 
         def self.default_capsule!

data/app/models/katello/glue/candlepin/pool.rb

@@ -135,7 +135,7 @@ module Katello
       end
 
       def hosts
-        entitlements = Resources::Candlepin::Pool.entitlements(self.cp_id)
+        entitlements = Resources::Candlepin::Pool.entitlements(self.cp_id, ["consumer.uuid"])
         uuids = entitlements.map { |ent| ent["consumer"]["uuid"] }
         ::Host.where(:id => Katello::Host::SubscriptionFacet.where(:uuid => uuids).pluck(:host_id))
       end

data/app/models/katello/ping.rb

@@ -12,11 +12,9 @@ module Katello
       #
       # Calls "status" services in all backend engines.
       #
-      # This should be called with User.current set if you want to check pulp_auth
       def ping(services: SERVICES, capsule_id: nil)
         result = {}
         services.each { |service| result[service] = {} }
-        result.delete(:pulp_auth) unless User.current
 
         ping_pulp_without_auth(result[:pulp], capsule_id) if result.include?(:pulp)
         ping_candlepin_without_auth(result[:candlepin]) if result.include?(:candlepin)

data/app/models/katello/repository.rb

@@ -88,7 +88,7 @@ module Katello
 
     validates :product_id, :presence => true
     validates :pulp_id, :presence => true, :uniqueness => true, :if => proc { |r| r.name.present? }
-    validates :checksum_type, :inclusion => {:in => CHECKSUM_TYPES, :allow_blank => true}
+    validates :checksum_type, :inclusion => {:in => CHECKSUM_TYPES}, :allow_blank => true
     validates :docker_upstream_name, :allow_blank => true, :if => :docker?, :length => { :maximum => 255 }, :format => {
       :with => /\A([a-z0-9]+[a-z0-9\-\_\.]*)+(\/[a-z0-9]+[a-z0-9\-\_\.]*)?\z/,
       :message => _("must be a valid docker name")

data/app/models/katello/rhsm_fact_importer.rb

@@ -1,12 +1,27 @@
 module Katello
-  class RhsmFactImporter < ::FactImporter
+  class RhsmFactImporter < ::StructuredFactImporter
     def fact_name_class
       Katello::RhsmFactName
     end
 
-    def initialize(host, facts = {})
-      super
-      @facts = change_separator(@facts)
+    def normalize(facts)
+      facts = super
+      facts = change_separator(facts)
+      add_compose_facts(facts)
+    end
+
+    def add_compose_facts(facts)
+      additional_keys = []
+      facts.keys.each do |fact_name|
+        parts = fact_name.split(RhsmFactName::SEPARATOR)
+        additional_keys += parts[0..-2].reduce([]) { |memo, part| memo << [memo.last, part].compact.join(RhsmFactName::SEPARATOR) }
+      end
+
+      # add the facts hierarchy to facts hash
+      additional_keys.uniq.each do |key|
+        facts[key] = nil
+      end
+      facts
     end
 
     def change_separator(facts)
@@ -16,30 +31,5 @@ module Katello
       end
       to_ret
     end
-
-    def add_new_facts
-      @facts.keys.each { |key| add_fact_name(key) }
-      super
-    end
-
-    def add_fact_name(name, is_parent = false)
-      begin
-        parent_name = find_parent(name)
-        parent_fact_name = add_fact_name(parent_name, true) if parent_name
-        fact_name = RhsmFactName.where(:name => name).first_or_create! do |new_fact|
-          new_fact.parent = parent_fact_name
-          new_fact.compose = is_parent
-        end
-      rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid
-        retry
-      end
-      FactValue.create(:fact_name => fact_name, :value => nil, :host => @host) if is_parent
-      fact_name
-    end
-
-    def find_parent(name)
-      split = name.split(Katello::RhsmFactName::SEPARATOR)
-      split[0..split.length - 2].join(Katello::RhsmFactName::SEPARATOR) if split.length > 1
-    end
   end
 end

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

@@ -32,7 +32,8 @@
                    ng-model="packageAction.term"/>
 
             <span uib-dropdown class="input-group-btn">
-              <button class="btn btn-default" type="button"
+              <button class="btn btn-primary" type="button"
+                      ng-click="performPackageAction(packageAction.actionType, packageAction.term)"
                       ng-hide="denied('edit_hosts', host)"
                       ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
                       translate>
@@ -54,7 +55,7 @@
         </div>
 
         <div class="form-group">
-          <button class="btn btn-primary" type="button"
+          <button class="btn btn-default" type="button"
                   translate
                   ng-disabled="working"
                   ng-click="updateAll()">

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

@@ -12,12 +12,13 @@
     Your search returned zero Packages.
   </span>
 
-  <div data-block="actions" bst-feature-flag="remote_actions">
+  <div data-block="list-actions" bst-feature-flag="remote_actions">
     <div ng-hide="denied('edit_hosts', host)" class="nutupane-actions fr">
       <form ng-submit="performDefaultUpdateAction()" role="form">
 
         <span uib-dropdown class="btn-group">
-          <button class="btn btn-default" type="button"
+          <button class="btn btn-primary" type="button"
+                  ng-click="performDefaultUpdateAction()"
                   ng-hide="denied('edit_hosts', host)"
                   ng-disabled="working || table.numSelected === 0"
                   translate>
@@ -36,7 +37,7 @@
           </ul>
         </span>
 
-        <button class="btn btn-primary"
+        <button class="btn btn-default"
                 type="button"
                 translate
                 ng-disabled="working"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-copy.controller.js

@@ -16,7 +16,7 @@
             HostCollection.copy({id: $scope.$stateParams.hostCollectionId, 'host_collection': {name: newName}}, function (response) {
                 $scope.transitionTo('host-collection.info', {hostCollectionId: response.id});
             }, function (response) {
-                $scope.errorMessages.push(response.data.displayMessage);
+                $scope.$parent.errorMessages.push(response.data.displayMessage);
             });
         };
     }

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details.controller.js

@@ -4,14 +4,17 @@
  *
  * @requires $scope
  * @requires $state
+ * @requires $uibModal
+ * @requires translate
  * @requires Product
+ * @requires GlobalNotification
  * @requires ApiErrorHandler
  *
  * @description
  *   Provides the functionality for the product details action pane.
  */
 angular.module('Bastion.products').controller('ProductDetailsController',
-    ['$scope', '$state', 'Product', 'ApiErrorHandler', function ($scope, $state, Product, ApiErrorHandler) {
+    ['$scope', '$state', '$uibModal', 'translate', 'Product', 'GlobalNotification', 'ApiErrorHandler', function ($scope, $state, $uibModal, translate, Product, GlobalNotification, ApiErrorHandler) {
         $scope.successMessages = [];
         $scope.errorMessages = [];
         $scope.page = {
@@ -65,5 +68,27 @@ angular.module('Bastion.products').controller('ProductDetailsController',
 
             return readOnlyReason;
         };
+
+        $scope.updateProduct = function () {
+            function success() {
+                GlobalNotification.setSuccessMessage(translate('Sync Plan created and assigned to product.'));
+            }
+
+            function error(response) {
+                ApiErrorHandler.handlePUTRequestErrors(response, $scope);
+            }
+
+            $scope.product.$update(success, error);
+        };
+
+        $scope.openSyncPlanModal = function () {
+            $uibModal.open({
+                templateUrl: 'products/new/views/new-sync-plan-modal.html',
+                controller: 'NewSyncPlanModalController'
+            }).result.then(function ($value) {
+                $scope.product['sync_plan_id'] = $value.id;
+                $scope.updateProduct();
+            });
+        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-repositories.controller.js

@@ -16,8 +16,8 @@
  *   Provides the functionality for manipulating repositories attached to a product.
  */
 angular.module('Bastion.products').controller('ProductRepositoriesController',
-    ['$scope', '$state', '$location', 'ApiErrorHandler', 'Product', 'Repository', 'RepositoryBulkAction', 'CurrentOrganization', 'Nutupane', 'translate',
-    function ($scope, $state, $location, ApiErrorHandler, Product, Repository, RepositoryBulkAction, CurrentOrganization, Nutupane, translate) {
+    ['$scope', '$state', '$location', 'ApiErrorHandler', 'Product', 'Repository', 'RepositoryBulkAction', 'CurrentOrganization', 'Nutupane',
+    function ($scope, $state, $location, ApiErrorHandler, Product, Repository, RepositoryBulkAction, CurrentOrganization, Nutupane) {
         var repositoriesNutupane = new Nutupane(Repository, {
             'product_id': $scope.$stateParams.productId,
             'search': $location.search().search || "",
@@ -53,7 +53,6 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
 
         $scope.removingTasks = [];
 
-        $scope.checksums = [{name: translate('Default'), id: null}, {id: 'sha256', name: 'sha256'}, {id: 'sha1', name: 'sha1'}];
         $scope.table = repositoriesNutupane.table;
 
         $scope.syncSelectedRepositories = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/checksum.service.js

@@ -0,0 +1,22 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.repository.service:checksum
+ *
+ * @requires translate
+ *
+ * @description
+ *   Provides a checksum for repositories
+ */
+angular.module('Bastion.repositories').service('Checksum',
+    ['translate', function (translate) {
+
+        this.checksums = [{name: translate('Default'), id: null}, {id: 'sha256', name: 'sha256'}, {id: 'sha1', name: 'sha1'}];
+
+        this.checksumType = function (checksum) {
+            if (checksum === null) {
+                checksum = translate('Default');
+            }
+            return checksum;
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -7,6 +7,7 @@
  * @requires translate
  * @requires GPGKey
  * @requires CurrentOrganization
+ * @requires Checksum
  * @requires DownloadPolicy
  * @requires OstreeUpstreamSyncPolicy
  *
@@ -14,8 +15,8 @@
  *   Provides the functionality for the repository details info page.
  */
 angular.module('Bastion.repositories').controller('RepositoryDetailsInfoController',
-    ['$scope', '$q', 'translate', 'GPGKey', 'CurrentOrganization', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy',
-    function ($scope, $q, translate, GPGKey, CurrentOrganization, DownloadPolicy, OstreeUpstreamSyncPolicy) {
+    ['$scope', '$q', 'translate', 'GPGKey', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy',
+    function ($scope, $q, translate, GPGKey, CurrentOrganization, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy) {
         $scope.successMessages = [];
         $scope.errorMessages = [];
         $scope.uploadSuccessMessages = [];
@@ -94,15 +95,14 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
             $scope.progress.uploading = false;
         };
 
-        $scope.checksumTypeDisplay = function (checksum) {
-            if (checksum === null) {
-                checksum = translate('Default');
-            }
-            return checksum;
-        };
+        $scope.checksums = Checksum.checksums;
         $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
         $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
 
+        $scope.checksumTypeDisplay = function (checksum) {
+            return Checksum.checksumType(checksum);
+        };
+
         $scope.downloadPolicyDisplay = function (downloadPolicy) {
             return DownloadPolicy.downloadPolicyName(downloadPolicy);
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js

@@ -98,12 +98,12 @@
             var readOnlyReason = null;
 
             if (repo.$resolved && product.$resolved) {
-                if ($scope.denied('destroy_products', product)) {
-                    readOnlyReason = 'permissions';
-                } else if (repo.promoted) {
+                if (repo.promoted) {
                     readOnlyReason = 'published';
                 } else if (repo['product_type'] === "redhat") {
                     readOnlyReason = 'redhat';
+                } else if ($scope.denied('deletable', repo)) {
+                    readOnlyReason = 'permissions';
                 }
             }
             return readOnlyReason;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html

@@ -46,12 +46,13 @@
           </span>
         </li>
 
-        <li class="divider" bst-feature-flag="custom_products" ng-hide="denied('delete_repositories')"></li>
+        <li class="divider" bst-feature-flag="custom_products"></li>
         <li role="menuitem" ng-show="canRemove(repository, product)">
           <a ng-click="openModal()" translate>
             Remove Repository
           </a>
-
+        </li>
+        <li>
           <span class="disabled" ng-hide="canRemove(repository, product)">
             <span translate>Cannot Remove</span>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -11,6 +11,7 @@
  * @requires GlobalNotification
  * @requires ApiErrorHandler
  * @requires BastionConfig
+ * @requires Checksum
  * @requires DownloadPolicy
  * @requires OstreeUpstreamSyncPolicy
  *
@@ -18,8 +19,8 @@
  *   Controls the creation of an empty Repository object for use by sub-controllers.
  */
 angular.module('Bastion.repositories').controller('NewRepositoryController',
-    ['$scope', 'Repository', 'Product', 'GPGKey', 'FormUtils', 'translate', 'GlobalNotification', 'ApiErrorHandler', 'BastionConfig', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy',
-    function ($scope, Repository, Product, GPGKey, FormUtils, translate, GlobalNotification, ApiErrorHandler, BastionConfig, DownloadPolicy, OstreeUpstreamSyncPolicy) {
+    ['$scope', 'Repository', 'Product', 'GPGKey', 'FormUtils', 'translate', 'GlobalNotification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy',
+    function ($scope, Repository, Product, GPGKey, FormUtils, translate, GlobalNotification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy) {
 
         function success() {
             GlobalNotification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
@@ -74,6 +75,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             $scope.repositoryTypes = data;
         });
 
+        $scope.checksums = Checksum.checksums;
         $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
         $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-details.html

@@ -15,7 +15,7 @@
         </li>
 
         <li role="menuitem" ng-hide="denied('create_sync_plans')">
-          <a ui-sref="openProductModal()">
+          <a ng-click="openSyncPlanModal()">
             <span translate>New Sync Plan</span>
           </a>
         </li>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery-create.controller.js

@@ -37,7 +37,7 @@ angular.module('Bastion.products').controller('DiscoveryCreateController',
                 name: repo.name,
                 label: repo.label,
                 'content_type': repo.contentType,
-                url: repo.url,
+                url: repo.url + repo.path,
                 'product_id': $scope.createRepoChoices.existingProductId,
                 unprotected: $scope.createRepoChoices.unprotected,
                 'verify_ssl': $scope.createRepoChoices.verifySsl,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html

@@ -164,7 +164,7 @@
             <span ng-show="creating() || repo.created">{{ repo.label }}</span>
           </td>
           <td bst-table-cell ng-show="discovery.contentType === 'yum'">
-            {{ repo.url }}
+            {{ repo.url + repo.path }}
           </td>
         </tr>
       </tbody>

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.4.1".freeze
+  VERSION = "3.4.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1762,6 +1762,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details-info.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-repositories.controller.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/checksum.service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-advanced-sync.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.filter.js