katello 3.5.0.rc2 → 3.5.0

data/app/views/foreman_docker/containers/steps/_katello_container.html.erb

@@ -2,6 +2,16 @@
 <%= stylesheet "katello/containers/container" %>
 <div>
   <div class="form-group">
+    <% model_for("katello").errors.messages.select {|field, _| field == :katello_content }.each do |field, field_errors| %>
+    <div class="alert alert-danger">
+      <span class="pficon pficon-error-circle-o"></span>
+      <ul>
+        <% field_errors.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
     <%= hidden_field_tag :katello, true %>
     <% if Organization.current -%>
       <%= hidden_field_tag :organization_id, Organization.current.id%>
@@ -33,6 +43,10 @@
       <span id="no_capsules" class="hide"> <%= _("Selected organization has no smart proxies with Pulp or Pulp Node features. Please choose a different organization.")-%></span>
       <span id="error_capsules" class="hide"> <%= _("Unable to fetch any smart proxies. Please try again.")-%></span>
     </div>
-
+    <script type="text/javascript">
+      $(document).ready(function() {
+        KT.container.setSelection(<%= @state.image.try(:katello_content).to_json.html_safe %>)
+      })
+    </script>
   </div>
 </div>

data/app/views/katello/api/v2/docker_manifests/show.json.rabl

@@ -3,5 +3,6 @@ object @resource
 attributes :id, :name, :schema_version, :digest
 
 child :docker_tags => :tags do
-  attributes :id, :repository_id, :name
+  attributes :associated_meta_tag_identifier => :id
+  attributes :repository_id, :name
 end

data/app/views/katello/api/v2/docker_tags/show.json.rabl

@@ -8,5 +8,5 @@ child :docker_manifest => :manifest do
 end
 
 child :related_tags => :related_tags do
-  attributes :id, :name, :uuid
+  attributes :id, :name
 end

data/app/views/katello/api/v2/errata/show.json.rabl

@@ -1,7 +1,6 @@
 object @resource
 
-attributes :uuid => :id
-attributes :title, :errata_id
+attributes :id, :uuid, :title, :errata_id
 attributes :issued, :updated, :version, :status, :release
 attributes :severity, :description, :solution, :summary, :reboot_suggested
 attributes :_href
@@ -10,6 +9,7 @@ child :cves => :cves do
   attributes :cve_id, :href
 end
 
+attributes :title => :name
 attributes :errata_type => :type
 
 node(:hosts_available_count) { |m| m.hosts_available(params[:organization_id]).count }

data/config/katello.yaml.example

@@ -33,7 +33,7 @@
     # the candlepin host and the location of the copied file needs to be
     # specified here..
     :ca_cert_file:
-
+    # :bulk_load_size: 1000
   # Setup your pulp environment here
   :pulp:
     # refers to the url of the pulp

data/config/routes/api/v2.rb

@@ -119,7 +119,12 @@ Katello::Engine.routes.draw do
           end
         end
 
-        api_resources :docker_manifests, :only => [:index, :show]
+        api_resources :docker_manifests, :only => [:index, :show] do
+          collection do
+            get :auto_complete_search
+          end
+        end
+
         api_resources :docker_tags, :only => [:index, :show] do
           collection do
             get :auto_complete_search

data/db/migrate/20170822104447_add_katello_content_to_image.rb

@@ -0,0 +1,5 @@
+class AddKatelloContentToImage < ActiveRecord::Migration
+  def change
+    add_column :docker_container_wizard_states_images, :katello_content, :text
+  end
+end

data/db/migrate/20170913183848_add_errata_counts.rb

@@ -7,6 +7,7 @@ class AddErrataCounts < ActiveRecord::Migration
     add_column :katello_content_facets, :applicable_rpm_count, :integer, :null => false, :default => 0
     add_column :katello_content_facets, :upgradable_rpm_count, :integer, :null => false, :default => 0
 
+    Katello::Host::ContentFacet.reset_column_information
     Katello::Host::ContentFacet.find_each do |content_facet|
       content_facet.update_applicability_counts
     end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/architectures/architecture.factory.js

