puppetdb_foreman 3.1.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 012d05bfdd197afed1c498c95114aab2a3154243
-  data.tar.gz: ac4dcd46faa3bc80e68e6814254978b5ec58d68b
+SHA256:
+  metadata.gz: c6a297f534df49f9b10ae4b8398bbc957b90a10156a2aaefa4344e0dc2af61a2
+  data.tar.gz: 2247fe908bad567d6c6d21efb7a45be0d20a4f2464d230694b802ec6b5dd00f4
 SHA512:
-  metadata.gz: 9e90b059fff04ec699cb74f5c200ee6dbe7db6772a666b1a1a33fd0482dab34250f34f9dfa9df9a1f37575b99acdcd70e92341798360309f44fa1b0e3d31e04e
-  data.tar.gz: 528500da760e05edfb6e238138fb1962d5d8f80db4bbae995ede84ef7014ef551c8c801987be4c2f0279b86fdd86b747dd678796837689b931a2870a19e5f960
+  metadata.gz: 3a4841b0a410b36c6ca57fe2f523d3ccd9f9730bace770346377e051b4565bf3162c185b009a52478eb0dbdda6e3712a8b48ea1486ffb4ab8150f00b81498450
+  data.tar.gz: 4aef5cba6b027aa23cfb78d54551d05406103a9ecda2c821f69bed73695e452736a427c0f303d710a709cabb5bbefa868350ec23f02909758f5d87f2cbbf3045

data/README.md

@@ -16,6 +16,12 @@ It does the following:
 
 Feel free to raise issues, ask for features, anything, in the github repository or #theforeman IRC channel in Freenode.
 
+## Compatibility
+
+| Foreman Version | Plugin Version |
+| --------------- | -------------- |
+| >= 1.17         | ~> 4.0.0       |
+
 # Installation:
 
 **From packages**

data/app/controllers/puppetdb_foreman/nodes_controller.rb

@@ -15,7 +15,7 @@ module PuppetdbForeman
     def destroy
       Puppetdb.client.deactivate_node(@node)
       process_success :success_msg => _('Deactivated node %s in PuppetDB') % @node, :success_redirect => puppetdb_foreman_nodes_path
-    rescue => e
+    rescue StandardError => e
       process_error(:redirect => puppetdb_foreman_nodes_path, :error_msg => _('Failed to deactivate node in PuppetDB: %s') % e.message)
     end
 
@@ -23,7 +23,7 @@ module PuppetdbForeman
       facts = Puppetdb.client.facts(@node)
       host = PuppetdbHost.new(:facts => facts).to_host
       process_success :success_msg => _('Imported host %s from PuppetDB') % @node, :success_redirect => host_path(:id => host)
-    rescue => e
+    rescue StandardError => e
       process_error(:redirect => puppetdb_foreman_nodes_path, :error_msg => _('Failed to import host from PuppetDB: %s') % e.message)
     end
 

data/app/models/concerns/orchestration/puppetdb.rb

@@ -17,8 +17,8 @@ module Orchestration
     def delPuppetdb
       Rails.logger.info "Deactivating node in PuppetDB: #{name}"
       ::Puppetdb.client.deactivate_node(name)
-    rescue => e
-      failure _("Failed to deactiate node %{name} in PuppetDB: %{message}\n ") %
+    rescue StandardError => e
+      failure _("Failed to deactivate node %{name} in PuppetDB: %{message}\n ") %
               { :name => name, :message => e.message }, e
     end
 

data/app/models/puppetdb_foreman/host_extensions.rb

@@ -18,7 +18,7 @@ module PuppetdbForeman
 
       begin
         Puppetdb.client.deactivate_node(name)
-      rescue => e
+      rescue StandardError => e
         errors.add(:base, _("Could not deactivate host on PuppetDB: #{e}"))
         return false
       end

data/app/services/puppetdb_client/base.rb

@@ -22,7 +22,7 @@ module PuppetdbClient
     end
 
     def facts(nodename)
