foreman_puppet 6.4.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d63691d998c91ff4d8b69d038ac37c63e5bdc657e895d97ae88f6832417b9434
-  data.tar.gz: 530b34760965f3d259f63546b952d97952b7a1277d6b38b6bc5a3b0065f7ab15
+  metadata.gz: 8afb163e0a92e0237e545a8d6b99918f498126eab48a2ab0f1b5d47393919db9
+  data.tar.gz: 0123defbf5e8e8497b929b9f23aa8aeb7cebf15e07a4771cb951f5871a5d705d
 SHA512:
-  metadata.gz: 18b306ec3e92e0579f7671b9194a37c90f28c1293a16b51ce7feb9ba3402a13fdfe384c616e8371446195140a2524343ef6d03336691f4aa92844298bcf01cd6
-  data.tar.gz: 92863444989b2a6f74e9bd49fbd6c6bee13db7f660ddc4dd744e45e9d91249cd2636c8e1f2498ba3b9fb73c4da3d32b959b4e87bc7b2b231e05ab3d89389b26a
+  metadata.gz: 35845e3b125c4aaa9db265f32c21b260185761006af63b9ab73a98cee510b836e0359447108aa0f6babd900f8f2a20bd8ecc2b69ca642179dce3c14623cd5f8c
+  data.tar.gz: 62f7365a84ec1c7fb180a62e3cdd8ee2a1cc58f8367e033ae9c1512af4e40925f600479f908f7aceb913142ca750d4c99604b34323b7504ce23e99add62ac132

data/README.md

@@ -33,7 +33,8 @@ Some features will remain in core:
 
 |Foreman version|Plugin version|Notes                                     |
 |---------------|--------------|------------------------------------------|
-| >= 3.7        | ~> 6.0       | Required                                 |
+| >= 3.11       | ~> 7.0       | Required                                 |
+| ~> 3.7 - 3.10 | ~> 6.0       | Required                                 |
 | ~> 3.5, 3.6   | ~> 5.0       | Required                                 |
 | ~> 3.4        | ~> 4.1       | Required                                 |
 | ~> 3.3        | ~> 4.0       | Required                                 |
@@ -78,7 +79,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) *2020-2023* *The Foreman developers*
+Copyright (c) *2020-2024* *The Foreman developers*
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/lib/foreman_puppet/engine.rb

@@ -6,8 +6,10 @@ module ForemanPuppet
     config.paths['db/migrate'] << 'db/migrate_foreman' if Gem::Dependency.new('', ">= #{ForemanPuppet::FOREMAN_DROP_MIGRATIONS_VERSION}").match?('', SETTINGS[:version].notag)
     config.paths['config/routes.rb'].unshift('config/api_routes.rb')
 
-    initializer 'foreman_puppet.register_plugin', before: :finisher_hook do |_app|
-      require 'foreman_puppet/register'
+    initializer 'foreman_puppet.register_plugin', before: :finisher_hook do |app|
+      app.reloader.to_prepare do
+        require_relative 'register'
+      end
       Apipie.configuration.checksum_path += ['/foreman_puppet/api/']
     end
 
@@ -23,14 +25,10 @@ module ForemanPuppet
       SETTINGS[:foreman_puppet] = { assets: { precompile: ['foreman_puppet.scss'] } }
     end
 
-    initializer 'foreman_puppet.patch_parameters' do
-      # Parameters should go ASAP as they need to be applied before they are included in core controller
-      Foreman::Controller::Parameters::TemplateCombination.include ForemanPuppet::Extensions::ParametersTemplateCombination
-    end
-
     # Include concerns in this config.to_prepare block
     # rubocop:disable Metrics/BlockLength
     config.to_prepare do
+      Foreman::Controller::Parameters::TemplateCombination.include ForemanPuppet::Extensions::ParametersTemplateCombination
       # Facets extenstion is applied too early - before the Hostgroup is complete
       # We redefine thing, so we need to wait until complete definition of Hostgroup
       # thus separate patching instead of using facet patching

data/lib/foreman_puppet/register.rb

@@ -1,5 +1,5 @@
 Foreman::Plugin.register :foreman_puppet do
