katello 3.12.1 → 3.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45cc83708ed5880a23368a5f1b29b58e0c442475b96036d324f6e92c4d5aa308
-  data.tar.gz: e23464e83cf613250d03c4b980482716a5f5cee3640784669f5a8b7c0a09cc4f
+  metadata.gz: e3ef2a6f301c82689e48ffc4b9c4083b30520f8fd5452e9289cbdea4cc24b9d4
+  data.tar.gz: 7d2ce23015ff638867ab8ee8bd9869908119787adfea5cbee4f670503354a1fc
 SHA512:
-  metadata.gz: 75174382112a3331e2917fb949f30c66987b9a7b5b0f71363de706ca8f4b85094f662c25310b3cc37500e49c07f4b2c9d5011030926a5dc7e5dfcffa026e840c
-  data.tar.gz: 5ce0ed0ad5fd4f2666730c73d5ece96452132b5a6e26702d0c36eb14422392dc6b6852ce30189a167a2f47b382b9884102fb742c91262b74527210e47e4a7967
+  metadata.gz: 463318dc443c762c2c8ff801ef80b27832393bae009df0cf3db72a57faa552a1f04aea15ea44c30d994c272a15372a25d7ae74846de396f87d9bc2c8832ba11a
+  data.tar.gz: 8863c9e32f07ee9c3acbc3abfe3fcd0daacef2607a2e2b2dee904838f1d817e04f7c7b74546840c9949ed0a18b223dd53ca381693de6f07a4fb8b4e745d36593

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

@@ -1,8 +1,9 @@
 module Actions
   module Katello
     module Repository
-      class Discover < Actions::Base
+      class Discover < Actions::EntryAction
         include Dynflow::Action::Cancellable
+        include EncryptValue
 
         input_format do
           param :url, String
@@ -17,7 +18,8 @@ module Actions
         end
 
         def plan(url, content_type, upstream_username, upstream_password, search)
-          plan_self(url: url, content_type: content_type, upstream_username: upstream_username, upstream_password: upstream_password, search: search)
+          password = encrypt_field(upstream_password)
+          plan_self(url: url, content_type: content_type, upstream_username: upstream_username, upstream_password: password, search: search)
         end
 
         def run(event = nil)
@@ -25,14 +27,15 @@ module Actions
           output[:crawled] = output[:crawled] || []
           output[:to_follow] = output[:to_follow] || [input[:url]]
 
-          repo_discovery = ::Katello::RepoDiscovery.new(input[:url], input[:content_type],
-                                                        input[:upstream_username], input[:upstream_password],
-                                                        input[:search], proxy,
-                                                        output[:crawled], output[:repo_urls], output[:to_follow])
-
           match(event,
             (on nil do
               unless output[:to_follow].empty?
+                password = decrypt_field(input[:upstream_password])
+                repo_discovery = ::Katello::RepoDiscovery.new(input[:url], input[:content_type],
+                                                              input[:upstream_username], password,
+                                                              input[:search], proxy,
+                                                              output[:crawled], output[:repo_urls], output[:to_follow])
+
                 repo_discovery.run(output[:to_follow].shift)
                 suspend { |suspended_action| world.clock.ping suspended_action, 0.001 }
               end
@@ -42,11 +45,6 @@ module Actions
             end))
         end
 
-        # @return <String> urls found by the action
-        def task_input
-          input[:url]
-        end
-
         # @return [Array<String>] urls found by the action
         def task_output
           output[:repo_urls] || []

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

@@ -264,8 +264,11 @@ module Katello
                    {:org_name => organization.name, :host_name => host_name }
         end
 
-        if hosts_size == 1 && hosts.joins(:subscription_facet).empty?
-          return hosts.first
+        if hosts_size == 1
+          host = hosts.first
+          found_uuid = host.fact_values.find { |fv| fv.fact_name_id == uuid_fact_id }
+
+          return host if host.name == host_name && (host.build || found_uuid&.value == host_uuid)
         end
 
         hostnames = hosts.pluck(:name).sort.join(', ')

data/app/models/katello/repository.rb

@@ -628,7 +628,7 @@ module Katello
       !self.yum? || # non-yum repos
           self.in_default_view? || # default content view repos
           (self.archive? && !self.content_view.composite) || # non-composite content view archive repos
-          (self.content_view.composite? && self.component_source_repositories.count > 1) # composite archive repo with more than 1 source repository
+          (self.archive? && self.content_view.composite? && self.component_source_repositories.count > 1) # composite archive repo with more than 1 source repository
     end
 
     # a link repository has no content in the pulp repository and serves as a shell.  It will always be empty.  Only the YumCloneDistributor can be used

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

@@ -23,7 +23,9 @@ child :root_repositories => :gpg_key_repos do
   attribute :id
   attribute :name
   attribute :content_type
-
+  node :library_instance_id do |root|
+    root.library_instance.id
+  end
   child :product do |_product|
     attributes :id, :cp_id, :name
   end
@@ -44,7 +46,9 @@ child :ssl_ca_root_repos => :ssl_ca_root_repos do
   attribute :id
   attribute :name
   attribute :content_type
-
+  node :library_instance_id do |root|
+    root.library_instance.id
+  end
   child :product do |_product|
     attributes :id, :cp_id, :name
   end
@@ -65,7 +69,9 @@ child :ssl_client_root_repos => :ssl_client_root_repos do
   attribute :id
   attribute :name
   attribute :content_type
-
+  node :library_instance_id do |root|
+    root.library_instance.id
+  end
   child :product do |_product|
     attributes :id, :cp_id, :name
   end
@@ -86,7 +92,9 @@ child :ssl_key_root_repos => :ssl_key_root_repos do
   attribute :id
   attribute :name
   attribute :content_type
-
+  node :library_instance_id do |root|
+    root.library_instance.id
+  end
   child :product do |_product|
     attributes :id, :cp_id, :name
   end

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

@@ -25,7 +25,7 @@
       <tbody>
         <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>
+            <a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.library_instance_id})">{{ repository.name }}</a>
           </td>
           <td>
             <a ui-sref="product.repositories({productId: repository.product.id})">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js

@@ -28,7 +28,8 @@
                 state: 'content-views',
                 resource: 'ContentView',
                 display: translate('Content Views'),
-                params: {nondefault: true}
+                params: {nondefault: true},
+                autoLoad: true
             }, {
                 state: 'repositories',
                 resource: 'Repository',
@@ -87,11 +88,13 @@
         };
 
         this.buildNutupane = function (params) {
-            var nutupane;
+            var nutupane, type;
+
+            type = this.getCurrentContentType();
 
             params = params || {};
-            params = angular.extend(params, getContentType(currentState()).params);
-            nutupane = new Nutupane($injector.get(getContentType(currentState()).resource), params, 'queryPaged', { 'disableAutoLoad': true });
+            params = angular.extend(params, type.params);
+            nutupane = new Nutupane($injector.get(type.resource), params, 'queryPaged', { 'disableAutoLoad': !type.autoLoad });
 
             return nutupane;
         };

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

@@ -21,7 +21,7 @@
       </dd>
 
       <dt translate>Backend Identifier</dt>
-      <dd>{{ repository.pulp_id }}</dd>
+      <dd>{{ repository.backend_identifier }}</dd>
 
       <dt translate>Type</dt>
       <dd>{{ repository.content_type }}</dd>

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.12.1".freeze
+  VERSION = "3.12.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.12.1
+  version: 3.12.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails