foreman_puppet 2.0.0 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c850f32331462f52510a8e895c149eb470e9982ad819de78529c38c888ab549c
-  data.tar.gz: 81460cb582b62baa3f96083c3573a99607a9b2619d2a20c31df4f41da48677c6
+  metadata.gz: 7b1f794eadfcdfbc3e2b516b5e54ded28e14b5dbf5472864317e7eabf4a75976
+  data.tar.gz: 65e754ff457d4e3ddc39147385429077230e633d7d33ca6262d2dff24c1803f6
 SHA512:
-  metadata.gz: f0b20469d894d6a1cc2e8c6f486ef5f09dd9c04742c0be684f68846fe930536a813ee404fb30af2ba0ae9031df6c2c00ea3a4af0233be5b24640b81d2a58d031
-  data.tar.gz: 16cab8e0431a72b04795046e4e66ca67a029247f4bf182a7a3f36e7ec8f2c5d45a1ae3db4ce8d96a48869a698eebec284eef6d9c0290d10270c41ab19789d0ee
+  metadata.gz: 829a43c406bbdf51b3c2b3508189f283f0dddcb44c4dd9fa578afdffc9369f8f3e06836b700001efb267c1020e917c2b3f84e88bdc4f1edc8feb509f0a896154
+  data.tar.gz: c36b9a9f727417795cb169e371ad2ba7df5274ad58333eebfd38327c54f7dba20fe2e75730f68b29d749b48f6f5b4a8fff2c37e75f952d079463feceb3b19fb0

data/app/helpers/foreman_puppet/puppetclass_lookup_keys_helper.rb

@@ -9,7 +9,7 @@ module ForemanPuppet
     # ------ Host(group) Form Helpers -----
 
     def overridable_puppet_lookup_keys(klass, obj)
-      klass.class_params.override.where(environment_classes: { environment_id: obj.environment_id })
+      klass.class_params.override.where(environment_classes: { environment_id: obj.environment })
     end
 
     def hidden_puppet_lookup_value_fields(lookup_key, lookup_value, disabled)

data/db/migrate/20220201205305_migrate_host_class_permission.foreman_puppet.rb

@@ -0,0 +1,9 @@
+class MigrateHostClassPermission < ActiveRecord::Migration[6.0]
+  def up
+    Permission.where(resource_type: 'HostClass').update_all(resource_type: 'ForemanPuppet::HostClass')
+  end
+
+  def down
+    # no can do
+  end
+end

data/db/migrate/20220208135305_migrate_environment_ignore_type.foreman_puppet.rb

@@ -0,0 +1,15 @@
+class MigrateEnvironmentIgnoreType < ActiveRecord::Migration[6.0]
+  def up
+    taxonomies = Taxonomy.unscoped.where("ignore_types LIKE '%Environment%'")
+    environment_ids = ForemanPuppet::Environment.unscoped.pluck(:id)
+
+    taxonomies.each do |tax|
+      new_types = tax.ignore_types.reject { |type| type == 'Environment' }
+      tax.update_columns(ignore_types: new_types)
+      taxable_rows = environment_ids.map do |env_id|
+        { taxable_id: env_id, taxable_type: 'ForemanPuppet::Environment', taxonomy_id: tax.id }
+      end
+      TaxableTaxonomy.insert_all(taxable_rows) if taxable_rows.any?
+    end
+  end
+end

data/db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.foreman_puppet.rb

@@ -1,6 +1,8 @@
 class CreateHostgroupsPuppetclasses < ActiveRecord::Migration[6.0]
   def up
-    create_table :hostgroups_puppetclasses, id: false, if_not_exists: true do |t|
+    # this table is later renamed into hostgroup_classes and thus we don't want to create it if it exists under the later name
+    return if table_exists?(:hostgroups_puppetclasses) || table_exists?(:hostgroup_classes)
+    create_table :hostgroups_puppetclasses, id: false do |t|
       t.references :hostgroup, foreign_key: true, null: false
       t.references :puppetclass, foreign_key: true, null: false
     end

data/db/migrate_foreman/20120824142048_add_some_indexes.foreman_puppet.rb

@@ -13,9 +13,9 @@ class AddSomeIndexes < ActiveRecord::Migration[4.2]
   end
 
   def down
-    remove_foreign_key 'host_classes', 'hosts', name: 'host_classes_host_id_fk'
-    remove_foreign_key 'host_classes', 'puppetclasses', name: 'host_classes_puppetclass_id_fk'
-    remove_foreign_key 'operatingsystems_puppetclasses', 'operatingsystems', name: 'operatingsystems_puppetclasses_operatingsystem_id_fk'
-    remove_foreign_key 'operatingsystems_puppetclasses', 'puppetclasses', name: 'operatingsystems_puppetclasses_puppetclass_id_fk'
+    remove_foreign_key('host_classes', 'hosts') if foreign_key_exists?(:host_classes, :hosts)
+    remove_foreign_key('host_classes', 'puppetclasses') if foreign_key_exists?(:host_classes, :puppetclasses)
+    remove_foreign_key('operatingsystems_puppetclasses', 'operatingsystems') if foreign_key_exists?(:operatingsystems_puppetclasses, :operatingsystems)
+    remove_foreign_key('operatingsystems_puppetclasses', 'puppetclasses') if foreign_key_exists?(:operatingsystems_puppetclasses, :puppetclasses)
   end
 end

data/lib/foreman_puppet/register.rb

@@ -147,7 +147,8 @@ Foreman::Plugin.register :foreman_puppet do
     permission :import_puppetclasses, { 'foreman_puppet/puppetclasses' => %i[import_environments obsolete_and_new],
                                         'foreman_puppet/api/v2/environments' => [:import_puppetclasses] },
       resource_type: 'ForemanPuppet::Puppetclass'
-    permission :edit_classes, { 'foreman_puppet/api/v2/host_classes': %i[index create destroy] },
+    permission :edit_classes, { :host_editing => [:edit_classes],
+                                'foreman_puppet/api/v2/host_classes' => %i[index create destroy] },
       resource_type: 'ForemanPuppet::HostClass'
   end
 

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.4'.freeze
 end