foreman_rh_cloud 0.9.5 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d3adffa464bc496cf7b3d80bf897e5f9720f343316af3a32e61b99f55f41655
-  data.tar.gz: fabb5e4334b5c9d9f6c17d5c44cc70a27afb165fc5e2684f0609a280b40a61db
+  metadata.gz: 1f6361a25739c19a67518378257d51f67fc443839d76d7d07f5bd597f09ef15d
+  data.tar.gz: b558ad39920b634ee4c9be77ec20f65235eb3193de374879dc85bc284a15bfa5
 SHA512:
-  metadata.gz: 9eb34258b36236a537dfea9d5160f553cef3ffc4d39b2f95007cf4fab3d3d9aaaef29671cb056fcb73ade319ba847db47b9719c7fd5124f456a8d7ccca976481
-  data.tar.gz: 8bb6f9bf92278d2ab534681fb6950c3169f1da6a5f543dcaa56946745ca6d626d3edd37c21d7d1d3ede5a30de5cc1790449c92e13f2859e99c756cadb9546e8d
+  metadata.gz: 83b2169b736d8c57d544b8ce53bda7e91e4741efdd384953fd32a22ac96e531282e97ef740112a7be5310ef44fc0569fe8995972304844302d0b2eb3db6215f8
+  data.tar.gz: 3b7bbd7d76a68b5b41874472961eabd2360de0ad871705430d7549d8c44b48e5811ba9d566d74a3c0a8774b7c3b4c0c5a0f75ae57f2f38519ef528e12239c4f3

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -25,7 +25,6 @@ module ForemanInventoryUpload
       ]
 
       render json: {
-        autoUploadEnabled: Setting[:allow_auto_inventory_upload],
         accounts: accounts,
       }, status: :ok
     end

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -11,10 +11,14 @@ module ForemanInventoryUpload
 
     def download_file
       filename = ForemanInventoryUpload.facts_archive_name(params[:organization_id])
-      files = Dir["{#{ForemanInventoryUpload.uploads_file_path(filename)},#{ForemanInventoryUpload.done_file_path(filename)}}"]
+      path = Rails.root.join(ForemanInventoryUpload.uploads_folder, filename)
+      unless File.exist? path
+        return throw_flash_error(
+          "Path doesn't exist: #{path}"
+        )
+      end
 
-      return send_file files.first, disposition: 'attachment', filename: filename unless files.empty?
-      throw_flash_error "File doesn't exist"
+      send_file path, disposition: 'attachment', filename: filename
     end
 
     def throw_flash_error(message)
@@ -23,16 +27,5 @@ module ForemanInventoryUpload
         :error_msg => message
       )
     end
-
-    def auto_upload
-      Setting[:allow_auto_inventory_upload] = auto_upload_params
-      render json: {
-        autoUploadEnabled: Setting[:allow_auto_inventory_upload],
-      }
-    end
-
-    def auto_upload_params
-      ActiveModel::Type::Boolean.new.cast(params.require(:value))
-    end
   end
 end

data/config/routes.rb

@@ -6,6 +6,5 @@ Rails.application.routes.draw do
     get ':organization_id/uploads/last', to: 'uploads#last', constraints: { organization_id: %r{[^\/]+} }
     get ':organization_id/uploads/file', to: 'uploads#download_file', constraints: { organization_id: %r{[^\/]+} }
     get 'accounts', to: 'accounts#index'
-    post 'auto_upload', to: 'uploads#auto_upload'
   end
 end

data/lib/foreman_inventory_upload.rb

@@ -18,18 +18,6 @@ module ForemanInventoryUpload
     )
   end
 