-      parse(get("#{facts_url}?#{URI.escape("query=[\"=\", \"certname\", \"#{nodename}\"]")}"))
+      parse(get(facts_url, query: "[\"=\", \"certname\", \"#{nodename}\"]"))
     end
 
     private
@@ -42,9 +42,9 @@ module PuppetdbClient
       "#{uri.scheme}://#{uri.host}:#{uri.port}"
     end
 
-    def get(endpoint)
-      logger.debug "PuppetdbClient: GET request to #{endpoint}"
-      connection(endpoint).get.body
+    def get(endpoint, params = {})
+      logger.debug "PuppetdbClient: GET request to #{endpoint} with params: #{params}"
+      connection(endpoint).get(params: params).body
     end
 
     def post(endpoint, payload)

data/db/migrate/20170717140010_migrate_puppetdb_api_version_setting.rb

@@ -1,4 +1,4 @@
-class MigratePuppetdbApiVersionSetting < ActiveRecord::Migration
+class MigratePuppetdbApiVersionSetting < ActiveRecord::Migration[4.2]
   def up
     puppetdb_address = Setting.where(:category => 'Setting::Puppetdb', :name => 'puppetdb_address').first.try(:value)
     return unless puppetdb_address

data/lib/puppetdb_foreman/engine.rb

@@ -5,7 +5,7 @@ module PuppetdbForeman
     initializer 'puppetdb_foreman.load_default_settings', :before => :load_config_initializers do |_app|
       require_dependency File.expand_path('../../../app/models/setting/puppetdb.rb', __FILE__) if begin
                                                                                                      Setting.table_exists?
-                                                                                                   rescue
+                                                                                                   rescue StandardError
                                                                                                      (false)
                                                                                                    end
     end
@@ -18,7 +18,7 @@ module PuppetdbForeman
 
     initializer 'puppetdb_foreman.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :puppetdb_foreman do
-        requires_foreman '>= 1.11'
+        requires_foreman '>= 1.17'
 
         apipie_documented_controllers ["#{PuppetdbForeman::Engine.root}/app/controllers/api/v2/*.rb"]
 
@@ -50,7 +50,7 @@ module PuppetdbForeman
     config.to_prepare do
       begin
         Host::Managed.send :include, PuppetdbForeman::HostExtensions
-      rescue => e
+      rescue StandardError => e
         Rails.logger.warn "PuppetdbForeman: skipping engine hook (#{e})"
       end
     end

data/lib/puppetdb_foreman/version.rb

@@ -1,3 +1,3 @@
 module PuppetdbForeman
-  VERSION = '3.1.2'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/lib/tasks/puppetdb_foreman_tasks.rake

@@ -19,7 +19,7 @@ namespace :puppetdb_foreman do
                          "#{PuppetdbForeman::Engine.root}/lib/**/*.rb",
                          "#{PuppetdbForeman::Engine.root}/test/**/*.rb"]
       end
-    rescue
+    rescue StandardError
       puts 'Rubocop not loaded.'
     end
 

data/test/controllers/api/v2/puppetdb_nodes_controller_test.rb

@@ -4,13 +4,13 @@ class Api::V2::PuppetdbNodesControllerTest < ActionController::TestCase
   setup do
     setup_settings
     User.current = users(:admin)
-    @host = FactoryGirl.create(:host, :managed)
+    @host = FactoryBot.create(:host, :managed)
   end
 
   context '#index' do
     test 'lists puppetdb nodes unknown to foreman' do
       ::PuppetdbClient::V4.any_instance.stubs(:query_nodes).returns(['one.example.com', 'two.example.com'])
-      get :index, {}, set_session_user
+      get :index, session: set_session_user
       assert_response :success
       response = ActiveSupport::JSON.decode(@response.body)
       hosts = response['results']
@@ -21,9 +21,9 @@ class Api::V2::PuppetdbNodesControllerTest < ActionController::TestCase
 
   context '#unknown' do
     test 'lists puppetdb nodes unknown to foreman' do
-      host = FactoryGirl.create(:host, :managed)
+      host = FactoryBot.create(:host, :managed)
       ::PuppetdbClient::V4.any_instance.stubs(:query_nodes).returns([host.name, 'two.example.com'])
-      get :unknown, {}, set_session_user
+      get :unknown, session: set_session_user
       assert_response :success
       response = ActiveSupport::JSON.decode(@response.body)
       hosts = response['results']
@@ -41,7 +41,7 @@ class Api::V2::PuppetdbNodesControllerTest < ActionController::TestCase
     end
 
     test 'imports a host by puppetdb facts' do
-      delete :destroy, { :id => node }, set_session_user
+      delete :destroy, params: { :id => node }, session: set_session_user
       assert_response :success
       response = ActiveSupport::JSON.decode(@response.body)
       expected = { 'job' => { 'uuid' => uuid } }
@@ -51,7 +51,7 @@ class Api::V2::PuppetdbNodesControllerTest < ActionController::TestCase
 
   context '#import' do
     let(:node) { 'test.example.com' }
-    let(:host) { FactoryGirl.create(:host) }
+    let(:host) { FactoryBot.create(:host) }
 
     before do
       ::PuppetdbClient::V4.any_instance.expects(:facts).with(node).returns({})
