foreman_puppet 0.0.1 → 1.0.0.rc.2

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ForemanPuppet
+  module Mutations
+    module Hosts
+      module CreateExtensions
+        PUPPET_PARAMS = %i[
+          environment
+          puppetclasses
+        ].freeze
+
+        extend ActiveSupport::Concern
+
+        included do
+          argument :environment_id, GraphQL::Types::ID, loads: ForemanPuppet::Types::Environment
+          argument :puppetclass_ids, [GraphQL::Types::ID], loads: ForemanPuppet::Types::Puppetclass, as: :puppetclasses
+
+          private
+
+          def initialize_object(params)
+            host = super(params.except(*PUPPET_PARAMS))
+            host.build_puppet(params.slice(*PUPPET_PARAMS))
+            host
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ForemanPuppet
+  module Types
+    module HostExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        belongs_to :environment, ForemanPuppet::Types::Environment
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ForemanPuppet
+  module Types
+    module HostgroupExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        belongs_to :environment, ForemanPuppet::Types::Environment
+      end
+    end
+  end
+end

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/graphgl/concerns/foreman_puppet/types/location_extensions.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ForemanPuppet
+  module Types
+    module LocationExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :environments, ForemanPuppet::Types::Environment
+        has_many :puppetclasses, ForemanPuppet::Types::Puppetclass
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ForemanPuppet
+  module Types
+    module OrganizationExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :environments, ForemanPuppet::Types::Environment
+        has_many :puppetclasses, ForemanPuppet::Types::Puppetclass
+      end
+    end
+  end
+end

data/app/graphgl/foreman_puppet/types/environment.rb

@@ -0,0 +1,20 @@
+module ForemanPuppet
+  module Types
+    class Environment < ::Types::BaseObject
+      model_class ForemanPuppet::Environment
+      description 'An Environment'
+
+      global_id_field :id
+      timestamps
+      field :name, String
+
+      has_many :locations, ::Types::Location
+      has_many :organizations, ::Types::Organization
+      has_many :puppetclasses, ForemanPuppet::Types::Puppetclass
+
+      def self.graphql_definition
+        super.tap { |type| type.instance_variable_set(:@name, 'ForemanPuppet::Environment') }
+      end
+    end
+  end
+end

data/app/graphgl/foreman_puppet/types/puppetclass.rb

@@ -0,0 +1,20 @@
+module ForemanPuppet
+  module Types
+    class Puppetclass < ::Types::BaseObject
+      model_class ForemanPuppet::Puppetclass
+      description 'A Puppetclass'
+
+      global_id_field :id
+      timestamps
+      field :name, String
+
+      has_many :environments, ForemanPuppet::Types::Environment
+      has_many :locations, ::Types::Location
+      has_many :organizations, ::Types::Organization
+
+      def self.graphql_definition
+        super.tap { |type| type.instance_variable_set(:@name, 'ForemanPuppet::Puppetclass') }
+      end
+    end
+  end
+end

data/app/helpers/foreman_puppet/environments_helper.rb

@@ -9,7 +9,7 @@ module ForemanPuppet
     end
 
     def environments_title_actions
-      title_actions import_proxy_select(hash_for_import_environments_environments_path),
+      title_actions import_proxy_select(hash_for_import_environments_environments_path.merge(engine: foreman_puppet)),
         button_group(new_link(_('Create Puppet Environment'), engine: foreman_puppet)),
         button_group(help_button)
     end

data/app/helpers/foreman_puppet/hosts_helper.rb

@@ -4,6 +4,7 @@ module ForemanPuppet
       multiple_actions_provider :puppet_host_multiple_actions
       # otherwise registered twice
       overview_buttons_provider :puppet_host_overview_buttons if ForemanPuppet.extracted_from_core?
+      overview_fields_provider :puppet_host_overview_fields if ForemanPuppet.extracted_from_core?
     end
 
     def puppet_host_multiple_actions
@@ -28,5 +29,19 @@ module ForemanPuppet
       end
       buttons
     end
+
+    def puppet_host_overview_fields(host)
+      fields = []
+      if host.environment.present?
+        fields << {
+          field: [
+            _('Puppet Environment'),
+            link_to(host.puppet.environment, hosts_path(search: "environment = #{host.puppet.environment}")),
+          ],
+          priority: 650,
+        }
+      end
+      fields
+    end
   end
 end

data/app/helpers/foreman_puppet/puppetclass_lookup_keys_helper.rb

@@ -2,8 +2,8 @@ module ForemanPuppet
   module PuppetclassLookupKeysHelper
     def puppetclass_lookup_keys_breadcrumbs
       breadcrumbs(resource_url: api_smart_class_parameters_path,
-                  name_field: 'parameter',
-                  switcher_item_url: '/puppetclass_lookup_keys/:id-:name/edit')
+        name_field: 'parameter',
+        switcher_item_url: '/puppetclass_lookup_keys/:id-:name/edit')
     end
 
     # ------ Host(group) Form Helpers -----

