foreman_rh_cloud 1.0.5 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5492f054563594467c7f237d388dbe7dbcb2ccd184e1d9eb493b31757f500c66
-  data.tar.gz: 02cf9ab283f73239246cebf291dee44878f80734c694baab0610e748e707e975
+  metadata.gz: a9b4163dafd6baf15a6b8ffc04de58d1b0316114838e06ef3c3d28f043442a6c
+  data.tar.gz: 9c8bf6874697a56d76e696397cfc11ed0f3f1379716d5b91bebc54fdc4be98a0
 SHA512:
-  metadata.gz: '059b4ef6c7238a1efb31767e48e2edba060d33f915a0a8c0d9aa1b4552517a32aaecf0655f57ca9e34fd779a863d017f79983e66a813a4c6eb115ab8fba1d14b'
-  data.tar.gz: 9fc152b2d8f82c9b42e59135b1a620808d3a8bada32f592aefab487caf3b3fd312a2bc89c23c650c1da06dd5b380ee40d9b746f9980f7e5f8459906f866b12f3
+  metadata.gz: 56d9d668982202c78267c8b3d2425a6b3f3695be21fe3bf993710990c0811438b7bf938298e5a5421a40374dbb862d48538811388d851621bb4dbba8a7dfa396
+  data.tar.gz: e725d4ff38d466f6c1713822108ed9d04e08946f57fbd27032977b0ef7f4278c414d7d1c418f517a6d25b27b0e2131030ae8ba376ab27ac365729b9c60737f41

data/README.md

@@ -11,6 +11,14 @@ for how to install Foreman plugins
 
 *Usage here*
 
+### In Satellite
+
+Normally you run it via UI in RH Cloud -> Inventory Upload -> Restart, but if you need to run from command-line for some reason:
+
+    export organization_id=1
+    export target=/var/lib/foreman/red_hat_inventory/generated_reports/
+    /usr/sbin/foreman-rake foreman_inventory_upload:report:generate
+
 ## TODO
 
 *Todo list here*

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -1,12 +1,8 @@
 module ForemanInventoryUpload
   class AccountsController < ::ApplicationController
-    # override default "welcome screen behavior, since we don't have a model"
-    def welcome
-      true
-    end
-
     def index
