katello 3.12.1 → 3.12.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/lib/actions/katello/repository/discover.rb +10 -12
- data/app/models/katello/host/subscription_facet.rb +5 -2
- data/app/models/katello/repository.rb +1 -1
- data/app/views/katello/api/v2/content_credentials/show.json.rabl +12 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-repositories.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js +7 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +1 -1
- data/lib/katello/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e3ef2a6f301c82689e48ffc4b9c4083b30520f8fd5452e9289cbdea4cc24b9d4
|
4
|
+
data.tar.gz: 7d2ce23015ff638867ab8ee8bd9869908119787adfea5cbee4f670503354a1fc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 463318dc443c762c2c8ff801ef80b27832393bae009df0cf3db72a57faa552a1f04aea15ea44c30d994c272a15372a25d7ae74846de396f87d9bc2c8832ba11a
|
7
|
+
data.tar.gz: 8863c9e32f07ee9c3acbc3abfe3fcd0daacef2607a2e2b2dee904838f1d817e04f7c7b74546840c9949ed0a18b223dd53ca381693de6f07a4fb8b4e745d36593
|
@@ -1,8 +1,9 @@
|
|
1
1
|
module Actions
|
2
2
|
module Katello
|
3
3
|
module Repository
|
4
|
-
class Discover < Actions::
|
4
|
+
class Discover < Actions::EntryAction
|
5
5
|
include Dynflow::Action::Cancellable
|
6
|
+
include EncryptValue
|
6
7
|
|
7
8
|
input_format do
|
8
9
|
param :url, String
|
@@ -17,7 +18,8 @@ module Actions
|
|
17
18
|
end
|
18
19
|
|
19
20
|
def plan(url, content_type, upstream_username, upstream_password, search)
|
20
|
-
|
21
|
+
password = encrypt_field(upstream_password)
|
22
|
+
plan_self(url: url, content_type: content_type, upstream_username: upstream_username, upstream_password: password, search: search)
|
21
23
|
end
|
22
24
|
|
23
25
|
def run(event = nil)
|
@@ -25,14 +27,15 @@ module Actions
|
|
25
27
|
output[:crawled] = output[:crawled] || []
|
26
28
|
output[:to_follow] = output[:to_follow] || [input[:url]]
|
27
29
|
|
28
|
-
repo_discovery = ::Katello::RepoDiscovery.new(input[:url], input[:content_type],
|
29
|
-
input[:upstream_username], input[:upstream_password],
|
30
|
-
input[:search], proxy,
|
31
|
-
output[:crawled], output[:repo_urls], output[:to_follow])
|
32
|
-
|
33
30
|
match(event,
|
34
31
|
(on nil do
|
35
32
|
unless output[:to_follow].empty?
|
33
|
+
password = decrypt_field(input[:upstream_password])
|
34
|
+
repo_discovery = ::Katello::RepoDiscovery.new(input[:url], input[:content_type],
|
35
|
+
input[:upstream_username], password,
|
36
|
+
input[:search], proxy,
|
37
|
+
output[:crawled], output[:repo_urls], output[:to_follow])
|
38
|
+
|
36
39
|
repo_discovery.run(output[:to_follow].shift)
|
37
40
|
suspend { |suspended_action| world.clock.ping suspended_action, 0.001 }
|
38
41
|
end
|
@@ -42,11 +45,6 @@ module Actions
|
|
42
45
|
end))
|
43
46
|
end
|
44
47
|
|
45
|
-
# @return <String> urls found by the action
|
46
|
-
def task_input
|
47
|
-
input[:url]
|
48
|
-
end
|
49
|
-
|
50
48
|
# @return [Array<String>] urls found by the action
|
51
49
|
def task_output
|
52
50
|
output[:repo_urls] || []
|
@@ -264,8 +264,11 @@ module Katello
|
|
264
264
|
{:org_name => organization.name, :host_name => host_name }
|
265
265
|
end
|
266
266
|
|
267
|
-
if hosts_size == 1
|
268
|
-
|
267
|
+
if hosts_size == 1
|
268
|
+
host = hosts.first
|
269
|
+
found_uuid = host.fact_values.find { |fv| fv.fact_name_id == uuid_fact_id }
|
270
|
+
|
271
|
+
return host if host.name == host_name && (host.build || found_uuid&.value == host_uuid)
|
269
272
|
end
|
270
273
|
|
271
274
|
hostnames = hosts.pluck(:name).sort.join(', ')
|
@@ -628,7 +628,7 @@ module Katello
|
|
628
628
|
!self.yum? || # non-yum repos
|
629
629
|
self.in_default_view? || # default content view repos
|
630
630
|
(self.archive? && !self.content_view.composite) || # non-composite content view archive repos
|
631
|
-
(self.content_view.composite? && self.component_source_repositories.count > 1) # composite archive repo with more than 1 source repository
|
631
|
+
(self.archive? && self.content_view.composite? && self.component_source_repositories.count > 1) # composite archive repo with more than 1 source repository
|
632
632
|
end
|
633
633
|
|
634
634
|
# 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
|
@@ -23,7 +23,9 @@ child :root_repositories => :gpg_key_repos do
|
|
23
23
|
attribute :id
|
24
24
|
attribute :name
|
25
25
|
attribute :content_type
|
26
|
-
|
26
|
+
node :library_instance_id do |root|
|
27
|
+
root.library_instance.id
|
28
|
+
end
|
27
29
|
child :product do |_product|
|
28
30
|
attributes :id, :cp_id, :name
|
29
31
|
end
|
@@ -44,7 +46,9 @@ child :ssl_ca_root_repos => :ssl_ca_root_repos do
|
|
44
46
|
attribute :id
|
45
47
|
attribute :name
|
46
48
|
attribute :content_type
|
47
|
-
|
49
|
+
node :library_instance_id do |root|
|
50
|
+
root.library_instance.id
|
51
|
+
end
|
48
52
|
child :product do |_product|
|
49
53
|
attributes :id, :cp_id, :name
|
50
54
|
end
|
@@ -65,7 +69,9 @@ child :ssl_client_root_repos => :ssl_client_root_repos do
|
|
65
69
|
attribute :id
|
66
70
|
attribute :name
|
67
71
|
attribute :content_type
|
68
|
-
|
72
|
+
node :library_instance_id do |root|
|
73
|
+
root.library_instance.id
|
74
|
+
end
|
69
75
|
child :product do |_product|
|
70
76
|
attributes :id, :cp_id, :name
|
71
77
|
end
|
@@ -86,7 +92,9 @@ child :ssl_key_root_repos => :ssl_key_root_repos do
|
|
86
92
|
attribute :id
|
87
93
|
attribute :name
|
88
94
|
attribute :content_type
|
89
|
-
|
95
|
+
node :library_instance_id do |root|
|
96
|
+
root.library_instance.id
|
97
|
+
end
|
90
98
|
child :product do |_product|
|
91
99
|
attributes :id, :cp_id, :name
|
92
100
|
end
|
@@ -25,7 +25,7 @@
|
|
25
25
|
<tbody>
|
26
26
|
<tr ng-repeat="repository in table.rows | filter:contentCredentialRepositoryFilter">
|
27
27
|
<td>
|
28
|
-
<a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.
|
28
|
+
<a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.library_instance_id})">{{ repository.name }}</a>
|
29
29
|
</td>
|
30
30
|
<td>
|
31
31
|
<a ui-sref="product.repositories({productId: repository.product.id})">
|
data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js
CHANGED
@@ -28,7 +28,8 @@
|
|
28
28
|
state: 'content-views',
|
29
29
|
resource: 'ContentView',
|
30
30
|
display: translate('Content Views'),
|
31
|
-
params: {nondefault: true}
|
31
|
+
params: {nondefault: true},
|
32
|
+
autoLoad: true
|
32
33
|
}, {
|
33
34
|
state: 'repositories',
|
34
35
|
resource: 'Repository',
|
@@ -87,11 +88,13 @@
|
|
87
88
|
};
|
88
89
|
|
89
90
|
this.buildNutupane = function (params) {
|
90
|
-
var nutupane;
|
91
|
+
var nutupane, type;
|
92
|
+
|
93
|
+
type = this.getCurrentContentType();
|
91
94
|
|
92
95
|
params = params || {};
|
93
|
-
params = angular.extend(params,
|
94
|
-
nutupane = new Nutupane($injector.get(
|
96
|
+
params = angular.extend(params, type.params);
|
97
|
+
nutupane = new Nutupane($injector.get(type.resource), params, 'queryPaged', { 'disableAutoLoad': !type.autoLoad });
|
95
98
|
|
96
99
|
return nutupane;
|
97
100
|
};
|
data/lib/katello/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: katello
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.12.
|
4
|
+
version: 3.12.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- N/A
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-07
|
11
|
+
date: 2019-08-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|