foreman_puppet 4.0.2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad4345e5b4481b1263e0d9a6af568f6d899288fb6e25843dbc0bb5cabf86b5b9
-  data.tar.gz: 61e41f2886a32d9b73b42513b69d1eb5f0ba28b3151a68c0be21a14b62ca039f
+  metadata.gz: ad8bedb9a6b0aa20d769da8ad51d57891e3c77da03ed70f2a90cdf9fe7af3ffa
+  data.tar.gz: 17d3af41d610400ba081936f7b151d9329ae26b1fd311c81eaf5925a23366841
 SHA512:
-  metadata.gz: ae6266081bbf344be643d88bbd57dfa2a8028f897dee6df45d6e08d5c7bddc451cae45b49759c484d8561a84fd8d96b35636fc5aa4165df49193e5b17d65edc8
-  data.tar.gz: 829314db4098020a1471276f94f6f1e8bc3421f7f3c1af3d5d08228f4ac811e999c5ce48bade42871a86775f9e630f40e991044a4411a07fb343a9ed8f9a2811
+  metadata.gz: a87e47f5a35f3a45bb6ac4a77f591ee0b85c37f6736972afd97559d35f4c752a7647c0958b3f7a131ef45b75b54b0f1f2cc104b6a6e4d78a847162a54de73d8f
+  data.tar.gz: 3a9c0f4ef48ce2e69e46dd1bbe54a488911e9d97261429f2d6d1f01fb48f53679a651beebb5e94a6bcc1c8159319241d260e342327ff018b9e9c3c8f1bb93281

data/app/graphgl/concerns/foreman_puppet/mutations/hosts/create_extensions.rb

@@ -4,16 +4,20 @@ module ForemanPuppet
   module Mutations
     module Hosts
       module CreateExtensions
-        PUPPET_PARAMS = %i[
-          environment
-          puppetclasses
-        ].freeze
-
         extend ActiveSupport::Concern
 
         included do
+          prepend PatchMethods
+
           argument :environment_id, GraphQL::Types::ID, loads: ForemanPuppet::Types::Environment
           argument :puppetclass_ids, [GraphQL::Types::ID], loads: ForemanPuppet::Types::Puppetclass, as: :puppetclasses
+        end
+
+        module PatchMethods
+          PUPPET_PARAMS = %i[
+            environment
+            puppetclasses
+          ].freeze
 
           private
 

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

@@ -7,7 +7,8 @@ class MigrateEnvironmentIgnoreType < ActiveRecord::Migration[6.0]
       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 }
+        data = { taxable_id: env_id, taxable_type: 'ForemanPuppet::Environment', taxonomy_id: tax.id }
+        TaxableTaxonomy.column_names.include?('created_at') ? data.merge({ created_at: Time.zone.now, updated_at: Time.zone.now }) : data
       end
       TaxableTaxonomy.insert_all(taxable_rows) if taxable_rows.any?
     end

data/lib/foreman_puppet/register.rb

@@ -1,5 +1,5 @@
 Foreman::Plugin.register :foreman_puppet do
-  requires_foreman '>= 3.3.0'
+  requires_foreman '>= 3.5.0'
   # Add Global JS file for extending foreman-core components and routes
   register_global_js_file 'global'
 
@@ -225,8 +225,10 @@ Foreman::Plugin.register :foreman_puppet do
         priority: 100
     end
   end
-  extend_page 'hosts/_list' do |cx|
-    cx.add_pagelet :hosts_table_column_header, resource_type: 'host', partial: 'hosts/foreman_puppet/form_list_env_field_header', priority: 100
-    cx.add_pagelet :hosts_table_column_content, resource_type: 'host', partial: 'hosts/foreman_puppet/form_list_env_field_content', priority: 100
+  extend_page 'hosts/_list' do |context|
+    context.with_profile :puppet, _('Puppet'), default: true do
+      add_pagelet :hosts_table_column_header, key: :environment, label: s_('Environment name'), sortable: true, width: '10%', class: 'hidden-xs'
+      add_pagelet :hosts_table_column_content, key: :environment, callback: ->(host) { host.environment }, class: 'hidden-xs ellipsis'
+    end
   end
 end

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '4.0.2'.freeze
+  VERSION = '5.0.0'.freeze
 end

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