data/app/helpers/foreman_puppet/puppetclasses_and_environments_helper.rb

@@ -42,7 +42,7 @@ module ForemanPuppet
           mod_name,
           rel: 'popover',
           data: { content: mod_classes[mod_name].sort.join('<br>').html_safe,
-                  "original-title": format(n_('%{name} has %{num_tag} class', '%{name} has %{num_tag} classes', num), name: mod_name, num_tag: num_tag),
+                  'original-title': format(n_('%{name} has %{num_tag} class', '%{name} has %{num_tag} classes', num), name: mod_name, num_tag: num_tag),
                   trigger: 'focus',
                   container: 'body',
                   html: true },

data/app/helpers/foreman_puppet/puppetclasses_helper.rb

@@ -30,7 +30,7 @@ module ForemanPuppet
 
     def link_to_remove_function(text, options)
       options.delete_if { |key, _value| !options[key].to_s } # otherwise error during template render
-      title = (_('Click to remove %s') % options[:"data-class-name"])
+      title = (_('Click to remove %s') % options[:'data-class-name'])
       link_to_function(text, 'tfm.classEditor.removePuppetClass(this)', options.merge!('data-original-title': title))
     end
 
@@ -43,7 +43,7 @@ module ForemanPuppet
 
     def link_to_add_function(text, options)
       link_to_function(text, 'tfm.classEditor.addPuppetClass(this)',
-        options.merge('data-original-title': _('Click to add %s') % options[:"data-class-name"]))
+        options.merge('data-original-title': _('Click to add %s') % options[:'data-class-name']))
     end
 
     def options_for_puppetclass_selection(klass, type)

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

@@ -3,21 +3,30 @@ module ForemanPuppet
     module Host
       extend ActiveSupport::Concern
 
+      include ForemanPuppet::Extensions::HostCommon if ForemanPuppet.extracted_from_core?
+
       included do
         prepend PrependedMethods
 
-        env_assoc = reflect_on_association(:environment)
-        env_assoc&.instance_variable_set(:@class_name, 'ForemanPuppet::Environment')
+        if ForemanPuppet.extracted_from_core?
+          has_one :environment, through: :puppet, class_name: 'ForemanPuppet::Environment'
+        else
+          env_assoc = reflect_on_association(:environment)
+          env_assoc&.instance_variable_set(:@class_name, 'ForemanPuppet::Environment')
+
+          host_classes_assoc = reflect_on_association(:host_classes)
+          host_classes_assoc&.instance_variable_set(:@class_name, 'ForemanPuppet::HostClass')
+        end
 
         include_in_clone puppet: %i[config_groups host_config_groups host_classes]
 
         scoped_search relation: :environment, on: :name, complete_value: true, rename: :environment
         scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :class, only_explicit: true, operators: ['= ', '~ '],
-                      ext_method: :search_by_deprecated_class
+          ext_method: :search_by_deprecated_class
         scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :puppetclass, only_explicit: true, operators: ['= ', '~ '],
-                      ext_method: :search_by_puppetclass
+          ext_method: :search_by_puppetclass
         scoped_search relation: :config_groups, on: :name, complete_value: true, rename: :config_group, only_explicit: true, operators: ['= ', '~ '],
-                      ext_method: :search_by_config_group
+          ext_method: :search_by_config_group
       end
 
       class_methods do
@@ -61,6 +70,12 @@ module ForemanPuppet
       end
 
       module PrependedMethods
+        # TODO: we can drop this once extracted_from_core?
+        def validate_association_taxonomy(association_name)
+          return if association_name.to_sym == :environment
+          super
+        end
+
         def provisioning_template(opts = {})
           opts[:environment_id] ||= puppet&.environment_id
           super(opts)
@@ -69,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,13 +3,19 @@ module ForemanPuppet
     module Hostgroup
       extend ActiveSupport::Concern
 
+      include ForemanPuppet::Extensions::HostCommon if ForemanPuppet.extracted_from_core?
+
       included do
         class << self
           prepend PatchedClassMethods
         end
 
-        env_assoc = reflect_on_association(:environment)
-        env_assoc.instance_variable_set(:@class_name, 'ForemanPuppet::Environment')
+        if ForemanPuppet.extracted_from_core?
+          has_one :environment, through: :puppet, class_name: 'ForemanPuppet::Environment'
+        else
+          env_assoc = reflect_on_association(:environment)
+          env_assoc&.instance_variable_set(:@class_name, 'ForemanPuppet::Environment')
+        end
 
         include_in_clone puppet: %i[host_config_groups config_groups hostgroup_classes]
 
