katello 3.11.0.rc1 → 3.11.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a32463caf56384a932ac684b0b75d47c98ae21e6b3b3bbca2b66a4f0cf6d5c9
-  data.tar.gz: 708211d7fd9d19eebf438ae7656aba6425bbeab7e93118adc44480af84e48b5c
+  metadata.gz: 33692b74c9a55f4c19bfe2791e7b6ea3c9e480441f8e6069916702f12d061287
+  data.tar.gz: 534f1a11e88cecf4a44218d51019cf2aaa567b310314c9dc415ab0b3e09ebd56
 SHA512:
-  metadata.gz: 80f6db1719414ea26a9391e4a245961a580b050c62e0f8dfa355fe9d00398e629c2b04c87e810b374af8a0328497881301e110f9b090ef48888d2f6d368df948
-  data.tar.gz: b9676a10313f563208e0982ecdf209886ea17d19755ffe52f42303ebed127ce42994c35bca39e3fd016e442b67edbe3f2a68340a3b58c57f7006783949a67f51
+  metadata.gz: 3bd83f58ccd7cc236b1de78e2c8004ad6a870791b9bb9cfc4b2051d5af29fe71d1df61a4cb177473a07c88fb057cd2703c247eaa909684332cd7b6bc3a848564
+  data.tar.gz: 844f4cac7b5f9263c0b7a4c3883d1a53cf8fb73626860cda4ca94b66875022b5a60c8e25557442770700b6bfe58d5f661448bbb3371aa7779be1cb6b339f710d

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

@@ -4,7 +4,7 @@ module Katello
     include Katello::Concerns::Api::V2::RepositoryContentController
 
     before_action :find_host, :only => [:index, :available_errata]
-    before_action :find_optional_organization, :only => :available_errata
+    before_action :find_optional_organization, :only => [:index, :auto_complete_search, :available_errata]
     before_action :find_environment, :only => :available_errata
     before_action :find_filter, :only => :available_errata
 

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

@@ -1,3 +1,4 @@
+# rubocop:disable HandleExceptions
 require 'fileutils'
 require 'English'
 
@@ -35,6 +36,11 @@ module Actions
           delete_tmp_files(tmp_files) if $ERROR_INFO && tmp_files
         end
 
+        def run
+          ForemanTasks.async_task(Repository::CapsuleSync, ::Katello::Repository.find(input[:repository][:id]))
+        rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
+        end
+
         def humanized_name
           _("Upload into")
         end

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

@@ -19,7 +19,7 @@ module Katello
         end
 
         def generate_distributors
-          puppet_install_dist = Runcible::Models::PuppetInstallDistributor.new(puppet_install_distributor_path, :id => repo.pulp_id, :auto_publish => false)
+          puppet_install_dist = Runcible::Models::PuppetInstallDistributor.new(puppet_install_distributor_path, :subdir => 'modules', :id => repo.pulp_id, :auto_publish => false)
           puppet_dist = Runcible::Models::PuppetDistributor.new(nil, (root.unprotected || false), true,
                                                                 :id => "#{repo.pulp_id}_puppet", :auto_publish => true)
           [puppet_dist, puppet_install_dist]
@@ -27,7 +27,7 @@ module Katello
 
         def puppet_install_distributor_path
           puppet_env = ::Environment.construct_name(repo.organization, repo.environment, repo.content_view)
-          ::File.join(smart_proxy.puppet_path, puppet_env, 'modules')
+          ::File.join(smart_proxy.puppet_path, puppet_env)
         end
 
         def partial_repo_path

data/app/services/katello/repository_type.rb

@@ -29,12 +29,12 @@ module Katello
       self.id.to_s <=> other.id.to_s
     end
 
-    def as_json(options = {})
-      ret = super(options)
-      ret[:name] = self.id.to_s
-      ret[:creatable] = @allow_creation_by_user
-      ret.delete("allow_creation_by_user")
-      ret
+    def as_json(_options = {})
+      {
+        :name => self.id.to_s,
+        :id => self.id,
+        :creatable => @allow_creation_by_user
+      }
     end
   end
 end

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -16,7 +16,7 @@ module BastionKatello
         :name => 'bastion_katello',
         :javascript => proc do
           [
-            javascript_include_tag(*webpack_asset_paths('katello_common', :extension => 'js'), "data-turbolinks-track" => true),
+            javascript_include_tag(*webpack_asset_paths('katello:common', :extension => 'js'), "data-turbolinks-track" => true),
             javascript_include_tag('bastion_katello/bastion_katello')
           ]
         end,

data/lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake

@@ -5,10 +5,17 @@ namespace :katello do
       task :update_puppet_repos => %w(environment) do
         User.current = User.anonymous_admin
         Katello::Repository.puppet_type.each do |repo|
-          puts "Refreshing repository #{repo.label} (#{repo.id})"
-          install_dist = repo.backend_service(SmartProxy.pulp_master).backend_data['distributors'].find { |dist| dist['distributor_type_id'] == 'puppet_install_distributor' }
-          SmartProxy.pulp_master.pulp_api.resources.repository.delete_distributor(repo.pulp_id, install_dist['id'])
-          ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
+          begin
+            puts "Refreshing repository #{repo.label} (#{repo.id})"
+            install_dist = repo.backend_service(SmartProxy.pulp_master).backend_data['distributors'].find { |dist| dist['distributor_type_id'] == 'puppet_install_distributor' }
+            if install_dist
+              SmartProxy.pulp_master.pulp_api.resources.repository.delete_distributor(repo.pulp_id, install_dist['id'])
+            end
+            ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
+          rescue RestClient::ResourceNotFound
+            Rails.logger.warn("Recieved 404 on repository: #{repo.id} - #{repo.name}")
+            next
+          end
         end
       end
     end

data/lib/katello/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.11.0.rc1
+  version: 3.11.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,7 +176,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0