@@ -6,7 +6,18 @@ module ForemanPuppet
       class CreateMutationTest < GraphQLQueryTestCase
         let(:hostname) { 'my-graphql-host' }
         let(:tax_location) { FactoryBot.create(:location) }
+        let(:location_id) { Foreman::GlobalId.for(tax_location) }
         let(:organization) { FactoryBot.create(:organization) }
+        let(:organization_id) { Foreman::GlobalId.for(organization) }
+        let(:domain) { FactoryBot.create(:domain) }
+        let(:domain_id) { Foreman::GlobalId.for(domain) }
+        let(:operatingsystem) { FactoryBot.create(:operatingsystem, :with_grub, :with_associations) }
+        let(:operatingsystem_id) { Foreman::GlobalId.for(operatingsystem) }
+        let(:ptable_id) { Foreman::GlobalId.for(operatingsystem.ptables.first) }
+        let(:medium_id) { Foreman::GlobalId.for(operatingsystem.media.first) }
+        let(:architecture_id) { Foreman::GlobalId.for(operatingsystem.architectures.first) }
+        let(:ip) { '192.0.2.1' }
+
         let(:environment) { FactoryBot.create(:environment, locations: [tax_location], organizations: [organization]) }
         let(:environment_id) { Foreman::GlobalId.for(environment) }
         let(:puppetclass) { FactoryBot.create(:puppetclass) }
