redhat_access 2.2.15 → 2.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f89c7faa75f59562806c09d6c4dc210e754bcf2fe0148c3adc8e4017790df0e
-  data.tar.gz: e775c96ab698eb7ab8cc7969f8423a1b323a749ff9a86b4adfe57addb704e059
+  metadata.gz: fe33c66ba4b918fd0d0a4b643075d656ba00c8f1af2efc387643d181b8b132df
+  data.tar.gz: 1b7c7b46ffe75f51142247eac000413b5507f343bcefbeae4d436663adc74ae2
 SHA512:
-  metadata.gz: 84ea9bc59d80cb132a2e833ee2c47c6c38db1ede55c2fb28fd974f06c5b51fe9be3647cb1fd17b4456c8a49a3a046914f10fa25b106a6e3e39ada41364436ee7
-  data.tar.gz: cdb8bae03acecdc24d49fe1228ad8c0fc78ccbec51389057f0c986af2e55e14454aaecf10549310edd62f846913394c2cc08e85f9fbb7e7cd1fe132352f4e9bf
+  metadata.gz: 2cfb18c7636c09b3e55bb16c8d848a55ff1d64c87129b0de6291121ac2da3aff83a363b679346c9bbd4dd5b347290a81a4d29aa36c96ab7d7239be9f57ecfd48
+  data.tar.gz: 89f7c4b1effd5629d548c82def18385e60e1357729024162daac288524b9fa9561bbdfc1bd317a496182934b82359f90bfa8b14c0f5b995ecd78ca4ec7038f9c

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

@@ -120,6 +120,18 @@ module RedhatAccess
         host = get_content_host(uuid)
         org = get_organization(host)
 
+        # {
+        #     "Satellite":  {
+        #         "Organization": ["Insights"],
+        #         "Location": ["North America", "RTP"]
+        #     },
+        #
+        #     "SatelliteParameter": {
+        #         "parameter_1": ["value_1"],
+        #         "parameter_2": ["value_2"]
+        #     }
+        # }
+
         # get organization
         labels = [{
                       :namespace => "Satellite",

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

@@ -15,8 +15,7 @@ module RedhatAccess
       end
 
       def can_mask_rules(user)
-        # #TODO move this to an auth class?
-        # TODO move this to an auth class?
+        849456        # TODO move this to an auth class?
         return false if user.nil?
         return true if user.admin
         permissions = user.cached_roles.collect(&:permissions).flatten.map!(&:name)
@@ -67,7 +66,8 @@ module RedhatAccess
       def disconnected_org?(org)
         if org
           # TODO: fix hard coding
-          org.redhat_repository_url != 'https://cdn.redhat.com'
+          # disable insights if disconnected orgs aren't enabled and katello doesn't point to redhat's CDN
+          !REDHAT_ACCESS_CONFIG[:enable_insights_for_disconnected_orgs] && org.redhat_repository_url != 'https://cdn.redhat.com'
         else
           raise(RecordNotFound, 'Organization not found or invalid')
         end

data/config/config.yml.example

@@ -11,6 +11,7 @@
 # :telemetry_api_timeout_s : 60
 :telemetry_ssl_verify_peer : true
 :use_subsets : false
+:enable_insights_for_disconnected_orgs : false
 
 :diagnostic_logs :
   - /var/log/foreman/production.log

data/config/defaults.yml

@@ -9,6 +9,7 @@
 :telemetry_api_host : "https://cert-api.access.redhat.com"
 :telemetry_ssl_verify_peer : true
 
+:enable_insights_for_disconnected_orgs : false
 :use_subsets : false
 
 :diagnostic_logs :

data/lib/redhat_access/version.rb

@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "2.2.15"
+  VERSION = "2.2.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redhat_access
 version: !ruby/object:Gem::Version
-  version: 2.2.15
+  version: 2.2.16
 platform: ruby
 authors:
 - Lindani Phiri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redhat_access_lib