foreman_rh_cloud 5.0.29 → 5.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/helpers/foreman_inventory_upload_host_helper.rb +2 -1
- 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/Gemfile.lock.gh_test +204 -168
- data/config/package-lock.json +41822 -0
- data/config/package-lock.json.gh_test +14336 -7973
- data/config/routes.rb +1 -1
- 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/engine.rb +10 -1
- data/lib/foreman_rh_cloud/version.rb +1 -1
- data/lib/foreman_rh_cloud.rb +7 -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/foreman_rh_cloud_self_host_test.rb +7 -0
- data/test/unit/rh_cloud_permissions_test.rb +14 -0
- 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/AccountList/AccountListActions.js +1 -1
- data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.js +3 -3
- data/webpack/ForemanInventoryUpload/Components/InventoryFilter/index.js +0 -2
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js +1 -1
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonActions.js +1 -1
- data/webpack/ForemanRhCloudFills.js +8 -1
- data/webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettingsActions.js +1 -1
- data/webpack/InsightsHostDetailsTab/InsightsTabActions.js +1 -1
- data/webpack/InsightsHostDetailsTab/InsightsTabConstants.js +75 -0
- data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js +147 -0
- data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js +0 -1
- data/webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js +1 -0
- data/webpack/__mocks__/foremanReact/{redux/actions/toasts.js → components/ToastsList/index.js} +0 -0
- data/webpack/common/ForemanTasks/ForemanTasksActions.js +1 -1
- metadata +7 -4
- data/webpack/__mocks__/foremanReact/components/Layout/LayoutSelectors.js +0 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5991354b7fcd361491a962af732a7543402245af2516964876fee68b1bfd6e07
|
|
4
|
+
data.tar.gz: 6232fd7c367092e0afb3591c313f3347c751610fa2a3b4d38e2f59de08cd2313
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d38647081b45704673ed8c77b51ade6e90ee8955bf5bd8433bdca9f3072667d505b314ece193e1dd488af51c8cdf6396de5d987acb718693e6c0cecd7e1c7a18
|
|
7
|
+
data.tar.gz: 2622868402ef0d3a0fa55d74652e1985b97c95b1dd42bab865e86dd8b68929e95ebd5dd1bc3bba8fb9fef2fa8d7e4af23b9f00c959d5aca8eb4d4ee180722fb6
|
|
@@ -5,8 +5,9 @@ module ForemanInventoryUploadHostHelper
|
|
|
5
5
|
|
|
6
6
|
def hits_counts_cell(host)
|
|
7
7
|
host_hits = hits_counts[host.id]
|
|
8
|
+
host_link = Setting['host_details_ui'] ? "#{host_details_page_path(host)}#/Insights" : "#{host_path(host)}#insights"
|
|
8
9
|
tag.td class: ['hidden-xs', 'ellipsis', 'text-center'] do
|
|
9
|
-
link_to(host_hits,
|
|
10
|
+
link_to(host_hits, host_link) if host_hits
|
|
10
11
|
end
|
|
11
12
|
end
|
|
12
13
|
end
|
|
@@ -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))
|