foreman_rh_cloud 5.0.42 → 6.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21744025612c50afc1aa1c943e33a0c2dd6e76e8a2ee778ae74068d57c8d971f
-  data.tar.gz: 491d74b6e3ad554de98c2ce45c5b95806547855ab8794aa9a51e3e08bc6e3bca
+  metadata.gz: f9180080890adb316306a32a93c88fd86153d3ddf3acc9d5182831a325b35ca4
+  data.tar.gz: 6a6d744fda10894d04f630e48b1c27a9bc87d4d6ac6af6324e3c2644b69e6948
 SHA512:
-  metadata.gz: a4e8097f9923909d623e445a0b0ca604e737409ee6ce06962e0ae9122f9d8a95d568a41b8e5b2061d2629e6290605f72209f861a9dd7c709661703a927bb5cdf
-  data.tar.gz: 6c62744629566595c8f2ddb4e6b649ac6131efe177666455c97d9dc7353c1f7e2102f90938c2828f95ddfc57fa65a11244cf0a7cc2641595df429948ce01117e
+  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/services/foreman_rh_cloud/cert_auth.rb

@@ -13,7 +13,7 @@ module ForemanRhCloud
       certs = candlepin_id_cert(params.delete(:organization))
       final_params = {
         ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-        ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+        ssl_client_key: OpenSSL::PKey.read(certs[:key]),
       }.deep_merge(params)
 
       super(final_params)

data/app/services/foreman_rh_cloud/cloud_ping_service.rb

@@ -27,7 +27,7 @@ module ForemanRhCloud
             content_type: :json,
           },
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
+          ssl_client_key: OpenSSL::PKey.read(certs[:key])
         )
       rescue StandardError => ex
         ex

data/app/services/foreman_rh_cloud/cloud_presence.rb

@@ -24,7 +24,7 @@ module ForemanRhCloud
               content_type: :json,
             },
             ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-            ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
+            ssl_client_key: OpenSSL::PKey.read(certs[:key])
           )
         )
 
@@ -42,7 +42,7 @@ module ForemanRhCloud
               content_type: :json,
             },
             ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-            ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key])
+            ssl_client_key: OpenSSL::PKey.read(certs[:key])
           )
         )
 