-      labels = Organization.all.pluck(:id, :name)
+      organizations = User.current.my_organizations
+      labels = organizations.pluck(:id, :name)
 
       accounts = Hash[
         labels.map do |id, label|

data/app/controllers/foreman_rh_cloud/react_controller.rb

@@ -0,0 +1,8 @@
+module ForemanRhCloud
+  class ReactController < ::ApplicationController
+    layout "foreman_rh_cloud/application"
+
+    def inventory_upload
+    end
+  end
+end

data/app/models/setting/rh_cloud.rb

@@ -4,6 +4,7 @@ class Setting::RhCloud < Setting
     return unless super
     [
       set('allow_auto_inventory_upload', N_('Allow automatic upload of the host inventory to the Red Hat cloud'), true),
+      set('obfuscate_inventory_hostnames', N_('Obfuscate host names sent to Red Hat cloud'), false),
     ]
   end
 

data/app/views/foreman_rh_cloud/react/inventory_upload.html.erb

@@ -0,0 +1 @@
+<%= mount_react_component("ForemanInventoryUpload", '#ForemanRhCloudReactRoot') %>

data/app/views/{foreman_inventory_upload/layouts/react.html.erb → layouts/foreman_rh_cloud/application.html.erb}

@@ -10,7 +10,7 @@
   <%= notifications %>
   <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
   <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
-  <div id="ForemanInventoryUploadReactRoot"></div>
+  <div id="ForemanRhCloudReactRoot"></div>
+  <%= yield %>
 <% end %>
 <%= render file: "layouts/base" %>
-<%= mount_react_component('ForemanInventoryUpload', '#ForemanInventoryUploadReactRoot') %>

data/config/routes.rb

@@ -1,6 +1,5 @@
 Rails.application.routes.draw do
   namespace :foreman_inventory_upload do
-    get 'index', to: 'react#index'
     get ':organization_id/reports/last', to: 'reports#last', constraints: { organization_id: %r{[^\/]+} }
     post ':organization_id/reports', to: 'reports#generate', constraints: { organization_id: %r{[^\/]+} }
     get ':organization_id/uploads/last', to: 'uploads#last', constraints: { organization_id: %r{[^\/]+} }
@@ -8,4 +7,8 @@ Rails.application.routes.draw do
     get 'accounts', to: 'accounts#index'
     post 'auto_upload', to: 'uploads#auto_upload'
   end
+
+  namespace :foreman_rh_cloud do
+    get 'inventory_upload', to: 'react#inventory_upload'
+  end
 end

data/lib/foreman_inventory_upload/async/async_helpers.rb

@@ -0,0 +1,13 @@
+module ForemanInventoryUpload
+  module Async
+    module AsyncHelpers
+      extend ActiveSupport::Concern
+
+      def hash_to_s(hash)
+        hash.each_with_object({}) do |(k, v), a|
+          a[k.to_s] = v.to_s
+        end
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload/async/shell_process.rb

@@ -3,11 +3,13 @@ require 'open3'
 module ForemanInventoryUpload
   module Async
     class ShellProcess < ::ApplicationJob
+      include AsyncHelpers
+
       def perform(instance_label)
         klass_name = self.class.name
         logger.debug("Starting #{klass_name} with label #{instance_label}")
         progress_output = ProgressOutput.register(instance_label)
-        Open3.popen2e(env, command) do |_stdin, stdout_stderr, wait_thread|
+        Open3.popen2e(hash_to_s(env), command) do |_stdin, stdout_stderr, wait_thread|
           progress_output.status = "Running in pid #{wait_thread.pid}"
 
           stdout_stderr.each do |out_line|

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -37,11 +37,7 @@ module ForemanInventoryUpload
       end
 
       def http_proxy_string
-        @http_proxy_string ||= begin
-          if Setting[:content_default_http_proxy]
-            HttpProxy.unscoped.find_by(name: Setting[:content_default_http_proxy])&.full_url
-          end
-        end
+        @http_proxy_string ||= HttpProxy.default_global_content_proxy&.full_url
       end
 
       def rh_credentials

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -3,6 +3,11 @@ module ForemanInventoryUpload
     module FactHelpers
       extend ActiveSupport::Concern
 
+      CLOUD_AMAZON = 'aws'
+      CLOUD_GOOGLE = 'google'
+      CLOUD_AZURE = 'azure'
+      CLOUD_ALIBABA = 'alibaba'
+
       def fact_value(host, fact_name)
         value_record = host.fact_values.find do |fact_value|
           fact_value.fact_name_id == ForemanInventoryUpload::Generators::Queries.fact_names[fact_name]
@@ -13,6 +18,57 @@ module ForemanInventoryUpload
       def kilobytes_to_bytes(kilobytes)
         kilobytes * 1024
       end
+
+      def account_id(organization)
+        @organization_accounts ||= {}
+        @organization_accounts[organization.id] ||= organization.pools.where.not(account_number: nil).pluck(:account_number).first
+      end
+
+      def golden_ticket?(organization)
+        result = organization.try(:golden_ticket?)
+        result = organization.content_access_mode == 'org_environment' if result.nil?
+
+        @organization_golden_tickets ||= {}
+        @organization_golden_tickets[organization.id] ||= result
+      end
+
+      def cloud_provider(host)
+        bios_version = fact_value(host, 'dmi::bios::version')
+
+        if bios_version
+          return CLOUD_AMAZON if bios_version.downcase['amazon']
+          return CLOUD_GOOGLE if bios_version.downcase['google']
+        end
+
+        chassis_asset_tag = fact_value(host, 'dmi::chassis::asset_tag')
+        return CLOUD_AZURE if chassis_asset_tag && chassis_asset_tag['7783-7084-3265-9085-8269-3286-77']
+
+        system_manufacturer = fact_value(host, 'dmi::system::manufacturer')
+        return CLOUD_ALIBABA if system_manufacturer && system_manufacturer.downcase['alibaba cloud']
+
+        product_name = fact_value(host, 'dmi::system::product_name')
+        return CLOUD_ALIBABA if product_name && product_name.downcase['alibaba cloud ecs']
+
+        nil
+      end
+
+      def obfuscate_hostname?(host)
+        insights_client_setting = fact_value(host, 'insights_client::obfuscate_hostname_enabled')
+        insights_client_setting = ActiveModel::Type::Boolean.new.cast(insights_client_setting)
+        return insights_client_setting unless insights_client_setting.nil?
+
+        Setting[:obfuscate_inventory_hostnames]
+      end
+
+      def fqdn(host)
+        return host.fqdn unless obfuscate_hostname?(host)
+
+        fact_value(host, 'insights_client::hostname') || obfuscate_fqdn(host.fqdn)
+      end
+
+      def obfuscate_fqdn(fqdn)
+        Base64.urlsafe_encode64(Digest::SHA1.digest(fqdn), padding: false)
+      end
     end
   end
 end

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -19,6 +19,12 @@ module ForemanInventoryUpload
               'lscpu::flags',
               'distribution::version',
               'distribution::id',
+              'virt::is_guest',
+              'dmi::system::manufacturer',
+              'dmi::system::product_name',
+              'dmi::chassis::asset_tag',
+              'insights_client::obfuscate_hostname_enabled',
+              'insights_client::hostname',
             ]).pluck(:name, :id)
           ]
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -26,7 +26,7 @@ module ForemanInventoryUpload
           @stream.array_field('hosts', :last) do
             first = true
             hosts_batch.each do |host|
