foreman_rh_cloud 4.0.25.1 → 4.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf14938ab96483d5b90b699ad095664ccda999db645f3d0e4b868b8e6066f268
-  data.tar.gz: 90062d9c4bf632a9d856d17e16639d6920e6a9b9d0bbad1334202041122fd19f
+  metadata.gz: d30780fe6dc3c0b25146d8c8b5549179516218ebbf8cfcaa02aa704ee24d9f62
+  data.tar.gz: 3a0c1d673a773487565e26493f34fe88dd91f5b7a27f15fa6b532b8ef7a2eb58
 SHA512:
-  metadata.gz: 46eb0bfffd3853da3d4d0254756469e07f6f690166e96732bcb77a027d9cf3370cbe3d3f72e59a801cf85338fd2b2a042e45dd4a74907df3b66969a1006cb8c8
-  data.tar.gz: 1464b0f05e778e6b0a002114175b0c0a3f95b51c78af5fecd00395c42d6cd4196dffb0362724bcc62989403500e9994afe9012552e6e0ad00f0c0fe8f2e2fc5e
+  metadata.gz: 80e8f58e6cb5572796af39e096163f151fa1636b92064ab239f16fc439dee10e25c6cf7be17f046670424dcdf2c799fcc497be964585e96ef51070154fe6c6a6
+  data.tar.gz: 3233f24be9b101917d12367e6649edf96e52e705db61de109f04a82ac13369018dbdca536bd2b400ed56a23971aaeceb04905b18f80220f8fe702181403c941b

data/app/controllers/api/v2/rh_cloud/inventory_controller.rb

@@ -7,6 +7,7 @@ module Api
         include InventoryUpload::TaskActions
 
         api :GET, "/organizations/:organization_id/rh_cloud/report", N_("Download latest report")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def download_file
           filename, file = report_file(params[:organization_id])
 
@@ -16,6 +17,7 @@ module Api
         end
 
         api :POST, "/organizations/:organization_id/rh_cloud/report", N_("Start report generation")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def generate_report
           organization_id = params[:organization_id]
 
@@ -27,6 +29,7 @@ module Api
         end
 
         api :POST, "/organizations/:organization_id/rh_cloud/inventory_sync", N_("Start inventory synchronization")
+        param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
         def sync_inventory_status
           selected_org = Organization.find(params[:organization_id])
 
@@ -39,7 +42,7 @@ module Api
           render json: { message: error.message }, status: :bad_request
         end
 
-        api :POST, "rh_cloud/enable_connector", N_("Enable cloud connector")
+        api :POST, "/rh_cloud/enable_connector", N_("Enable cloud connector")
         def enable_cloud_connector
           cloud_connector = ForemanRhCloud::CloudConnector.new
           render json: cloud_connector.install.to_json

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

@@ -25,6 +25,14 @@ module InsightsCloud::Api
         }, status: :bad_gateway
       end
 
+      if @cloud_response.code >= 300
+        return render json: {
+          :message => 'Cloud request failed',
+          :headers => {},
+          :response => @cloud_response,
+        }, 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

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -17,6 +17,8 @@ module ForemanRhCloud
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)
+    rescue RestClient::Exception => error_response
+      error_response.response
     end
 
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)
@@ -62,6 +64,12 @@ module ForemanRhCloud
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
           ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
         }
+      when connection_test_request?
+        {
+          url: ForemanRhCloud.cert_base_url + '/api/apicast-tests/ping',
+          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
+          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+        }
       else # Legacy insights API
         {
           url: ForemanRhCloud.legacy_insights_url + request_path.sub('/redhat_access/r/insights', '/r/insights'),
@@ -76,6 +84,10 @@ module ForemanRhCloud
       ->(request_path) { request_path.include? '/platform' }
     end
 
+    def connection_test_request?
+      ->(request_path) { request_path =~ /redhat_access\/r\/insights\/?$/ }
+    end
+
     def prepare_forward_cloud_url(base_url, request_path)
       cloud_path = request_path.sub('/redhat_access/r/insights/platform/', '')
                                .sub('/redhat_access/r/insights/', '')
@@ -84,11 +96,11 @@ module ForemanRhCloud
     end
 
     def core_app_name
-      'Foreman'
+      BranchInfo.new.core_app_name
     end
 
     def core_app_version
-      Foreman::Version.new
+      BranchInfo.new.core_app_version
     end
 
     def http_user_agent(original_request)