-  def self.uploads_file_path(filename)
-    File.join(ForemanInventoryUpload.uploads_folder, filename)
-  end
-
-  def self.done_folder
-    File.join(ForemanInventoryUpload.uploads_folder, 'done/')
-  end
-
-  def self.done_file_path(filename)
-    File.join(ForemanInventoryUpload.done_folder, filename)
-  end
-
   def self.generated_reports_folder
     @generated_reports_folder ||= ensure_folder(
       File.join(

data/lib/foreman_inventory_upload/async/generate_all_reports_job.rb

@@ -2,14 +2,6 @@ module ForemanInventoryUpload
   module Async
     class GenerateAllReportsJob < ::ApplicationJob
       def perform
-        unless Setting[:allow_auto_inventory_upload]
-          logger.debug(
-            'The scheduled process is disabled due to the "allow_auto_inventory_upload"
-            setting being set to false.'
-          )
-          return
-        end
-
         organizations = Organization.unscoped.all
 
         organizations.map do |organization|

data/lib/foreman_inventory_upload/async/queue_for_upload_job.rb

@@ -30,11 +30,16 @@ module ForemanInventoryUpload
       def ensure_output_script
         return if File.exist?(script_file)
 
-        script_source_file = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
-
-        script_source = File.read(script_source_file)
-        script_source.gsub!('<%= @upload_url %>', ForemanInventoryUpload.upload_url)
-
+        script_source = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
+
+        template_src = Foreman::Renderer::Source::String.new(content: File.read(script_source))
+        scope = Foreman::Renderer::Scope::Base.new(
+          source: template_src,
+          variables: {
+            upload_url: ForemanInventoryUpload.upload_url,
+          }
+        )
+        script_source = Foreman::Renderer.render(template_src, scope)
         File.write(script_file, script_source)
         FileUtils.chmod('+x', script_file)
       end

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/archived_report.rb

@@ -16,9 +16,9 @@ module ForemanInventoryUpload
               first = true
               host_batches.each do |hosts_batch|
                 slice_id = Foreman.uuid
-                @logger.info "Adding slice #{slice_id}"
-                hosts_count = generate_slice(tmpdir, slice_id, hosts_batch)
-                @logger.info "slice #{slice_id} was created with #{hosts_count} hosts"
+                hosts_count = hosts_batch.count
+                @logger.info "Adding slice #{slice_id} with #{hosts_count} hosts"
+                generate_slice(tmpdir, slice_id, hosts_batch)
                 inner_generator.add_slice(slice_id, hosts_count, first)
                 first = false
               end
@@ -43,13 +43,10 @@ module ForemanInventoryUpload
       private
 
       def generate_slice(tmpdir, slice_id, hosts_batch)
-        hosts_count = 0
         File.open(File.join(tmpdir, "#{slice_id}.json"), 'w') do |slice_out|
           slice_generator = ForemanInventoryUpload::Generators::Slice.new(hosts_batch, slice_out, slice_id)
           slice_generator.render
-          hosts_count = slice_generator.hosts_count
         end
-        hosts_count
       end
     end
   end

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -18,7 +18,6 @@ module ForemanInventoryUpload
               'uname::release',
               'lscpu::flags',
               'distribution::version',
-              'distribution::id',
             ]).pluck(:name, :id)
           ]
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -4,13 +4,11 @@ module ForemanInventoryUpload
       include FactHelpers
 
       attr_accessor :slice_id
-      attr_reader :hosts_count
 
       def initialize(hosts, output = [], slice_id = Foreman.uuid)
         @stream = JsonStream.new(output)
         @hosts = hosts
         @slice_id = slice_id
-        @hosts_count = 0
       end
 
       def render
@@ -28,10 +26,7 @@ module ForemanInventoryUpload
             hosts_batch.each do |host|
               next unless host&.subscription_facet&.pools&.first
               @stream.comma unless first
-              if report_host(host)
-                first = false
-                @hosts_count += 1
-              end
+              first = false if report_host(host)
             end
           end
         end
