foreman_rh_cloud 4.0.29 → 4.0.32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/services/foreman_rh_cloud/cloud_ping_service.rb +4 -1
- data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb +1 -1
- data/config/package-lock.json +41822 -0
- data/lib/foreman_inventory_upload/generators/fact_helpers.rb +3 -1
- data/lib/foreman_inventory_upload/generators/tags.rb +8 -1
- data/lib/foreman_rh_cloud/version.rb +1 -1
- data/package.json +1 -1
- data/test/controllers/inventory_upload/cloud_status_controller_test.rb +2 -0
- data/test/unit/fact_helpers_test.rb +2 -2
- data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb +19 -0
- data/test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb +4 -0
- data/test/unit/tags_generator_test.rb +15 -0
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b11e8e007c7d982a5554b027916d26df635d1d3824ba8a586b794370f1828f1a
|
|
4
|
+
data.tar.gz: ac439b33efec89c1f939745de5470d8bcb12c9cc21dd8464527ecd400d9fe0a0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 05a8f783d13985048ec24dd4d9fe8037cb1a5d8af0b266739fbbc515c9542f2b9c14de8e6e2b209194f84c8b5902300ff6f0b746814a063e0ab45521d8139035
|
|
7
|
+
data.tar.gz: 632d536fa1056cc8fd69ee7375f7683da2675756151f890a3a6d1e42081225cbde5e71c8b3516e0804eabcda54ac61b340ae622f0f7cc63ebc0f4fc15026c809
|
|
@@ -39,6 +39,9 @@ module ForemanRhCloud
|
|
|
39
39
|
certs = candlepin_id_cert(@org)
|
|
40
40
|
return StandardError.new('certificate missing') unless certs
|
|
41
41
|
|
|
42
|
+
cert_checker = Katello::UpstreamConnectionChecker.new(@org)
|
|
43
|
+
cert_checker.assert_connection
|
|
44
|
+
|
|
42
45
|
execute_cloud_request(
|
|
43
46
|
method: :get,
|
|
44
47
|
url: ForemanRhCloud.cert_base_url + "/api/apicast-tests/ping",
|
|
@@ -72,7 +75,7 @@ module ForemanRhCloud
|
|
|
72
75
|
org,
|
|
73
76
|
{
|
|
74
77
|
success: cert_response.is_a?(RestClient::Response),
|
|
75
|
-
error: (cert_response.is_a?(Exception) ? cert_response.inspect : nil),
|
|
78
|
+
error: (cert_response.is_a?(Exception) ? cert_response&.message || cert_response.inspect : nil),
|
|
76
79
|
},
|
|
77
80
|
]
|
|
78
81
|
end
|
|
@@ -28,7 +28,7 @@ module ForemanRhCloud
|
|
|
28
28
|
headers: {
|
|
29
29
|
params: forward_params,
|
|
30
30
|
user_agent: http_user_agent(original_request),
|
|
31
|
-
content_type: original_request.media_type,
|
|
31
|
+
content_type: original_request.media_type.presence || original_request.format.to_s,
|
|
32
32
|
},
|
|
33
33
|
}
|
|
34
34
|
base_params.merge(path_params(original_request.path, certs))
|