redhat_access 2.2.7 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b740339358ef572af5ca6bc1df7226e0b00eff8ab6e3740d3715b8a07af199ea
-  data.tar.gz: b996a6399e8a2c120ea0e7958f8e35eb8ef243c2346e121b890a809c53c02edf
+  metadata.gz: 06eace60e082178a03ecb70b5e9e074b59de66baf85ff9cdbbd5704ee72c6e26
+  data.tar.gz: 947a47fbdc1da0bfcf31a3ff0e6aaffbb88e08912c72be9ab9f94fc70ca68036
 SHA512:
-  metadata.gz: 85e504f465a34208d70866c1776c49dab33cf1d362b4406d8a071a51da8333a2d88d8b3278de9aa2b74ab450badf54a1459b4e0f3435f7966bf4a0a7a4a99f65
-  data.tar.gz: 0e691f651455847d24ac38e46288215eef9c6fcd2bec624ab2f024c38dcb3a6b4eefa6579207794ec1e96a52c4b3d91006eb94ee58ae82d3ff3f96020f015336
+  metadata.gz: 512e7a807786b57d014dab005e5a31881f0eb3002aa29ceda6036b9fef68391698374d390a3cb33758825fd4f9916651b982714ed942a2311d3181b4af28ee4c
+  data.tar.gz: 9b93f4a0e89392eb16aa15ef7f5f20df33bace669b62f79c3ce665c5573bddb2d38f9f09ac1b8139e4d59a85e48d9315a0967e3bb4c5564fcf86566654da6a17

data/app/controllers/redhat_access/api/machine_telemetry_api_controller.rb

@@ -36,7 +36,7 @@ module RedhatAccess
 
       def api_connection_test
         client = get_api_client
-        res = client.call_tapi('GET', '/', nil, nil, nil)
+        res = client.call_tapi('GET', '/', nil, nil, {timeout: get_tapi_timeout})
         Rails.logger.debug(res[:data])
         render status: res[:code], json: {}
       end
@@ -61,7 +61,7 @@ module RedhatAccess
         
         client = get_api_client
         Rails.logger.debug("Proxy upload original_payload : #{original_payload}")
-        res = client.call_tapi(original_method, URI.escape(resource), original_params, original_payload, nil, use_subsets)
+        res = client.call_tapi(original_method, URI.escape(resource), original_params, original_payload, {timeout: get_upload_timeout}, use_subsets)
         render status: res[:code] , json: res[:data]
       end
 

data/app/controllers/redhat_access/api/telemetry_api_controller.rb

@@ -65,7 +65,7 @@ module RedhatAccess
 
       def connection_status
         client = get_api_client
-        res = client.call_tapi('GET', 'me', nil, nil, nil)
+        res = client.call_tapi('GET', 'me', nil, nil, {timeout: get_tapi_timeout})
         Rails.logger.debug(res[:data])
         case res[:code]
         when 200
@@ -117,7 +117,7 @@ module RedhatAccess
         end
 
         client = get_api_client
-        res = client.call_tapi(original_method, URI.escape(resource), original_params, original_payload, nil, use_subsets)
+        res = client.call_tapi(original_method, URI.escape(resource), original_params, original_payload, {timeout: get_tapi_timeout}, use_subsets)
         #401 erros means our proxy is not configured right.
         #Change it to 502 to distinguish with local applications 401 errors
         resp_data = res[:data]

data/app/controllers/redhat_access/telemetry_configurations_controller.rb

@@ -19,7 +19,7 @@ module RedhatAccess
         else
           render json: {:error=>"Invalid parameters"}.to_json, status: 400
         end
-          rescue=>e
+          rescue => e
           Rails.logger.info(e)
           render json: {:error=>"Error processing update"}.to_json, status: 500
         end

data/app/services/redhat_access/telemetry/look_ups.rb

@@ -210,7 +210,6 @@ module RedhatAccess
         "#{get_plugin_parent_name}/#{get_plugin_parent_version};#{get_rha_plugin_name}/#{get_rha_plugin_version}"
       end
 
-
       def get_http_options(include_user_id = false)
         headers = {}
         if include_user_id && User.current
@@ -222,6 +221,22 @@ module RedhatAccess
          :headers => headers}
       end
 
+      # global use_subsets flag - defaults to false to suppress use of subsets to address scalability problems
+      # (subset and branch_id are equivalent for satellite)
+      def use_subsets?
+        REDHAT_ACCESS_CONFIG[:use_subsets] || false
+      end
+
+      # timeout for telemetry api operations
+      def get_tapi_timeout
+        REDHAT_ACCESS_CONFIG[:telemetry_api_timeout_s] || 60
+      end
+
+      # timeout for telemetry uploads
+      def get_upload_timeout
+        REDHAT_ACCESS_CONFIG[:telemetry_upload_timeout_s] || 120
+      end
+
       def user_login_to_hash(login)
         Digest::SHA1.hexdigest(login)
       end

data/app/services/redhat_access/telemetry/messaging_service.rb

@@ -164,7 +164,7 @@ module RedhatAccess
                                                         #{:branch_id => @branch_id}.merge(options[:params]),
                                                         options[:params],
                                                         options[:payload],
-                                                        nil,
+                                                        {timeout: get_tapi_timeout},
                                                         options[:use_subsets])
         if res.key?(:error)
           raise res[:error]

data/app/services/redhat_access/telemetry/portal_client.rb

@@ -20,6 +20,11 @@ module RedhatAccess
         @context = context
       end
 
+      # intercept call_tapi() so we can override use of subsets
+      def call_tapi(original_method, resource, original_params, original_payload, extra, use_subsets = true)
+        super(original_method, resource, original_params, original_payload, extra, use_subsets? && use_subsets)
+      end
+
       # Returns the branch id of the current org/account
       def get_branch_id
         organization = get_current_organization

data/config/config.yml.example

@@ -6,8 +6,11 @@
 
 :enable_telemetry_basic_auth : false
 :telemetry_upload_host : "https://cert-api.access.redhat.com"
+# :telemetry_upload_timeout_s : 120
 :telemetry_api_host : "https://cert-api.access.redhat.com"
+# :telemetry_api_timeout_s : 60
 :telemetry_ssl_verify_peer : true
+:use_subsets : false
 
 :diagnostic_logs :
   - /var/log/foreman/production.log

data/config/defaults.yml

@@ -9,6 +9,8 @@
 :telemetry_api_host : "https://cert-api.access.redhat.com"
 :telemetry_ssl_verify_peer : true
 
+:use_subsets : false
+
 :diagnostic_logs :
   - /var/log/foreman/production.log
   - /var/log/foreman/delayed_job.log

data/lib/redhat_access/version.rb

@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "2.2.7"
+  VERSION = "2.2.8"
 end

data/redhat_access.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib,vendor,public,script,ca,locale}/**/*"] + ["LICENSE.txt", "Rakefile", "README.rdoc", "redhat_access.gemspec", "Gemfile"]
   s.test_files = Dir["test/**/*"]
-  s.add_dependency "redhat_access_lib" , ">=1.1.0"
+  s.add_dependency "redhat_access_lib" , ">=1.1.5"
   s.add_dependency "angular-rails-templates", ">=0.0.4"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redhat_access
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.8
 platform: ruby
 authors:
 - Lindani Phiri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redhat_access_lib
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates
   requirement: !ruby/object:Gem::Requirement