foreman_puppet 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f4ecdeb14e00d3daed1a47021174874190c39173dbcf50548f8652128cff8c9
-  data.tar.gz: ee23eb1076fbf0a2d5a6b95e7d066c4eb88a343b99d039903f9350233095bb89
+  metadata.gz: 7f8a5c7b68f8d77f54787c4c9de924bc02f27d7a0f957fc6539b5b4aa6c64b49
+  data.tar.gz: 6cd563d9cc2f56c22186bbbb0fb9d3c9679c8718e965d7fd952bbed3efacf222
 SHA512:
-  metadata.gz: fa9df4333cfdf456010e4a67e5a7d67c7a198424b471c48a22a04f86ee8896e8be69ffcdcdc8b0b7df87d081cc7773dc13a489fd1586a5924329fbe3adc0742e
-  data.tar.gz: 4fc2f8dfccfb68519faed7519b65a8347e156dc776240d66d235c52c36bbed9736755b79bae5407b6bf67c5f8fd46628f126e075099a781b040d0d00a7a87f32
+  metadata.gz: 1a09cf7ff50545983f0e472b3c03f0708087dddf8d2136dc32978f49a1fd76ba7ca4c716db6e6b3add3055279745754b2d2eddf2cd1630a91e75187ba9683c1e
+  data.tar.gz: 5c4bb18d77784e2a9c43c7f102adc9df6469b739525fee007d1c89bf635713e1dd051140489101ebeb9d66298100195f56571fa5fb55a1a179c8381cac56a65b

data/app/controllers/concerns/foreman_puppet/extensions/hostgroups_controller_extensions.rb

@@ -23,7 +23,9 @@ module ForemanPuppet
       module Actions
         def nest
           super
-          @hostgroup.puppetclasses = @parent.puppetclasses
+          return unless @parent.puppet
+          puppet = @hostgroup.puppet || @hostgroup.build_puppet
+          puppet.puppetclasses = @parent.puppet.puppetclasses
         end
 
         def environment_selected

data/app/models/foreman_puppet/host_puppet_facet.rb

@@ -48,7 +48,7 @@ module ForemanPuppet
 
     def parent_config_groups
       return [] unless host.hostgroup
-      host.hostgroup.puppet&.all_config_groups
+      host.hostgroup.puppet&.all_config_groups || []
     end
 
     def ensure_puppet_associations

data/app/models/foreman_puppet/hostgroup_puppet_facet.rb

@@ -48,6 +48,8 @@ module ForemanPuppet
       Hostgroup.sort_by_ancestry(hostgroup.ancestors.joins(:puppet).where(HostgroupPuppetFacet.arel_table[attr.to_sym].not_eq(nil))).last&.puppet.try(attr)
     end
 
+    delegate :parent_id, to: :hostgroup
+
     # and helpers
     def parent_facet_id
       parent_facet&.id

data/db/migrate/20200803113903_migrate_host_type_in_host_config_groups.foreman_puppet.rb

@@ -13,26 +13,8 @@ class MigrateHostTypeInHostConfigGroups < ActiveRecord::Migration[6.0]
   end
 
   def up