@@ -9,7 +9,7 @@
  */
 angular.module('Bastion.architectures').factory('Architecture',
     ['BastionResource', function (BastionResource) {
-        var resource = BastionResource('/api/v2/architectures/');
+        var resource = BastionResource('api/v2/architectures/');
         return resource;
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version.controller.js

@@ -26,10 +26,11 @@
         $scope.hasErrata = function (version) {
             var found = false;
 
-            found = _.find(version['errata_counts'], function (counts) {
-                return counts !== 0;
-            });
-
+            if (version['errata_counts'] &&
+                version['errata_counts'].total &&
+                version['errata_counts'].total !== 0) {
+                return true;
+            }
             return found;
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifests/docker-manifest.factory.js

@@ -10,7 +10,10 @@
      */
     function DockerManifest(BastionResource) {
         return BastionResource('katello/api/v2/docker_manifests/:id',
-            {'id': '@id'}
+            {'id': '@id'},
+            {
+                'autocomplete': {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
+            }
         );
     }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-details.controller.js

@@ -12,15 +12,13 @@
  *   Provides the functionality for the docker tags details action pane.
  */
 angular.module('Bastion.docker-tags').controller('DockerTagDetailsController',
-    ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization', 'ApiErrorHandler',
-    function ($scope, $location, Nutupane, DockerTag, CurrentOrganization, ApiErrorHandler) {
+    ['$scope', '$location', 'DockerTag', 'CurrentOrganization', 'ApiErrorHandler',
+    function ($scope, $location, DockerTag, CurrentOrganization, ApiErrorHandler) {
         $scope.panel = {
             error: false,
             loading: true
         };
 
-        $scope.table = {};
-
         if ($scope.tag) {
             $scope.panel.loading = false;
         }
@@ -31,21 +29,5 @@ angular.module('Bastion.docker-tags').controller('DockerTagDetailsController',
             $scope.panel.loading = false;
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });
-
-        $scope.tag.$promise.then(function () {
-            var params = {
-                'organization_id': CurrentOrganization,
-                'search': $location.search().search || "",
-                'sort_by': 'name',
-                'sort_order': 'ASC',
-                'paged': false,
-                'ids[]': _.map($scope.tag['related_tags'], 'uuid')
-            };
-            var nutupane = new Nutupane(DockerTag, params);
-            $scope.controllerName = 'katello_docker_tags';
-            $scope.table = nutupane.table;
-            $scope.panel.loading = false;
-            nutupane.refresh();
-        });
     }
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-environments.controller.js

@@ -0,0 +1,64 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.docker-tags.controller:DockerTagDetailsController
+ *
+ * @requires $scope
+ * @requires $location
+ * @requires DockerTag
+ * @requires CurrentOrganization
+ * @requires translate
+ *
+ * @description
+ *   Provides the functionality for the docker tags details environments list.
+ */
+angular.module('Bastion.docker-tags').controller('DockerTagEnvironmentsController',
+    ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization', 'translate',
+    function ($scope, $location, Nutupane, DockerTag, CurrentOrganization, translate) {
+        var params = {
+            'organization_id': CurrentOrganization,
+            'search': $location.search().search || "",
+            'sort_by': 'name',
+            'sort_order': 'ASC',
+            'paged': false
+        };
+        var nutupane = new Nutupane(DockerTag, params, null, {disableAutoLoad: true});
+
+        var renderTable = function () {
+            var ids = _.map($scope.tag.related_tags, 'id');
+            var newParams = {
+                'organization_id': CurrentOrganization,
+                'search': $location.search().search || "",
+                'sort_by': 'name',
+                'sort_order': 'ASC',
+                'paged': false,
+                'ids[]': ids
+            };
+            $scope.table = nutupane.table;
+            nutupane.setParams(newParams);
+            $scope.panel.loading = false;
+            if (!_.isEmpty(ids)) {
+                nutupane.refresh();
+            }
+        };
+
+        $scope.controllerName = 'katello_docker_tags';
+
+        if ($scope.tag) {
+            $scope.panel.loading = false;
+        }
+
+        if ($scope.tag && $scope.tag.related_tags) {
+            renderTable();
+        } else {
+            $scope.tag.$promise.then(renderTable);
+        }
+
+        $scope.getManifestType = function (schema) {
+            if (schema['manifest_type'] === 'image') {
+                return translate("Image");
+            }
+            return translate("List");
+        };
+
+    }
+]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.routes.js

@@ -46,6 +46,7 @@ angular.module('Bastion.docker-tags').config(['$stateProvider', function ($state
         url: '/environments',
         permission: 'view_environments',
         templateUrl: 'docker-tags/details/views/docker-tag-environments.html',
+        controller: 'DockerTagEnvironmentsController',
         ncyBreadcrumb: {
             label: "{{ 'Lifecycle Environments' | translate }}",
             parent: 'docker-tag.info'

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js

@@ -115,24 +115,20 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
                 HostBulkAction.installContent(params, transitionToTask, error);
             };
 
-            if (IncrementalUpdate.canApply()) {
-                $scope.selectedContentHosts = IncrementalUpdate.getBulkContentHosts();
-                $scope.selectedContentHosts['errata_ids'] = IncrementalUpdate.getErrataIds();
-                $scope.selectedContentHosts['organization_id'] = CurrentOrganization;
-                HostBulkAction.availableIncrementalUpdates($scope.selectedContentHosts, function (updates) {
-                    $scope.updates = updates;
-                });
-            }
+            $scope.selectedContentHosts = IncrementalUpdate.getBulkContentHosts();
+            $scope.selectedContentHosts['errata_ids'] = IncrementalUpdate.getErrataIds();
+            $scope.selectedContentHosts['organization_id'] = CurrentOrganization;
+            HostBulkAction.availableIncrementalUpdates($scope.selectedContentHosts, function (updates) {
+                $scope.updates = updates;
+            });
 
             $scope.confirmApply = function() {
                 $scope.applyingErrata = true;
-                IncrementalUpdate.getIncrementalUpdates().then(function(updates) {
-                    if (updates.length === 0) {
-                        applyErrata();
-                    } else {
-                        incrementalUpdate();
-                    }
-                });
+                if ($scope.updates.length === 0) {
+                    applyErrata();
+                } else {
+                    incrementalUpdate();
+                }
             };
 
             $scope.incrementalUpdates = IncrementalUpdate.getIncrementalUpdates();

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

@@ -80,6 +80,9 @@ angular.module('Bastion.errata').controller('ErratumContentHostsController',
 
         $scope.goToNextStep = function () {
             IncrementalUpdate.setBulkContentHosts(nutupane.getAllSelectedResults());
+            if ($scope.errata) {
+                IncrementalUpdate.setErrataIds([$scope.errata['errata_id']]);
+            }
 
             if ($scope.errata && $scope.errata.id) {
                 $scope.transitionTo('erratum.apply', {errataId: $scope.errata.id});

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

@@ -129,17 +129,6 @@
             searchId = Task.registerSearch(taskSearchParams, taskSearchComplete);
             return deferred.promise;
         };
-
-        /**
-         * Determines whether or not errata can be applied.
-         *
-         * For now, simply checks if the parameters exist.
-         *
-         * @returns boolean
-         */
-        this.canApply = function () {
-            return this.errataIds.length > 0 && this.contentHostIds.length > 0;
-        };
     }
 
     angular.module('Bastion.errata').service('IncrementalUpdate', IncrementalUpdate);

data/lib/katello/engine.rb

@@ -40,7 +40,8 @@ module Katello
           :url => 'https://localhost:8443/candlepin',
           :oauth_key => 'katello',
           :oauth_secret => 'katello',
-          :ca_cert_file => nil
+          :ca_cert_file => nil,
+          :bulk_load_size => 1000
         }
       }
 
@@ -193,6 +194,7 @@ module Katello
       ::Setting.send :include, Katello::Concerns::SettingExtensions
       ::Container.send :include, Katello::Concerns::ContainerExtensions
       ::DockerContainerWizardState.send :include, Katello::Concerns::DockerContainerWizardStateExtensions
+      ::DockerContainerWizardStates::Image.send :include, Katello::Concerns::DockerContainerWizardStateImageExtensions
 
       #Controller extensions
       ::HostsController.send :include, Katello::Concerns::HostsControllerExtensions

data/lib/katello/plugin.rb

@@ -244,16 +244,18 @@ Foreman::Plugin.register :katello do
                   'bastion/bastion/index_ie should have a permission that grants access'
                 ])
 
-  add_controller_action_scope(HostsController, :index) do |base_scope|
-    base_scope
-      .preload(:content_view, :lifecycle_environment, :subscription_facet)
-      .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
-  end
+  in_to_prepare do
+    add_controller_action_scope(HostsController, :index) do |base_scope|
+      base_scope
+        .preload(:content_view, :lifecycle_environment, :subscription_facet)
+        .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
+    end
 
-  add_controller_action_scope(Api::V2::HostsController, :index) do |base_scope|
-    base_scope
-      .preload(:content_view, :lifecycle_environment, :subscription_facet)
-      .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
+    add_controller_action_scope(Api::V2::HostsController, :index) do |base_scope|
+      base_scope
+        .preload(:content_view, :lifecycle_environment, :subscription_facet)
+        .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
+    end
   end
 
   register_info_provider Katello::Host::InfoProvider

data/lib/katello/tasks/clean_backend_objects.rake

@@ -1,42 +1,73 @@
 namespace :katello do
   desc "Cleans backend objects (hosts) that are missing in one or more backend systems.  Run with COMMIT=true to commit changes."
   task :clean_backend_objects => ["environment", "check_ping"] do
-    def cleanup_hosts
-      Host.includes(:content_facet, :subscription_facet).find_each do |host|
-        if test_candlepin(host) || test_pulp(host)
-          print "Host #{host.id} #{host.name} #{host.subscription_facet.try(:uuid)} is partially missing.  Un-registering\n"
-          execute("Failed to delete host") { ForemanTasks.sync_task(::Actions::Katello::Host::Unregister, host) }
-        end
+    class BackendCleaner
+      def initialize
+        @candlepin_uuids = []
+        @pulp_uuids = []
+        @katello_candlepin_uuids = []
+        @katello_pulp_uuids = []
+      end
+
+      def populate!
+        @candlepin_uuids = Katello::Resources::Candlepin::Consumer.all_uuids
+        @katello_candlepin_uuids = Katello::Host::SubscriptionFacet.pluck(:uuid).compact
+
+        @pulp_uuids = ::Katello.pulp_server.extensions.consumer.retrieve_all.map { |consumer| consumer['id'] }
+        @katello_pulp_uuids = Katello::Host::ContentFacet.pluck(:uuid).compact
+      end
+
+      def hosts_with_no_subscriptions
+        ::Host.where(:id => Katello::Host::SubscriptionFacet.where(:uuid => @katello_candlepin_uuids - @candlepin_uuids).select(:host_id))
+      end
+
+      def hosts_with_no_content
+        ::Host.where(:id => Katello::Host::ContentFacet.where(:uuid => @katello_pulp_uuids - @pulp_uuids).select(:host_id))
+      end
+
+      def hosts_with_nil_facets
+        nil_sub = Katello::Host::SubscriptionFacet.where(:uuid => nil).select(:host_id).to_sql
+        ::Host.where(" id in (#{nil_sub})")
       end
-    end
 
-    def test_pulp(host)
-      if host.content_facet.try(:uuid)
-        test_method { Katello.pulp_server.extensions.consumer.retrieve(host.content_facet.uuid) }
-      else
-        false
+      def cp_orphaned_host_uuids
+        @candlepin_uuids - @katello_candlepin_uuids
+      end
+
+      def pulp_orphaned_host_uuids
+        @pulp_uuids - @katello_pulp_uuids
       end
     end
 
-    def test_candlepin(host)
-      if host.subscription_facet && host.subscription_facet.uuid
-        test_method { ::Katello::Resources::Candlepin::Consumer.get(host.subscription_facet.uuid) }
-      elsif host.subscription_facet
-        true
-      else
-        false
+    def cleanup_hosts(cleaner)
+      cleaner.hosts_with_nil_facets.each do |host|
+        print "Host #{host.id} #{host.name} is partially missing subscription information.  Un-registering\n"
+        execute("Failed to delete host") { ForemanTasks.sync_task(::Actions::Katello::Host::Unregister, host) }
+      end
+
+      cleaner.hosts_with_no_subscriptions.each do |host|
+        print "Host #{host.id} #{host.name} #{host.subscription_facet.try(:uuid)} is partially missing subscription information.  Un-registering\n"
+        execute("Failed to delete host") { ForemanTasks.sync_task(::Actions::Katello::Host::Unregister, host) }
+      end
+
+      cleaner.hosts_with_no_content.each do |host|
+        print "Host #{host.id} #{host.name} #{host.content_facet.try(:uuid)} is partially missing content information.  Un-registering\n"
+        execute("Failed to delete host") { ForemanTasks.sync_task(::Actions::Katello::Host::Unregister, host) }
       end
     end
 
-    def test_method
-      yield
-      false
-    rescue RestClient::ResourceNotFound
-      true
-    rescue RestClient::Gone
-      true
-    rescue RestClient::Conflict
-      true
+    def clean_backend_orphans(cleaner)
+      cp_uuids = cleaner.cp_orphaned_host_uuids
+      print "#{cp_uuids.count} orphaned consumer id(s) found in candlepin.\n"
+      cp_uuids.each do |consumer_id|
+        execute("exception when destroying candlepin consumer #{consumer_id}") { Katello::Resources::Candlepin::Consumer.destroy(consumer_id) }
+      end
+
+      pulp_uuids = cleaner.pulp_orphaned_host_uuids
+      print "#{pulp_uuids.count} orphaned consumer id(s) found in pulp.\n"
+      pulp_uuids.each do |consumer_id|
+        execute("exception when destroying pulp consumer #{consumer_id}") { Katello.pulp_server.extensions.consumer.delete(consumer_id) }
+      end
     end
 
     # rubocop:disable HandleExceptions
@@ -50,21 +81,16 @@ namespace :katello do
       print e.inspect
     end
 
-    def clean_backend_orphans
-      consumer_ids = Katello::Candlepin::Consumer.orphaned_consumer_ids
-      print "#{consumer_ids.count} orphaned consumer id(s) found.\n"
-      consumer_ids.each do |consumer_id|
-        execute("exception when destroying candlepin consumer #{consumer_id}") { Katello::Resources::Candlepin::Consumer.destroy(consumer_id) }
-        execute("exception when destroying pulp consumer #{consumer_id}") { Katello.pulp_server.extensions.consumer.delete(consumer_id) }
-      end
-    end
-
     unless ENV['COMMIT'] == 'true'
       print "The following changes will not actually be performed.  Rerun with COMMIT=true to apply the changes\n"
     end
 
+    SETTINGS[:katello][:candlepin][:bulk_load_size] = 15_000
     User.current = User.anonymous_admin
-    cleanup_hosts
-    clean_backend_orphans
+    cleaner = BackendCleaner.new
+    cleaner.populate!
+
+    cleanup_hosts(cleaner)
+    clean_backend_orphans(cleaner)
   end
 end

data/lib/katello/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.5.0.rc2
+  version: 3.5.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -844,6 +844,7 @@ files:
 - app/models/katello/concerns/content_facet_host_extensions.rb
 - app/models/katello/concerns/content_view_filter_rule_common.rb
 - app/models/katello/concerns/docker_container_wizard_state_extensions.rb
+- app/models/katello/concerns/docker_container_wizard_state_image_extensions.rb
 - app/models/katello/concerns/environment_extensions.rb
 - app/models/katello/concerns/host_managed_extensions.rb
 - app/models/katello/concerns/hostgroup_extensions.rb
@@ -1416,6 +1417,7 @@ files:
 - db/migrate/20170718142148_create_katello_subscription_facet_pools.rb
 - db/migrate/20170821170915_add_index_to_installed_packages.rb
 - db/migrate/20170821170916_add_nvra_index_to_installed_packages.rb
+- db/migrate/20170822104447_add_katello_content_to_image.rb
 - db/migrate/20170913183848_add_errata_counts.rb
 - db/migrate/20171010170443_add_index_to_katello_content_facet_errata.rb
 - db/seeds.d/101-locations.rb
@@ -1641,6 +1643,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifests/docker-manifest.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifests/docker-manifests.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-details.controller.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-environments.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-details.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-environments.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-info.html
@@ -2089,9 +2092,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: []
 rubyforge_project: 
 rubygems_version: 2.4.6