foreman_puppet 1.0.0.rc.1 → 1.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f41d4919f84bff60f30a23f1e05ceae83e468bb4d005ed781f635ee39a33246c
-  data.tar.gz: 208fbb6587882e138874b60cf19d1c76d5470f3ffd1cf5c7487f5a48983a5e51
+  metadata.gz: 37d0dfe755f795957a77e9889c1c958343a3b2b54d38e451e7a119bb8b4db98b
+  data.tar.gz: 2e4e4bad454345c115ec10fa6968409a56dbf2403891bf0711fdaf858225291c
 SHA512:
-  metadata.gz: 3d4c7c3a02a500d554a0c11fd35f3f47f37e3accb2503270f82d920c47b1bd6aa751a76b698105d508ef24c04757fc7cc5f08a412a0221cfc2e51a553523a567
-  data.tar.gz: bae382d27974df26cfebed71b5b89963229f97b962e75fecd53bf19a9b35edbff829b9d823fde79c05f8859341982cc24b4e3f3a3b35c58d1c81f5802cd49c01
+  metadata.gz: c7558294ebc8a1eaca149102ed9d5dcefe10a7ae1fa643bd7836c143de807bec77e3af8fa31df43dcd6b3ec52775ba7b36a6a5a15028413e4f889f479d3295fe
+  data.tar.gz: b40b1472b66dc27f61c634c11cd500d23d61de31d1eb984c7b68184cb626e9fbfa2b2dbd0bba74009cdd2800c7576fae427cef346a4f48b4e4fb59b8b88eeaf0

data/app/graphgl/concerns/foreman_puppet/types/interface_attributes_input_extensions.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ForemanPuppet
+  module Types
+    module InterfaceAttributesInputExtensions
+      delegate :with_indifferent_access, to: :to_h
+    end
+  end
+end

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

@@ -3,6 +3,8 @@ module ForemanPuppet
     module Host
       extend ActiveSupport::Concern
 
+      include ForemanPuppet::Extensions::HostCommon if ForemanPuppet.extracted_from_core?
+
       included do
         prepend PrependedMethods
 
@@ -82,10 +84,10 @@ module ForemanPuppet
         def available_template_kinds(provisioning = nil)
           kinds = template_kinds(provisioning)
           kinds.map do |kind|
-            ProvisioningTemplate.find_template({ kind: kind.name,
-                                                 operatingsystem_id: operatingsystem_id,
-                                                 hostgroup_id: hostgroup_id,
-                                                 environment_id: puppet&.environment_id })
+            ::ProvisioningTemplate.find_template({ kind: kind.name,
+                                                   operatingsystem_id: operatingsystem_id,
+                                                   hostgroup_id: hostgroup_id,
+                                                   environment_id: puppet&.environment_id })
           end.compact
         end
 

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

@@ -0,0 +1,17 @@
+module ForemanPuppet
+  module Extensions
+    module HostCommon
+      extend ActiveSupport::Concern
+
+      def all_puppetclasses(env = environment)
+        return ForemanPuppet::Puppetclass.none unless puppet
+        puppet.all_puppetclasses(env)
+      end
+
+      def puppetclasses
+        return ForemanPuppet::Puppetclass.none unless puppet
+        puppet.puppetclasses
+      end
+    end
+  end
+end

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

@@ -3,6 +3,8 @@ module ForemanPuppet
     module Hostgroup
       extend ActiveSupport::Concern
 
+      include ForemanPuppet::Extensions::HostCommon if ForemanPuppet.extracted_from_core?
+
       included do
         class << self
           prepend PatchedClassMethods

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

@@ -46,7 +46,7 @@ module ForemanPuppet
 
         def template_includes
           includes = super
-          tc_include = includes.detect { |i| i.key?(:template_combinations) }
+          tc_include = includes.detect { |i| i.is_a?(Hash) && i.key?(:template_combinations) }
           tc_include ||= includes << {}
           tc_include[:template_combinations] = %i[hostgroup environment]
           includes

data/app/services/foreman_puppet/host_info_providers/config_groups_info.rb

