katello 3.10.0.rc1.1 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1684a0dc74546bf1ae0268fec4e40a5359bb3e2b9852ecefb78b65d8d9e76ce2
-  data.tar.gz: ead5ba3429716c8fbf2fad95040a1a4542f7d5e2b8a6b75dcacbd557c4aaef13
+  metadata.gz: 549f4d68cf5b318cdd905af9f64484b4b9e72c47a63e97c9762eb8d1a9bfd727
+  data.tar.gz: e3ffb0fc087a2af96c68197dfde40416216d0d63c89e34106b89c6bf5d4282c7
 SHA512:
-  metadata.gz: 26f6eb57a2d9dd32ca9be6e7065d7dcd224b44ea9c765384d8ab4860e066fae4aa7dbbc8c4c49e07a9fd11ae7f733fb101cae68213a0d031612d6a266eee5f0d
-  data.tar.gz: 31bb715ce69dd9fcb055d279fec29d1a0c3d0b327d0b0b5ea5b7501552fbd7f153247847ba794f640ad94fb2f2e720dc7bd221c7da9aec659dd3ecf79deca375
+  metadata.gz: 0d0d88d495d52f78327a79dc19ece1997275474e3ee33049b681540eb18242a75b0a097c272d7d61e602d4c1cb400fb86b170727b74501bfeb9595eecbdb3fe9
+  data.tar.gz: 9362b8d400c5424c60de7b58f99c538fe45dcba35c280204243045e110d1086fee3159e853234365d07214fcb60ba7d3c95429695f4056b87da57fa7bba21083

data/app/lib/actions/candlepin/import_pool_handler.rb

@@ -25,7 +25,7 @@ module Actions
         when /pool\.created/
           message_handler.import_pool
         when /pool\.deleted/
-          message_handler.import_pool
+          message_handler.delete_pool
         when /^compliance\.created/
           reindex_subscription_status
         when /system_purpose_compliance\.created/

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

@@ -3,7 +3,7 @@ module Katello
     module Candlepin
       class Job < CandlepinResource
         class << self
-          NOT_FINISHED_STATES = %w(CREATED PENDING RUNNING).freeze unless defined? NOT_FINISHED_STATES
+          NOT_FINISHED_STATES = %w(CREATED WAITING PENDING RUNNING).freeze unless defined? NOT_FINISHED_STATES
 
           def not_finished?(job)
             NOT_FINISHED_STATES.include?(job[:state])

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

@@ -85,6 +85,13 @@ module Katello
           ::Katello::Pool.import_pool(pool_id, index_hosts)
         end
       end
+
+      def delete_pool
+        if pool
+          Rails.logger.info "deleting pool #{pool.id} from Katello"
+          pool.destroy!
+        end
+      end
     end
   end
 end

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

@@ -19,7 +19,7 @@ child :products => :gpg_key_products do
   end
 end
 
-child :repositories => :gpg_key_repos do
+child :root_repositories => :gpg_key_repos do
   attribute :id
   attribute :name
   attribute :content_type
@@ -40,7 +40,7 @@ child :ssl_ca_products => :ssl_ca_products do
   end
 end
 
-child :ssl_ca_repos => :ssl_ca_repos do
+child :ssl_ca_root_repos => :ssl_ca_root_repos do
   attribute :id
   attribute :name
   attribute :content_type
@@ -61,7 +61,7 @@ child :ssl_client_products => :ssl_client_products do
   end
 end
 
-child :ssl_client_repos => :ssl_client_repos do
+child :ssl_client_root_repos => :ssl_client_root_repos do
   attribute :id
   attribute :name
   attribute :content_type
@@ -82,7 +82,7 @@ child :ssl_key_products => :ssl_key_products do
   end
 end
 
-child :ssl_key_repos => :ssl_key_repos do
+child :ssl_key_root_repos => :ssl_key_root_repos do
   attribute :id
   attribute :name
   attribute :content_type

data/db/seeds.d/111-upgrade_tasks.rb