-    host_config_group_ids = FakeHostConfigGroup.for_host.pluck(:host_id).uniq
-    host_config_group_ids.each do |host_id|
-      host_facet_id = ForemanPuppet::HostPuppetFacet.where(host_id: host_id).pick(:id)
-      host_groups = FakeHostConfigGroup.for_host.where(host_id: host_id)
-      if host_facet_id
-        host_groups.update_all(host_type: 'ForemanPuppet::HostPuppetFacet', host_id: host_facet_id)
-      else
-        deleted_groups = FakeConfigGroup.where(id: host_groups.pluck(:config_group_id)).pluck(:name)
-        say "deleting groups #{deleted_groups.join(', ')} from Host (id=#{host_id}) because it has no environment"
-        host_groups.delete_all
-      end
-    end
-    hostgroup_config_group_ids = FakeHostConfigGroup.for_hostgroup.pluck(:host_id).uniq
-    hostgroup_config_group_ids.each do |hostgroup_id|
-      hostgroup_facet_id = ForemanPuppet::HostgroupPuppetFacet.where(hostgroup_id: hostgroup_id).pick(:id)
-      hostgroup_facet_id ||= ForemanPuppet::HostgroupPuppetFacet.create!(hostgroup: Hostgroup.unscoped.find(hostgroup_id)).id
-      FakeHostConfigGroup.for_hostgroup
-                         .where(host_id: hostgroup_id)
-                         .update_all(host_type: 'ForemanPuppet::HostgroupPuppetFacet', host_id: hostgroup_facet_id)
-    end
+    migrate_host_data_to_facets
+    migrate_hostgroup_data_to_facets
   end
 
   def down
@@ -51,4 +33,38 @@ class MigrateHostTypeInHostConfigGroups < ActiveRecord::Migration[6.0]
                          .update_all(host_type: 'Hostgroup', host_id: hostgroup_facet_ids[hostgroup_facet_id])
     end
   end
+
+  private
+
+  def migrate_host_data_to_facets
+    host_config_group_ids = FakeHostConfigGroup.for_host.pluck(:host_id).uniq
+    host_config_group_ids.each do |host_id|
+      host_facet_id = ForemanPuppet::HostPuppetFacet.where(host_id: host_id).pick(:id)
+      host_groups = FakeHostConfigGroup.for_host.where(host_id: host_id)
+      if host_facet_id
+        host_groups.update_all(host_type: 'ForemanPuppet::HostPuppetFacet', host_id: host_facet_id)
+      else
+        deleted_groups = FakeConfigGroup.where(id: host_groups.pluck(:config_group_id)).pluck(:name)
+        say "Deleting Config groups #{deleted_groups.join(', ')} from Host (id=#{host_id}) because the Host doesn't exist or has no environment"
+        host_groups.delete_all
+      end
+    end
+  end
+
+  def migrate_hostgroup_data_to_facets
+    hostgroup_config_group_ids = FakeHostConfigGroup.for_hostgroup.pluck(:host_id).uniq
+    hostgroup_config_group_ids.each do |hostgroup_id|
+      hostgroup = Hostgroup.unscoped.find_by(id: hostgroup_id)
+      hostgroup_groups = FakeHostConfigGroup.for_hostgroup.where(host_id: hostgroup_id)
+      if hostgroup
+        hostgroup_facet_id = ForemanPuppet::HostgroupPuppetFacet.where(hostgroup_id: hostgroup_id).pick(:id)
+        hostgroup_facet_id ||= ForemanPuppet::HostgroupPuppetFacet.create!(hostgroup: hostgroup).id
+        hostgroup_groups.update_all(host_type: 'ForemanPuppet::HostgroupPuppetFacet', host_id: hostgroup_facet_id)
+      else
+        deleted_groups = FakeConfigGroup.where(id: hostgroup_groups.pluck(:config_group_id)).pluck(:name)
+        say "Deleting Config groups #{deleted_groups.join(', ')} from Hostgroup (id=#{hostgroup_id}) because Hostgroup doesn't exist"
+        hostgroup_groups.delete_all
+      end
+    end
+  end
 end

data/db/migrate/20211112130803_cleanup_environment_from_core_tables.foreman_puppet.rb

@@ -0,0 +1,10 @@
+class CleanupEnvironmentFromCoreTables < ActiveRecord::Migration[6.0]
+  def up
+    ::Hostgroup.update_all(environment_id: nil) if column_exists?(:hostgroups, :environment_id)
+    Host::Managed.update_all(environment_id: nil) if column_exists?(:hosts, :environment_id)
+  end
+
+  def down
+    # nothing to do
+  end
+end

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end