puppetdb_foreman 5.0.0 → 6.0.0

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

@@ -1,68 +1,73 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
-class Api::V2::PuppetdbNodesControllerTest < ActionController::TestCase
-  setup do
-    setup_settings
-    User.current = users(:admin)
-    @host = FactoryBot.create(:host, :managed)
-  end
+module Api
+  module V2
+    class PuppetdbNodesControllerTest < ActionController::TestCase
+      setup do
+        User.current = users(:admin)
+        @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, session: set_session_user
-      assert_response :success
-      response = ActiveSupport::JSON.decode(@response.body)
-      hosts = response['results']
-      assert_includes hosts, 'name' => 'one.example.com'
-      assert_includes hosts, 'name' => 'two.example.com'
-    end
-  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, session: set_session_user
+          assert_response :success
+          response = ActiveSupport::JSON.decode(@response.body)
+          hosts = response['results']
+          assert_includes hosts, 'name' => 'one.example.com'
+          assert_includes hosts, 'name' => 'two.example.com'
+        end
+      end
 
-  context '#unknown' do
-    test 'lists puppetdb nodes unknown to foreman' do
-      host = FactoryBot.create(:host, :managed)
-      ::PuppetdbClient::V4.any_instance.stubs(:query_nodes).returns([host.name, 'two.example.com'])
-      get :unknown, session: set_session_user
-      assert_response :success
-      response = ActiveSupport::JSON.decode(@response.body)
-      hosts = response['results']
-      refute_includes hosts, 'name' => host.name
-      assert_includes hosts, 'name' => 'two.example.com'
-    end
-  end
+      context '#unknown' do
+        test 'lists puppetdb nodes unknown to foreman' do
+          host = FactoryBot.create(:host, :managed)
+          ::PuppetdbClient::V4.any_instance.stubs(:query_nodes).returns([host.name, 'two.example.com'])
+          get :unknown, session: set_session_user
+          assert_response :success
+          response = ActiveSupport::JSON.decode(@response.body)
+          hosts = response['results']
+          assert_not_includes hosts, 'name' => host.name
+          assert_includes hosts, 'name' => 'two.example.com'
+        end
+      end
 
-  context '#destroy' do
-    let(:node) { 'test.example.com' }
-    let(:uuid) { SecureRandom.uuid }
+      context '#destroy' do
+        let(:node) { 'test.example.com' }
+        let(:uuid) { SecureRandom.uuid }
 
-    before do
-      ::PuppetdbClient::V4.any_instance.expects(:deactivate_node).with(node).returns(uuid)
-    end
+        before do
+          ::PuppetdbClient::V4.any_instance.expects(:deactivate_node).with(node).returns(uuid)
+        end
 
-    test 'imports a host by puppetdb facts' do
-      delete :destroy, params: { :id => node }, session: set_session_user
-      assert_response :success
-      response = ActiveSupport::JSON.decode(@response.body)
-      expected = { 'job' => { 'uuid' => uuid } }
-      assert_equal expected, response
-    end
-  end
+        test 'imports a host by puppetdb facts' do
+          delete :destroy, params: { id: node }, session: set_session_user
+          assert_response :success
+          response = ActiveSupport::JSON.decode(@response.body)
+          expected = { 'job' => { 'uuid' => uuid } }
+          assert_equal expected, response
+        end
+      end
 
-  context '#import' do
-    let(:node) { 'test.example.com' }
-    let(:host) { FactoryBot.create(:host) }
+      context '#import' do
+        let(:node) { 'test.example.com' }
+        let(:host) { FactoryBot.create(:host) }
 
-    before do
-      ::PuppetdbClient::V4.any_instance.expects(:facts).with(node).returns({})
-      PuppetdbHost.any_instance.expects(:to_host).returns(host)
-    end
+        before do
+          ::PuppetdbClient::V4.any_instance.expects(:facts).with(node).returns({})
+          PuppetdbHost.any_instance.expects(:to_host).returns(host)
+        end
 