@@ -2,6 +2,8 @@ module ForemanPuppet
   module HostInfoProviders
     class ConfigGroupsInfo < HostInfo::Provider
       def host_info
+        return {} unless host.puppet
+
         config_groups = (host.puppet.config_groups + host.puppet.parent_config_groups).uniq.map(&:name)
         { 'parameters' => { 'foreman_config_groups' => config_groups } }
       end

data/app/views/smart_proxies/plugins/_puppet_ca.html.erb

@@ -0,0 +1,44 @@
+<ul id="proxy-puppetca-tab" class="nav nav-tabs nav-tabs-pf">
+  <li class="active"><a href="#ca_general" data-toggle="tab"><%= _("General") %></a></li>
+  <% if authorized_for(:permission => :view_smart_proxies_puppetca, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+  <li><a href="#certificates" data-toggle="tab"><%= _("Certificates") %></a></li>
+  <% end %>
+  <% if authorized_for(:permission => :view_smart_proxies_autosign, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+  <li><a href="#autosign" data-toggle="tab"><%= _("Autosign entries") %></a></li>
+  <% end %>
+</ul>
+<div id="proxy-puppetca-tab-content" class="tab-content">
+  <div class="tab-pane active in" id="ca_general">
+    <div class="row">
+      <div class="col-md-6">
+        <%= show_feature_version('puppetca') %>
+        <div class="row">
+          <div class="col-md-4"><strong><%= _('Hosts managed:') %></strong></div>
+          <div class="col-md-8">
+            <%= link_to Host::Managed.where(:puppet_ca_proxy_id => @smart_proxy.id).count, hosts_path(:search => "puppet_ca = \"#{@smart_proxy.name}\"") %>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="container-fluid container-cards-pf">
+      <div class="row row-cards-pf">
+      <% if authorized_for(:permission => :view_smart_proxies_puppetca, :auth_object => @smart_proxy) %>
+        <span data-ajax-url="<%= counts_smart_proxy_puppetca_path(:smart_proxy_id => @smart_proxy) %>"><%= spinner%></span>
+        <span data-ajax-url="<%= expiry_smart_proxy_puppetca_path(:smart_proxy_id => @smart_proxy) %>"><%= spinner%></span>
+      <% end %>
+      <% if authorized_for(:permission => :view_smart_proxies_autosign, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+        <span data-ajax-url="<%= counts_smart_proxy_autosign_path(:smart_proxy_id => @smart_proxy) %>"><%= spinner%></span>
+      <% end %>
+      </div>
+    </div>
+  </div>
+  <% if authorized_for(:permission => :view_smart_proxies_puppetca, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+    <div class="tab-pane" id="certificates" data-ajax-url="<%= smart_proxy_puppetca_index_path(:smart_proxy_id => @smart_proxy) %>" data-on-complete="certTable"><%= spinner %></div>
+  <% end %>
+  <% if authorized_for(:permission => :view_smart_proxies_autosign, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+    <div class="tab-pane" id="autosign" data-ajax-url="<%= smart_proxy_autosign_index_path(:smart_proxy_id => @smart_proxy) %>" data-on-complete="tfm.tools.activateDatatables"><%= spinner %></div>
+    <% if authorized_for(:permission => :create_smart_proxies_autosign, :auth_object => @smart_proxy, :authorizer => authorizer) %>
+      <div data-ajax-url=<%= new_smart_proxy_autosign_path(:smart_proxy_id => @smart_proxy) %>></div>
+    <% end %>
+  <% end %>
+</div>

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

@@ -1,34 +1,53 @@
 class MigrateHostTypeInHostConfigGroups < ActiveRecord::Migration[6.0]
   class FakeHostConfigGroup < ::ApplicationRecord
     self.table_name = 'host_config_groups'
+
+    scope :for_host, -> { where(host_type: %w[Host::Base Host::Managed]) }
+    scope :for_hostgroup, -> { where(host_type: 'Hostgroup') }
+    scope :for_host_facet, -> { where(host_type: 'ForemanPuppet::HostPuppetFacet') }
+    scope :for_hostgroup_facet, -> { where(host_type: 'ForemanPuppet::HostgroupPuppetFacet') }
+  end
+
+  class FakeConfigGroup < ::ApplicationRecord
+    self.table_name = 'config_groups'
   end
 
   def up
-    host_config_group_ids = FakeHostConfigGroup.where(host_type: %w[Host::Base Host::Managed]).pluck(:host_id).uniq
+    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)
-      FakeHostConfigGroup.where(host_type: %w[Host::Base Host::Managed], host_id: host_id)
-                         .update_all(host_type: 'ForemanPuppet::HostPuppetFacet', host_id: host_facet_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.where(host_type: 'Hostgroup').pluck(:host_id).uniq
+    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)
-      FakeHostConfigGroup.where(host_type: 'Hostgroup', host_id: hostgroup_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
   end
 
   def down
-    host_config_group_ids = FakeHostConfigGroup.where(host_type: 'ForemanPuppet::HostPuppetFacet').pluck(:host_id).uniq
+    host_config_group_ids = FakeHostConfigGroup.for_host_facet.pluck(:host_id).uniq
     host_facet_ids = ForemanPuppet::HostPuppetFacet.where(id: host_config_group_ids).pluck(:id, :host_id).to_h
     host_config_group_ids.each do |host_puppet_facet_id|
-      FakeHostConfigGroup.where(host_type: 'ForemanPuppet::HostPuppetFacet', host_id: host_puppet_facet_id)
+      FakeHostConfigGroup.for_host_facet
+                         .where(host_id: host_puppet_facet_id)
                          .update_all(host_type: 'Host::Managed', host_id: host_facet_ids[host_puppet_facet_id])
     end
-    hostgroup_config_group_ids = FakeHostConfigGroup.where(host_type: 'ForemanPuppet::HostgroupPuppetFacet').pluck(:host_id).uniq
+    hostgroup_config_group_ids = FakeHostConfigGroup.for_hostgroup_facet.pluck(:host_id).uniq
     hostgroup_facet_ids = ForemanPuppet::HostgroupPuppetFacet.where(id: hostgroup_config_group_ids).pluck(:id, :hostgroup_id).to_h
     hostgroup_config_group_ids.each do |hostgroup_facet_id|
-      FakeHostConfigGroup.where(host_type: 'ForemanPuppet::HostgroupPuppetFacet', host_id: hostgroup_facet_id)
+      FakeHostConfigGroup.for_hostgroup_facet
+                         .where(host_id: hostgroup_facet_id)
                          .update_all(host_type: 'Hostgroup', host_id: hostgroup_facet_ids[hostgroup_facet_id])
     end
   end

data/db/migrate/20201125113903_migrate_puppetclasses_to_facets.foreman_puppet.rb

@@ -7,6 +7,10 @@ class MigratePuppetclassesToFacets < ActiveRecord::Migration[6.0]
     self.table_name = 'hostgroup_classes'
   end
 
+  class FakePuppetclass < ApplicationRecord
+    self.table_name = 'puppetclasses'
+  end
+
   def up
     add_reference :host_classes, :host_puppet_facet, foreign_key: true, index: true
     add_reference :hostgroup_classes, :hostgroup_puppet_facet, foreign_key: true, index: true
@@ -14,11 +18,19 @@ class MigratePuppetclassesToFacets < ActiveRecord::Migration[6.0]
     host_ids = FakeHostClass.all.pluck(:host_id).uniq
     host_ids.each do |host_id|
       host_facet = ForemanPuppet::HostPuppetFacet.find_by(host_id: host_id)
-      ForemanPuppet::HostClass.where(host_id: host_id).update_all(host_puppet_facet_id: host_facet.id)
+      host_classes = ForemanPuppet::HostClass.where(host_id: host_id)
+      if host_facet
+        host_classes.update_all(host_puppet_facet_id: host_facet.id)
+      else
+        deleted_classes = FakePuppetclass.where(id: host_classes.pluck(:puppetclass_id)).pluck(:name)
+        say "deleting classes #{deleted_classes.join(', ')} from Host (id=#{host_id}) because it has no environment"
+        host_classes.delete_all
+      end
     end
     hostgroup_ids = FakeHostgroupClass.all.pluck(:hostgroup_id).uniq
     hostgroup_ids.each do |hostgroup_id|
       hostgroup_facet = ForemanPuppet::HostgroupPuppetFacet.find_by(hostgroup_id: hostgroup_id)
+      hostgroup_facet ||= ForemanPuppet::HostgroupPuppetFacet.create(hostgroup: Hostgroup.unscoped.find(hostgroup_id))
       ForemanPuppet::HostgroupClass.where(hostgroup_id: hostgroup_id).update_all(hostgroup_puppet_facet_id: hostgroup_facet.id)
     end
 

data/lib/foreman_puppet/engine.rb

@@ -15,7 +15,18 @@ module ForemanPuppet
           end
         end
 
+        module RelayClassicMutationClassMethodPath
+          # rubocop:disable Metrics/ParameterLists
+          def argument(name, type, *rest, loads: nil, **kwargs, &block)
+            # rubocop:enable Metrics/ParameterLists
+            return if [::Types::Environment, ::Types::Puppetclass].include?(loads)
+
+            super
+          end
+        end
+
         GraphQL::Types::Relay::BaseObject.extend(BaseObjectClassMethodPath)
+        GraphQL::Schema::RelayClassicMutation.extend(RelayClassicMutationClassMethodPath)
       end
     end
 
@@ -97,6 +108,8 @@ module ForemanPuppet
       ::Types::Hostgroup.include(ForemanPuppet::Types::HostgroupExtensions)
       ::Types::Location.include(ForemanPuppet::Types::LocationExtensions)
       ::Types::Organization.include(ForemanPuppet::Types::OrganizationExtensions)
+      ::Types::InterfaceAttributesInput.include(ForemanPuppet::Types::InterfaceAttributesInputExtensions)
+
       ::Mutations::Hosts::Create.include(ForemanPuppet::Mutations::Hosts::CreateExtensions)
     rescue StandardError => e
       Rails.logger.warn "ForemanPuppet: skipping engine hook (#{e})\n#{e.backtrace.join("\n")}"

data/lib/foreman_puppet/register.rb

@@ -170,8 +170,7 @@ Foreman::Plugin.register :foreman_puppet do
       # extend_model ForemanPuppet::Extensions::Host
       api_view list: 'foreman_puppet/api/v2/host_puppet_facets/base',
         single: 'foreman_puppet/api/v2/host_puppet_facets/host_single'
-      template_compatibility_properties :environment, :environment_id, :environment_name,
-        :puppetclasses, :all_puppetclasses
+      template_compatibility_properties :environment, :environment_id, :environment_name
       set_dependent_action :destroy
     end
     configure_hostgroup(ForemanPuppet::HostgroupPuppetFacet) do

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '1.0.0.rc.1'.freeze
+  VERSION = '1.0.0.rc.2'.freeze
 end

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

@@ -17,6 +17,16 @@ module ForemanPuppet
             name: hostname,
             environmentId: environment_id,
             puppetclassIds: [puppetclass_id],
+            interfacesAttributes: [
+              {
+                type: 'bond',
+                attachedTo: %w[eth0 eth1],
+                identifier: 'bond0',
+                primary: true,
+                provision: true,
+                managed: true,
+              },
+            ],
           }
         end
         let(:context_user) { FactoryBot.create(:user, :admin, locations: [tax_location], organizations: [organization]) }
@@ -28,11 +38,13 @@ module ForemanPuppet
                 $name: String!,
                 $environmentId: ID,
                 $puppetclassIds: [ID!],
+                $interfacesAttributes: [InterfaceAttributesInput!]
               ) {
               createHost(input: {
                 name: $name,
                 environmentId: $environmentId,
                 puppetclassIds: $puppetclassIds,
+                interfacesAttributes: $interfacesAttributes,
               }) {
                 host {
                   id
@@ -57,6 +69,15 @@ module ForemanPuppet
             assert_equal environment.id, host.puppet.environment_id
             assert_equal [puppetclass.id], host.puppet.puppetclasses.pluck(:id)
 
+            assert_equal 1, host.interfaces.count
+            interface = host.interfaces.first
+            assert_equal 'Nic::Bond', interface.type
+            assert_equal 'eth0, eth1', interface.attached_to
+            assert_equal 'bond0', interface.identifier
+            assert interface.primary
+            assert interface.provision
+            assert interface.managed
+
             assert_not_nil data
           end
         end

data/test/models/foreman_puppet/provisioning_template_test.rb

@@ -37,6 +37,13 @@ module ForemanPuppet
       assert_equal [], tmplt.template_combinations
     end
 
+    test '#template_includes adds environment include' do
+      includes = ProvisioningTemplate.template_includes
+      tc_include = includes.detect { |i| i.is_a?(Hash) && i.key?(:template_combinations) }
+      assert tc_include
+      assert_includes tc_include[:template_combinations], :environment
+    end
+
     describe '#find_template by template_combinations' do
       setup do
         @arch = FactoryBot.create(:architecture)

data/test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb

@@ -0,0 +1,35 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  class ConfigGroupInfoTest < ActiveSupport::TestCase
+    let(:cg_info) { HostInfoProviders::ConfigGroupsInfo.new(host) }
+
+    context 'with Puppet Host' do
+      let(:config_group) { FactoryBot.create(:config_group) }
+      let(:host) do
+        FactoryBot.build(:host, :with_puppet_enc,
+          location: taxonomies(:location1),
+          organization: taxonomies(:organization1),
+          operatingsystem: operatingsystems(:redhat),
+          config_groups: [config_group])
+      end
+
+      it 'adds config_groups to host parameters' do
+        assert_equal([config_group.name], cg_info.host_info['parameters']['foreman_config_groups'])
+      end
+    end
+
+    context 'without Puppet' do
+      let(:host) do
+        FactoryBot.build(:host,
+          location: taxonomies(:location1),
+          organization: taxonomies(:organization1),
+          operatingsystem: operatingsystems(:redhat))
+      end
+
+      it 'does not fail without puppet facet' do
+        assert_equal({}, cg_info.host_info)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
+  version: 1.0.0.rc.2
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environmets and classes to the Foreman Hosts.
 email:
@@ -56,6 +56,7 @@ files:
 - app/graphgl/concerns/foreman_puppet/mutations/hosts/create_extensions.rb
 - app/graphgl/concerns/foreman_puppet/types/host_extensions.rb
 - app/graphgl/concerns/foreman_puppet/types/hostgroup_extensions.rb
+- app/graphgl/concerns/foreman_puppet/types/interface_attributes_input_extensions.rb
 - app/graphgl/concerns/foreman_puppet/types/location_extensions.rb
 - app/graphgl/concerns/foreman_puppet/types/organization_extensions.rb
 - app/graphgl/foreman_puppet/types/environment.rb
@@ -70,6 +71,7 @@ files:
 - app/helpers/foreman_puppet/puppetclasses_helper.rb
 - app/helpers/foreman_puppet/template_combinations_helper.rb
 - app/models/concerns/foreman_puppet/extensions/host.rb
+- app/models/concerns/foreman_puppet/extensions/host_common.rb
 - app/models/concerns/foreman_puppet/extensions/hostgroup.rb
 - app/models/concerns/foreman_puppet/extensions/nic_managed.rb
 - app/models/concerns/foreman_puppet/extensions/operatingsystem.rb
@@ -169,6 +171,7 @@ files:
 - app/views/provisioning_templates/_combination.html.erb
 - app/views/provisioning_templates/_combinations.html.erb
 - app/views/smart_proxies/plugins/_puppet.html.erb
+- app/views/smart_proxies/plugins/_puppet_ca.html.erb
 - config/api_routes.rb
 - config/initializers/api_reroute.rb
 - config/routes.rb
@@ -260,6 +263,7 @@ files:
 - test/models/foreman_puppet/report_test.rb
 - test/models/foreman_puppet/smart_proxy_test.rb
 - test/models/foreman_puppet/user_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
@@ -312,6 +316,7 @@ signing_key:
 specification_version: 4
 summary: Adds puppet ENC features
 test_files:
+- 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/integration/foreman_puppet/smartclass_parameter_js_test.rb