@@ -4,6 +4,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:correct_puppet_environments', :long_running => true, :skip_failure => true, :always_run => true},
     {:name => 'katello:clean_backend_objects', :long_running => true, :skip_failure => true, :always_run => true},
     {:name => 'katello:upgrades:3.8:clear_checksum_type'},
-    {:name => 'katello:upgrades:3.9:migrate_sync_plans'}
+    {:name => 'katello:upgrades:3.9:migrate_sync_plans'},
+    {:name => 'katello:upgrades:3.10:clear_invalid_repo_credentials'}
   ]
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/content-credential.factory.js

@@ -7,77 +7,75 @@
  * @description
  *   Provides a BastionResource for Content Credentials.
  */
-angular.module('Bastion.content-credentials').factory('ContentCredential',
-    ['BastionResource', 'CurrentOrganization',
-    function (BastionResource, CurrentOrganization) {
+angular.module("Bastion.content-credentials").factory("ContentCredential", [
+    "BastionResource",
+    "CurrentOrganization",
+    function(BastionResource, CurrentOrganization) {
+        var repoTypeMap = {
+            "gpg_key_repos": "GPG Key",
+            "ssl_ca_root_repos": "SSL CA Cert",
+            "ssl_client_root_repos": "SSL Client Cert",
+            "ssl_key_root_repos": "SSL Client Key"
+        };
 
-        return BastionResource('katello/api/v2/content_credentials/:id/:action',
-            {id: '@id', 'organization_id': CurrentOrganization},
-            {
-                autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
-                update: {method: 'PUT'},
-                products: {method: 'GET', transformResponse:
-                    function (data) {
-                        var contentCredential = angular.fromJson(data);
-                        var allProducts = {};
-                        allProducts.length = 0;
-                        allProducts.products = {};
+        var productTypeMap = {
+            "gpg_key_products": "GPG Key",
+            "ssl_ca_products": "SSL CA Cert",
+            "ssl_client_products": "SSL Client Cert",
+            "ssl_key_products": "SSL Client Key"
+        };
 
-                        function collectProducts(allP, thisP, usedAs) {
-                            var key;
-                            for (key in thisP) {
-                                if (thisP.hasOwnProperty(key)) {
-                                    thisP[key]["used_as"] = usedAs;
-                                    allP.products[allP.length] = thisP[key];
-                                    allP.length++;
-                                }
-                            }
-                        }
+        function appendData(allData, fullCredential, usedAs) {
+            angular.forEach(fullCredential, function(data) {
+                data.usedAs = usedAs;
+                allData.push(data);
+            });
+        }
 
-                        collectProducts(allProducts, contentCredential.gpg_key_products, "GPG Key");
-                        collectProducts(allProducts, contentCredential.ssl_ca_products, "SSL CA Cert");
-                        collectProducts(allProducts, contentCredential.ssl_client_products, "SSL Client Cert");
-                        collectProducts(allProducts, contentCredential.ssl_key_products, "SSL Client Key");
+        function parseContentCredentialData(data, typeMap) {
+            var contentCredential = angular.fromJson(data);
+            var allData = [];
+            _.forOwn(contentCredential, function(value, key) {
+                if (typeMap.hasOwnProperty(key)) {
+                    appendData(allData, value, typeMap[key]);
+                }
+            });
+            return allData;
+        }
 
+        return BastionResource(
+            "katello/api/v2/content_credentials/:id/:action",
+            { "id": "@id", "organization_id": CurrentOrganization },
+            {
+                autocomplete: {
+                    method: "GET",
+                    isArray: true,
+                    params: { id: "auto_complete_search" }
+                },
+                update: { method: "PUT" },
+                products: {
+                    method: "GET",
+                    transformResponse: function(data) {
+                        var allProducts = parseContentCredentialData(data, productTypeMap);
                         return {
                             total: allProducts.length,
                             subtotal: allProducts.length,
-                            results: allProducts.products
+                            results: allProducts
                         };
                     }
                 },
-                repositories: {method: 'GET', transformResponse:
-                    function (data) {
-                        var contentCredential = angular.fromJson(data);
-                        var allRepos = {};
-                        allRepos.length = 0;
-                        allRepos.repositories = {};
-
-                        function collectRepos(allR, thisR, usedAs) {
-                            var key;
-                            for (key in thisR) {
-                                if (thisR.hasOwnProperty(key)) {
-                                    thisR[key]["used_as"] = usedAs;
-                                    allR.repositories[allR.length] = thisR[key];
-                                    allR.length++;
-                                }
-                            }
-                        }
-
-                        collectRepos(allRepos, contentCredential.gpg_key_repos, "GPG Key");
-                        collectRepos(allRepos, contentCredential.ssl_ca_repos, "SSL CA Cert");
-                        collectRepos(allRepos, contentCredential.ssl_client_repos, "SSL Client Cert");
-                        collectRepos(allRepos, contentCredential.ssl_key_repos, "SSL Client Key");
-
+                repositories: {
+                    method: "GET",
+                    transformResponse: function(data) {
+                        var allRepos = parseContentCredentialData(data, repoTypeMap);
                         return {
                             total: allRepos.length,
                             subtotal: allRepos.length,
-                            results: allRepos.repositories
+                            results: allRepos
                         };
                     }
                 }
             }
         );
-
-    }]
-);
+    }
+]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-products.html

@@ -5,25 +5,32 @@
     You currently don't have any Products associated with this Content Credential.
   </span>
 
+  <div data-block="search">
+    <input type="text" class="form-control" stop-event="click"
+            placeholder="{{ 'Filter...' | translate }}"
+            ng-model="contentCredentialProductFilter"/>
+  </div>
+
+
   <div data-block="table">
     <table bst-table="table" class="table table-striped table-bordered">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="name" sortable><span translate>Name</span></th>
-          <th bst-table-column="used_as" sortable><span translate>Used as</span></th>
+          <th bst-table-column="usedAs" sortable><span translate>Used as</span></th>
           <th bst-table-column class="number-cell" translate>Repositories</th>
         </tr>
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="product in table.rows">
+        <tr bst-table-row ng-repeat="product in table.rows | filter:contentCredentialProductFilter">
           <td bst-table-cell>
             <a ui-sref="product.info({productId: product.id})">
               {{ product.name }}
             </a>
           </td>
           <td bst-table-cell>
-              {{ product.used_as }}
+              {{ product.usedAs }}
           </td>
           <td bst-table-cell class="number-cell">
             <a ui-sref="product.repositories({productId: product.id})">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-repositories.html

@@ -5,6 +5,12 @@
     You currently don't have any Repositories associated with this Content Credential.
   </span>
 
+  <div data-block="search">
+    <input type="text" class="form-control" stop-event="click"
+            placeholder="{{ 'Filter...' | translate }}"
+            ng-model="contentCredentialRepositoryFilter"/>
+  </div>
+
   <div data-block="table">
       <table class="table table-striped table-bordered">
       <thead>
@@ -17,7 +23,7 @@
       </thead>
 
       <tbody>
-        <tr ng-repeat="repository in table.rows">
+        <tr ng-repeat="repository in table.rows | filter:contentCredentialRepositoryFilter">
           <td>
             <a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.id})">{{ repository.name }}</a>
           </td>
@@ -27,7 +33,7 @@
             </a>
           </td>
           <td>{{ repository.content_type }}</td>
-          <td>{{ repository.used_as }}</td>
+          <td>{{ repository.usedAs }}</td>
         </tr>
       </tbody>
     </table>

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

@@ -146,7 +146,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
             var deferred = $q.defer();
 
             Organization.get({id: CurrentOrganization}, function (organization) {
-                deferred.resolve(organization.system_purposes.role);
+                deferred.resolve(organization.system_purposes.roles);
             });
 
             return deferred.promise;

data/lib/katello/tasks/upgrades/3.10/clear_invalid_repo_credentials.rake

@@ -0,0 +1,27 @@
+# Before 3.8, you could successfully edit only the username, or only the
+# password, but since we added a validation now those old repos are now
+# invalid.  This finds those repos and clears their credentials.
+
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.10' do
+      desc "Clear invalid credentials for repositories"
+      task :clear_invalid_repo_credentials => %w(environment) do
+        User.current = User.anonymous_admin
+
+        # Where one, but not both, is set
+        root_repos = Katello::RootRepository.where('(upstream_username IS NULL AND upstream_password is NOT NULL) OR (upstream_username IS NOT NULL AND upstream_password is NULL)')
+
+        root_repos.each do |root_repo|
+          puts "Clearing invalid credentials for #{root_repo.label} (#{root_repo.id})"
+          root_repo.update_attributes(upstream_username: nil, upstream_password: nil)
+
+          root_repo.repositories.each do |repo|
+            puts "Refreshing repository #{repo.label} (#{repo.id})"
+            ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/katello/tasks/upgrades/3.9/migrate_sync_plans.rake

@@ -1,24 +1,44 @@
 namespace :katello do
   namespace :upgrades do
     namespace '3.9' do
+      def importer_type(repo)
+        case repo.content_type
+        when Katello::Repository::YUM_TYPE
+          Runcible::Models::YumImporter::ID
+        when Katello::Repository::FILE_TYPE
+          Runcible::Models::IsoImporter::ID
+        when Katello::Repository::PUPPET_TYPE
+          Runcible::Models::PuppetImporter::ID
+        when Katello::Repository::DOCKER_TYPE
+          Runcible::Models::DockerImporter::ID
+        when Katello::Repository::OSTREE_TYPE
+          Runcible::Models::OstreeImporter::ID
+        when Katello::Repository::DEB_TYPE
+          Runcible::Models::DebImporter::ID
+        else
+          fail _("Unexpected repo type %s") % repo.content_type
+        end
+      end
+
       desc "Migrate Pulp Sync Plans to new recurring logics"
       task :migrate_sync_plans => ["environment"] do
         User.current = User.anonymous_admin
         puts "Starting recurring logic for migrated sync plans and deleting Pulp schedules"
 
         Katello::SyncPlan.find_each do |sync_plan|
-          sync_plan.associate_recurring_logic
-          sync_plan.save!
-          if sync_plan.foreman_tasks_recurring_logic.state.nil?
-            sync_plan.start_recurring_logic
-            sync_plan.foreman_tasks_recurring_logic.enabled = false unless sync_plan.enabled
+          if sync_plan.foreman_tasks_recurring_logic.nil?
+            sync_plan.associate_recurring_logic
+            sync_plan.save!
+            if sync_plan.foreman_tasks_recurring_logic.state.nil?
+              sync_plan.start_recurring_logic
+              sync_plan.foreman_tasks_recurring_logic.enabled = false unless sync_plan.enabled
+            end
           end
-
           sync_plan.products.each do |product|
             product.repos(product.library).each do |repo_k|
               repo = ::Katello::Repository.find(repo_k.id)
               begin
-                Katello.pulp_server.extensions.repository.remove_schedules(repo.pulp_id, repo.importer_type)
+                Katello.pulp_server.extensions.repository.remove_schedules(repo.pulp_id, importer_type(repo))
               rescue RestClient::ResourceNotFound
                 puts "Could not update repository #{repo.id}, missing in pulp."
               end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.10.0.rc1.1".freeze
+  VERSION = "3.10.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.10.0.rc1.1
+  version: 3.10.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2228,6 +2228,7 @@ files:
 - lib/katello/tasks/unify_hosts.rake
 - lib/katello/tasks/update_subscription_facet_backend_data.rake
 - lib/katello/tasks/upgrade_check.rake
+- lib/katello/tasks/upgrades/3.10/clear_invalid_repo_credentials.rake
 - lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake
 - lib/katello/tasks/upgrades/3.9/migrate_sync_plans.rake
 - lib/katello/tasks/virt_who_report.rake
@@ -2655,9 +2656,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.7.6