-  requires_foreman '>= 3.7'
+  requires_foreman '>= 3.13'
   register_gettext
 
   # Add Global JS file for extending foreman-core components and routes

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '6.4.0'.freeze
+  VERSION = '8.0.0'.freeze
 end

data/webpack/global_index.js

@@ -1,4 +1,6 @@
 import { registerReducer } from 'foremanReact/common/MountingService';
+import { registerColumns } from 'foremanReact/components/HostsIndex/Columns/core';
+import { translate as __ } from 'foremanReact/common/I18n';
 import reducers from './src/reducers';
 import { registerFills } from './src/Extends/Fills';
 import { registerLegacy } from './legacy';
@@ -9,3 +11,22 @@ registerReducer('puppet', reducers);
 registerFills();
 // TODO: the checkForUnavailablePuppetclasses is very nasty
 registerLegacy();
+
+// register columns for React hosts index page
+const puppetHostsIndexColumns = [
+  {
+    columnName: 'environment',
+    title: __('Puppet env'),
+    isSorted: true,
+    wrapper: hostDetails => hostDetails.environment_name,
+    weight: 2700,
+  },
+];
+
+puppetHostsIndexColumns.forEach(column => {
+  column.tableName = 'hosts';
+  column.categoryName = 'Puppet';
+  column.categoryKey = 'puppet';
+});
+
+registerColumns(puppetHostsIndexColumns);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -245,7 +245,6 @@ files:
 - locale/de/LC_MESSAGES/foreman_puppet.mo
 - locale/de/foreman_puppet.po
 - locale/en/LC_MESSAGES/foreman_puppet.mo
-- locale/en/foreman_puppet.edit.po
 - locale/en/foreman_puppet.po
 - locale/en_GB/LC_MESSAGES/foreman_puppet.mo
 - locale/en_GB/foreman_puppet.po
@@ -408,76 +407,76 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Add Puppet features to Foreman
 test_files:
-- test/unit/foreman_puppet_test.rb
-- test/unit/foreman_puppet/global_id_test.rb
-- test/unit/foreman_puppet/puppet_class_importer_test.rb
-- test/unit/foreman_puppet/template_rendering_test.rb
-- test/unit/foreman_puppet/access_permissions_test.rb
-- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
+- test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/host_classes_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/hostgroup_classes_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/hostgroups_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/lookups_common_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/override_values_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/provisioning_templates_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/puppetclasses_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/smart_proxies_controller_test.rb
+- test/controllers/foreman_puppet/api/v2/template_combinations_controller_test.rb
+- test/controllers/foreman_puppet/config_groups_controller_test.rb
+- test/controllers/foreman_puppet/environments_controller_test.rb
+- test/controllers/foreman_puppet/hostgroups_controller_test.rb
+- test/controllers/foreman_puppet/hosts_controller_test.rb
+- test/controllers/foreman_puppet/puppet_smart_proxies_controller_test.rb
+- test/controllers/foreman_puppet/puppetclass_lookup_keys_controller_test.rb
+- test/controllers/foreman_puppet/puppetclasses_controller_test.rb
+- test/controllers/provisioning_templates_controller_test.rb
+- test/factories/foreman_puppet_factories.rb
+- test/factories/host_puppet_enhancements.rb
+- test/factories/proxy_puppet_enhancements.rb
+- test/graphql/mutations/hosts/create_mutation_test.rb
+- test/graphql/queries/environment_query_test.rb
+- test/graphql/queries/environments_query_test.rb
+- test/graphql/queries/host_puppet_query_test.rb
+- test/graphql/queries/hostgroup_puppet_query_test.rb
+- test/graphql/queries/location_query_test.rb
+- test/graphql/queries/organization_query_test.rb
+- test/graphql/queries/puppetclass_query_test.rb
+- test/graphql/queries/puppetclasses_query_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
+- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
 - test/helpers/foreman_puppet/puppetclasses_helper_test.rb
 - test/integration/foreman_puppet/dashboard_js_test.rb
