foreman_rh_cloud 5.0.46 → 6.0.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb +5 -11
  3. data/app/services/foreman_rh_cloud/cert_auth.rb +1 -1
  4. data/app/services/foreman_rh_cloud/cloud_ping_service.rb +1 -1
  5. data/app/services/foreman_rh_cloud/cloud_presence.rb +4 -4
  6. data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb +3 -3
  7. data/config/Gemfile.lock.gh_test +215 -226
  8. data/lib/foreman_inventory_upload/async/upload_report_job.rb +5 -1
  9. data/lib/foreman_rh_cloud/engine.rb +2 -3
  10. data/lib/foreman_rh_cloud/settings.rb +11 -0
  11. data/lib/foreman_rh_cloud/version.rb +1 -1
  12. data/lib/inventory_sync/async/host_result.rb +1 -1
  13. data/package.json +1 -1
  14. data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb +0 -11
  15. data/test/jobs/upload_report_job_test.rb +1 -1
  16. data/webpack/ForemanRhCloudFills.js +1 -1
  17. metadata +4 -5
  18. data/app/models/setting/rh_cloud.rb +0 -29
  19. data/lib/tasks/hybrid_cloud.rake +0 -64
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3ea5b770cae26d383e7b4809c1e00fbb177561b5a32f15cbb6422cff7b793ee5
4
- data.tar.gz: acceb56161f35e3a9edccccb9dfe666801f5856dea00b5e0d1c63a20cee89228
3
+ metadata.gz: c3c56d7e23a70203868099896bbdcf3bb1b6ec31dc5a703a5da9bd147f849a10
4
+ data.tar.gz: d6ea56a9abbc11fad5d4d77347d829a0eb3062af500b8773c9d617235ce0b0fc
5
5
  SHA512:
6
- metadata.gz: 609894df0bb5c2e00d960d8c8be2d9c3938a36379fa447a6bf72fa40b5eb53113f84dd038ba40fa36cd833f975e8f9de589afc7a6f47b4942bf5a6e4aa2d856c
7
- data.tar.gz: 3e620d13c72b977cd3ebdf2f5ad74cf114b23c02db3746c388c3b6788e8aa501d72743f6eaff9588c7cbdbda0a56a1bae2c48da24d69f92742e1e70ee9581763
6
+ metadata.gz: 523354ddf7e4511663d53833823b0e5ffa3128ea9513eeab23b458e23d6f5a76254017ffc52b8f513245f8404e991154123585bc93269f1b72c06ec7512e595a
7
+ data.tar.gz: '03784d6b78c2acf11b084912739cb5714e95f165871db256a260da8aab1e3c3d278eb8120eb2aec673477467da611a02f4ac89b87ed4b60b099a27d51e3c0e5b'
data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb CHANGED
@@ -33,6 +33,10 @@ module InsightsCloud::Api
33
33
  }, status: @cloud_response.code
34
34
  end
35
35
 
36
+ if @cloud_response.headers[:content_disposition]
37
+ return send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
38
+ end
39
+
36
40
  # Append redhat-specific headers
37
41
  @cloud_response.headers.each do |key, value|
38
42
  assign_header(response, @cloud_response, key, false) if key.to_s.start_with?('x_rh_')
@@ -41,17 +45,7 @@ module InsightsCloud::Api
41
45
  assign_header(response, @cloud_response, :x_resource_count, true)
42
46
  headers[Rack::ETAG] = @cloud_response.headers[:etag]
43
47
 
44
- if @cloud_response.headers[:content_disposition]
45
- # If there is a Content-Disposition header, it means we are forwarding binary data, send the raw data with proper
46
- # content type
47
- send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
48
- elsif @cloud_response.headers[:content_type] =~ /zip/
49
- # if there is no Content-Disposition, but the content type is binary according the content type,
50
- # forward the request as binry too
51
- send_data @cloud_response, type: @cloud_response.headers[:content_type]
52
- else
53
- render json: @cloud_response, status: @cloud_response.code
54
- end
48
+ render json: @cloud_response, status: @cloud_response.code
55
49
  end
56
50
 
57
51
  def branch_info
data/app/services/foreman_rh_cloud/cert_auth.rb CHANGED
@@ -13,7 +13,7 @@ module ForemanRhCloud
13
13
  certs = candlepin_id_cert(params.delete(:organization))
14
14
  final_params = {
15
15
  ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
16
- ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
16
+ ssl_client_key: OpenSSL::PKey.read(certs[:key]),
17
17
  }.deep_merge(params)
18
18
 
19
19
  super(final_params)
data/app/services/foreman_rh_cloud/cloud_ping_service.rb CHANGED
@@ -27,7 +27,7 @@ module ForemanRhCloud
27
27
  content_type: :json,
28
28
  },
29
29
  ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
30
- ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
30
+ ssl_client_key: OpenSSL::PKey.read(certs[:key])
31
31
  )
32
32
  rescue StandardError => ex
33
33
  ex
data/app/services/foreman_rh_cloud/cloud_presence.rb CHANGED
@@ -24,7 +24,7 @@ module ForemanRhCloud
24
24
  content_type: :json,
25
25
  },
26
26
  ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
27
- ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
27
+ ssl_client_key: OpenSSL::PKey.read(certs[:key])
28
28
  )
29
29
  )
30
30
 
@@ -42,7 +42,7 @@ module ForemanRhCloud
42
42
  content_type: :json,
43
43
  },
44
44
  ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
45
- ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
45
+ ssl_client_key: OpenSSL::PKey.read(certs[:key])
46
46
  )
47
47
  )
48
48
 
@@ -60,7 +60,7 @@ module ForemanRhCloud
60
60
  content_type: :json,
61
61
  },
62
62
  ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
63
- ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
63
+ ssl_client_key: OpenSSL::PKey.read(certs[:key]),
64
64
  payload: {
65
65
  name: "satellite: #{Foreman.instance_id} org: #{@organization.name}",
66
66
  source_ref: Foreman.instance_id,
@@ -84,7 +84,7 @@ module ForemanRhCloud
84
84
  content_type: :json,
85
85
  },
86
86
  ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
