foreman_remote_execution 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d00f4722f74258ad947432c2d8104522d3fb53749f7bac4e7c52914862af3ecc
-  data.tar.gz: 187645d51578339523b94fb83fe781cba865477a616c2d8c0980255be1fd0377
+  metadata.gz: b85a9cedafe92aa9f2183d1dd5569baa99bd15005b43c26e2ae22ac064b810ee
+  data.tar.gz: ffa0a77c6d12ff977e897933ce9d74072cf5e57495cfbef55a933d1d5f802fd3
 SHA512:
-  metadata.gz: 04c6a44e96bb03d75310d7dd48acd249503f04778c62f520d1101bf4719d195c2cd4d11e9a6ae63c97e24d8cbd50884dd090ec56a54aff933ee19f3379bbeec1
-  data.tar.gz: 165ba49b54b18ed4128c7b72a53ef52fea60f6f9a619ee7bd0a22545910cf68997b763e27f3569892b20dd528e70236c44b241c1d1b6c5fcec15a5a21f76af7e
+  metadata.gz: d2b5947c13f9831c4312f9ab0af739fb8357cc6f31dbf621021267d906dabd013087a1880a319ea65b59957b91550324fa350ff05789924bbf9aebf61c982693
+  data.tar.gz: 28e4246d181f3f772e929c8fbc0626cbe4dcceff5de718d8d8da0e87b9fc8363a0b16841868f5a0f0e3b2cc9b785c8c072bfda90f059edd24a993927f06bf0c8

data/.github/workflows/ci.yml

@@ -0,0 +1,100 @@
+name: CI
+on: [pull_request]
+env:
+  RAILS_ENV: test
+  DATABASE_URL: postgresql://postgres:@localhost/test
+  DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - name: Setup
+        run: |
+          gem install bundler
+          bundle install --jobs=3 --retry=3
+      - name: Run rubocop
+        run: bundle exec rubocop
+  test_ruby:
+    runs-on: ubuntu-latest
+    needs: rubocop
+    services:
+      postgres:
+        image: postgres:12.1
+        ports: ['5432:5432']
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    strategy:
+      fail-fast: false
+      matrix:
+        foreman-core-branch: [2.1-stable, develop]
+        ruby-version: [2.5, 2.6]
+        node-version: [12]
+    steps:
+      - run: sudo apt-get install build-essential libcurl4-openssl-dev zlib1g-dev libpq-dev
+      - uses: actions/checkout@v2
+        with:
+          repository: theforeman/foreman
+          ref: ${{ matrix.foreman-core-branch }}
+      - uses: actions/checkout@v2
+        with:
+          path: foreman_remote_execution
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Setup Node
+        uses: actions/setup-node@v1
+        with:
+          node-version:  ${{ matrix.node-version }}
+      - uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-fgems-${{ matrix.ruby-version }}-${{ hashFiles('Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-fgems-${{ matrix.ruby-version }}-
+      - name: Setup Bundler
+        run: |
+          echo "gem 'foreman_remote_execution', path: './foreman_remote_execution'" > bundler.d/foreman_remote_execution.local.rb
+          gem install bundler
+          bundle config set without journald development console libvirt
+          bundle config set path vendor/bundle
+      - name: Prepare test env
+        run: |
+          bundle install --jobs=3 --retry=3
+          bundle exec rake db:create
+          bundle exec rake db:migrate
+      - name: Run plugin tests
+        run: |
+          bundle exec rake test:foreman_remote_execution
+          bundle exec rake test TEST="test/unit/foreman/access_permissions_test.rb"
+  test_js:
+    runs-on: ubuntu-latest
+    needs: rubocop
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: [2.6]
+        node-version: [10, 12]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Setup Node
+        uses: actions/setup-node@v1
+        with:
+          node-version:  ${{ matrix.node-version }}
+      - name: Nmp install
+        run: |
+          npm install
+      - name: Run plugin linter
+        run: |
+          npm run lint
+      - name: Run plugin tests
+        run: |
+          npm run test

data/.rubocop_todo.yml

@@ -6,6 +6,9 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+Minitest/GlobalExpectations:
+  Enabled: false
+
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: TreatCommentsAsGroupSeparators, Include.

data/app/models/concerns/foreman_remote_execution/orchestration/ssh.rb

@@ -8,8 +8,10 @@ module ForemanRemoteExecution
       register_rebuild(:queue_ssh_destroy, N_("SSH_#{self.to_s.split('::').first}"))
     end
 
-    def drop_from_known_hosts(args)
-      proxy_id, target = args
+    def drop_from_known_hosts(proxy_id)
+      _, _, target = host_kind_target
+      return true if target.nil?
+
       proxy = ::SmartProxy.find(proxy_id)
       begin
         proxy.drop_host_from_known_hosts(target)
@@ -26,11 +28,11 @@ module ForemanRemoteExecution
     def ssh_destroy
       logger.debug "Scheduling SSH known_hosts cleanup"
 
-      host, _kind, target = host_kind_target
+      host, _kind, _target = host_kind_target
       proxies = host.remote_execution_proxies('SSH').values
       proxies.flatten.uniq.each do |proxy|
         queue.create(id: queue_id(proxy.id), name: _("Remove SSH known hosts for %s") % self,
-          priority: 200, action: [self, :drop_from_known_hosts, [proxy.id, target]])
+          priority: 200, action: [self, :drop_from_known_hosts, proxy.id])
       end
     end
 
@@ -40,7 +42,7 @@ module ForemanRemoteExecution
 
     def should_drop_from_known_hosts?
       host, = host_kind_target
-      host&.build && host&.changes&.key?('build')
+      host && !host.new_record? && host.build && host.changes.key?('build')
     end
 
     private

data/foreman_remote_execution.gemspec

@@ -15,10 +15,9 @@ Gem::Specification.new do |s|
   s.description = 'A plugin bringing remote execution to the Foreman, completing the config ' +
                   'management functionality with remote management functionality.'
 
-  s.files =            `git ls-files`.split("\n").reject do |file|
-    file =~ /^scripts/ ||
-        file.start_with?('lib/foreman_remote_execution_core') ||
-        file == 'foreman_remote_execution_core.gemspec'
+  s.files = `git ls-files`.split("\n").reject do |file|
+    file.start_with?('scripts', 'lib/foreman_remote_execution_core') ||
+      file == 'foreman_remote_execution_core.gemspec'
   end
 
   s.test_files =       `git ls-files test`.split("\n")

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '3.3.0'.freeze
+  VERSION = '3.3.1'.freeze
 end

data/locale/action_names.rb

@@ -3,4 +3,3 @@ _("Action with sub plans")
 _("Import facts")
 _("Import Puppet classes")
 _("Remote action:")
-

data/test/models/orchestration/ssh_test.rb

@@ -15,10 +15,42 @@ class SSHOrchestrationTest < ActiveSupport::TestCase
   end
 
   it 'attempts to drop IP address and hostname from smart proxies on rebuild' do
+    host.stubs(:skip_orchestration?).returns false
+    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).with(interface.ip)
+    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).with(host.name)
+
     host.build = true
     host.save!