@@ -17,11 +23,11 @@ module ForemanPuppet
         scoped_search relation: :environment, on: :name, complete_value: true, rename: :environment, only_explicit: true
         scoped_search relation: :puppetclasses, on: :name, complete_value: true, rename: :class, only_explicit: true, operators: ['= ', '~ ']
         scoped_search relation: :config_groups, on: :name,
-                      complete_value: true,
-                      rename: :config_group,
-                      only_explicit: true,
-                      operators: ['= ', '~ '],
-                      ext_method: :search_by_config_group
+          complete_value: true,
+          rename: :config_group,
+          only_explicit: true,
+          operators: ['= ', '~ '],
+          ext_method: :search_by_config_group
       end
 
       # Temporary, can be ordinary class_methods do, when removed from core

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

@@ -4,7 +4,7 @@ module ForemanPuppet
       extend ActiveSupport::Concern
 
       included do
-        has_and_belongs_to_many :puppetclasses
+        has_and_belongs_to_many :puppetclasses, class_name: 'ForemanPuppet::Puppetclass'
       end
     end
   end

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

@@ -6,11 +6,11 @@ module ForemanPuppet
       included do
         if ForemanPuppet.extracted_from_core?
           has_many :environments, through: :template_combinations
-          before_destroy EnsureNotUsedBy.new(:environments)
+          before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:environments)
 
           scoped_search relation: :environments, on: :name, rename: :environment, complete_value: true
 
-          class << base
+          class << self
             prepend PrependedClassMethods
           end
 
@@ -24,23 +24,29 @@ module ForemanPuppet
       module PrependedClassMethods
         def templates_by_template_combinations(templates, hosts_or_conditions)
           if hosts_or_conditions.is_a?(Hash)
-            conditions = hosts_or_conditions
-            conditions[:hostgroup_id] = Array.wrap(conditions[:hostgroup_id]) | [nil]
-            conditions[:environment_id] = Array.wrap(conditions[:environment_id]) | [nil]
+            conditions = []
+            if hosts_or_conditions[:hostgroup_id] && hosts_or_conditions[:environment_id]
+              conditions << { hostgroup_id: Array.wrap(hosts_or_conditions[:hostgroup_id]), environment_id: Array.wrap(hosts_or_conditions[:environment_id]) }
+            end
+            conditions << { hostgroup_id: Array.wrap(hosts_or_conditions[:hostgroup_id]), environment_id: [nil] } if hosts_or_conditions[:hostgroup_id]
+            conditions << { hostgroup_id: [nil], environment_id: Array.wrap(hosts_or_conditions[:environment_id]) } if hosts_or_conditions[:environment_id]
           else
-            conditions = {}
-            conditions[:hostgroup_id] = hosts_or_conditions.pluck(:hostgroup_id) | [nil]
-            conditions[:environment_id] = hosts_or_conditions.pluck(:environment_id) | [nil]
+            conditions = [{
+              hostgroup_id: hosts_or_conditions.pluck(:hostgroup_id) | [nil],
+              environment_id: hosts_or_conditions.joins(:puppet).pluck('host_puppet_facets.environment_id') | [nil],
+            }]
           end
-          at = TemplateCombination.arel_table
-          arel = at[:hostgroup_id].in(conditions[:hostgroup_id])
-          arel = arel.and(at[:environment_id].in(conditions[:environment_id]))
-          templates.joins(:template_combinations).where(arel).distinct
+          tpls = templates.where('1=0')
+          conditions.each do |cond|
+            tpls = templates.joins(:template_combinations).where(template_combinations: cond).distinct
+            return tpls if tpls.any?
+          end
+          tpls
         end
 
         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/models/concerns/foreman_puppet/extensions/report.rb

@@ -5,6 +5,24 @@ module ForemanPuppet
 
       included do
         has_one :environment, through: :host
+
+        # for cases when class already inherit before we apply the patch
+        self.class.subclasses.each do |subclass|
+          add_environment_search_to(subclass)
+        end
+      end
+
+      class_methods do
+        def inherited(child)
+          add_environment_search_to(child)
+          super
+        end
+
+        def add_environment_search_to(klass)
+          klass.instance_eval do
+            scoped_search relation: :environment, on: :name, complete_value: true, rename: :environment
+          end
+        end
       end
     end
   end

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

@@ -6,7 +6,7 @@ module ForemanPuppet
       included do
         has_many :environments, through: :taxable_taxonomies, source: :taxable, source_type: 'ForemanPuppet::Environment'
 
-        has_many :puppetclasses, through: :environments
+        has_many :puppetclasses, through: :environments, class_name: 'ForemanPuppet::Puppetclass'
       end
 
       def dup