-    test 'imports a host by puppetdb facts' do
-      put :import, params: { :id => node }, session: set_session_user
-      assert_response :success
-      response = ActiveSupport::JSON.decode(@response.body)
-      assert_equal host.id, response['id']
+        test 'imports a host by puppetdb facts' do
+          put :import, params: { id: node }, session: set_session_user
+          assert_response :success
+          response = ActiveSupport::JSON.decode(@response.body)
+          assert_equal host.id, response['id']
+        end
+      end
     end
   end
 end

data/test/controllers/nodes_controller_test.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class NodesControllerTest < ActionController::TestCase
   tests ::PuppetdbForeman::NodesController
 
   setup do
-    setup_settings
     User.current = users(:admin)
     @host = FactoryBot.create(:host, :managed)
   end
@@ -15,7 +16,7 @@ class NodesControllerTest < ActionController::TestCase
       ::PuppetdbClient::V4.any_instance.stubs(:query_nodes).returns([host.name, 'two.example.com'])
       get :index, session: set_session_user
       assert_response :success
-      refute response.body =~ /#{host.name}/m
+      assert_not response.body =~ /#{host.name}/m
       assert response.body =~ /two.example.com/m
     end
   end
@@ -27,7 +28,7 @@ class NodesControllerTest < ActionController::TestCase
       resources_resp = [
         { 'type' => 'Class', 'title' => 'main' },
         { 'type' => 'Class', 'title' => 'Settings' },
-        { 'type' => 'Stage', 'title' => 'main' }
+        { 'type' => 'Stage', 'title' => 'main' },
       ]
 
       ::PuppetdbClient::V4.any_instance.stubs(:resources).returns(resources_resp)
@@ -48,7 +49,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, params: { :id => node }, session: 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]
@@ -67,9 +68,9 @@ class NodesControllerTest < ActionController::TestCase
     end
 
     test 'imports a host from puppetdb facts' do
-      put :import, params: { :id => node }, session: set_session_user
+      put :import, params: { id: node }, session: set_session_user
       assert_response :found
-      assert_redirected_to host_path(:id => host)
+      assert_redirected_to host_path(id: host)
       assert_nil flash[:error]
       assert_not_nil flash[:notice] || flash[:success]
       assert_equal "Imported host #{node} from PuppetDB", flash[:notice] || flash[:success]

data/test/models/host_test.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class HostTest < ActiveSupport::TestCase
   setup do
     User.current = FactoryBot.build(:user, :admin)
-    setup_settings
     disable_orchestration
   end
 
@@ -24,9 +25,9 @@ class HostTest < ActiveSupport::TestCase
         assert_equal 1, tasks.size
       end
 
-      test '#delPuppetdb' do
+      test '#del_puppetdb' do
         ::PuppetdbClient::V4.any_instance.expects(:deactivate_node).with(host.name).returns(true)
-        host.send(:delPuppetdb)
+        host.send(:del_puppetdb)
       end
     end
 
@@ -40,7 +41,7 @@ class HostTest < ActiveSupport::TestCase
         host.queue.clear
         host.send(:queue_puppetdb_destroy)
         tasks = host.queue.all.map(&:name)
-        assert_equal [], tasks
+        assert_empty tasks
       end
     end
   end

data/test/test_plugin_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This calls the main test_helper in Foreman-core
 require 'test_helper'
 require 'database_cleaner'
@@ -6,10 +8,6 @@ require 'webmock/minitest'
 # Foreman's setup doesn't handle cleaning up for Minitest::Spec
 DatabaseCleaner.strategy = :transaction
 
-def setup_settings
-  Setting::Puppetdb.load_defaults
-end
-
 def fixture(name)
   File.read(File.expand_path("../static_fixtures/#{name}", __FILE__))
 end

data/test/unit/puppetdb_host_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class PuppetdbHostTest < ActiveSupport::TestCase
@@ -7,7 +9,6 @@ class PuppetdbHostTest < ActiveSupport::TestCase
   setup do
     User.current = FactoryBot.create(:user, :admin)
     disable_orchestration