-              next unless host&.subscription_facet&.pools&.first
+              next unless host&.subscription_facet
               @stream.comma unless first
               if report_host(host)
                 first = false
@@ -39,11 +39,10 @@ module ForemanInventoryUpload
 
       def report_host(host)
         @stream.object do
-          @stream.simple_field('display_name', host.name)
-          @stream.simple_field('fqdn', host.fqdn)
-          @stream.simple_field('account', host.subscription_facet.pools.where.not(account_number: nil).first&.account_number&.to_s)
-          @stream.simple_field('subscription_manager_id', host.subscription_facet.uuid)
-          @stream.simple_field('satellite_id', host.subscription_facet.uuid)
+          @stream.simple_field('fqdn', fqdn(host))
+          @stream.simple_field('account', account_id(host.organization).to_s)
+          @stream.simple_field('subscription_manager_id', host.subscription_facet&.uuid)
+          @stream.simple_field('satellite_id', host.subscription_facet&.uuid)
           @stream.simple_field('bios_uuid', fact_value(host, 'dmi::system::uuid'))
           @stream.simple_field('vm_uuid', fact_value(host, 'virt::uuid'))
           @stream.array_field('ip_addresses') do
@@ -123,6 +122,11 @@ module ForemanInventoryUpload
         @stream.simple_field('subscription_status', host.subscription_status_label)
         @stream.simple_field('katello_agent_running', host.content_facet&.katello_agent_installed?)
         @stream.simple_field('satellite_managed', true)