@@ -59,7 +59,7 @@ class Api::V2::PuppetdbNodesControllerTest < ActionController::TestCase
     end
 
     test 'imports a host by puppetdb facts' do
-      put :import, { :id => node }, set_session_user
+      put :import, params: { :id => node }, session: set_session_user
       assert_response :success
       response = ActiveSupport::JSON.decode(@response.body)
       assert_equal host.id, response['id']

data/test/controllers/nodes_controller_test.rb

@@ -6,14 +6,14 @@ class NodesControllerTest < ActionController::TestCase
   setup do
     setup_settings
     User.current = users(:admin)
-    @host = FactoryGirl.create(:host, :managed)
+    @host = FactoryBot.create(:host, :managed)
   end
 
   context '#index' do
     test 'lists puppetdb nodes unknown to foreman' do
-      host = FactoryGirl.create(:host, :managed)
+      host = FactoryBot.create(:host, :managed)
       ::PuppetdbClient::V4.any_instance.stubs(:query_nodes).returns([host.name, 'two.example.com'])
-      get :index, {}, set_session_user
+      get :index, session: set_session_user
       assert_response :success
       refute response.body =~ /#{host.name}/m
       assert response.body =~ /two.example.com/m
@@ -24,7 +24,7 @@ class NodesControllerTest < ActionController::TestCase
     let(:node) { 'test.example.com' }
     test 'deactivating a node in puppetdb' do
       ::PuppetdbClient::V4.any_instance.expects(:deactivate_node).with(node).returns(true)
-      delete :destroy, { :id => node }, set_session_user
+      delete :destroy, params: { :id => node }, session: set_session_user
       assert_response :found
       assert_redirected_to puppetdb_foreman_nodes_path
       assert_nil flash[:error]
@@ -35,7 +35,7 @@ class NodesControllerTest < ActionController::TestCase
 
   context '#import' do
     let(:node) { 'test.example.com' }
-    let(:host) { FactoryGirl.create(:host) }
+    let(:host) { FactoryBot.create(:host) }
 
     before do
       ::PuppetdbClient::V4.any_instance.expects(:facts).with(node).returns({})
@@ -43,9 +43,7 @@ class NodesControllerTest < ActionController::TestCase
     end
 
     test 'imports a host from puppetdb facts' do
-      put :import, {
-        :id => node
-      }, set_session_user
+      put :import, params: { :id => node }, session: set_session_user
       assert_response :found
       assert_redirected_to host_path(:id => host)
       assert_nil flash[:error]

data/test/models/host_test.rb

@@ -2,13 +2,13 @@ require 'test_plugin_helper'
 
 class HostTest < ActiveSupport::TestCase
   setup do
-    User.current = FactoryGirl.build(:user, :admin)
+    User.current = FactoryBot.build(:user, :admin)
     setup_settings
     disable_orchestration
   end
 
   context 'a host with puppetdb orchestration' do
-    let(:host) { FactoryGirl.build(:host, :managed) }
+    let(:host) { FactoryBot.build(:host, :managed) }
 
     context 'with puppetdb enabled' do
       before do

data/test/unit/puppetdb_host_test.rb

@@ -1,8 +1,11 @@
 require 'test_plugin_helper'
 
 class PuppetdbHostTest < ActiveSupport::TestCase
+  include FactImporterIsolation
+  allow_transactions_for_any_importer
+
   setup do
-    User.current = FactoryGirl.create(:user, :admin)
+    User.current = FactoryBot.create(:user, :admin)
     disable_orchestration
     setup_settings
   end
@@ -32,7 +35,7 @@ class PuppetdbHostTest < ActiveSupport::TestCase
 
   test 'updates an existing host by facts' do
     Setting[:update_subnets_from_facts] = true
-    FactoryGirl.create(:host, :managed, :hostname => 'host', :domain => FactoryGirl.create(:domain, :name => 'example.com'))
+    FactoryBot.create(:host, :managed, :hostname => 'host', :domain => FactoryBot.create(:domain, :name => 'example.com'))
     pdbhost.to_host
     host = Host.find_by(name: 'host.example.com')
     assert_equal 'host.example.com', host.name

data/test/unit/puppetdb_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 
 class PuppetdbTest < ActiveSupport::TestCase
   setup do
-    User.current = FactoryGirl.build(:user, :admin)
+    User.current = FactoryBot.build(:user, :admin)
     setup_settings
     disable_orchestration
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: This is a Foreman plugin to interact with PuppetDB.