foreman_puppet 4.0.4 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 314d7d6b144722c190425f83640ed9c147703933d8a393c111340625331bc690
-  data.tar.gz: 42b53c1aab258f5a421e66ff1709ff9eaf2fdf5f463954d1eee50a7c9f195c8f
+  metadata.gz: 85029a61a622dd49d223e5e0c57bfc096d417c8b5761f5574d05635f03d6569a
+  data.tar.gz: 9bd16fa183dfc25f913110c4ad18172c0982c41f453649a65f6531ab3826f0f0
 SHA512:
-  metadata.gz: 0ecbde2f0782d0fe4c4fafd8906367f088d878643bb5b6bc633619a4ccb2270ace2a07bda66b3cce041b8fb2623afec9352bc6f690c363eefbde140720e18461
-  data.tar.gz: 3834a356630a973ac6b074dcb350207ed99f5845e10afe2414d67b163acee77433add99b08606c75023a629e2578c4b44b911f19a1ea6d3793b16cae53a4038f
+  metadata.gz: 0ec5b4da654c66eef0bf8ffda2bf487adda07d35295e3f91eca999022a515370ff109aec6b14b0c39b9999e58af845b3770faccdbb256098322ff72ae6c95861
+  data.tar.gz: d6a1447d180e49d0f7c6d21a889110bc455299b7c3bac9230e033b2a65c6d9ab7e29989f313a0d800c66191b025da172f3e56f6ca0e5b57f63aa3f1e992932b2

data/README.md

@@ -37,8 +37,9 @@ You can install it on Foreman 2.5 to prepare for the Foreman update.
 
 |Foreman version|Plugin version|Notes                                     |
 |---------------|--------------|------------------------------------------|
-| >= 3.3        | ~> 4.0       | Required                                 |
-| >= 3.2        | ~> 3.0       | Required                                 |
+| ~> 3.4        | ~> 4.1       | Required                                 |
+| ~> 3.3        | ~> 4.0       | Required                                 |
+| ~> 3.2        | ~> 3.0       | Required                                 |
 | ~> 3.1        | ~> 2.0       | Required                                 |
 | ~> 3.0        | ~> 1.0       | Required                                 |
 | >= 2.5        | ~> 0.1       | Optional; replaces Core features         |

data/app/models/concerns/foreman_puppet/extensions/host.rb

@@ -30,7 +30,7 @@ module ForemanPuppet
         def search_by_puppetclass(_key, operator, value)
           conditions = sanitize_sql_for_conditions(["puppetclasses.name #{operator} ?", value_to_sql(operator, value)])
           config_group_ids = ForemanPuppet::ConfigGroup.joins(:puppetclasses).where(conditions).pluck(:id)
-          host_ids         = ::Host.authorized(:view_hosts, Host).joins(puppet: :puppetclasses).where(conditions).distinct.pluck(:id)
+          host_ids         = ::Host.authorized(:view_hosts).joins(puppet: :puppetclasses).where(conditions).distinct.pluck(:id)
           host_ids        += ForemanPuppet::HostConfigGroup
                              .where(host_type: 'ForemanPuppet::HostPuppetFacet')
                              .where(config_group_id: config_group_ids)

data/app/models/foreman_puppet/puppetclass.rb

@@ -15,8 +15,8 @@ module ForemanPuppet
     before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
     has_many :environment_classes, dependent: :destroy, inverse_of: :puppetclass
     has_many :environments, -> { distinct }, through: :environment_classes
-    has_many :organizations, -> { distinct.reorder(nil) }, through: :environments
-    has_many :locations, -> { distinct.reorder(nil) }, through: :environments
+    has_many :organizations, -> { distinct.reorder(:id) }, through: :environments
+    has_many :locations, -> { distinct.reorder(:id) }, through: :environments
 
     # rubocop:disable Rails/HasAndBelongsToMany
     has_and_belongs_to_many :operatingsystems

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '4.0.4'.freeze
+  VERSION = '4.1.1'.freeze
 end

data/lib/tasks/foreman_puppet_tasks.rake

@@ -1,15 +1,5 @@
 require 'rake/testtask'
 
-# Tasks
-namespace :foreman_puppet do
-  namespace :example do
-    desc 'Example Task'
-    task task: :environment do
-      # Task goes here
-    end
-  end
-end
-
 # Tests
 namespace :test do
   desc 'Test ForemanPuppet'

data/test/graphql/mutations/hosts/create_mutation_test.rb

@@ -72,7 +72,7 @@ module ForemanPuppet
             assert_equal 1, host.interfaces.count
             interface = host.interfaces.first
             assert_equal 'Nic::Bond', interface.type
-            assert_equal 'eth0, eth1', interface.attached_to
+            assert_same_elements %w[eth0 eth1], interface.attached_to.split(', ')
             assert_equal 'bond0', interface.identifier
             assert interface.primary
             assert interface.provision

data/webpack/src/Extends/Host/PuppetTab/index.js

@@ -21,6 +21,8 @@ const PuppetTab = ({ response, status, location: { pathname } }) => {
         {SECONDARY_TABS.map(({ key, title }) => (
           <Tab
             key={key}
+            id={`puppet-subtab-${key}`}
+            ouiaId={`puppet-subtab-${key}`}
             eventKey={key}
             title={<TabTitleText>{title}</TabTitleText>}
           />

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.1.1
 platform: ruby
 authors:
 - Ondřej Ezr
 - Shira Maximov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -224,6 +224,7 @@ 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
@@ -360,7 +361,7 @@ homepage: https://github.com/theforeman/foreman_puppet
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -375,75 +376,75 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Add Puppet features to Foreman
 test_files:
-- test/controllers/foreman_puppet/api/v2/config_groups_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/lookups_common_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_proxies_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/template_combinations_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/override_values_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
-- test/controllers/foreman_puppet/config_groups_controller_test.rb
-- test/controllers/foreman_puppet/hostgroups_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/foreman_puppet/environments_controller_test.rb
-- test/controllers/foreman_puppet/hosts_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/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/puppetclasses_query_test.rb
-- test/graphql/queries/environment_query_test.rb
-- test/graphql/queries/puppetclass_query_test.rb
-- test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
+- test/unit/foreman_puppet_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/helpers/foreman_puppet/hosts_and_hostgroups_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/puppetclass_js_test.rb
 - test/integration/foreman_puppet/smartclass_parameter_js_test.rb
-- test/models/foreman_puppet/config_group_class_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_puppet_helper.rb
 - test/models/foreman_puppet/config_group_test.rb
-- test/models/foreman_puppet/environment_test.rb
-- test/models/foreman_puppet/host_config_group_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/puppetclass_lookup_key_test.rb
 - test/models/foreman_puppet/report_test.rb
-- test/models/foreman_puppet/smart_proxy_test.rb
-- test/models/foreman_puppet/user_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/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/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/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/puppet_class_importer_test.rb
-- test/unit/foreman_puppet/template_rendering_test.rb
-- test/unit/foreman_puppet_test.rb
-- test/integration_puppet_helper.rb