redhat_access 2.1.10 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3f2d7895af2ff247048b38149cfb5d71a001368eaee189077516fa1afb4b4428
-  data.tar.gz: 59ddd32c84310572267af5867fa0262d0ef8bdb5eea5ddfe79bdbe0a40410651
+SHA1:
+  metadata.gz: 56b1c25b08f98029fce262ff0cff8b2ca21b908e
+  data.tar.gz: 14aecaa87ca12f6480d3c2a7cbdbcb8d2bc94700
 SHA512:
-  metadata.gz: b7af6fcd285fc8ca428bc6c6b76f7691bb55cc8bc72e9e5cd123ecf8e7d97aecb99057c738087d814ae3e65dbfc994e143d15a03643ab4f9eedb66dbd31b7cb4
-  data.tar.gz: a0e451a84bbbb4619ee4b689142e74f68a4f8a29feb435897910c1217dcd14c46e701f384cb5e51aa97781a03f6d351e57172593f76efdbd447412d12548a2dd
+  metadata.gz: 82243a1fc7341fdc2f7d09ea28986e169bab1c37d78303b2148b43b18334b95427ec3bc2591c8ca971752b12e83f6d0593dc6f5d703a3e5be6f51ca333ad061a
+  data.tar.gz: 0a773d5bb91b95e4c05381f880056d2ea3e90560550f41bdeaddf151fc3372f687d70e8a7193d94206ef29152f4aca10267ffcad09de62880685b44caf54322b

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

@@ -51,14 +51,9 @@ module RedhatAccess
         else
           resource = "uploads/#{params[:id]}"
         end
-        if request.format.json?
-          original_payload = original_payload.to_json
-        end
         if params[:file]
-          #Overwrite payload if sending a file
           original_payload = get_file_data(params)
         end
-        
         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)

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

@@ -63,7 +63,7 @@ module RedhatAccess
          unless content_hdr.nil?
             headers['content-type'] = content_hdr
          end