-    setup_settings
   end
 
   let(:sample_facts) do
@@ -15,7 +16,7 @@ class PuppetdbHostTest < ActiveSupport::TestCase
   end
 
   let(:pdbhost) do
-    PuppetdbHost.new(:facts => sample_facts)
+    PuppetdbHost.new(facts: sample_facts)
   end
 
   test 'parses facts' do
@@ -35,12 +36,12 @@ class PuppetdbHostTest < ActiveSupport::TestCase
 
   test 'updates an existing host by facts' do
     Setting[:update_subnets_from_facts] = true
-    FactoryBot.create(:host, :managed, :hostname => 'host', :domain => FactoryBot.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
     # foreman core does not delete old interfaces when importing interfaces from facts
-    assert host.interfaces.where(:ip => '1.1.1.174').first
+    assert host.interfaces.where(ip: '1.1.1.174').first
     assert_equal Operatingsystem.find_by(title: 'RedHat 7.3'), host.operatingsystem
   end
 end

data/test/unit/puppetdb_test.rb

@@ -1,138 +1,16 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 class PuppetdbTest < ActiveSupport::TestCase
   setup do
     User.current = FactoryBot.build(:user, :admin)
-    setup_settings
     disable_orchestration
   end
 
   let(:client) { Puppetdb.client }
   let(:uuid) { SecureRandom.uuid }
 
-  context 'with V1 API' do
-    setup do
-      Setting[:puppetdb_api_version] = 1
-      Setting[:puppetdb_address] = 'https://localhost:8080/v3/commands'
-    end
-
-    test 'deactivate_node' do
-      stub_request(:post, 'https://localhost:8080/v3/commands')
-        .with(:body => 'payload={"command":"deactivate node","version":1,"payload":"\\"www.example.com\\""}',
-              :headers => { 'Accept' => 'application/json' })
-        .to_return(:status => 200, :body => "{\"uuid\" : \"#{uuid}\"}", :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
-
-      assert_equal uuid, client.deactivate_node('www.example.com')
-    end
-
-    test 'query_nodes' do
-      stub_request(:get, 'https://localhost:8080/v3/nodes')
-        .with(:headers => { 'Accept' => 'application/json' })
-        .to_return(:status => 200, :body => fixture('query_nodes.json'), :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
-      expected = (1..10).map { |i| "server#{i}.example.com" }
-      assert_equal expected, client.query_nodes
-    end
-
-    test 'resources' do
-      stub_request(:get, 'https://localhost:8080/v3/resources?query=%5B%22=%22,%20%22certname%22,%20%22host.example.com%22%5D')
-        .with(:headers => { 'Accept' => 'application/json' })
-        .to_return(:status => 200, :body => fixture('resources.json'), :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
-
-      resources = client.resources('host.example.com')
-      sample = {
-        'tags' => %w[params class],
-        'file' => nil,
-        'type' => 'Class',
-        'title' => 'Cron',
-        'line' => nil,
-        'resource' => 'f13ec266-2914-420c-8d71-13e3466c5856',
-        'certname' => 'host.example.com',
-        'parameters' => {},
-        'exported' => false
-      }
-
-      assert_kind_of Array, resources
-      assert_includes resources, sample
-    end
-
-    test 'facts' do
-      stub_request(:get, 'https://localhost:8080/v3/facts?query=%5B%22=%22,%20%22certname%22,%20%22host.example.com%22%5D')
-        .with(:headers => { 'Accept' => 'application/json' })
-        .to_return(:status => 200, :body => fixture('facts.json'), :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
-      facts = client.facts('host.example.com')
-      assert_kind_of Array, facts
-      sample = {
-        'value' => 'CEST',
-        'name' => 'timezone',
-        'certname' => 'host.example.com'
-      }
-      assert_includes facts, sample
-    end
-  end
-
-  context 'with V3 API' do
-    setup do
-      Setting[:puppetdb_api_version] = 3
-    end
-
-    let(:producer_timestamp) { Time.now.iso8601.to_s }
-
-    test 'deactivate_node' do
-      client.stubs(:producer_timestamp).returns(producer_timestamp)
-
-      stub_request(:post, 'https://puppetdb:8081/pdb/cmd/v1')
-        .with(:body => "{\"command\":\"deactivate node\",\"version\":3,\"payload\":{\"certname\":\"www.example.com\",\"producer_timestamp\":\"#{producer_timestamp}\"}}",
-              :headers => { 'Accept' => 'application/json', 'Content-Type' => 'application/json' })
-        .to_return(:status => 200, :body => "{\"uuid\" : \"#{uuid}\"}", :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
-
-      assert_equal uuid, client.deactivate_node('www.example.com')
-    end
-
-    test 'query_nodes' do
-      stub_request(:get, 'https://puppetdb:8081/pdb/query/v4/nodes')
-        .with(:headers => { 'Accept' => 'application/json' })
-        .to_return(:status => 200, :body => fixture('query_nodes_v3_4.json'), :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
-      expected = (1..10).map { |i| "server#{i}.example.com" }
-      assert_equal expected, client.query_nodes
-    end
-
-    test 'resources' do
-      stub_request(:get, 'https://puppetdb:8081/pdb/query/v4/resources?query=%5B%22=%22,%20%22certname%22,%20%22host.example.com%22%5D')
-        .with(:headers => { 'Accept' => 'application/json' })
-        .to_return(:status => 200, :body => fixture('resources.json'), :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
-
-      resources = client.resources('host.example.com')
-      sample = {
-        'tags' => %w[params class],
-        'file' => nil,
-        'type' => 'Class',
-        'title' => 'Cron',
-        'line' => nil,
-        'resource' => 'f13ec266-2914-420c-8d71-13e3466c5856',
-        'certname' => 'host.example.com',
-        'parameters' => {},
-        'exported' => false
-      }
-
-      assert_kind_of Array, resources
-      assert_includes resources, sample
-    end
-
-    test 'facts' do
-      stub_request(:get, 'https://puppetdb:8081/pdb/query/v4/facts?query=%5B%22=%22,%20%22certname%22,%20%22host.example.com%22%5D')
-        .with(:headers => { 'Accept' => 'application/json' })
-        .to_return(:status => 200, :body => fixture('facts.json'), :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
-      facts = client.facts('host.example.com')
-      assert_kind_of Array, facts
-      sample = {
-        'value' => 'CEST',
-        'name' => 'timezone',
-        'certname' => 'host.example.com'
-      }
-      assert_includes facts, sample
-    end
-  end
-
   context 'with V4 API' do
     setup do
       Setting[:puppetdb_api_version] = 4
@@ -144,25 +22,30 @@ class PuppetdbTest < ActiveSupport::TestCase
       client.stubs(:producer_timestamp).returns(producer_timestamp)
 
       stub_request(:post, 'https://puppetdb:8081/pdb/cmd/v1')
-        .with(:body => "{\"command\":\"deactivate node\",\"version\":3,\"payload\":{\"certname\":\"www.example.com\",\"producer_timestamp\":\"#{producer_timestamp}\"}}",
-              :headers => { 'Accept' => 'application/json', 'Content-Type' => 'application/json' })
-        .to_return(:status => 200, :body => "{\"uuid\" : \"#{uuid}\"}", :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
+        .with(
+          body: "{\"command\":\"deactivate node\",\"version\":3,\"payload\":{\"certname\":\"www.example.com\",\"producer_timestamp\":\"#{producer_timestamp}\"}}",
+          headers: {
+            'Accept' => 'application/json',
+            'Content-Type' => 'application/json',
+          }
+        )
+        .to_return(status: 200, body: "{\"uuid\" : \"#{uuid}\"}", headers: { 'Content-Type' => 'application/json; charset=utf-8' })
 
       assert_equal uuid, client.deactivate_node('www.example.com')
     end
 
     test 'query_nodes' do
       stub_request(:get, 'https://puppetdb:8081/pdb/query/v4/nodes')
-        .with(:headers => { 'Accept' => 'application/json' })
-        .to_return(:status => 200, :body => fixture('query_nodes_v3_4.json'), :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
+        .with(headers: { 'Accept' => 'application/json' })
+        .to_return(status: 200, body: fixture('query_nodes_v3_4.json'), headers: { 'Content-Type' => 'application/json; charset=utf-8' })
       expected = (1..10).map { |i| "server#{i}.example.com" }
       assert_equal expected, client.query_nodes
     end
 
     test 'resources' do
       stub_request(:get, 'https://puppetdb:8081/pdb/query/v4/resources?query=%5B%22=%22,%20%22certname%22,%20%22host.example.com%22%5D')
-        .with(:headers => { 'Accept' => 'application/json' })
-        .to_return(:status => 200, :body => fixture('resources.json'), :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
+        .with(headers: { 'Accept' => 'application/json' })
+        .to_return(status: 200, body: fixture('resources.json'), headers: { 'Content-Type' => 'application/json; charset=utf-8' })
 
       resources = client.resources('host.example.com')
       sample = {
@@ -174,7 +57,7 @@ class PuppetdbTest < ActiveSupport::TestCase
         'resource' => 'f13ec266-2914-420c-8d71-13e3466c5856',
         'certname' => 'host.example.com',
         'parameters' => {},
-        'exported' => false
+        'exported' => false,
       }
 
       assert_kind_of Array, resources
@@ -183,14 +66,14 @@ class PuppetdbTest < ActiveSupport::TestCase
 
     test 'facts' do
       stub_request(:get, 'https://puppetdb:8081/pdb/query/v4/facts?query=%5B%22=%22,%20%22certname%22,%20%22host.example.com%22%5D')
-        .with(:headers => { 'Accept' => 'application/json' })
-        .to_return(:status => 200, :body => fixture('facts.json'), :headers => { 'Content-Type' => 'application/json; charset=utf-8' })
+        .with(headers: { 'Accept' => 'application/json' })
+        .to_return(status: 200, body: fixture('facts.json'), headers: { 'Content-Type' => 'application/json; charset=utf-8' })
       facts = client.facts('host.example.com')
       assert_kind_of Array, facts
       sample = {
         'value' => 'CEST',
         'name' => 'timezone',
-        'certname' => 'host.example.com'
+        'certname' => 'host.example.com',
       }
       assert_includes facts, sample
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: theforeman-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -83,11 +83,8 @@ files:
 - app/helpers/concerns/puppetdb_foreman/hosts_helper_extensions.rb
 - app/models/concerns/orchestration/puppetdb.rb
 - app/models/puppetdb_foreman/host_extensions.rb
-- app/models/setting/puppetdb.rb
 - app/services/puppetdb.rb
 - app/services/puppetdb_client/base.rb
-- app/services/puppetdb_client/v1.rb
-- app/services/puppetdb_client/v3.rb
 - app/services/puppetdb_client/v4.rb
 - app/services/puppetdb_host.rb
 - app/views/api/v2/puppetdb_nodes/import.json.rabl
@@ -106,7 +103,6 @@ files:
 - test/controllers/nodes_controller_test.rb
 - test/models/host_test.rb
 - test/static_fixtures/facts.json
-- test/static_fixtures/query_nodes.json
 - test/static_fixtures/query_nodes_v3_4.json
 - test/static_fixtures/resources.json
 - test/test_plugin_helper.rb
@@ -116,7 +112,7 @@ homepage: http://www.github.com/theforeman/puppetdb_foreman
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,19 +127,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: This is a Foreman plugin to interact with PuppetDB.
 test_files:
-- test/unit/puppetdb_test.rb
-- test/unit/puppetdb_host_test.rb
+- test/controllers/api/v2/puppetdb_nodes_controller_test.rb
+- test/controllers/nodes_controller_test.rb
 - test/models/host_test.rb
-- test/test_plugin_helper.rb
+- test/static_fixtures/facts.json
 - test/static_fixtures/query_nodes_v3_4.json
-- test/static_fixtures/query_nodes.json
 - test/static_fixtures/resources.json
-- test/static_fixtures/facts.json
-- test/controllers/nodes_controller_test.rb
-- test/controllers/api/v2/puppetdb_nodes_controller_test.rb
+- test/test_plugin_helper.rb
+- test/unit/puppetdb_host_test.rb
+- test/unit/puppetdb_test.rb

data/app/models/setting/puppetdb.rb

@@ -1,49 +0,0 @@
-class Setting::Puppetdb < ::Setting
-  BLANK_ATTRS << 'puppetdb_address'
-  BLANK_ATTRS << 'puppetdb_ssl_ca_file'
-  BLANK_ATTRS << 'puppetdb_ssl_certificate'
-  BLANK_ATTRS << 'puppetdb_ssl_private_key'
-  BLANK_ATTRS << 'puppetdb_api_version'
-
-  def self.default_settings
-    if SETTINGS[:puppetdb].present?
-      default_enabled = SETTINGS[:puppetdb][:enabled]
-      default_address = SETTINGS[:puppetdb][:address]
-      default_ssl_ca_file = SETTINGS[:puppetdb][:ssl_ca_file]
-      default_ssl_certificate = SETTINGS[:puppetdb][:ssl_certificate]
-      default_ssl_private_key = SETTINGS[:puppetdb][:ssl_private_key]
-      default_api_version = SETTINGS[:puppetdb][:api_version]
-    end
-
-    default_enabled = false if default_enabled.nil?
-    default_address ||= 'https://puppetdb:8081/pdb/cmd/v1'
-    default_ssl_ca_file ||= (SETTINGS[:ssl_ca_file]).to_s
-    default_ssl_certificate ||= (SETTINGS[:ssl_certificate]).to_s
-    default_ssl_private_key ||= (SETTINGS[:ssl_priv_key]).to_s
-    default_api_version ||= 4
-
-    [
-      set('puppetdb_enabled', _("Integration with PuppetDB, enabled will deactivate a host in PuppetDB when it's deleted in Foreman"), default_enabled),
-      set('puppetdb_address', _('Foreman will send PuppetDB requests to this address'), default_address),
-      set('puppetdb_ssl_ca_file', _('Foreman will send PuppetDB requests with this CA file'), default_ssl_ca_file),
-      set('puppetdb_ssl_certificate', _('Foreman will send PuppetDB requests with this certificate file'), default_ssl_certificate),
-      set('puppetdb_ssl_private_key', _('Foreman will send PuppetDB requests with this key file'), default_ssl_private_key),
-      set('puppetdb_api_version', _('Foreman will use this PuppetDB API version'), default_api_version, N_('PuppetDB API Version'), nil, collection: proc { ::Puppetdb::API_VERSIONS })
-    ]
-  end
-
-  def self.load_defaults
-    # Check the table exists
-    return unless super
-
-    transaction do
-      default_settings.each { |s| create! s.update(:category => 'Setting::Puppetdb') }
-    end
-
-    true
-  end
-
-  def self.humanized_category
-    N_('PuppetDB')
-  end
-end

data/app/services/puppetdb_client/v1.rb

@@ -1,33 +0,0 @@
-module PuppetdbClient
-  class V1 < Base
-    # The payload is expected to be the certname of a node as a serialized JSON string.
-    def deactivate_node_payload(nodename)
-      payload = {
-        'command' => 'deactivate node',
-        'version' => 1,
-        'payload' => nodename.to_json
-      }.to_json
-      'payload=' + payload
-    end
-
-    def command_url
-      '/v3/commands'
-    end
-
-    def nodes_url
-      '/v3/nodes'
-    end
-
-    def facts_url
-      '/v3/facts'
-    end
-
-    def resources_url
-      '/v3/resources'
-    end
-
-    def query_nodes
-      super.map { |node| node['name'] }
-    end
-  end
-end