@@ -41,7 +36,7 @@ module ForemanInventoryUpload
         @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('account', host.subscription_facet.pools.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('bios_uuid', fact_value(host, 'dmi::system::uuid'))
@@ -70,7 +65,7 @@ module ForemanInventoryUpload
 
           @stream.array_field('tags', :last) do
             report_tag('satellite', 'satellite_instance_id', Foreman.instance_id) if Foreman.respond_to?(:instance_id)
-            report_tag('satellite', 'organization_id', host.organization_id.to_s, :last)
+            report_tag('satellite', 'organization_id', host.organization_id, :last)
           end
         end
       end
@@ -110,14 +105,7 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        @stream.simple_field(
-          'os_release',
-          os_release_value(
-            name: fact_value(host, 'distribution::name'),
-            version: fact_value(host, 'distribution::version'),
-            codename: fact_value(host, 'distribution::id')
-          )
-        )
+        @stream.simple_field('os_release', fact_value(host, 'distribution::name'))
         @stream.simple_field('os_kernel_version', fact_value(host, 'uname::release'))
         @stream.simple_field('arch', host.architecture&.name)
         @stream.simple_field('subscription_status', host.subscription_status_label)
@@ -154,10 +142,6 @@ module ForemanInventoryUpload
         @stream.simple_field('satellite_instance_id', Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil)
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
-
-      def os_release_value(name:, version:, codename:)
-        "#{name} #{version} (#{codename})"
-      end
     end
   end
 end

data/lib/foreman_inventory_upload/scripts/uploader.sh.erb

@@ -1,6 +1,7 @@
 #! /bin/sh
 
 DEST=<%= @upload_url %>
+RH_USERNAME=<%= @rh_username %>
 
 if [ -z "$FILES" ]
 then

data/lib/foreman_rh_cloud/engine.rb

@@ -5,10 +5,6 @@ module ForemanRhCloud
   class Engine < ::Rails::Engine
     engine_name 'foreman_rh_cloud'
 
-    initializer 'foreman_rh_cloud.load_default_settings', :before => :load_config_initializers do
-      require_dependency File.expand_path('../../app/models/setting/rh_cloud.rb', __dir__)
-    end
-
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
@@ -26,7 +22,7 @@ module ForemanRhCloud
 
     initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '>= 1.20'
+        requires_foreman '> 1.24'
 
         # Add permissions
         security_block :foreman_rh_cloud do

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '0.9.5'.freeze
+  VERSION = '2.0.4'.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"
   }
 }

data/test/controllers/accounts_controller_test.rb

@@ -14,17 +14,12 @@ class AccountsControllerTest < ActionController::TestCase
     upload_label = ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id)
     upload_output = ForemanInventoryUpload::Async::ProgressOutput.register(upload_label)
     upload_output.status = 'upload_status_test'
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :value => true)
-    assert_equal true, Setting[:allow_auto_inventory_upload]
 
     get :index, session: set_session_user
 
     assert_response :success
-    actual = JSON.parse(response.body)
-    actual_account_statuses = actual['accounts'][test_org.id.to_s]
-    assert_equal 'generate_status_test', actual_account_statuses['generate_report_status']
-    assert_equal 'upload_status_test', actual_account_statuses['upload_report_status']
-
-    assert_equal true, actual['autoUploadEnabled']
+    actual = JSON.parse(response.body)['accounts'][test_org.id.to_s]
+    assert_equal 'generate_status_test', actual['generate_report_status']
+    assert_equal 'upload_status_test', actual['upload_report_status']
   end
 end

data/test/controllers/uploads_controller_test.rb

@@ -18,17 +18,4 @@ class UploadsControllerTest < ActionController::TestCase
     actual = JSON.parse(response.body)
     assert_equal 'test output', actual['output']
   end
-
-  test 'should update allow_auto_inventory_upload setting' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
-
-    assert_equal false, Setting[:allow_auto_inventory_upload]
-
-    post :auto_upload, params: { value: true }, session: set_session_user
-
-    assert_response :success
-    actual = JSON.parse(response.body)
-    assert_equal true, actual['autoUploadEnabled']
-    assert_equal true, Setting[:allow_auto_inventory_upload]
-  end
 end