foreman_rh_cloud 6.0.42.1 → 6.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d6287736ecb0fe82ecd3506ba7a5c638b0359976c9948ace0e5d7fc1cda5b8
-  data.tar.gz: 650285b17a358808f0e8d79bdb239a310b0468dff592848a390bd3201a5f6369
+  metadata.gz: f9180080890adb316306a32a93c88fd86153d3ddf3acc9d5182831a325b35ca4
+  data.tar.gz: 6a6d744fda10894d04f630e48b1c27a9bc87d4d6ac6af6324e3c2644b69e6948
 SHA512:
-  metadata.gz: 140f8b1c56d18863d22d97c8195b08f1f264b8b3ed2ead351c1f78d5b9b9eb779505cfe913b7c9360153f4bfb0c1c356c1e179e70211a3cf277b0bc47c7fcfc1
-  data.tar.gz: 1b6a57cda764598e8a2a82567c8cc2cd653af3dc6af0e950ce3adca8b6961235e3b1057a4f4fbd8ae173db9b0515c1b97c8c3b4f272e4b96d8ff499bdcdac250
+  metadata.gz: 39ced1494bc063a49bc6db9917dc067abf9491e5c2f0b1eb5083134dc8cb74ef83cbe4fddabe26cfc2e44204594e3eb48ef23bb5d6c6b987838c3adaacfbc18e
+  data.tar.gz: a84b6d061179e2d9c5a4ab3ba8031c0d3f949bdfd09fe8701435eb3328f87cd1c252602659fe963bfaf22e20feccd9b7242e9dae381a8ccf3ef4b9833c2f42b9

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -18,6 +18,9 @@ module ForemanInventoryUpload
     end
 
     def enable_cloud_connector
+      # Set the autoupload to true, since it's required by the feature.
+      Setting[:allow_auto_inventory_upload] = true
+
       cloud_connector = ForemanRhCloud::CloudConnector.new
       render json: cloud_connector.install.to_json
     end

data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -33,6 +33,10 @@ module InsightsCloud::Api
         }, status: @cloud_response.code
       end
 
+      if @cloud_response.headers[:content_disposition]
+        return send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
+      end
+
       # Append redhat-specific headers
       @cloud_response.headers.each do |key, value|
         assign_header(response, @cloud_response, key, false) if key.to_s.start_with?('x_rh_')
@@ -41,17 +45,7 @@ module InsightsCloud::Api
       assign_header(response, @cloud_response, :x_resource_count, true)
       headers[Rack::ETAG] = @cloud_response.headers[:etag]
 
-      if @cloud_response.headers[:content_disposition]
-        # If there is a Content-Disposition header, it means we are forwarding binary data, send the raw data with proper
-        # content type
-        send_data @cloud_response, disposition: @cloud_response.headers[:content_disposition], type: @cloud_response.headers[:content_type]
-      elsif @cloud_response.headers[:content_type] =~ /zip/
-        # if there is no Content-Disposition, but the content type is binary according the content type,
-        # forward the request as binry too
-        send_data @cloud_response, type: @cloud_response.headers[:content_type]
-      else
-        render json: @cloud_response, status: @cloud_response.code
-      end
+      render json: @cloud_response, status: @cloud_response.code
     end
 
     def branch_info

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-	VERSION = '6.0.42.1'.freeze
+  VERSION = '6.0.43'.freeze
 end

data/lib/inventory_sync/async/host_result.rb

@@ -11,7 +11,7 @@ module InventorySync
         @per_page = result['per_page']
         @sub_ids = result["results"].map { |host| host['subscription_manager_id'] }
         @uuid_by_sub_id = Hash[result["results"].map { |host| [host['subscription_manager_id'], host['id']] }]
-        @uuid_by_fqdn = Hash[result["results"].map { |host| [host['fqdn']&.downcase, host['id']] }]
+        @uuid_by_fqdn = Hash[result["results"].map { |host| [host['fqdn'].downcase, host['id']] }]
       end
 
       def status_hashes

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "6.0.42.1",
+  "version": "6.0.43",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -72,17 +72,6 @@ module InsightsCloud::Api
         assert_equal etag, @response.headers[Rack::ETAG]
       end
 
-      test "should set content type header to response from cloud" do
-        req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org')
-        net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
-        net_http_resp[:content_type] = 'application/zip'
-        res = RestClient::Response.create(@body, net_http_resp, req)
-        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
-
-        get :forward_request, params: { "path" => "static/v1/release/insights-core.egg" }
-        assert_equal net_http_resp[:content_type], @response.headers['Content-Type']
-      end
-
       test "should handle failed authentication to cloud" do
         net_http_resp = Net::HTTPResponse.new(1.0, 401, "Unauthorized")
         res = RestClient::Response.create(@body, net_http_resp, @http_req)

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/index.js

@@ -1,5 +1,7 @@
 import React from 'react';
 import { useSelector, useDispatch } from 'react-redux';
+import { openConfirmModal } from 'foremanReact/components/ConfirmModal';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { CloudConnectorButton } from './CloudConnectorButton';
 import { configureCloudConnector } from './CloudConnectorActions';
 import { selectStatus, selectJobLink } from './CloudConnectorSelectors';
@@ -12,7 +14,18 @@ const ConnectedCloudConnectorButton = () => {
   return (
     <CloudConnectorButton
       status={status}
-      onClick={() => dispatch(configureCloudConnector())}
+      onClick={() =>
+        dispatch(
+          openConfirmModal({
+            title: __('Notice'),
+            message: __(
+              'This action will also enable automatic reports upload'
+            ),
+            isWarning: true,
+            onConfirm: () => dispatch(configureCloudConnector()),
+          })
+        )
+      }
       jobLink={jobLink}
     />
   );

data/webpack/InsightsCloudSync/Components/InsightsTable/table.scss

@@ -1,5 +1,3 @@
-@import '~@redhat-cloud-services/frontend-components/index.css';
-
 .rh-cloud-recommendations-table {
   .pf-c-table__check {
     input:disabled {

data/webpack/__mocks__/foremanReact/components/ConfirmModal/index.js

@@ -0,0 +1,3 @@
+export const openConfirmModal = options => options;
+
+export default openConfirmModal;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 6.0.42.1
+  version: 6.0.43
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -624,6 +624,7 @@ files:
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/MountingService.js
 - webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/components/ConfirmModal/index.js
 - webpack/__mocks__/foremanReact/components/Head.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutConstants.js
 - webpack/__mocks__/foremanReact/components/ToastsList/index.js