+
     ids = ["ssh_remove_known_hosts_interface_#{interface.ip}_#{proxy.id}",
            "ssh_remove_known_hosts_host_#{host.name}_#{proxy.id}"]
     _(host.queue.task_ids).must_equal ids
+    _(host.queue.items.map(&:status)).must_equal %w(completed completed)
+  end
+
+  it 'does not fail on 404 from the smart proxy' do
+    host.stubs(:skip_orchestration?).returns false
+    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).raises(RestClient::ResourceNotFound).twice
+    host.build = true
+    host.save!
+    ids = ["ssh_remove_known_hosts_interface_#{interface.ip}_#{proxy.id}",
+           "ssh_remove_known_hosts_host_#{host.name}_#{proxy.id}"]
+    _(host.queue.task_ids).must_equal ids
+    _(host.queue.items.map(&:status)).must_equal %w(completed completed)
+  end
+
+  it 'does not trigger the removal when creating a new host' do
+    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).never
+    host = Host::Managed.new(:name => 'test', :ip => '127.0.0.1')
+    host.stubs(:skip_orchestration?).returns false
+    _(host.queue.task_ids).must_equal []
+  end
+
+  it 'does not call to the proxy when target is nil' do
+    host.stubs(:skip_orchestration?).returns false
+    SmartProxy.any_instance.expects(:drop_host_from_known_hosts).with(host.name)
+    host.interfaces.first.stubs(:ip)
+    host.destroy
+    _(host.queue.items.map(&:status)).must_equal %w(completed completed)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -127,11 +127,10 @@ files:
 - ".babelrc.js"
 - ".eslintignore"
 - ".eslintrc"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - ".tx/config"
 - Gemfile
 - LICENSE
@@ -427,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config

data/.hound.yml

@@ -1,14 +0,0 @@
-scss:
-  enabled: false
-
-stylelint:
-  enabled: true
-
-rubocop:
-  config_file: .rubocop.yml
-  version: 0.80.0
-
-jshint:
-  enabled: false
-
-fail_on_violations: true

data/.travis.yml

@@ -1,5 +0,0 @@
-language: node_js
-node_js:
-  - '10'
-  - '12'
-script: ./scripts/travis_run_js_tests.sh