+        @stream.simple_field(
+          'infrastructure_type',
+          ActiveModel::Type::Boolean.new.cast(fact_value(host, 'virt::is_guest')) ? 'virtual' : 'physical'
+        )
+        @stream.simple_field('cloud_provider', cloud_provider(host))
         unless (installed_products = host.subscription_facet&.installed_products).empty?
           @stream.array_field('installed_products') do
             @stream.raw(installed_products.map do |product|
@@ -143,15 +147,16 @@ module ForemanInventoryUpload
       end
 
       def report_satellite_facts(host)
-        @stream.simple_field('virtual_host_name', host.subscription_facet.hypervisor_host&.name)
-        @stream.simple_field('virtual_host_uuid', host.subscription_facet.hypervisor_host&.subscription_facet&.uuid)
+        @stream.simple_field('virtual_host_name', host.subscription_facet&.hypervisor_host&.name)
+        @stream.simple_field('virtual_host_uuid', host.subscription_facet&.hypervisor_host&.subscription_facet&.uuid)
         if defined?(ForemanThemeSatellite)
           @stream.simple_field('satellite_version', ForemanThemeSatellite::SATELLITE_VERSION)
         end
         @stream.simple_field('system_purpose_usage', host.subscription_facet.purpose_usage)
         @stream.simple_field('system_purpose_role', host.subscription_facet.purpose_role)
         @stream.simple_field('distribution_version', fact_value(host, 'distribution::version'))
-        @stream.simple_field('satellite_instance_id', Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil)
+        @stream.simple_field('satellite_instance_id', Foreman.try(:instance_id))
+        @stream.simple_field('is_simple_content_access', golden_ticket?(host.organization))
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
 

data/lib/foreman_rh_cloud/engine.rb

@@ -26,19 +26,31 @@ module ForemanRhCloud
 
     initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '~> 1.24.0'
+        requires_foreman '> 1.24'
 
         # Add permissions
         security_block :foreman_rh_cloud do
-          permission :view_foreman_rh_cloud, :'foreman_rh_cloud/reports' => [:last]
+          permission(:generate_foreman_rh_cloud, :'foreman_inventory_upload/reports' => [:generate])
+          permission(:view_foreman_rh_cloud,
+                     'foreman_inventory_upload/accounts': [:index],
+                     'foreman_inventory_upload/reports': [:last],
+                     'foreman_inventory_upload/uploads': [:auto_upload, :download_file, :last],
+                     'foreman_rh_cloud/react': [:inventory_upload]
+                    )
         end
 
-        # Add a new role called 'Discovery' if it doesn't exist
-        role 'ForemanRhCloud', [:view_foreman_rh_cloud]
+        plugin_permissions = [:view_foreman_rh_cloud, :generate_foreman_rh_cloud]
+
+        role 'ForemanRhCloud', plugin_permissions, 'Role granting permissions to view the hosts inventory,
+                                                    generate a report, upload it to the cloud and download it locally'
+
+        add_permissions_to_default_roles Role::ORG_ADMIN => plugin_permissions,
+                                         Role::MANAGER => plugin_permissions,
+                                         Role::SYSTEM_ADMIN => plugin_permissions
 
         # Adding a sub menu after hosts menu
         sub_menu :top_menu, :foreman_rh_cloud, :caption => N_('RH Cloud'), :icon => 'fa fa-cloud-upload' do
-          menu :top_menu, :level1, :caption => N_('Inventory Upload'), :url_hash => { controller: :'foreman_inventory_upload/react', :action => :index}
+          menu :top_menu, :level1, :caption => N_('Inventory Upload'), :url_hash => { controller: :'foreman_rh_cloud/react', :action => :inventory_upload}
         end
       end
     end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '1.0.5'.freeze
+  VERSION = '2.0.7'.freeze
 end

data/package.json

@@ -4,14 +4,14 @@
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
-    "lint": "./node_modules/.bin/eslint -c .eslintrc webpack/",
-    "test": "node node_modules/.bin/jest --no-cache",
-    "test:watch": "node node_modules/.bin/jest --watchAll",
-    "test:current": "node node_modules/.bin/jest --watch",
-    "coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
-    "storybook": "start-storybook -p 6006",
-    "storybook:build": "node --max_old_space_size=2048 ./node_modules/.bin/build-storybook --config-dir .storybook --output-dir .storybook-dist",
-    "storybook:deploy": "surge --project .storybook-dist"
+    "lint": "tfm-lint --plugin -d /webpack",
+    "test": "tfm-test --plugin",
+    "test:watch": "tfm-test --plugin --watchAll",
+    "test:current": "tfm-test --plugin --watch",
+    "publish-coverage": "tfm-publish-coverage",
+    "stories": "tfm-stories --plugin",
+    "stories:build": "tfm-build-stories --plugin",
+    "stories:deploy": "surge --project .storybook-dist"
   },
   "repository": {
     "type": "git",
@@ -20,106 +20,26 @@
   "bugs": {
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
-  "optionalDependencies": {
-    "babel-plugin-module-resolver": "^3.2.0"
+  "peerDependencies": {
+    "@theforeman/vendor": ">= 4.0.2"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^5.0.1",
-    "@storybook/addon-knobs": "^5.0.1",
-    "@storybook/react": "^5.0.1",
-    "babel-cli": "^6.10.1",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^8.2.3",
-    "babel-jest": "^23.6.0",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-dynamic-import-node": "^2.0.0",
-    "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-assign": "^6.8.0",
-    "babel-plugin-transform-object-rest-spread": "^6.8.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-react": "^6.5.0",
-    "coveralls": "^3.0.0",
-    "enzyme": "^3.4.0",
-    "enzyme-adapter-react-16": "^1.4.0",
-    "enzyme-to-json": "^3.2.1",
-    "eslint": "^4.10.0",
-    "eslint-import-resolver-babel-module": "^4.0.0",
-    "eslint-plugin-patternfly-react": "0.2.0",
-    "identity-obj-proxy": "^3.0.0",
-    "jed": "^1.1.1",
-    "jest-cli": "^23.6.0",
-    "jest-prop-type-error": "^1.1.0",
-    "node-sass": "^4.5.0",
-    "patternfly": "^3.58.0",
+    "@babel/core": "^7.7.0",
+    "@theforeman/builder": "^4.0.2",
+    "@theforeman/stories": "^4.0.2",
+    "@theforeman/test": "^4.0.2",
+    "@theforeman/vendor-dev": "^4.0.2",
+    "@theforeman/eslint-plugin-foreman": "^4.0.2",
+    "babel-eslint": "^10.0.0",
+    "eslint": "^6.7.2",
     "prettier": "^1.13.5",
     "raf": "^3.4.0",
-    "react-redux-test-utils": "^0.1.1",
-    "react-remarkable": "^1.1.3",
-    "sass-loader": "^6.0.7",
     "stylelint": "^9.3.0",
     "stylelint-config-standard": "^18.0.0",
     "surge": "^0.20.3"
   },
   "dependencies": {
-    "babel-polyfill": "^6.26.0",
-    "classnames": "^2.2.5",
-    "lodash": "^4.17.10",
-    "patternfly-react": "^2.19.1",
-    "prop-types": "^15.6.0",
-    "react": "^16.4.0",
-    "react-dom": "^16.4.0",
-    "react-intl": "^2.8.0",
-    "react-redux": "^5.0.6",
-    "redux": "^3.6.0",
-    "redux-thunk": "^2.2.0",
-    "reselect": "^3.0.1",
-    "seamless-immutable": "^7.1.2",
-    "urijs": "^1.18.10",
-    "uuid": "^3.0.1"
-  },
-  "jest": {
-    "automock": true,
-    "verbose": true,
-    "testMatch": [
-      "**/*.test.js"
-    ],
-    "testURL": "http://localhost/",
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "webpack/**/*.js",
-      "!webpack/index.js",
-      "!webpack/test_setup.js",
-      "!webpack/**/bundle*",
-      "!webpack/stories/**",
-      "!webpack/**/*stories.js"
-    ],
-    "coverageReporters": [
-      "lcov"
-    ],
-    "unmockedModulePathPatterns": [
-      "webpack/",
-      "react",
-      "node_modules/"
-    ],
-    "moduleNameMapper": {
-      "^.+\\.(png|gif|css|scss)$": "identity-obj-proxy"
-    },
-    "globals": {
-      "__testing__": true
-    },
-    "transform": {
-      "^.+\\.js$": "babel-jest"
-    },
-    "moduleDirectories": [
-      "node_modules",
-      "webpack"
-    ],
-    "setupFiles": [
-      "raf/polyfill",
-      "jest-prop-type-error",
-      "./webpack/test_setup.js"
-    ]
+    "jed": "^1.1.1",
+    "react-intl": "^2.8.0"
   }
 }