-         headers['Authorization'] = env['HTTP_AUTHORIZATION'] if env['HTTP_AUTHORIZATION']
+         headers['Authorization'] = request.env['HTTP_AUTHORIZATION'] if request.env['HTTP_AUTHORIZATION']
          Rails.logger.debug("User agent for telemetry is #{get_http_user_agent}")
          strata_host = 'https://api.' + REDHAT_ACCESS_CONFIG[:strata_host]
          return RedhatAccess::Telemetry::PortalClient.new(strata_host,

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

@@ -108,14 +108,9 @@ module RedhatAccess
           original_payload = request.body.read
         end
         resource = params[:path] == nil ? "/" : params[:path]
-
         if params[:file]
           original_payload = get_file_data(params)
-        elsif request.format.json? && request.patch? && original_payload
-          # because rails behaves stupidly for http PATCH:
-          original_payload = original_payload.to_json unless original_payload.is_a? String
         end
-
         client = get_api_client
         res = client.call_tapi(original_method, URI.escape(resource), original_params, original_payload, nil, use_subsets)
         #401 erros means our proxy is not configured right.
@@ -150,10 +145,10 @@ module RedhatAccess
       end
 
       def get_file_data params
-        data            = {}
-        data[:file]     = params[:file]
-        data[:metadata] = params[:metadata] if params[:metadata]  # include the metadata part if present
-        return data
+        return {
+          :file => params[:file],
+          :filename => params[:file].original_filename
+        }
       end
 
       def add_branch_to_params(params)

data/app/models/redhat_access/concerns/host_managed_extensions.rb

@@ -12,10 +12,8 @@ module RedhatAccess
         def search_by_plan_id(key, operator, value)
           insights_plan_runner = ForemanAnsible::InsightsPlanRunner.new(Organization.current, value.to_i)
           hostname_rules_relation = insights_plan_runner.hostname_rules(insights_plan_runner.playbook)
-          hosts = hostname_rules_relation.keys.map do |hostname|
-            Host::Managed.find_by(:name => hostname).id
-          end
-          { :conditions => " hosts.id IN(#{hosts.join(',')})" }
+          host_ids = Host::Managed.where(:name => hostname_rules_relation.keys).pluck(&:id)
+          { :conditions => " hosts.id IN(#{host_ids.join(',')})" }
         end
       end
     end

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

@@ -185,7 +185,8 @@ module RedhatAccess
 
       def get_content_hosts(org)
         if org
-          ::Host::Managed.authorized('view_hosts', ::Host::Managed).joins(:subscription_facet).rewhere({:organization_id => org.id}).pluck("katello_subscription_facets.uuid")
+          host_ids = ::Host::Managed.authorized('view_hosts', ::Host::Managed).where({:organization_id => org.id}).pluck(:id)
+          Katello::Host::SubscriptionFacet.where(:host_id => host_ids).pluck(:uuid)
         else
           raise(RecordNotFound, 'Organization not found or invalid')
         end

data/config/routes.rb

@@ -16,8 +16,8 @@ RedhatAccess::Engine.routes.draw do
       get   '/v1/branch_info',      to: 'api/machine_telemetry_api#get_branch_info'
       post  '/uploads/(:id)',       to: 'api/machine_telemetry_api#proxy_upload'
       get '/view/api/:v/me' ,   to: 'api/telemetry_api#connection_status', :constraints => {:v =>/(v[0-9]|latest)/}
-      match '/view/api/:path',      to: 'api/telemetry_api#proxy', :constraints => {:path => /.*/} ,via: [:get, :post, :delete,:put, :patch]
-      match '/:path',               to: 'api/machine_telemetry_api#proxy', :constraints => {:path => /.*/}, via: [:get, :post, :delete,:put, :patch]
+      match '/view/api/:path',      to: 'api/telemetry_api#proxy', :constraints => {:path => /.*/} ,via: [:get, :post, :delete,:put]
+      match '/:path',               to: 'api/machine_telemetry_api#proxy', :constraints => {:path => /.*/}, via: [:get, :post, :delete,:put]
     end
     get 'insights', to: 'analytics_dashboard#index'
     get 'analytics_configuration', to: 'telemetry_configuration#index'

data/lib/redhat_access/engine.rb

@@ -89,7 +89,7 @@ module RedhatAccess
           Foreman::Plugin.installed?('foreman_sam')
         end
 
-        requires_foreman '>= 1.15'
+        requires_foreman '>= 1.18'
         #requires_foreman_plugin 'katello', '> 3.0.0'
 
         precompile_assets([
@@ -131,37 +131,6 @@ module RedhatAccess
         end
         add_all_permissions_to_default_roles
         # menus
-        sub_menu :header_menu, :redhat_access_menu, :caption => N_('Red Hat Access') do
-          menu :header_menu,
-               :Search,
-               :url => '/redhat_access/search',
-               :url_hash => {:controller => :"redhat_access/search", :action => :index},
-               :engine => RedhatAccess::Engine,
-               :turbolinks => false
-          menu :header_menu,
-               :LogViewer,
-               :url => '/redhat_access/logviewer',
-               :url_hash => {:controller => :"redhat_access/logs", :action => :logs},
-               :engine => RedhatAccess::Engine,
-               :caption => N_('Logs'),
-               :turbolinks => false
-          divider :header_menu, :parent => :redhat_access_menu, :caption => N_('Support')
-          menu :header_menu,
-               :mycases,
-               :url => '/redhat_access/case/list',
-               :url_hash => {:controller => :"redhat_access/cases", :action => :index},
-               :engine => RedhatAccess::Engine,
-               :caption => N_('My Cases'),
-               :turbolinks => false
-
-          menu :header_menu, :new_cases, :caption => N_('Open New Case'),
-               :url => '/redhat_access/case/new',
-               :url_hash => {:controller => :"redhat_access/cases", :action => :create},
-               :engine => RedhatAccess::Engine,
-               :turbolinks => false
-
-        end
-
         unless sam_deployment?
           sub_menu :top_menu, :redhat_access_top_menu, :caption => N_('Insights'),
                                                        :icon => 'pficon pficon-storage-domain' do
@@ -215,6 +184,36 @@ module RedhatAccess
                      :engine => RedhatAccess::Engine,
                      :turbolinks => false
           end
+          sub_menu :top_menu, :redhat_access_menu, :caption => N_('Access'), :icon => 'fa fa-phone' do
+            menu :top_menu,
+                 :Search,
+                 :url => '/redhat_access/search',
+                 :url_hash => {:controller => :"redhat_access/search", :action => :index},
+                 :engine => RedhatAccess::Engine,
+                 :turbolinks => false
+            menu :top_menu,
+                 :LogViewer,
+                 :url => '/redhat_access/logviewer',
+                 :url_hash => {:controller => :"redhat_access/logs", :action => :logs},
+                 :engine => RedhatAccess::Engine,
+                 :caption => N_('Logs'),
+                 :turbolinks => false
+            divider :top_menu, :parent => :redhat_access_menu, :caption => N_('Support')
+            menu :top_menu,
+                 :mycases,
+                 :url => '/redhat_access/case/list',
+                 :url_hash => {:controller => :"redhat_access/cases", :action => :index},
+                 :engine => RedhatAccess::Engine,
+                 :caption => N_('My Cases'),
+                 :turbolinks => false
+
+            menu :top_menu, :new_cases, :caption => N_('Open New Case'),
+                 :url => '/redhat_access/case/new',
+                 :url_hash => {:controller => :"redhat_access/cases", :action => :create},
+                 :engine => RedhatAccess::Engine,
+                 :turbolinks => false
+
+          end
           widget 'insights_issues_widget', :name => 'Red Hat Insights Actions', :sizey => 1, :sizex => 6
           widget 'insights_risk_widget', :name => 'Red Hat Insights Risk Summary', :sizey => 1, :sizex => 6
         end

data/lib/redhat_access/version.rb

@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "2.1.10"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redhat_access
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.2.0
 platform: ruby
 authors:
 - Lindani Phiri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redhat_access_lib
@@ -336,61 +336,62 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Plugin to add Redhat Access to Foreman
 test_files:
-- test/unit/redhat_access/telemetry_configuration_test.rb
-- test/unit/helpers/redhat_access/telemetry_configuration_helper_test.rb
+- test/integration/navigation_test.rb
 - test/unit/helpers/redhat_access/redhat_access_helper_test.rb
-- test/unit/helpers/redhat_access/attachments_helper_test.rb
-- test/unit/helpers/redhat_access/cases_helper_test.rb
-- test/unit/helpers/redhat_access/analytics_dashboard_helper_test.rb
-- test/unit/helpers/redhat_access/search_helper_test.rb
 - test/unit/helpers/redhat_access/logs_helper_test.rb
 - test/unit/helpers/redhat_access/log_viewer_helper_test.rb
+- test/unit/helpers/redhat_access/search_helper_test.rb
+- test/unit/helpers/redhat_access/telemetry_configuration_helper_test.rb
+- test/unit/helpers/redhat_access/analytics_dashboard_helper_test.rb
+- test/unit/helpers/redhat_access/attachments_helper_test.rb
+- test/unit/helpers/redhat_access/cases_helper_test.rb
+- test/unit/redhat_access/telemetry_configuration_test.rb
+- test/test_helper.rb
+- test/models/redhat_access/telemetry_proxy_credentials_test.rb
+- test/functional/redhat_access/telemetry_configuration_controller_test.rb
+- test/functional/redhat_access/redhat_access_controller_test.rb
+- test/functional/redhat_access/attachments_controller_test.rb
+- test/functional/redhat_access/search_controller_test.rb
+- test/functional/redhat_access/analytics_dashboard_controller_test.rb
+- test/functional/redhat_access/configuration_controller_test.rb
+- test/functional/redhat_access/logs_controller_test.rb
+- test/functional/redhat_access/cases_controller_test.rb
+- test/functional/redhat_access/log_viewer_controller_test.rb
+- test/redhat_access_test.rb
 - test/sos-report-test.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/helpers/application_helper.rb
+- test/dummy/README.rdoc
 - test/dummy/config/routes.rb
-- test/dummy/config/locales/en.yml
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/application.rb
 - test/dummy/config/database.yml
+- test/dummy/config/application.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/environment.rb
 - test/dummy/config/boot.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/inflections.rb
+- test/dummy/public/404.html
+- test/dummy/public/500.html
+- test/dummy/public/422.html
+- test/dummy/public/favicon.ico
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/controllers/application_controller.rb
 - test/dummy/config.ru
-- test/dummy/script/rails
 - test/dummy/Rakefile
-- test/dummy/public/favicon.ico
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/README.rdoc
-- test/integration/navigation_test.rb
-- test/models/redhat_access/telemetry_proxy_credentials_test.rb
-- test/redhat_access_test.rb
+- test/dummy/script/rails
 - test/fixtures/redhat_access/telemetry_configurations.yml
 - test/fixtures/redhat_access/telemetry_proxy_credentials.yml
-- test/test_helper.rb
-- test/functional/redhat_access/analytics_dashboard_controller_test.rb
-- test/functional/redhat_access/redhat_access_controller_test.rb
-- test/functional/redhat_access/logs_controller_test.rb
-- test/functional/redhat_access/search_controller_test.rb
-- test/functional/redhat_access/telemetry_configuration_controller_test.rb
-- test/functional/redhat_access/log_viewer_controller_test.rb
-- test/functional/redhat_access/attachments_controller_test.rb
-- test/functional/redhat_access/configuration_controller_test.rb
-- test/functional/redhat_access/cases_controller_test.rb