@@ -60,7 +60,7 @@ module ForemanRhCloud
             content_type: :json,
           },
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
           payload: {
             name: "satellite: #{Foreman.instance_id} org: #{@organization.name}",
             source_ref: Foreman.instance_id,
@@ -84,7 +84,7 @@ module ForemanRhCloud
             content_type: :json,
           },
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
           payload: {
             source_id: source_id,
             rhc_id: Setting[:rhc_instance_id],

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -63,19 +63,19 @@ module ForemanRhCloud
         {
           url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+          ssl_client_key: OpenSSL::PKey.read(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]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
         }
       else # Legacy insights API
         {
           url: ForemanRhCloud.legacy_insights_url + request_path.sub('/redhat_access/r/insights', '/r/insights'),
           ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
-          ssl_client_key: OpenSSL::PKey::RSA.new(certs[:key]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
           ssl_ca_file: ForemanRhCloud.legacy_insights_ca,
         }
       end

data/config/Gemfile.lock.gh_test

@@ -1,8 +1,8 @@
 PATH
   remote: ../foreman-tasks
   specs:
-    foreman-tasks (5.2.0)
-      dynflow (>= 1.2.3)
+    foreman-tasks (6.0.2)
+      dynflow (>= 1.6.0)
       get_process_mem
       parse-cron (~> 0.1.4)
       sinatra
@@ -10,7 +10,7 @@ PATH
 PATH
   remote: ../foreman_rh_cloud
   specs:
-    foreman_rh_cloud (5.0.29)
+    foreman_rh_cloud (6.0.39)
       foreman-tasks
       foreman_ansible
       katello
@@ -18,29 +18,30 @@ PATH
 PATH
   remote: ../katello
   specs:
-    katello (4.3.0.rc2.1)
+    katello (4.5.0)
       activerecord-import
       anemone
       angular-rails-templates (~> 1.1.0)
       apipie-rails (>= 0.5.14)
       deface (>= 1.0.2, < 2.0.0)
       dynflow (>= 1.6.1)
+      faraday (< 1.9)
       foreman-tasks (>= 5.0)
-      foreman_remote_execution (>= 3.0)
+      foreman_remote_execution (>= 7.1.0)
       fx (< 1.0)
       gettext_i18n_rails
       json
       oauth
       pg
-      pulp_ansible_client (>= 0.10, < 0.11)
+      pulp_ansible_client (>= 0.13.1, < 0.14)
       pulp_certguard_client (< 2.0)
-      pulp_container_client (>= 2.9.0, < 2.10.0)
-      pulp_deb_client (>= 2.16.0, < 2.17.0)
+      pulp_container_client (>= 2.10.0, < 2.11.0)
+      pulp_deb_client (>= 2.18.0, < 2.19.0)
       pulp_file_client (>= 1.10.0, < 1.11.0)
       pulp_ostree_client
-      pulp_python_client (>= 3.5.0, < 3.6.0)
-      pulp_rpm_client (>= 3.16.0, < 3.17.0)
-      pulpcore_client (>= 3.16.0, < 3.17.0)
+      pulp_python_client (>= 3.6.0, < 3.7.0)
+      pulp_rpm_client (>= 3.17.0, < 3.18.0)
+      pulpcore_client (>= 3.18.0, < 3.19.0)
       qpid_proton
       rabl
       rails
@@ -52,52 +53,52 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.7)
-      actionpack (= 6.0.3.7)
+    actioncable (6.0.4.8)
+      actionpack (= 6.0.4.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionmailbox (6.0.4.8)
+      actionpack (= 6.0.4.8)
+      activejob (= 6.0.4.8)
+      activerecord (= 6.0.4.8)
+      activestorage (= 6.0.4.8)
+      activesupport (= 6.0.4.8)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
+    actionmailer (6.0.4.8)
+      actionpack (= 6.0.4.8)
+      actionview (= 6.0.4.8)
+      activejob (= 6.0.4.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.7)
-      actionview (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionpack (6.0.4.8)
+      actionview (= 6.0.4.8)
+      activesupport (= 6.0.4.8)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actiontext (6.0.4.8)
+      actionpack (= 6.0.4.8)
+      activerecord (= 6.0.4.8)
+      activestorage (= 6.0.4.8)
+      activesupport (= 6.0.4.8)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionview (6.0.4.8)
+      activesupport (= 6.0.4.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    activejob (6.0.4.8)
+      activesupport (= 6.0.4.8)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord (6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord-import (1.2.0)
-      activerecord (>= 3.2)
+    activemodel (6.0.4.8)
+      activesupport (= 6.0.4.8)
+    activerecord (6.0.4.8)
+      activemodel (= 6.0.4.8)
+      activesupport (= 6.0.4.8)
+    activerecord-import (1.4.0)
+      activerecord (>= 4.2)
     activerecord-nulldb-adapter (0.8.0)
       activerecord (>= 5.2.0, < 7.1)
     activerecord-session_store (2.0.0)
@@ -106,12 +107,12 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 2.0.8, < 3)
       railties (>= 5.2.4.1)
-    activestorage (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
+    activestorage (6.0.4.8)
+      actionpack (= 6.0.4.8)
+      activejob (= 6.0.4.8)
+      activerecord (= 6.0.4.8)
       marcel (~> 1.0.0)
-    activesupport (6.0.3.7)
+    activesupport (6.0.4.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -133,47 +134,43 @@ GEM
       sprockets (>= 3.0, < 5)
       tilt
     ansi (1.5.0)
-    apipie-dsl (2.4.0)
+    apipie-dsl (2.5.0)
     apipie-params (0.0.5)
-    apipie-rails (0.5.19)
+    apipie-rails (0.5.20)
       rails (>= 4.1)
-    as_deprecation_tracker (1.5.0)
+    as_deprecation_tracker (1.6.0)
       activesupport (>= 4.2)
       railties (>= 4.2)
     ast (2.4.2)
     audited (4.10.0)
       activerecord (>= 4.2, < 6.2)
-    autoprefixer-rails (10.3.3.0)
+    autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.18)
     bcrypt_pbkdf (1.1.0)
-    benchmark-ips (2.9.2)
-    binding_of_caller (0.8.0)
+    benchmark-ips (2.10.0)
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.9.3)
-      msgpack (~> 1.0)
+    bootsnap (1.13.0)
+      msgpack (~> 1.2)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.4)
-    bullet (6.1.5)
+    bullet (7.0.2)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (11.1.3)
-    capybara (3.35.3)
+    capybara (3.37.1)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    childprocess (3.0.0)
-    ci_reporter (2.0.0)
-      builder (>= 2.1.2)
-    ci_reporter_minitest (1.0.0)
-      ci_reporter (~> 2.0)
-      minitest (~> 5.0)
+    childprocess (4.1.0)
     coderay (1.1.3)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
@@ -182,76 +179,62 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     concurrent-ruby-edge (0.6.0)
       concurrent-ruby (~> 1.1.6)
     connection_pool (2.2.5)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.10.0)
+    css_parser (1.11.0)
       addressable
     daemons (1.4.1)
     database_cleaner (1.99.0)
     deacon (1.0.0)
     debug_inspector (1.1.0)
     declarative (0.0.20)
-    deep_cloneable (3.1.0)
-      activerecord (>= 3.1.0, < 7)
-    deface (1.8.1)
+    deep_cloneable (3.2.0)
+      activerecord (>= 3.1.0, < 8)
+    deface (1.9.0)
+      actionview (>= 5.2)
       nokogiri (>= 1.6)
       polyglot
-      rails (>= 5.2)
+      railties (>= 5.2)
       rainbow (>= 2.1.0)
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dynflow (1.6.1)
+    dynflow (1.6.7)
       algebrick (~> 0.7.0)
       apipie-params
       concurrent-ruby (~> 1.1.3)
       concurrent-ruby-edge (~> 0.6.0)
-      msgpack (~> 1.3.3)
+      msgpack (~> 1.3, >= 1.3.3)
       multi_json
       sequel (>= 4.0.0)
-    ed25519 (1.2.4)
-    erubi (1.10.0)
-    excon (0.88.0)
+    ed25519 (1.3.0)
+    erubi (1.11.0)
+    excon (0.92.4)
     execjs (2.8.1)
-    facter (4.2.5)
+    facter (4.2.11)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
+    facterdb (1.19.0)
+      facter (< 5.0.0)
+      jgrep
     factory_bot (5.2.0)
       activesupport (>= 4.2.0)
     factory_bot_rails (5.2.0)
       factory_bot (~> 5.2.0)
       railties (>= 4.2.0)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
+    faraday (0.17.5)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
     fast_gettext (1.8.0)
-    ffi (1.15.4)
-    fog-aws (3.12.0)
+    ffi (1.15.5)
+    fog-aws (3.14.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
     fog-core (2.1.0)
       builder
       excon (~> 0.58)
@@ -272,17 +255,16 @@ GEM
       fog-xml (~> 0.1.1)
       json
       ruby-libvirt (>= 0.7.0)
-    fog-openstack (1.0.11)
+    fog-openstack (1.1.0)
       fog-core (~> 2.1)
       fog-json (>= 1.0)
-      ipaddress (>= 0.8)
-    fog-ovirt (2.0.1)
+    fog-ovirt (2.0.2)
       activesupport
       fog-core
       fog-json
       fog-xml
       ovirt-engine-sdk (>= 4.3.1)
-    fog-vsphere (3.5.0)
+    fog-vsphere (3.5.2)
       fog-core
       rbvmomi (>= 1.9, < 3)
     fog-xml (0.1.4)
@@ -293,16 +275,16 @@ GEM
     foreman (0.87.2)
     foreman-tasks-core (0.3.6)
       dynflow (>= 1.2.0)
-    foreman_ansible (6.4.1)
+    foreman_ansible (7.1.2)
       acts_as_list (~> 1.0.3)
       deface (< 2.0)
+      foreman-tasks (>= 5.2.0)
       foreman_remote_execution (>= 4.4.0)
-      ipaddress (>= 0.8.0, < 1.0)
     foreman_ansible_core (4.2.1)
       foreman-tasks-core (~> 0.3.2)
       foreman_remote_execution_core (~> 1.1)
       net-ssh
-    foreman_remote_execution (4.8.0)
+    foreman_remote_execution (7.1.1)
       deface
       dynflow (>= 1.0.2, < 2.0.0)
       foreman-tasks (>= 5.1.0)
@@ -313,19 +295,22 @@ GEM
       net-ssh
       smart_proxy_remote_execution_ssh (>= 0.4.0)
     formatador (0.3.0)
+    forwardable (1.3.2)
     friendly_id (5.3.0)
       activerecord (>= 4.0.0)
-    fx (0.6.2)
+    fx (0.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
-    gettext (3.4.1)
+    gettext (3.4.3)
+      erubi
       locale (>= 2.0.5)
+      prime
       text (>= 1.3.0)
     gettext_i18n_rails (1.8.1)
       fast_gettext (>= 0.9.0)
-    gettext_i18n_rails_js (1.3.0)
+    gettext_i18n_rails_js (1.3.1)
       gettext (>= 3.0.2)
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
@@ -342,8 +327,8 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.12)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
     googleauth (0.17.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
@@ -361,20 +346,20 @@ GEM
     hashdiff (1.0.1)
     hocon (1.3.1)
     http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     immigrant (0.3.6)
       activerecord (>= 3.0)
-    ipaddress (0.8.3)
-    journald-logger (3.0.1)
+    jgrep (1.5.4)
+    journald-logger (3.1.0)
       journald-native (~> 1.0)
     journald-native (1.0.12)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.6.1)
+    json (2.6.2)
     jwt (2.2.3)
     launchy (2.5.0)
       addressable (~> 2.7)
@@ -383,28 +368,28 @@ GEM
       net-ldap (>= 0.11)
     little-plugger (1.1.4)
     locale (2.1.3)
-    logging (2.3.0)
+    logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
     logging-journald (2.1.0)
       journald-logger (~> 3.0)
       logging
-    loofah (2.12.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.2)
     maruku (0.7.3)
+    matrix (0.4.2)
     memoist (0.16.2)
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
-    minitest (5.10.3)
-    minitest-reporters (1.4.3)
+    minitest (5.16.2)
+    minitest-reporters (1.5.0)
       ansi
       builder
       minitest (>= 5.0)
@@ -415,43 +400,45 @@ GEM
       minitest (>= 5.0)
       railties (>= 4.1)
     minitest-tags (0.0.5)
-    mocha (1.13.0)
+    mocha (1.14.0)
     mqtt (0.5.0)
-    msgpack (1.3.3)
+    msgpack (1.5.4)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
-    mustermann (1.1.1)
+    multipart-post (2.2.3)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    net-ldap (0.17.0)
+    net-ldap (0.17.1)
     net-ping (2.0.8)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (4.2.0)
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
-    oauth (0.5.8)
+    oauth (0.5.10)
     optimist (3.0.1)
     os (1.1.4)
     ovirt-engine-sdk (4.4.1)
       json (>= 1, < 3)
-    paint (2.2.1)
-    parallel (1.21.0)
-    parallel_tests (3.7.3)
+    paint (2.3.0)
+    parallel (1.22.1)
+    parallel_tests (3.11.1)
       parallel
     parse-cron (0.1.4)
-    parser (3.0.3.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     patternfly-sass (3.59.5)
       bootstrap-sass (~> 3.4.0)
       font-awesome-sass (~> 4.6.2)
       sassc (> 2.0.1, < 3.0)
-    pg (1.2.3)
+    pg (1.4.3)
     po_to_json (1.0.1)
       json (>= 1.6.0)
     polyglot (0.3.5)
+    prime (0.1.2)
+      forwardable
+      singleton
     prometheus-client (1.0.0)
     promise.rb (0.7.4)
     pry (0.13.1)
@@ -460,7 +447,7 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    pry-doc (1.2.0)
+    pry-doc (1.3.0)
       pry (~> 0.11)
       yard (~> 0.9.11)
     pry-rails (0.3.9)
@@ -468,44 +455,44 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    pry-stack_explorer (0.4.13)
-      binding_of_caller (~> 0.7)
+    pry-stack_explorer (0.6.1)
+      binding_of_caller (~> 1.0)
       pry (~> 0.13)
-    public_suffix (4.0.6)
-    pulp_ansible_client (0.10.1)
-      faraday (>= 0.14.0)
+    public_suffix (4.0.7)
+    pulp_ansible_client (0.13.2)
+      faraday (~> 0.17, < 1.9.0)
       json (~> 2.1, >= 2.1.0)
-    pulp_certguard_client (1.5.1)
-      faraday (>= 0.14.0)
+    pulp_certguard_client (1.5.3)
+      faraday (~> 0.17, < 1.9.0)
       json (~> 2.1, >= 2.1.0)
-    pulp_container_client (2.9.1)
-      faraday (>= 0.14.0)
+    pulp_container_client (2.10.5)
+      faraday (>= 0.17, < 1.9.0)
       json (~> 2.1, >= 2.1.0)
-    pulp_deb_client (2.16.0)
-      faraday (>= 0.14.0)
+    pulp_deb_client (2.18.0)
+      faraday (~> 0.17, < 1.9.0)
       json (~> 2.1, >= 2.1.0)
-    pulp_file_client (1.10.1)
-      faraday (>= 0.14.0)
+    pulp_file_client (1.10.3)
+      faraday (~> 0.17, < 1.9.0)
       json (~> 2.1, >= 2.1.0)
-    pulp_ostree_client (2.0.0a3.dev1638674738)
-      faraday (>= 0.14.0)
+    pulp_ostree_client (2.0.0a7.dev1660103594)
+      faraday (>= 0.17, < 2.0)
       json (~> 2.1, >= 2.1.0)
-    pulp_python_client (3.5.2)
+    pulp_python_client (3.6.0)
       faraday (>= 0.14.0)
       json (~> 2.1, >= 2.1.0)
-    pulp_rpm_client (3.16.1)
-      faraday (>= 0.14.0)
+    pulp_rpm_client (3.17.10)
+      faraday (>= 0.17, < 1.9.0)
       json (~> 2.1, >= 2.1.0)
-    pulpcore_client (3.16.1)
-      faraday (>= 0.14.0)
+    pulpcore_client (3.18.6)
+      faraday (>= 0.17, < 1.9.0)
       json (~> 2.1, >= 2.1.0)
-    puma (5.5.2)
+    puma (5.6.4)
       nio4r (~> 2.0)
     qpid_proton (0.33.0)
     rabl (0.14.5)
       activesupport (>= 2.3.14)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.4)
     rack-cors (1.0.6)
       rack (>= 1.6.0)
     rack-jsonp (1.3.1)
@@ -513,24 +500,24 @@ GEM
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-protection (2.1.0)
+    rack-protection (2.2.2)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.3.7)
-      actioncable (= 6.0.3.7)
-      actionmailbox (= 6.0.3.7)
-      actionmailer (= 6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actiontext (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (6.0.4.8)
+      actioncable (= 6.0.4.8)
+      actionmailbox (= 6.0.4.8)
+      actionmailer (= 6.0.4.8)
+      actionpack (= 6.0.4.8)
+      actiontext (= 6.0.4.8)
+      actionview (= 6.0.4.8)
+      activejob (= 6.0.4.8)
+      activemodel (= 6.0.4.8)
+      activerecord (= 6.0.4.8)
+      activestorage (= 6.0.4.8)
+      activesupport (= 6.0.4.8)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.7)
+      railties (= 6.0.4.8)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -539,20 +526,20 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    railties (6.0.4.8)
+      actionpack (= 6.0.4.8)
+      activesupport (= 6.0.4.8)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbvmomi (2.4.1)
@@ -561,11 +548,9 @@ GEM
       nokogiri (~> 1.5)
       optimist (~> 3.0)
     rdoc (6.3.3)
-    record_tag_helper (1.0.1)
-      actionview (>= 5)
-    redis (4.1.4)
-    regexp_parser (2.2.0)
-    representable (3.1.1)
+    redis (4.5.1)
+    regexp_parser (2.5.0)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -583,8 +568,8 @@ GEM
     roadie (4.0.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
-    roadie-rails (2.2.0)
-      railties (>= 5.1, < 6.2)
+    roadie-rails (2.3.0)
+      railties (>= 5.1, < 7.1)
       roadie (>= 3.1, < 5.0)
     robotex (1.0.0)
     robottelo_reporter (0.1.1)
@@ -620,7 +605,7 @@ GEM
     ruby2ruby (2.4.4)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_parser (3.18.1)
+    ruby_parser (3.19.1)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
     runcible (2.13.1)
@@ -629,7 +614,7 @@ GEM
       json
       oauth
       rest-client (>= 1.6.1, < 3.0.0)
-    safemode (1.3.6)
+    safemode (1.3.7)
       ruby2ruby (>= 2.4.0)
       ruby_parser (>= 3.10.1)
       sexp_processor (>= 4.10.0)
@@ -651,25 +636,27 @@ GEM
     scoped_search (4.1.10)
       activerecord (>= 4.2.0)
     sd_notify (0.1.1)
-    secure_headers (6.3.3)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
-      rubyzip (>= 1.2.2)
-    sequel (5.51.0)
-    sexp_processor (4.16.0)
+    secure_headers (6.4.0)
+    selenium-webdriver (4.4.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
+    sequel (5.59.0)
+    sexp_processor (4.16.1)
     shoulda-context (1.2.2)
     shoulda-matchers (4.3.0)
       activesupport (>= 4.2.0)
     show_me_the_cookies (5.0.1)
       capybara (>= 2, < 4)
-    sidekiq (5.2.9)
+    sidekiq (5.2.10)
       connection_pool (~> 2.2, >= 2.2.2)
       rack (~> 2.0)
       rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 4.2)
-    signet (0.16.0)
+      redis (~> 4.5, < 4.6.0)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simplecov (0.21.2)
@@ -677,34 +664,35 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov-rcov (0.2.3)
+    simplecov-rcov (0.3.1)
       simplecov (>= 0.4.1)
-    simplecov_json_formatter (0.1.3)
-    sinatra (2.1.0)
-      mustermann (~> 1.0)
+    simplecov_json_formatter (0.1.4)
+    sinatra (2.2.2)
+      mustermann (~> 2.0)
       rack (~> 2.2)
-      rack-protection (= 2.1.0)
+      rack-protection (= 2.2.2)
       tilt (~> 2.0)
     single_test (0.6.0)
       rake
+    singleton (0.1.1)
     slop (3.6.0)
-    smart_proxy_dynflow (0.6.1)
+    smart_proxy_dynflow (0.8.1)
       dynflow (~> 1.6)
       rest-client
       sqlite3
-    smart_proxy_remote_execution_ssh (0.5.0)
+    smart_proxy_remote_execution_ssh (0.8.0)
       mqtt
       net-ssh (>= 4.2.0)
-      smart_proxy_dynflow (~> 0.5)
+      smart_proxy_dynflow (~> 0.8)
     spring (2.1.1)
-    sprockets (4.0.2)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.4.1)
+    sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.4.4)
     sshkey (1.9.0)
     statsd-instrument (2.9.2)
     stomp (1.4.10)
@@ -716,30 +704,31 @@ GEM
       rubocop-performance (~> 1.8.1)
       rubocop-rails (~> 2.8.1)
       rubocop-rspec (~> 1.43.2)
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
-    tilt (2.0.10)
+    tilt (2.0.11)
     trailblazer-option (0.1.2)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uber (0.1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
-    uniform_notifier (1.14.2)
+    uniform_notifier (1.16.0)
     validates_lengths_from_database (0.8.0)
       activerecord (>= 4)
     vcr (3.0.3)
-    webmock (3.14.0)
+    webmock (3.17.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webpack-rails (0.9.11)
       railties (>= 3.2.0)
     webrick (1.7.0)
+    websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -748,12 +737,12 @@ GEM
       paint (>= 0.9, < 3.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.27)
+    yard (0.9.28)
       webrick (~> 1.7.0)
-    zeitwerk (2.5.1)
+    zeitwerk (2.6.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   activerecord-nulldb-adapter
@@ -770,7 +759,6 @@ DEPENDENCIES
   bullet (>= 6.1.0)
   byebug
   capybara (~> 3.33)
-  ci_reporter_minitest
   coffee-rails (~> 5.0.0)
   daemons
   database_cleaner (~> 1.3)
@@ -779,6 +767,7 @@ DEPENDENCIES
   dynflow (>= 1.4.4, < 2.0.0)
   execjs (>= 1.4.0, < 3.0)
   facter
+  facterdb (~> 1.7)
   factory_bot_rails (~> 5.0)
   fast_gettext (~> 1.4)
   fog-aws (>= 3.6.2, < 4)
@@ -790,14 +779,15 @@ DEPENDENCIES
   fog-vsphere (>= 3.5.0, < 4.0)
   foreman
   foreman-tasks!
+  foreman_ansible (~> 7.1.2)
   foreman_ansible_core
-  foreman_remote_execution (~> 4.8.0)
+  foreman_remote_execution (~> 7.1.0)
   foreman_rh_cloud!
   friendly_id (>= 5.3.0, < 5.4)
   get_process_mem
   gettext (>= 3.2.1, < 4.0.0)
   gettext_i18n_rails (~> 1.8)
-  gettext_i18n_rails_js (~> 1.0)
+  gettext_i18n_rails_js (~> 1.3.1)
   gitlab-sidekiq-fetcher
   graphiql-rails (~> 1.7)
   graphql (~> 1.8.0)
@@ -813,8 +803,8 @@ DEPENDENCIES
   logging-journald (~> 2.0)
   mail (~> 2.7)
   maruku (~> 0.7)
-  minitest (~> 5.1, < 5.11)
-  minitest-reporters
+  minitest (~> 5.1)
+  minitest-reporters (~> 1.4)
   minitest-retry (~> 0.0)
   minitest-spec-rails (~> 6.0)
   minitest-tags
@@ -840,13 +830,12 @@ DEPENDENCIES
   rack-cors (~> 1.0.2)
   rack-jsonp
   rack-openid (~> 1.3)
-  rails (~> 6.0.3.1)
+  rails (~> 6.0.4.7)
   rails-controller-testing (~> 1.0)
   rails-i18n (~> 6.0)
   rainbow (>= 2.2.1)
   rbvmomi (~> 2.0)
-  rdoc
-  record_tag_helper (~> 1.0)
+  rdoc (< 6.4)
   redis (~> 4.0)
   responders (~> 3.0)
   rest-client (>= 2.0.0, < 3)
@@ -887,4 +876,4 @@ DEPENDENCIES
   wirb (>= 1.0, < 3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.2.24

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -13,7 +13,7 @@ module ForemanInventoryUpload
       end
 
       def run
-        if Setting[:content_disconnected]
+        if content_disconnected?
           progress_output do |progress_output|
             progress_output.write_line('Upload was stopped since disconnected mode setting is enabled for content on this instance.')
             progress_output.status = "Task aborted, exit 1"
@@ -74,6 +74,10 @@ module ForemanInventoryUpload
       def organization
         @organization ||= Organization.find(input[:organization_id])
       end
+
+      def content_disconnected?
+        Setting[:content_disconnected]
+      end
     end
   end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -21,7 +21,7 @@ module ForemanRhCloud
     end
 
     initializer 'foreman_rh_cloud.load_default_settings', :before => :load_config_initializers do
-      require_dependency File.expand_path('../../app/models/setting/rh_cloud.rb', __dir__)
+      require_dependency File.expand_path('settings.rb', __dir__)
     end
 
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
@@ -29,7 +29,6 @@ module ForemanRhCloud
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/app/overrides"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/lib"]
 
     config.eager_load_paths += Dir["#{config.root}/lib"]
@@ -43,7 +42,7 @@ module ForemanRhCloud
 
     initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '>= 2.3'
+        requires_foreman '>= 3.3'
 
         apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
 

data/lib/foreman_rh_cloud/settings.rb

@@ -0,0 +1,11 @@
+Foreman::SettingManager.define(:foreman) do
+  category(:rh_cloud, N_('RHCloud')) do
+    setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud'), default: true, full_name: N_('Automatic inventory upload'))
+    setting('allow_auto_insights_sync', type: :boolean, description: N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), default: false, full_name: N_('Synchronize recommendations Automatically'))
+    setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host names'))
+    setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host ipv4 addresses'))
+    setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud'), default: false, full_name: N_("Exclude installed Packages"))
+    setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman?'), default: false, full_name: N_('Include parameters in insights-client reports'))
+    setting('rhc_instance_id', type: :string, description: N_('RHC daemon id'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
+  end
+end

data/lib/foreman_rh_cloud/version.rb

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

data/package.json

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

data/test/jobs/upload_report_job_test.rb

@@ -12,7 +12,7 @@ class UploadReportJobTest < ActiveSupport::TestCase
         'idCert' => 'TEST_CERT',
       }
     )
-    Setting[:content_disconnected] = true
+    ForemanInventoryUpload::Async::UploadReportJob.any_instance.expects(:content_disconnected?).returns(true)
 
     ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
 

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/ForemanRhCloudFills.js

@@ -18,7 +18,7 @@ const fills = [
     weight: 400,
   },
   {
-    slot: 'details-cards',
+    slot: 'host-overview-cards',
     name: 'insights-total-risk-chart',
     component: props => <InsightsTotalRiskCard {...props} />,
     weight: 1100,

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: 5.0.42
+  version: 6.0.43
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -158,7 +158,6 @@ files:
 - app/models/insights_resolution.rb
 - app/models/insights_rule.rb
 - app/models/inventory_sync/inventory_status.rb
-- app/models/setting/rh_cloud.rb
 - app/models/task_output_line.rb
 - app/models/task_output_status.rb
 - app/overrides/hosts_list.rb
@@ -219,6 +218,7 @@ files:
 - lib/foreman_inventory_upload/scripts/uploader.sh.erb
 - lib/foreman_rh_cloud.rb
 - lib/foreman_rh_cloud/engine.rb
+- lib/foreman_rh_cloud/settings.rb
 - lib/foreman_rh_cloud/version.rb
 - lib/insights_cloud.rb
 - lib/insights_cloud/async/cloud_connector_announce_task.rb
@@ -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

data/app/models/setting/rh_cloud.rb

@@ -1,29 +0,0 @@
-class Setting::RhCloud < Setting
-  ::Setting::BLANK_ATTRS.concat %w{rhc_instance_id}
-
-  def self.load_defaults
-    return false unless table_exists?
-    transaction do
-      # If the user had auto_upload default setting, we will not surprise him, and force the value to false
-      # for new users, the default will be set to true and the value will remain nil
-      Setting.where(name: 'allow_auto_inventory_upload', value: nil).where("settings.default LIKE '%false%'").update_all(value: "--- false\n...")
-      super
-    end
-  end
-
-  def self.default_settings
-    [
-      set('allow_auto_inventory_upload', N_('Enable automatic upload of your host inventory to the Red Hat cloud'), true, N_('Automatic inventory upload')),
-      set('allow_auto_insights_sync', N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), false, N_('Synchronize recommendations Automatically')),
-      set('obfuscate_inventory_hostnames', N_('Obfuscate host names sent to the Red Hat cloud'), false, N_('Obfuscate host names')),
-      set('obfuscate_inventory_ips', N_('Obfuscate ipv4 addresses sent to the Red Hat cloud'), false, N_('Obfuscate host ipv4 addresses')),
-      set('exclude_installed_packages', N_('Exclude installed packages from being uploaded to the Red Hat cloud'), false, N_("Exclude installed Packages")),
-      set('include_parameter_tags', N_('Should import include parameter tags from Foreman?'), false, N_('Include parameters in insights-client reports')),
-      set('rhc_instance_id', N_('RHC daemon id'), nil, N_('ID of the RHC(Yggdrasil) daemon')),
-    ]
-  end
-
-  def self.humanized_category
-    N_('RH Cloud')
-  end
-end