puppetdb_foreman 6.0.0 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2917867afdc2d20921a278f2c2fb35aa90ee71ad3ceca28cbfb6fbff4d087bd9
-  data.tar.gz: 3f6bd9d01c00bd9007220a95b1c0752c938cbbad24c01c670f03ae79e80fd6a5
+  metadata.gz: d683f14f9607acc0274d79c0c245ac9bf7c9b37ee0957f92ef2942df991f2edd
+  data.tar.gz: 3786bbda19883a603921ffa43b748c4ca24101c0bd237c70c8b528a765e5bd69
 SHA512:
-  metadata.gz: 424fd00c14417f01cc1ae6eac59d468bb6b32048f5fbd2f0e646319182500a8b46349f31d2797d87efb578d86704eed14cb42710bf25097334993118a335c904
-  data.tar.gz: 0e0ad581dbecf0ce351bb50e8fd88c348e080b64a812c82cb933da13c60a9006f681ba1bcdc6229987e36b96d5d37719895eb7be81c685a15ddb5ec1c8630121
+  metadata.gz: b728cb91bf886df44aa6c892d1ef6076d3892453e378a82d78453c0e3bed68973139eb48f15d72c1c4e79905b1a05d77eb547a90c8695ccb1e0e27583f3725e7
+  data.tar.gz: 1f8c68c45e271137f28b819e0529110ed0d3ea6100699757a051d728bd5e6ba1569a26c2f02622121c88afe1c08b7f4f46904c457725edc94e0a4a9d2ccf8fe5

data/README.md

@@ -11,7 +11,7 @@ It does the following:
   * Compares nodes in PuppetDB to Hosts in Foreman.
   * Creates Hosts in Foreman from PuppetDB facts.
 
-Feel free to raise issues, ask for features, anything, in the github repository or #theforeman IRC channel in Freenode.
+Feel free to raise issues, ask for features, anything, in the github repository or visit [the Foreman support pages](https://theforeman.org/support.html).
 
 ## Compatibility
 

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

@@ -20,11 +20,12 @@ module Orchestration
     end
 
     def del_puppetdb
-      Rails.logger.info "Deactivating node in PuppetDB: #{name}"
-      ::Puppetdb.client.deactivate_node(name)
+      Rails.logger.info "Deactivating node in PuppetDB: #{certname} (#{name})"
+      ::Puppetdb.client.deactivate_node(certname)
     rescue StandardError => e
       failure format(
-        _("Failed to deactivate node %<name>s in PuppetDB: %<message>s\n "), name: name, message: e.message
+        _("Failed to deactivate node %<certname>s (%<name>s) in PuppetDB: %<message>s\n "),
+        name: name, message: e.message, certname: certname
       ), e
     end
 

data/db/migrate/20170717140010_migrate_puppetdb_api_version_setting.rb

@@ -2,11 +2,11 @@
 
 class MigratePuppetdbApiVersionSetting < ActiveRecord::Migration[4.2]
   def up
-    puppetdb_address = Setting.where(category: 'Setting::Puppetdb', name: 'puppetdb_address').first.try(:value)
+    puppetdb_address = Setting.where(name: 'puppetdb_address').first.try(:value)
     return unless puppetdb_address
 
     api_version = URI.parse(puppetdb_address).path.start_with?('/pdb') ? 3 : 1
-    setting = Setting.where(category: 'Setting::Puppetdb', name: 'puppetdb_api_version').first_or_create
+    setting = Setting.where(name: 'puppetdb_api_version').first_or_create
     setting.value = api_version
     setting.save
   end

data/db/migrate/20221026123754_fix_puppetdb_settings_category_to_dsl.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class FixPuppetdbSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    # rubocop:disable Rails/SkipsModelValidations
+    Setting.where(category: 'Setting::Puppetdb').update_all(category: 'Setting') if column_exists?(:settings, :category)
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/lib/puppetdb_foreman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetdbForeman
-  VERSION = '6.0.0'
+  VERSION = '6.0.2'
 end

data/test/models/host_test.rb

@@ -26,7 +26,7 @@ class HostTest < ActiveSupport::TestCase
       end
 
       test '#del_puppetdb' do
-        ::PuppetdbClient::V4.any_instance.expects(:deactivate_node).with(host.name).returns(true)
+        ::PuppetdbClient::V4.any_instance.expects(:deactivate_node).with(host.certname).returns(true)
         host.send(:del_puppetdb)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,10 +66,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'Disable hosts on PuppetDB after they are deleted or built in Foreman.
+description: Disable hosts on PuppetDB after they are deleted or built in Foreman.
   Follow https://github.com/theforeman/puppetdb_foreman and raise an issue/submit
-  a pull request if you need extra functionality. You can also find some help in #theforeman
-  IRC channel on Freenode.'
+  a pull request if you need extra functionality. You can also find some help via
+  the Foreman support pages (https://theforeman.org/support.html).
 email: elobatocs@gmail.com
 executables: []
 extensions: []
@@ -95,6 +95,7 @@ files:
 - config/routes.rb
 - db/migrate/20170717140010_migrate_puppetdb_api_version_setting.rb
 - db/migrate/20181001113836_remove_puppetdb_dashboard_address_setting.puppetdb_foreman.rb
+- db/migrate/20221026123754_fix_puppetdb_settings_category_to_dsl.rb
 - lib/puppetdb_foreman.rb
 - lib/puppetdb_foreman/engine.rb
 - lib/puppetdb_foreman/version.rb
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: This is a Foreman plugin to interact with PuppetDB.