+- test/integration/foreman_puppet/environment_js_test.rb
 - test/integration/foreman_puppet/host_js_test.rb
 - test/integration/foreman_puppet/hostgroup_js_test.rb
-- test/integration/foreman_puppet/smartclass_parameter_js_test.rb
 - test/integration/foreman_puppet/puppetclass_js_test.rb
-- test/integration/foreman_puppet/environment_js_test.rb
-- test/factories/foreman_puppet_factories.rb
-- test/factories/host_puppet_enhancements.rb
-- test/factories/proxy_puppet_enhancements.rb
+- test/integration/foreman_puppet/smartclass_parameter_js_test.rb
 - test/integration_puppet_helper.rb
+- test/models/foreman_puppet/config_group_class_test.rb
 - test/models/foreman_puppet/config_group_test.rb
-- test/models/foreman_puppet/report_test.rb
+- test/models/foreman_puppet/environment_test.rb
+- test/models/foreman_puppet/host_config_group_test.rb
 - test/models/foreman_puppet/host_puppet_facet_test.rb
 - test/models/foreman_puppet/host_test.rb
-- test/models/foreman_puppet/user_test.rb
-- test/models/foreman_puppet/provisioning_template_test.rb
-- test/models/foreman_puppet/host_config_group_test.rb
-- test/models/foreman_puppet/lookup_value_test.rb
-- test/models/foreman_puppet/hostgroup_test.rb
 - test/models/foreman_puppet/hostgroup_puppet_facet_test.rb
+- test/models/foreman_puppet/hostgroup_test.rb
+- test/models/foreman_puppet/lookup_value_test.rb
+- test/models/foreman_puppet/provisioning_template_test.rb
 - test/models/foreman_puppet/puppetclass_lookup_key_test.rb
-- test/models/foreman_puppet/environment_test.rb
 - test/models/foreman_puppet/puppetclass_test.rb
-- test/models/foreman_puppet/config_group_class_test.rb
+- test/models/foreman_puppet/report_test.rb
 - test/models/foreman_puppet/smart_proxy_test.rb
-- test/graphql/queries/hostgroup_puppet_query_test.rb
-- test/graphql/queries/puppetclass_query_test.rb
-- test/graphql/queries/location_query_test.rb
-- test/graphql/queries/organization_query_test.rb
-- test/graphql/queries/puppetclasses_query_test.rb
-- test/graphql/queries/environment_query_test.rb
-- test/graphql/queries/environments_query_test.rb
-- test/graphql/queries/host_puppet_query_test.rb
-- test/graphql/mutations/hosts/create_mutation_test.rb
-- test/test_puppet_helper.rb
-- test/controllers/provisioning_templates_controller_test.rb
-- test/controllers/foreman_puppet/hostgroups_controller_test.rb
-- test/controllers/foreman_puppet/puppetclass_lookup_keys_controller_test.rb
-- test/controllers/foreman_puppet/environments_controller_test.rb
-- test/controllers/foreman_puppet/puppet_smart_proxies_controller_test.rb
-- test/controllers/foreman_puppet/hosts_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/template_combinations_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/host_classes_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/hostgroups_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/lookups_common_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/hostgroup_classes_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/puppetclasses_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/smart_proxies_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/override_values_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/provisioning_templates_controller_test.rb
-- test/controllers/foreman_puppet/puppetclasses_controller_test.rb
-- test/controllers/foreman_puppet/config_groups_controller_test.rb
-- test/services/foreman_puppet/input_type/puppet_parameter_input_test.rb
+- test/models/foreman_puppet/user_test.rb
 - test/services/foreman_puppet/host_counter_test.rb
 - test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb
 - test/services/foreman_puppet/host_info_providers/puppet_info_test.rb
+- test/services/foreman_puppet/input_type/puppet_parameter_input_test.rb
+- test/test_puppet_helper.rb
+- test/unit/foreman_puppet/access_permissions_test.rb
+- test/unit/foreman_puppet/global_id_test.rb
+- test/unit/foreman_puppet/puppet_class_importer_test.rb
+- test/unit/foreman_puppet/template_rendering_test.rb
+- test/unit/foreman_puppet_test.rb