87
- ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
87
+ ssl_client_key: OpenSSL::PKey.read(certs[:key]),
88
88
  payload: {
89
89
  source_id: source_id,
90
90
  rhc_id: Setting[:rhc_instance_id],
data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb CHANGED
@@ -63,19 +63,19 @@ module ForemanRhCloud
63
63
  {
64
64
  url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
65
65
  ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
66
- ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
66
+ ssl_client_key: OpenSSL::PKey.read(certs[:key]),
67
67
  }
68
68
  when connection_test_request?
69
69
  {
70
70
  url: ForemanRhCloud.cert_base_url + '/api/apicast-tests/ping',
71
71
  ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
72
- ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
72
+ ssl_client_key: OpenSSL::PKey.read(certs[:key]),
73
73
  }
74
74
  else # Legacy insights API
75
75
  {
76
76
  url: ForemanRhCloud.legacy_insights_url + request_path.sub('/redhat_access/r/insights', '/r/insights'),
77
77
  ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
78
- ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
78
+ ssl_client_key: OpenSSL::PKey.read(certs[:key]),
79
79
  ssl_ca_file: ForemanRhCloud.legacy_insights_ca,
80
80
  }
81
81
  end
data/config/Gemfile.lock.gh_test CHANGED
@@ -1,8 +1,8 @@
1
1
  PATH
2
2
  remote: ../foreman-tasks
3
3
  specs:
4
- foreman-tasks (5.2.0)
5
- dynflow (>= 1.2.3)
4
+ foreman-tasks (6.0.2)
5
+ dynflow (>= 1.6.0)
6
6
  get_process_mem
7
7
  parse-cron (~> 0.1.4)
8
8
  sinatra
@@ -10,7 +10,7 @@ PATH
10
10
  PATH
11
11
  remote: ../foreman_rh_cloud
12
12
  specs:
13
- foreman_rh_cloud (5.0.29)
13
+ foreman_rh_cloud (6.0.39)
14
14
  foreman-tasks
15
15
  foreman_ansible
16
16
  katello
@@ -18,29 +18,30 @@ PATH
18
18
  PATH
19
19
  remote: ../katello
20
20
  specs:
21
- katello (4.3.0.rc2.1)
21
+ katello (4.5.0)
22
22
  activerecord-import
23
23
  anemone
24
24
  angular-rails-templates (~> 1.1.0)
25
25
  apipie-rails (>= 0.5.14)
26
26
  deface (>= 1.0.2, < 2.0.0)
27
27
  dynflow (>= 1.6.1)
28
+ faraday (< 1.9)
28
29
  foreman-tasks (>= 5.0)
29
- foreman_remote_execution (>= 3.0)
30
+ foreman_remote_execution (>= 7.1.0)
30
31
  fx (< 1.0)
31
32
  gettext_i18n_rails
32
33
  json
33
34
  oauth
34
35
  pg
35
- pulp_ansible_client (>= 0.10, < 0.11)
36
+ pulp_ansible_client (>= 0.13.1, < 0.14)
36
37
  pulp_certguard_client (< 2.0)
37
- pulp_container_client (>= 2.9.0, < 2.10.0)
38
- pulp_deb_client (>= 2.16.0, < 2.17.0)
38
+ pulp_container_client (>= 2.10.0, < 2.11.0)
39
+ pulp_deb_client (>= 2.18.0, < 2.19.0)
39
40
  pulp_file_client (>= 1.10.0, < 1.11.0)
40
41
  pulp_ostree_client
41
- pulp_python_client (>= 3.5.0, < 3.6.0)
42
- pulp_rpm_client (>= 3.16.0, < 3.17.0)
43
- pulpcore_client (>= 3.16.0, < 3.17.0)
42
+ pulp_python_client (>= 3.6.0, < 3.7.0)
43
+ pulp_rpm_client (>= 3.17.0, < 3.18.0)
44
+ pulpcore_client (>= 3.18.0, < 3.19.0)
44
45
  qpid_proton
45
46
  rabl
46
47
  rails
@@ -52,52 +53,52 @@ PATH
52
53
  GEM
53
54
  remote: https://rubygems.org/
54
55
  specs:
55
- actioncable (6.0.3.7)
56
- actionpack (= 6.0.3.7)
56
+ actioncable (6.0.4.8)
57
+ actionpack (= 6.0.4.8)
57
58
  nio4r (~> 2.0)
58
59
  websocket-driver (>= 0.6.1)
59
- actionmailbox (6.0.3.7)
60
- actionpack (= 6.0.3.7)
61
- activejob (= 6.0.3.7)
62
- activerecord (= 6.0.3.7)
63
- activestorage (= 6.0.3.7)
64
- activesupport (= 6.0.3.7)
60
+ actionmailbox (6.0.4.8)
61
+ actionpack (= 6.0.4.8)
62
+ activejob (= 6.0.4.8)
63
+ activerecord (= 6.0.4.8)
64
+ activestorage (= 6.0.4.8)
65
+ activesupport (= 6.0.4.8)
65
66
  mail (>= 2.7.1)
66
- actionmailer (6.0.3.7)
67
- actionpack (= 6.0.3.7)
68
- actionview (= 6.0.3.7)
69
- activejob (= 6.0.3.7)
67
+ actionmailer (6.0.4.8)
68
+ actionpack (= 6.0.4.8)
69
+ actionview (= 6.0.4.8)
70
+ activejob (= 6.0.4.8)
70
71
  mail (~> 2.5, >= 2.5.4)
71
72
  rails-dom-testing (~> 2.0)
72
- actionpack (6.0.3.7)
73
- actionview (= 6.0.3.7)
74
- activesupport (= 6.0.3.7)
73
+ actionpack (6.0.4.8)
74
+ actionview (= 6.0.4.8)
75
+ activesupport (= 6.0.4.8)
75
76
  rack (~> 2.0, >= 2.0.8)
76
77
  rack-test (>= 0.6.3)
77
78
  rails-dom-testing (~> 2.0)
78
79
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
79
- actiontext (6.0.3.7)
80
- actionpack (= 6.0.3.7)
81
- activerecord (= 6.0.3.7)
82
- activestorage (= 6.0.3.7)
83
- activesupport (= 6.0.3.7)
80
+ actiontext (6.0.4.8)
81
+ actionpack (= 6.0.4.8)
82
+ activerecord (= 6.0.4.8)
83
+ activestorage (= 6.0.4.8)
84
+ activesupport (= 6.0.4.8)
84
85
  nokogiri (>= 1.8.5)
85
- actionview (6.0.3.7)
86
- activesupport (= 6.0.3.7)
86
+ actionview (6.0.4.8)
87
+ activesupport (= 6.0.4.8)
87
88
  builder (~> 3.1)
88
89
  erubi (~> 1.4)
89
90
  rails-dom-testing (~> 2.0)
90
91
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
91
- activejob (6.0.3.7)
92
- activesupport (= 6.0.3.7)
92
+ activejob (6.0.4.8)
93
+ activesupport (= 6.0.4.8)
93
94
  globalid (>= 0.3.6)
94
- activemodel (6.0.3.7)
95
- activesupport (= 6.0.3.7)
96
- activerecord (6.0.3.7)
97
- activemodel (= 6.0.3.7)
98
- activesupport (= 6.0.3.7)
99
- activerecord-import (1.2.0)
100
- activerecord (>= 3.2)
95
+ activemodel (6.0.4.8)
96
+ activesupport (= 6.0.4.8)
97
+ activerecord (6.0.4.8)
98
+ activemodel (= 6.0.4.8)
99
+ activesupport (= 6.0.4.8)
100
+ activerecord-import (1.4.0)
101
+ activerecord (>= 4.2)
101
102
  activerecord-nulldb-adapter (0.8.0)
102
103
  activerecord (>= 5.2.0, < 7.1)
103
104
  activerecord-session_store (2.0.0)
@@ -106,12 +107,12 @@ GEM
106
107
  multi_json (~> 1.11, >= 1.11.2)
107
108
  rack (>= 2.0.8, < 3)
108
109
  railties (>= 5.2.4.1)
109
- activestorage (6.0.3.7)
110
- actionpack (= 6.0.3.7)
111
- activejob (= 6.0.3.7)
112
- activerecord (= 6.0.3.7)
110
+ activestorage (6.0.4.8)
111
+ actionpack (= 6.0.4.8)
112
+ activejob (= 6.0.4.8)
113
+ activerecord (= 6.0.4.8)
113
114
  marcel (~> 1.0.0)
114
- activesupport (6.0.3.7)
115
+ activesupport (6.0.4.8)
115
116
  concurrent-ruby (~> 1.0, >= 1.0.2)
116
117
  i18n (>= 0.7, < 2)
117
118
  minitest (~> 5.1)
@@ -133,47 +134,43 @@ GEM
133
134
  sprockets (>= 3.0, < 5)
134
135
  tilt
135
136
  ansi (1.5.0)
136
- apipie-dsl (2.4.0)
137
+ apipie-dsl (2.5.0)
137
138
  apipie-params (0.0.5)
138
- apipie-rails (0.5.19)
139
+ apipie-rails (0.5.20)
139
140
  rails (>= 4.1)
140
- as_deprecation_tracker (1.5.0)
141
+ as_deprecation_tracker (1.6.0)
141
142
  activesupport (>= 4.2)
142
143
  railties (>= 4.2)
143
144
  ast (2.4.2)
144
145
  audited (4.10.0)
145
146
  activerecord (>= 4.2, < 6.2)
146
- autoprefixer-rails (10.3.3.0)
147
+ autoprefixer-rails (10.4.7.0)
147
148
  execjs (~> 2)
148
- bcrypt (3.1.16)
149
+ bcrypt (3.1.18)
149
150
  bcrypt_pbkdf (1.1.0)
150
- benchmark-ips (2.9.2)
151
- binding_of_caller (0.8.0)
151
+ benchmark-ips (2.10.0)
152
+ binding_of_caller (1.0.0)
152
153
  debug_inspector (>= 0.0.1)
153
- bootsnap (1.9.3)
154
- msgpack (~> 1.0)
154
+ bootsnap (1.13.0)
155
+ msgpack (~> 1.2)
155
156
  bootstrap-sass (3.4.1)
156
157
  autoprefixer-rails (>= 5.2.1)
157
158
  sassc (>= 2.0.0)
158
159
  builder (3.2.4)
159
- bullet (6.1.5)
160
+ bullet (7.0.2)
160
161
  activesupport (>= 3.0.0)
161
162
  uniform_notifier (~> 1.11)
162
163
  byebug (11.1.3)
163
- capybara (3.35.3)
164
+ capybara (3.37.1)
164
165
  addressable
166
+ matrix
165
167
  mini_mime (>= 0.1.3)
166
168
  nokogiri (~> 1.8)
167
169
  rack (>= 1.6.0)
168
170
  rack-test (>= 0.6.3)
169
171
  regexp_parser (>= 1.5, < 3.0)
170
172
  xpath (~> 3.2)
171
- childprocess (3.0.0)
172
- ci_reporter (2.0.0)
173
- builder (>= 2.1.2)
174
- ci_reporter_minitest (1.0.0)
175
- ci_reporter (~> 2.0)
176
- minitest (~> 5.0)
173
+ childprocess (4.1.0)
177
174
  coderay (1.1.3)
178
175
  coffee-rails (5.0.0)
179
176
  coffee-script (>= 2.2.0)
@@ -182,76 +179,62 @@ GEM
182
179
  coffee-script-source
183
180
  execjs
184
181
  coffee-script-source (1.12.2)
185
- concurrent-ruby (1.1.9)
182
+ concurrent-ruby (1.1.10)
186
183
  concurrent-ruby-edge (0.6.0)
187
184
  concurrent-ruby (~> 1.1.6)
188
185
  connection_pool (2.2.5)
189
186
  crack (0.4.5)
190
187
  rexml
191
188
  crass (1.0.6)
192
- css_parser (1.10.0)
189
+ css_parser (1.11.0)
193
190
  addressable
194
191
  daemons (1.4.1)
195
192
  database_cleaner (1.99.0)
196
193
  deacon (1.0.0)
197
194
  debug_inspector (1.1.0)
198
195
  declarative (0.0.20)
199
- deep_cloneable (3.1.0)
200
- activerecord (>= 3.1.0, < 7)
201
- deface (1.8.1)
196
+ deep_cloneable (3.2.0)
197
+ activerecord (>= 3.1.0, < 8)
198
+ deface (1.9.0)
199
+ actionview (>= 5.2)
202
200
  nokogiri (>= 1.6)
203
201
  polyglot
204
- rails (>= 5.2)
202
+ railties (>= 5.2)
205
203
  rainbow (>= 2.1.0)
206
204
  docile (1.4.0)
207
205
  domain_name (0.5.20190701)
208
206
  unf (>= 0.0.5, < 1.0.0)
209
- dynflow (1.6.1)
207
+ dynflow (1.6.7)
210
208
  algebrick (~> 0.7.0)
211
209
  apipie-params
212
210
  concurrent-ruby (~> 1.1.3)
213
211
  concurrent-ruby-edge (~> 0.6.0)
214
- msgpack (~> 1.3.3)
212
+ msgpack (~> 1.3, >= 1.3.3)
215
213
  multi_json
216
214
  sequel (>= 4.0.0)
217
- ed25519 (1.2.4)
218
- erubi (1.10.0)
219
- excon (0.88.0)
215
+ ed25519 (1.3.0)
216
+ erubi (1.11.0)
217
+ excon (0.92.4)
220
218
  execjs (2.8.1)
221
- facter (4.2.5)
219
+ facter (4.2.11)
222
220
  hocon (~> 1.3)
223
221
  thor (>= 1.0.1, < 2.0)
222
+ facterdb (1.19.0)
223
+ facter (< 5.0.0)
224
+ jgrep
224
225
  factory_bot (5.2.0)
225
226
  activesupport (>= 4.2.0)
226
227
  factory_bot_rails (5.2.0)
227
228
  factory_bot (~> 5.2.0)
228
229
  railties (>= 4.2.0)
229
- faraday (1.8.0)
230
- faraday-em_http (~> 1.0)
231
- faraday-em_synchrony (~> 1.0)
232
- faraday-excon (~> 1.1)
233
- faraday-httpclient (~> 1.0.1)
234
- faraday-net_http (~> 1.0)
235
- faraday-net_http_persistent (~> 1.1)
236
- faraday-patron (~> 1.0)
237
- faraday-rack (~> 1.0)
230
+ faraday (0.17.5)
238
231
  multipart-post (>= 1.2, < 3)
239
- ruby2_keywords (>= 0.0.4)
240
- faraday-em_http (1.0.0)
241
- faraday-em_synchrony (1.0.0)
242
- faraday-excon (1.1.0)
243
- faraday-httpclient (1.0.1)
244
- faraday-net_http (1.0.1)
245
- faraday-net_http_persistent (1.2.0)
246
- faraday-patron (1.0.0)
247
- faraday-rack (1.0.0)
248
232
  fast_gettext (1.8.0)
249
- ffi (1.15.4)
250
- fog-aws (3.12.0)
233
+ ffi (1.15.5)
234
+ fog-aws (3.14.0)
251
235
  fog-core (~> 2.1)
252
236
  fog-json (~> 1.1)
253
237
  fog-xml (~> 0.1)
254
- ipaddress (~> 0.8)
255
238
  fog-core (2.1.0)
256
239
  builder
257
240
  excon (~> 0.58)
@@ -272,17 +255,16 @@ GEM
272
255
  fog-xml (~> 0.1.1)
273
256
  json
274
257
  ruby-libvirt (>= 0.7.0)
275
- fog-openstack (1.0.11)
258
+ fog-openstack (1.1.0)
276
259
  fog-core (~> 2.1)
277
260
  fog-json (>= 1.0)
278
- ipaddress (>= 0.8)
279
- fog-ovirt (2.0.1)
261
+ fog-ovirt (2.0.2)
280
262
  activesupport
281
263
  fog-core
282
264
  fog-json
283
265
  fog-xml
284
266
  ovirt-engine-sdk (>= 4.3.1)
285
- fog-vsphere (3.5.0)
267
+ fog-vsphere (3.5.2)
286
268
  fog-core
287
269
  rbvmomi (>= 1.9, < 3)
288
270
  fog-xml (0.1.4)
@@ -293,16 +275,16 @@ GEM
293
275
  foreman (0.87.2)
294
276
  foreman-tasks-core (0.3.6)
295
277
  dynflow (>= 1.2.0)
296
- foreman_ansible (6.4.1)
278
+ foreman_ansible (7.1.2)
297
279
  acts_as_list (~> 1.0.3)
298
280
  deface (< 2.0)
281
+ foreman-tasks (>= 5.2.0)
299
282
  foreman_remote_execution (>= 4.4.0)
300
- ipaddress (>= 0.8.0, < 1.0)
301
283
  foreman_ansible_core (4.2.1)
302
284
  foreman-tasks-core (~> 0.3.2)
303
285
  foreman_remote_execution_core (~> 1.1)
304
286
  net-ssh
305
- foreman_remote_execution (4.8.0)
287
+ foreman_remote_execution (7.1.1)
306
288
  deface
307
289
  dynflow (>= 1.0.2, < 2.0.0)
308
290
  foreman-tasks (>= 5.1.0)
@@ -313,19 +295,22 @@ GEM
313
295
  net-ssh
314
296
  smart_proxy_remote_execution_ssh (>= 0.4.0)
315
297
  formatador (0.3.0)
298
+ forwardable (1.3.2)
316
299
  friendly_id (5.3.0)
317
300
  activerecord (>= 4.0.0)
318
- fx (0.6.2)
301
+ fx (0.7.0)
319
302
  activerecord (>= 4.0.0)
320
303
  railties (>= 4.0.0)
321
304
  get_process_mem (0.2.7)
322
305
  ffi (~> 1.0)
323
- gettext (3.4.1)
306
+ gettext (3.4.3)
307
+ erubi
324
308
  locale (>= 2.0.5)
309
+ prime
325
310
  text (>= 1.3.0)
326
311
  gettext_i18n_rails (1.8.1)
327
312
  fast_gettext (>= 0.9.0)
328
- gettext_i18n_rails_js (1.3.0)
313
+ gettext_i18n_rails_js (1.3.1)
329
314
  gettext (>= 3.0.2)
330
315
  gettext_i18n_rails (>= 0.7.1)
331
316
  po_to_json (>= 1.0.0)
@@ -342,8 +327,8 @@ GEM
342
327
  representable (~> 3.0)
343
328
  retriable (>= 2.0, < 4.0)
344
329
  signet (~> 0.12)
345
- google-cloud-env (1.5.0)
346
- faraday (>= 0.17.3, < 2.0)
330
+ google-cloud-env (1.6.0)
331
+ faraday (>= 0.17.3, < 3.0)
347
332
  googleauth (0.17.1)
348
333
  faraday (>= 0.17.3, < 2.0)
349
334
  jwt (>= 1.4, < 3.0)
@@ -361,20 +346,20 @@ GEM
361
346
  hashdiff (1.0.1)
362
347
  hocon (1.3.1)
363
348
  http-accept (1.7.0)
364
- http-cookie (1.0.4)
349
+ http-cookie (1.0.5)
365
350
  domain_name (~> 0.5)
366
351
  httpclient (2.8.3)
367
- i18n (1.8.11)
352
+ i18n (1.12.0)
368
353
  concurrent-ruby (~> 1.0)
369
354
  immigrant (0.3.6)
370
355
  activerecord (>= 3.0)
371
- ipaddress (0.8.3)
372
- journald-logger (3.0.1)
356
+ jgrep (1.5.4)
357
+ journald-logger (3.1.0)
373
358
  journald-native (~> 1.0)
374
359
  journald-native (1.0.12)
375
360
  jquery-ui-rails (6.0.1)
376
361
  railties (>= 3.2.16)
377
- json (2.6.1)
362
+ json (2.6.2)
378
363
  jwt (2.2.3)
379
364
  launchy (2.5.0)
380
365
  addressable (~> 2.7)
@@ -383,28 +368,28 @@ GEM
383
368
  net-ldap (>= 0.11)
384
369
  little-plugger (1.1.4)
385
370
  locale (2.1.3)
386
- logging (2.3.0)
371
+ logging (2.3.1)
387
372
  little-plugger (~> 1.1)
388
373
  multi_json (~> 1.14)
389
374
  logging-journald (2.1.0)
390
375
  journald-logger (~> 3.0)
391
376
  logging
392
- loofah (2.12.0)
377
+ loofah (2.18.0)
393
378
  crass (~> 1.0.2)
394
379
  nokogiri (>= 1.5.9)
395
380
  mail (2.7.1)
396
381
  mini_mime (>= 0.1.1)
397
382
  marcel (1.0.2)
398
383
  maruku (0.7.3)
384
+ matrix (0.4.2)
399
385
  memoist (0.16.2)
400
386
  method_source (1.0.0)
401
387
  mime-types (3.4.1)
402
388
  mime-types-data (~> 3.2015)
403
- mime-types-data (3.2021.1115)
389
+ mime-types-data (3.2022.0105)
404
390
  mini_mime (1.1.2)
405
- mini_portile2 (2.6.1)
406
- minitest (5.10.3)
407
- minitest-reporters (1.4.3)
391
+ minitest (5.16.2)
392
+ minitest-reporters (1.5.0)
408
393
  ansi
409
394
  builder
410
395
  minitest (>= 5.0)
@@ -415,43 +400,45 @@ GEM
415
400
  minitest (>= 5.0)
416
401
  railties (>= 4.1)
417
402
  minitest-tags (0.0.5)
418
- mocha (1.13.0)
403
+ mocha (1.14.0)
419
404
  mqtt (0.5.0)
420
- msgpack (1.3.3)
405
+ msgpack (1.5.4)
421
406
  multi_json (1.15.0)
422
- multipart-post (2.1.1)
423
- mustermann (1.1.1)
407
+ multipart-post (2.2.3)
408
+ mustermann (2.0.2)
424
409
  ruby2_keywords (~> 0.0.1)
425
- net-ldap (0.17.0)
410
+ net-ldap (0.17.1)
426
411
  net-ping (2.0.8)
427
412
  net-scp (3.0.0)
428
413
  net-ssh (>= 2.6.5, < 7.0.0)
429
414
  net-ssh (4.2.0)
430
415
  netrc (0.11.0)
431
416
  nio4r (2.5.8)
432
- nokogiri (1.12.5)
433
- mini_portile2 (~> 2.6.1)
417
+ nokogiri (1.13.8-x86_64-linux)
434
418
  racc (~> 1.4)
435
- oauth (0.5.8)
419
+ oauth (0.5.10)
436
420
  optimist (3.0.1)
437
421
  os (1.1.4)
438
422
  ovirt-engine-sdk (4.4.1)
439
423
  json (>= 1, < 3)
440
- paint (2.2.1)
441
- parallel (1.21.0)
442
- parallel_tests (3.7.3)
424
+ paint (2.3.0)
425
+ parallel (1.22.1)
426
+ parallel_tests (3.11.1)
443
427
  parallel
444
428
  parse-cron (0.1.4)
445
- parser (3.0.3.1)
429
+ parser (3.1.2.1)
446
430
  ast (~> 2.4.1)
447
431
  patternfly-sass (3.59.5)
448
432
  bootstrap-sass (~> 3.4.0)
449
433
  font-awesome-sass (~> 4.6.2)
450
434
  sassc (> 2.0.1, < 3.0)
451
- pg (1.2.3)
435
+ pg (1.4.3)
452
436
  po_to_json (1.0.1)
453
437
  json (>= 1.6.0)
454
438
  polyglot (0.3.5)
439
+ prime (0.1.2)
440
+ forwardable
441
+ singleton
455
442
  prometheus-client (1.0.0)
456
443
  promise.rb (0.7.4)
457
444
  pry (0.13.1)
@@ -460,7 +447,7 @@ GEM
460
447
  pry-byebug (3.9.0)
461
448
  byebug (~> 11.0)
462
449
  pry (~> 0.13.0)
463
- pry-doc (1.2.0)
450
+ pry-doc (1.3.0)
464
451
  pry (~> 0.11)
465
452
  yard (~> 0.9.11)
466
453
  pry-rails (0.3.9)
@@ -468,44 +455,44 @@ GEM
468
455
  pry-remote (0.1.8)
469
456
  pry (~> 0.9)
470
457
  slop (~> 3.0)
471
- pry-stack_explorer (0.4.13)
472
- binding_of_caller (~> 0.7)
458
+ pry-stack_explorer (0.6.1)
459
+ binding_of_caller (~> 1.0)
473
460
  pry (~> 0.13)
474
- public_suffix (4.0.6)
475
- pulp_ansible_client (0.10.1)
476
- faraday (>= 0.14.0)
461
+ public_suffix (4.0.7)
462
+ pulp_ansible_client (0.13.2)
463
+ faraday (~> 0.17, < 1.9.0)
477
464
  json (~> 2.1, >= 2.1.0)
478
- pulp_certguard_client (1.5.1)
479
- faraday (>= 0.14.0)
465
+ pulp_certguard_client (1.5.3)
466
+ faraday (~> 0.17, < 1.9.0)
480
467
  json (~> 2.1, >= 2.1.0)
481
- pulp_container_client (2.9.1)
482
- faraday (>= 0.14.0)
468
+ pulp_container_client (2.10.5)
469
+ faraday (>= 0.17, < 1.9.0)
483
470
  json (~> 2.1, >= 2.1.0)
484
- pulp_deb_client (2.16.0)
485
- faraday (>= 0.14.0)
471
+ pulp_deb_client (2.18.0)
472
+ faraday (~> 0.17, < 1.9.0)
486
473
  json (~> 2.1, >= 2.1.0)
487
- pulp_file_client (1.10.1)
488
- faraday (>= 0.14.0)
474
+ pulp_file_client (1.10.3)
475
+ faraday (~> 0.17, < 1.9.0)
489
476
  json (~> 2.1, >= 2.1.0)
490
- pulp_ostree_client (2.0.0a3.dev1638674738)
491
- faraday (>= 0.14.0)
477
+ pulp_ostree_client (2.0.0a7.dev1660103594)
478
+ faraday (>= 0.17, < 2.0)
492
479
  json (~> 2.1, >= 2.1.0)
493
- pulp_python_client (3.5.2)
480
+ pulp_python_client (3.6.0)
494
481
  faraday (>= 0.14.0)
495
482
  json (~> 2.1, >= 2.1.0)
496
- pulp_rpm_client (3.16.1)
497
- faraday (>= 0.14.0)
483
+ pulp_rpm_client (3.17.10)
484
+ faraday (>= 0.17, < 1.9.0)
498
485
  json (~> 2.1, >= 2.1.0)
499
- pulpcore_client (3.16.1)
500
- faraday (>= 0.14.0)
486
+ pulpcore_client (3.18.6)
487
+ faraday (>= 0.17, < 1.9.0)
501
488
  json (~> 2.1, >= 2.1.0)
502
- puma (5.5.2)
489
+ puma (5.6.4)
503
490
  nio4r (~> 2.0)
504
491
  qpid_proton (0.33.0)
505
492
  rabl (0.14.5)
506
493
  activesupport (>= 2.3.14)
507
494
  racc (1.6.0)
508
- rack (2.2.3)
495
+ rack (2.2.4)
509
496
  rack-cors (1.0.6)
510
497
  rack (>= 1.6.0)
511
498
  rack-jsonp (1.3.1)
@@ -513,24 +500,24 @@ GEM
513
500
  rack-openid (1.4.2)
514
501
  rack (>= 1.1.0)
515
502
  ruby-openid (>= 2.1.8)
516
- rack-protection (2.1.0)
503
+ rack-protection (2.2.2)
517
504
  rack
518
- rack-test (1.1.0)
519
- rack (>= 1.0, < 3)
520
- rails (6.0.3.7)
521
- actioncable (= 6.0.3.7)
522
- actionmailbox (= 6.0.3.7)
523
- actionmailer (= 6.0.3.7)
524
- actionpack (= 6.0.3.7)
525
- actiontext (= 6.0.3.7)
526
- actionview (= 6.0.3.7)
527
- activejob (= 6.0.3.7)
528
- activemodel (= 6.0.3.7)
529
- activerecord (= 6.0.3.7)
530
- activestorage (= 6.0.3.7)
531
- activesupport (= 6.0.3.7)
505
+ rack-test (2.0.2)
506
+ rack (>= 1.3)
507
+ rails (6.0.4.8)
508
+ actioncable (= 6.0.4.8)
509
+ actionmailbox (= 6.0.4.8)
510
+ actionmailer (= 6.0.4.8)
511
+ actionpack (= 6.0.4.8)
512
+ actiontext (= 6.0.4.8)
513
+ actionview (= 6.0.4.8)
514
+ activejob (= 6.0.4.8)
515
+ activemodel (= 6.0.4.8)
516
+ activerecord (= 6.0.4.8)
517
+ activestorage (= 6.0.4.8)
518
+ activesupport (= 6.0.4.8)
532
519
  bundler (>= 1.3.0)
533
- railties (= 6.0.3.7)
520
+ railties (= 6.0.4.8)
534
521
  sprockets-rails (>= 2.0.0)
535
522
  rails-controller-testing (1.0.5)
536
523
  actionpack (>= 5.0.1.rc1)
@@ -539,20 +526,20 @@ GEM
539
526
  rails-dom-testing (2.0.3)
540
527
  activesupport (>= 4.2.0)
541
528
  nokogiri (>= 1.6)
542
- rails-html-sanitizer (1.4.2)
529
+ rails-html-sanitizer (1.4.3)
543
530
  loofah (~> 2.3)
544
531
  rails-i18n (6.0.0)
545
532
  i18n (>= 0.7, < 2)
546
533
  railties (>= 6.0.0, < 7)
547
- railties (6.0.3.7)
548
- actionpack (= 6.0.3.7)
549
- activesupport (= 6.0.3.7)
534
+ railties (6.0.4.8)
535
+ actionpack (= 6.0.4.8)
536
+ activesupport (= 6.0.4.8)
550
537
  method_source
551
538
  rake (>= 0.8.7)
552
539
  thor (>= 0.20.3, < 2.0)
553
- rainbow (3.0.0)
540
+ rainbow (3.1.1)
554
541
  rake (13.0.6)
555
- rb-fsevent (0.11.0)
542
+ rb-fsevent (0.11.1)
556
543
  rb-inotify (0.10.1)
557
544
  ffi (~> 1.0)
558
545
  rbvmomi (2.4.1)
@@ -561,11 +548,9 @@ GEM
561
548
  nokogiri (~> 1.5)
562
549
  optimist (~> 3.0)
563
550
  rdoc (6.3.3)
564
- record_tag_helper (1.0.1)
565
- actionview (>= 5)
566
- redis (4.1.4)
567
- regexp_parser (2.2.0)
568
- representable (3.1.1)
551
+ redis (4.5.1)
552
+ regexp_parser (2.5.0)
553
+ representable (3.2.0)
569
554
  declarative (< 0.1.0)
570
555
  trailblazer-option (>= 0.1.1, < 0.2.0)
571
556
  uber (< 0.2.0)
@@ -583,8 +568,8 @@ GEM
583
568
  roadie (4.0.0)
584
569
  css_parser (~> 1.4)
585
570
  nokogiri (~> 1.8)
586
- roadie-rails (2.2.0)
587
- railties (>= 5.1, < 6.2)
571
+ roadie-rails (2.3.0)
572
+ railties (>= 5.1, < 7.1)
588
573
  roadie (>= 3.1, < 5.0)
589
574
  robotex (1.0.0)
590
575
  robottelo_reporter (0.1.1)
@@ -620,7 +605,7 @@ GEM
620
605
  ruby2ruby (2.4.4)
621
606
  ruby_parser (~> 3.1)
622
607
  sexp_processor (~> 4.6)
623
- ruby_parser (3.18.1)
608
+ ruby_parser (3.19.1)
624
609
  sexp_processor (~> 4.16)
625
610
  rubyzip (2.3.2)
626
611
  runcible (2.13.1)
@@ -629,7 +614,7 @@ GEM
629
614
  json
630
615
  oauth
631
616
  rest-client (>= 1.6.1, < 3.0.0)
632
- safemode (1.3.6)
617
+ safemode (1.3.7)
633
618
  ruby2ruby (>= 2.4.0)
634
619
  ruby_parser (>= 3.10.1)
635
620
  sexp_processor (>= 4.10.0)
@@ -651,25 +636,27 @@ GEM
651
636
  scoped_search (4.1.10)
652
637
  activerecord (>= 4.2.0)
653
638
  sd_notify (0.1.1)
654
- secure_headers (6.3.3)
655
- selenium-webdriver (3.142.7)
656
- childprocess (>= 0.5, < 4.0)
657
- rubyzip (>= 1.2.2)
658
- sequel (5.51.0)
659
- sexp_processor (4.16.0)
639
+ secure_headers (6.4.0)
640
+ selenium-webdriver (4.4.0)
641
+ childprocess (>= 0.5, < 5.0)
642
+ rexml (~> 3.2, >= 3.2.5)
643
+ rubyzip (>= 1.2.2, < 3.0)
644
+ websocket (~> 1.0)
645
+ sequel (5.59.0)
646
+ sexp_processor (4.16.1)
660
647
  shoulda-context (1.2.2)
661
648
  shoulda-matchers (4.3.0)
662
649
  activesupport (>= 4.2.0)
663
650
  show_me_the_cookies (5.0.1)
664
651
  capybara (>= 2, < 4)
665
- sidekiq (5.2.9)
652
+ sidekiq (5.2.10)
666
653
  connection_pool (~> 2.2, >= 2.2.2)
667
654
  rack (~> 2.0)
668
655
  rack-protection (>= 1.5.0)
669
- redis (>= 3.3.5, < 4.2)
670
- signet (0.16.0)
656
+ redis (~> 4.5, < 4.6.0)
657
+ signet (0.17.0)
671
658
  addressable (~> 2.8)
672
- faraday (>= 0.17.3, < 2.0)
659
+ faraday (>= 0.17.5, < 3.a)
673
660
  jwt (>= 1.5, < 3.0)
674
661
  multi_json (~> 1.10)
675
662
  simplecov (0.21.2)
@@ -677,34 +664,35 @@ GEM
677
664
  simplecov-html (~> 0.11)
678
665
  simplecov_json_formatter (~> 0.1)
679
666
  simplecov-html (0.12.3)
680
- simplecov-rcov (0.2.3)
667
+ simplecov-rcov (0.3.1)
681
668
  simplecov (>= 0.4.1)
682
- simplecov_json_formatter (0.1.3)
683
- sinatra (2.1.0)
684
- mustermann (~> 1.0)
669
+ simplecov_json_formatter (0.1.4)
670
+ sinatra (2.2.2)
671
+ mustermann (~> 2.0)
685
672
  rack (~> 2.2)
686
- rack-protection (= 2.1.0)
673
+ rack-protection (= 2.2.2)
687
674
  tilt (~> 2.0)
688
675
  single_test (0.6.0)
689
676
  rake
677
+ singleton (0.1.1)
690
678
  slop (3.6.0)
691
- smart_proxy_dynflow (0.6.1)
679
+ smart_proxy_dynflow (0.8.1)
692
680
  dynflow (~> 1.6)
693
681
  rest-client
694
682
  sqlite3
695
- smart_proxy_remote_execution_ssh (0.5.0)
683
+ smart_proxy_remote_execution_ssh (0.8.0)
696
684
  mqtt
697
685
  net-ssh (>= 4.2.0)
698
- smart_proxy_dynflow (~> 0.5)
686
+ smart_proxy_dynflow (~> 0.8)
699
687
  spring (2.1.1)
700
- sprockets (4.0.2)
688
+ sprockets (4.1.1)
701
689
  concurrent-ruby (~> 1.0)
702
690
  rack (> 1, < 3)
703
- sprockets-rails (3.4.1)
691
+ sprockets-rails (3.4.2)
704
692
  actionpack (>= 5.2)
705
693
  activesupport (>= 5.2)
706
694
  sprockets (>= 3.0.0)
707
- sqlite3 (1.4.2)
695
+ sqlite3 (1.4.4)
708
696
  sshkey (1.9.0)
709
697
  statsd-instrument (2.9.2)
710
698
  stomp (1.4.10)
@@ -716,30 +704,31 @@ GEM
716
704
  rubocop-performance (~> 1.8.1)
717
705
  rubocop-rails (~> 2.8.1)
718
706
  rubocop-rspec (~> 1.43.2)
719
- thor (1.1.0)
707
+ thor (1.2.1)
720
708
  thread_safe (0.3.6)
721
- tilt (2.0.10)
709
+ tilt (2.0.11)
722
710
  trailblazer-option (0.1.2)
723
- tzinfo (1.2.9)
711
+ tzinfo (1.2.10)
724
712
  thread_safe (~> 0.1)
725
713
  uber (0.1.0)
726
714
  uglifier (4.2.0)
727
715
  execjs (>= 0.3.0, < 3)
728
716
  unf (0.1.4)
729
717
  unf_ext
730
- unf_ext (0.0.8)
718
+ unf_ext (0.0.8.2)
731
719
  unicode-display_width (1.8.0)
732
- uniform_notifier (1.14.2)
720
+ uniform_notifier (1.16.0)
733
721
  validates_lengths_from_database (0.8.0)
734
722
  activerecord (>= 4)
735
723
  vcr (3.0.3)
736
- webmock (3.14.0)
724
+ webmock (3.17.1)
737
725
  addressable (>= 2.8.0)
738
726
  crack (>= 0.3.2)
739
727
  hashdiff (>= 0.4.0, < 2.0.0)
740
728
  webpack-rails (0.9.11)
741
729
  railties (>= 3.2.0)
742
730
  webrick (1.7.0)
731
+ websocket (1.2.9)
743
732
  websocket-driver (0.7.5)
744
733
  websocket-extensions (>= 0.1.0)
745
734
  websocket-extensions (0.1.5)
@@ -748,12 +737,12 @@ GEM
748
737
  paint (>= 0.9, < 3.0)
749
738
  xpath (3.2.0)
750
739
  nokogiri (~> 1.8)
751
- yard (0.9.27)
740
+ yard (0.9.28)
752
741
  webrick (~> 1.7.0)
753
- zeitwerk (2.5.1)
742
+ zeitwerk (2.6.0)
754
743
 
755
744
  PLATFORMS
756
- ruby
745
+ x86_64-linux
757
746
 
758
747
  DEPENDENCIES
759
748
  activerecord-nulldb-adapter
@@ -770,7 +759,6 @@ DEPENDENCIES
770
759
  bullet (>= 6.1.0)
771
760
  byebug
772
761
  capybara (~> 3.33)
773
- ci_reporter_minitest
774
762
  coffee-rails (~> 5.0.0)
775
763
  daemons
776
764
  database_cleaner (~> 1.3)
@@ -779,6 +767,7 @@ DEPENDENCIES
779
767
  dynflow (>= 1.4.4, < 2.0.0)
780
768
  execjs (>= 1.4.0, < 3.0)
781
769
  facter
770
+ facterdb (~> 1.7)
782
771
  factory_bot_rails (~> 5.0)
783
772
  fast_gettext (~> 1.4)
784
773
  fog-aws (>= 3.6.2, < 4)
@@ -790,14 +779,15 @@ DEPENDENCIES
790
779
  fog-vsphere (>= 3.5.0, < 4.0)
791
780
  foreman
792
781
  foreman-tasks!
782
+ foreman_ansible (~> 7.1.2)
793
783
  foreman_ansible_core
794
- foreman_remote_execution (~> 4.8.0)
784
+ foreman_remote_execution (~> 7.1.0)
795
785
  foreman_rh_cloud!
796
786
  friendly_id (>= 5.3.0, < 5.4)
797
787
  get_process_mem
798
788
  gettext (>= 3.2.1, < 4.0.0)
799
789
  gettext_i18n_rails (~> 1.8)
800
- gettext_i18n_rails_js (~> 1.0)
790
+ gettext_i18n_rails_js (~> 1.3.1)
801
791
  gitlab-sidekiq-fetcher
802
792
  graphiql-rails (~> 1.7)
803
793
  graphql (~> 1.8.0)
@@ -813,8 +803,8 @@ DEPENDENCIES
813
803
  logging-journald (~> 2.0)
814
804
  mail (~> 2.7)
815
805
  maruku (~> 0.7)
816
- minitest (~> 5.1, < 5.11)
817
- minitest-reporters
806
+ minitest (~> 5.1)
807
+ minitest-reporters (~> 1.4)
818
808
  minitest-retry (~> 0.0)
819
809
  minitest-spec-rails (~> 6.0)
820
810
  minitest-tags
@@ -840,13 +830,12 @@ DEPENDENCIES
840
830
  rack-cors (~> 1.0.2)
841
831
  rack-jsonp
842
832
  rack-openid (~> 1.3)
843
- rails (~> 6.0.3.1)
833
+ rails (~> 6.0.4.7)
844
834
  rails-controller-testing (~> 1.0)
845
835
  rails-i18n (~> 6.0)
846
836
  rainbow (>= 2.2.1)
847
837
  rbvmomi (~> 2.0)
848
- rdoc
849
- record_tag_helper (~> 1.0)
838
+ rdoc (< 6.4)
850
839
  redis (~> 4.0)
851
840
  responders (~> 3.0)
852
841
  rest-client (>= 2.0.0, < 3)
@@ -887,4 +876,4 @@ DEPENDENCIES
887
876
  wirb (>= 1.0, < 3.0)
888
877
 
889
878
  BUNDLED WITH
890
- 1.17.3
879
+ 2.2.24
data/lib/foreman_inventory_upload/async/upload_report_job.rb CHANGED
@@ -13,7 +13,7 @@ module ForemanInventoryUpload
13
13
  end
14
14
 
15
15
  def run
16
- if Setting[:content_disconnected]
16
+ if content_disconnected?
17
17
  progress_output do |progress_output|
18
18
  progress_output.write_line('Upload was stopped since disconnected mode setting is enabled for content on this instance.')
19
19
  progress_output.status = "Task aborted, exit 1"
@@ -74,6 +74,10 @@ module ForemanInventoryUpload
74
74
  def organization
75
75
  @organization ||= Organization.find(input[:organization_id])
76
76
  end
77
+
78
+ def content_disconnected?
79
+ Setting[:content_disconnected]
80
+ end
77
81
  end
78
82
  end
79
83
  end
data/lib/foreman_rh_cloud/engine.rb CHANGED
@@ -21,7 +21,7 @@ module ForemanRhCloud
21
21
  end
22
22
 
23
23
  initializer 'foreman_rh_cloud.load_default_settings', :before => :load_config_initializers do
24
- require_dependency File.expand_path('../../app/models/setting/rh_cloud.rb', __dir__)
24
+ require_dependency File.expand_path('settings.rb', __dir__)
25
25
  end
26
26
 
27
27
  config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
@@ -29,7 +29,6 @@ module ForemanRhCloud
29
29
  config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
30
30
  config.autoload_paths += Dir["#{config.root}/app/services"]
31
31
  config.autoload_paths += Dir["#{config.root}/app/overrides"]
32
- config.autoload_paths += Dir["#{config.root}/app/services"]
33
32
  config.autoload_paths += Dir["#{config.root}/lib"]
34
33
 
35
34
  config.eager_load_paths += Dir["#{config.root}/lib"]
@@ -43,7 +42,7 @@ module ForemanRhCloud
43
42
 
44
43
  initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
45
44
  Foreman::Plugin.register :foreman_rh_cloud do
46
- requires_foreman '>= 2.3'
45
+ requires_foreman '>= 3.3'
47
46
 
48
47
  apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
49
48
 
data/lib/foreman_rh_cloud/settings.rb ADDED
@@ -0,0 +1,11 @@
1
+ Foreman::SettingManager.define(:foreman) do
2
+ category(:rh_cloud, N_('RHCloud')) do
3
+ setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud'), default: true, full_name: N_('Automatic inventory upload'))
4
+ setting('allow_auto_insights_sync', type: :boolean, description: N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), default: false, full_name: N_('Synchronize recommendations Automatically'))
5
+ setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host names'))
6
+ setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host ipv4 addresses'))
7
+ setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud'), default: false, full_name: N_("Exclude installed Packages"))
8
+ setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman?'), default: false, full_name: N_('Include parameters in insights-client reports'))
9
+ setting('rhc_instance_id', type: :string, description: N_('RHC daemon id'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
10
+ end
11
+ end
data/lib/foreman_rh_cloud/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanRhCloud
2
- VERSION = '5.0.46'.freeze
2
+ VERSION = '6.0.42'.freeze
3
3
  end
data/lib/inventory_sync/async/host_result.rb CHANGED
@@ -11,7 +11,7 @@ module InventorySync
11
11
  @per_page = result['per_page']
12
12
  @sub_ids = result["results"].map { |host| host['subscription_manager_id'] }
13
13
  @uuid_by_sub_id = Hash[result["results"].map { |host| [host['subscription_manager_id'], host['id']] }]
14
- @uuid_by_fqdn = Hash[result["results"].map { |host| [host['fqdn']&.downcase, host['id']] }]
14
+ @uuid_by_fqdn = Hash[result["results"].map { |host| [host['fqdn'].downcase, host['id']] }]
15
15
  end
16
16
 
17
17
  def status_hashes
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "foreman_rh_cloud",
3
- "version": "5.0.46",
3
+ "version": "6.0.42",
4
4
  "description": "Inventory Upload =============",
5
5
  "main": "index.js",
6
6
  "scripts": {
data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb CHANGED
@@ -72,17 +72,6 @@ module InsightsCloud::Api
72
72
  assert_equal etag, @response.headers[Rack::ETAG]
73
73
  end
74
74
 
75
- test "should set content type header to response from cloud" do
76
- req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org')
77
- net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
78
- net_http_resp['Content-Type'] = 'application/zip'
79
- res = RestClient::Response.create(@body, net_http_resp, req)
80
- ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
81
-
82
- get :forward_request, params: { "path" => "static/v1/release/insights-core.egg" }
83
- assert_equal net_http_resp['Content-Type'], @response.headers['Content-Type']
84
- end
85
-
86
75
  test "should handle failed authentication to cloud" do
87
76
  net_http_resp = Net::HTTPResponse.new(1.0, 401, "Unauthorized")
88
77
  res = RestClient::Response.create(@body, net_http_resp, @http_req)
data/test/jobs/upload_report_job_test.rb CHANGED
@@ -12,7 +12,7 @@ class UploadReportJobTest < ActiveSupport::TestCase
12
12
  'idCert' => 'TEST_CERT',
13
13
  }
14
14
  )
15
- Setting[:content_disconnected] = true
15
+ ForemanInventoryUpload::Async::UploadReportJob.any_instance.expects(:content_disconnected?).returns(true)
16
16
 
17
17
  ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
18
18
 
data/webpack/ForemanRhCloudFills.js CHANGED
@@ -18,7 +18,7 @@ const fills = [
18
18
  weight: 400,
19
19
  },
20
20
  {
21
- slot: 'details-cards',
21
+ slot: 'host-overview-cards',
22
22
  name: 'insights-total-risk-chart',
23
23
  component: props => <InsightsTotalRiskCard {...props} />,
24
24
  weight: 1100,
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_rh_cloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.0.46
4
+ version: 6.0.42
5
5
  platform: ruby
6
6
  authors:
7
7
  - Foreman Red Hat Cloud team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-03-20 00:00:00.000000000 Z
11
+ date: 2022-08-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: katello
@@ -158,7 +158,6 @@ files:
158
158
  - app/models/insights_resolution.rb
159
159
  - app/models/insights_rule.rb
160
160
  - app/models/inventory_sync/inventory_status.rb
161
- - app/models/setting/rh_cloud.rb
162
161
  - app/models/task_output_line.rb
163
162
  - app/models/task_output_status.rb
164
163
  - app/overrides/hosts_list.rb
@@ -219,6 +218,7 @@ files:
219
218
  - lib/foreman_inventory_upload/scripts/uploader.sh.erb
220
219
  - lib/foreman_rh_cloud.rb
221
220
  - lib/foreman_rh_cloud/engine.rb
221
+ - lib/foreman_rh_cloud/settings.rb
222
222
  - lib/foreman_rh_cloud/version.rb
223
223
  - lib/insights_cloud.rb
224
224
  - lib/insights_cloud/async/cloud_connector_announce_task.rb
@@ -238,7 +238,6 @@ files:
238
238
  - lib/inventory_sync/async/inventory_self_host_sync.rb
239
239
  - lib/inventory_sync/async/query_inventory_job.rb
240
240
  - lib/tasks/foreman_rh_cloud_tasks.rake
241
- - lib/tasks/hybrid_cloud.rake
242
241
  - lib/tasks/insights.rake
243
242
  - lib/tasks/rh_cloud_inventory.rake
244
243
  - locale/Makefile
@@ -675,7 +674,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
675
674
  - !ruby/object:Gem::Version
676
675
  version: '0'
677
676
  requirements: []
678
- rubygems_version: 3.3.26
677
+ rubygems_version: 3.3.7
679
678
  signing_key:
680
679
  specification_version: 4
681
680
  summary: Summary of ForemanRhCloud.
data/app/models/setting/rh_cloud.rb DELETED
@@ -1,29 +0,0 @@
1
- class Setting::RhCloud < Setting
2
- ::Setting::BLANK_ATTRS.concat %w{rhc_instance_id}
3
-
4
- def self.load_defaults
5
- return false unless table_exists?
6
- transaction do
7
- # If the user had auto_upload default setting, we will not surprise him, and force the value to false
8
- # for new users, the default will be set to true and the value will remain nil
9
- Setting.where(name: 'allow_auto_inventory_upload', value: nil).where("settings.default LIKE '%false%'").update_all(value: "--- false\n...")
10
- super
11
- end
12
- end
13
-
14
- def self.default_settings
15
- [
16
- set('allow_auto_inventory_upload', N_('Enable automatic upload of your host inventory to the Red Hat cloud'), true, N_('Automatic inventory upload')),
17
- set('allow_auto_insights_sync', N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), false, N_('Synchronize recommendations Automatically')),
18
- set('obfuscate_inventory_hostnames', N_('Obfuscate host names sent to the Red Hat cloud'), false, N_('Obfuscate host names')),
19
- set('obfuscate_inventory_ips', N_('Obfuscate ipv4 addresses sent to the Red Hat cloud'), false, N_('Obfuscate host ipv4 addresses')),
20
- set('exclude_installed_packages', N_('Exclude installed packages from being uploaded to the Red Hat cloud'), false, N_("Exclude installed Packages")),
21
- set('include_parameter_tags', N_('Should import include parameter tags from Foreman?'), false, N_('Include parameters in insights-client reports')),
22
- set('rhc_instance_id', N_('RHC daemon id'), nil, N_('ID of the RHC(Yggdrasil) daemon')),
23
- ]
24
- end
25
-
26
- def self.humanized_category
27
- N_('RH Cloud')
28
- end
29
- end
data/lib/tasks/hybrid_cloud.rake DELETED
@@ -1,64 +0,0 @@
1
- require 'io/console'
2
-
3
- namespace :rh_cloud do |args|
4
- desc 'Register Satellite Organization with Hybrid Cloud API. \
5
- Specify org_id=x replace your organization ID with x. \
6
- Specify SATELLITE_RH_CLOUD_URL=https://x with the Hybrid Cloud endpoint you are connecting to.'
7
- task hybridcloud_register: [:environment] do
8
- include ::ForemanRhCloud::CertAuth
9
- include ::InsightsCloud::CandlepinCache
10
-
11
- def logger
12
- @logger ||= Logger.new(STDOUT)
13
- end
14
-
15
- def registrations_url
16
- logger.warn("Custom url is not set, using the default one: #{ForemanRhCloud.base_url}") if ENV['SATELLITE_RH_CLOUD_URL'].empty?
17
- ForemanRhCloud.base_url + '/api/identity/certificate/registrations'
18
- end
19
-
20
- if ENV['org_id'].nil?
21
- logger.error('ERROR: org_id needs to be specified.')
22
- exit(1)
23
- end
24
-
25
- @organization = Organization.find_by(id: ENV['org_id'].to_i) # saw this coming in as a string, so making sure it gets passed as an integer.
26
- @uid = cp_owner_id(@organization)
27
- @hostname = ForemanRhCloud.foreman_host_name
28
- logger.error('Organization provided does not have a manifest imported.') + exit(1) if @uid.nil?
29
-
30
- puts 'Paste your token, output will be hidden.'
31
- @token = STDIN.noecho(&:gets).chomp
32
- logger.error('Token was not entered.') + exit(1) if @token.empty?
33
-
34
- def headers
35
- {
36
- Authorization: "Bearer #{@token}"
37
- }
38
- end
39
-
40
- def payload
41
- {
42
- "uid": @uid,
43
- "display_name": "#{@hostname}+#{@organization.label}"
44
- }
45
- end
46
-
47
- def method
48
- :post
49
- end
50
-
51
- begin
52
- response = execute_cloud_request(
53
- organization: @organization,
54
- method: method,
55
- url: registrations_url,
56
- headers: headers,
57
- payload: payload.to_json
58
- )
59
- logger.debug(response)
60
- rescue Exception => ex
61
- logger.error(ex)
62
- end
63
- end
64
- end