@@ -16,6 +27,14 @@ module ForemanPuppet
           {
             name: hostname,
             environmentId: environment_id,
+            ip: ip,
+            locationId: location_id,
+            organizationId: organization_id,
+            domainId: domain_id,
+            operatingsystemId: operatingsystem_id,
+            ptableId: ptable_id,
+            mediumId: medium_id,
+            architectureId: architecture_id,
             puppetclassIds: [puppetclass_id],
             interfacesAttributes: [
               {
@@ -37,12 +56,29 @@ module ForemanPuppet
             mutation createHostMutation(
                 $name: String!,
                 $environmentId: ID,
+                $ip: String,
+                $locationId: ID!,
+                $organizationId: ID!,
+                $domainId: ID,
+                $operatingsystemId: ID,
+                $architectureId: ID,
+                $ptableId: ID,
+                $mediumId: ID,
                 $puppetclassIds: [ID!],
                 $interfacesAttributes: [InterfaceAttributesInput!]
               ) {
               createHost(input: {
                 name: $name,
                 environmentId: $environmentId,
+                ip: $ip,
+                architectureId: $architectureId,
+                locationId: $locationId,
+                organizationId: $organizationId,
+                domainId: $domainId,
+                operatingsystemId: $operatingsystemId,
+                architectureId: $architectureId,
+                ptableId: $ptableId,
+                mediumId: $mediumId,
                 puppetclassIds: $puppetclassIds,
                 interfacesAttributes: $interfacesAttributes,
               }) {
@@ -78,6 +114,8 @@ module ForemanPuppet
             assert interface.provision
             assert interface.managed
 
+            assert_not_nil host.pxe_loader
+
             assert_not_nil data
           end
         end

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

@@ -1,9 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { Route, Switch, Redirect } from 'react-router-dom';
-import { translate as __ } from 'foremanReact/common/I18n';
 import { route } from './helpers';
-import EmptyPage from './SubTabs/EmptyPage';
 import Reports from './SubTabs/Reports';
 import ENCPreview from './SubTabs/ENCPreview';
 
@@ -12,7 +10,7 @@ const SecondaryTabRoutes = ({ hostName, hostInfo, status }) => (
     <Route path={route('reports')}>
       <Reports hostName={hostName} hostInfo={hostInfo} status={status} />
     </Route>
-    <Route path={route('assigned')}>
+    {/* <Route path={route('assigned')}>
       <EmptyPage
         header={__('Assigned classes')}
         description={__('This tab is still a work in progress')}
@@ -23,7 +21,7 @@ const SecondaryTabRoutes = ({ hostName, hostInfo, status }) => (
         header={__('Smart class parameters')}
         description={__('This tab is still a work in progress')}
       />
-    </Route>
+    </Route> */}
     <Route path={route('yaml')}>
       <ENCPreview hostName={hostName} />
     </Route>

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

@@ -36,7 +36,7 @@ const ENCPreview = ({ hostName }) => {
   }
   if (response !== '' || response !== undefined) {
     return (
-      <div className="enc-preview-tab" padding="16px 24px">
+      <div className="enc-preview-tab" style={{ padding: '16px 24px' }}>
         <ENCTab encData={response} />
       </div>
     );

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

@@ -2,7 +2,9 @@ import { translate as __ } from 'foremanReact/common/I18n';
 
 export const SECONDARY_TABS = [
   { key: 'reports', title: __('Reports') },
-  { key: 'assigned', title: __('Assigned classes') },
-  { key: 'smart-classes', title: __('Smart class parameters') },
+  /** Hiding the two tabs since they were not implemented yet and shouldn't be part of the release.
+   * { key: 'assigned', title: __('Assigned classes') },
+   * { key: 'smart-classes', title: __('Smart class parameters') },
+   */
   { key: 'yaml', title: __('ENC Preview') },
 ];

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Ondřej Ezr
 - Shira Maximov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -360,7 +360,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 +375,75 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Add Puppet features to Foreman
 test_files:
-- test/test_puppet_helper.rb
-- test/models/foreman_puppet/report_test.rb
-- test/models/foreman_puppet/host_test.rb
-- test/models/foreman_puppet/smart_proxy_test.rb
-- test/models/foreman_puppet/user_test.rb
+- 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/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/puppetclass_js_test.rb
+- test/integration/foreman_puppet/smartclass_parameter_js_test.rb
 - test/models/foreman_puppet/config_group_class_test.rb
 - test/models/foreman_puppet/config_group_test.rb
-- test/models/foreman_puppet/host_puppet_facet_test.rb
+- test/models/foreman_puppet/environment_test.rb
 - test/models/foreman_puppet/host_config_group_test.rb
-- test/models/foreman_puppet/puppetclass_test.rb
-- test/models/foreman_puppet/provisioning_template_test.rb
-- test/models/foreman_puppet/lookup_value_test.rb
-- test/models/foreman_puppet/puppetclass_lookup_key_test.rb
 - test/models/foreman_puppet/hostgroup_puppet_facet_test.rb
-- test/models/foreman_puppet/environment_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/provisioning_template_test.rb
+- test/models/foreman_puppet/puppetclass_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/factories/foreman_puppet_factories.rb
-- test/factories/host_puppet_enhancements.rb
-- test/factories/proxy_puppet_enhancements.rb
+- test/test_puppet_helper.rb
 - test/unit/foreman_puppet/access_permissions_test.rb
-- test/unit/foreman_puppet/template_rendering_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/graphql/mutations/hosts/create_mutation_test.rb
-- test/graphql/queries/environments_query_test.rb
-- test/graphql/queries/location_query_test.rb
-- test/graphql/queries/puppetclass_query_test.rb
-- test/graphql/queries/organization_query_test.rb
-- test/graphql/queries/host_puppet_query_test.rb
-- test/graphql/queries/environment_query_test.rb
-- test/graphql/queries/puppetclasses_query_test.rb
-- test/graphql/queries/hostgroup_puppet_query_test.rb
-- test/controllers/foreman_puppet/hostgroups_controller_test.rb
-- test/controllers/foreman_puppet/config_groups_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/hostgroups_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/smart_proxies_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/lookups_common_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/provisioning_templates_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/template_combinations_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/host_classes_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/puppetclasses_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/hostgroup_classes_controller_test.rb
-- test/controllers/foreman_puppet/puppetclasses_controller_test.rb
-- test/controllers/provisioning_templates_controller_test.rb
-- test/integration/foreman_puppet/puppetclass_js_test.rb
-- test/integration/foreman_puppet/host_js_test.rb
-- test/integration/foreman_puppet/environment_js_test.rb
-- test/integration/foreman_puppet/dashboard_js_test.rb
-- test/integration/foreman_puppet/smartclass_parameter_js_test.rb
-- test/integration/foreman_puppet/hostgroup_js_test.rb
-- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
-- test/helpers/foreman_puppet/puppetclasses_helper_test.rb
-- test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
 - test/integration_puppet_helper.rb