foreman_puppet 0.1.0 → 1.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22506c7ebf919c047dded9e11b60b405e4a3e7c1456cd2d5125312ef156d3e7f
-  data.tar.gz: 5249dd5ee17f4627b159fb10952ce36d0b2f0bcee212df9d5cd82ba18898259c
+  metadata.gz: f41d4919f84bff60f30a23f1e05ceae83e468bb4d005ed781f635ee39a33246c
+  data.tar.gz: 208fbb6587882e138874b60cf19d1c76d5470f3ffd1cf5c7487f5a48983a5e51
 SHA512:
-  metadata.gz: 99998691aeb424b63ceca8f140049677b3ba2c8a280c21972425b5f3efa1f4b024e75b67e386735dbb6024dfcd6d8bc4dbc3c226cef6e6d87f23c6872fd29c75
-  data.tar.gz: 5587134660de8b3a8bded2014307d5f515d7adcacfe6c32a90336289735ecf2123cc3b67f0231c6a1088bbe1ab11b56009cf0488449a61178e4be067bb330f0b
+  metadata.gz: 3d4c7c3a02a500d554a0c11fd35f3f47f37e3accb2503270f82d920c47b1bd6aa751a76b698105d508ef24c04757fc7cc5f08a412a0221cfc2e51a553523a567
+  data.tar.gz: bae382d27974df26cfebed71b5b89963229f97b962e75fecd53bf19a9b35edbff829b9d823fde79c05f8859341982cc24b4e3f3a3b35c58d1c81f5802cd49c01

data/app/controllers/concerns/foreman_puppet/extensions/api_base_controller.rb

@@ -0,0 +1,28 @@
+module ForemanPuppet
+  module Extensions
+    module ApiBaseController
+      extend ActiveSupport::Concern
+
+      included do
+        prepend PatchMethods
+
+        before_action :prepare_views
+      end
+
+      def prepare_views
+        prepend_view_path ForemanPuppet::Engine.root.join('app', 'prepend_views')
+      end
+
+      module PatchMethods
+        def resource_name(resource = controller_name)
+          case resource
+          when 'environment'
+            'foreman_puppet/environment'
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/foreman_puppet/extensions/api_template_combinations_controller.rb

@@ -6,7 +6,7 @@ module ForemanPuppet
       included do
         if ForemanPuppet.extracted_from_core?
           apipie_update_methods(%i[index create show update]) do
-            param :environment_id, String, desc: N_('ID of environment')
+            param :environment_id, nil, desc: N_('ID of environment')
           end
         end
 

data/app/controllers/foreman_puppet/api/v2/config_groups_controller.rb

@@ -1,9 +1,13 @@
 module ForemanPuppet
   module Api
     module V2
-      class ConfigGroupsController < BaseController
+      class ConfigGroupsController < ::ForemanPuppet::Api::V2::PuppetBaseController
         include ForemanPuppet::Parameters::ConfigGroup
 
+        resource_description do
+          api_base_url '/foreman_puppet/api'
+        end
+
         wrap_parameters ConfigGroup, include: config_group_params_filter.accessible_attributes(parameter_filter_context)
 
         before_action :find_resource, only: %i[show update destroy]

data/app/controllers/foreman_puppet/api/v2/environments_controller.rb

@@ -1,12 +1,11 @@
 module ForemanPuppet
   module Api
     module V2
-      class EnvironmentsController < BaseController
+      class EnvironmentsController < ::ForemanPuppet::Api::V2::PuppetBaseController
         include ForemanPuppet::Api::ImportPuppetclassesCommonController
         include ForemanPuppet::Parameters::Environment
 
         resource_description do
-          api_version '2'
           api_base_url '/foreman_puppet/api'
         end
 

data/app/controllers/foreman_puppet/api/v2/host_classes_controller.rb

@@ -1,7 +1,11 @@
 module ForemanPuppet
   module Api
     module V2
-      class HostClassesController < V2::BaseController
+      class HostClassesController < ::ForemanPuppet::Api::V2::PuppetBaseController
+        resource_description do
+          api_base_url '/foreman_puppet/api'
+        end
+
         before_action :find_host, only: %i[index create destroy]
         before_action :find_puppetclass, only: %i[create destroy]
 

data/app/controllers/foreman_puppet/api/v2/hostgroup_classes_controller.rb

@@ -1,7 +1,11 @@
 module ForemanPuppet
   module Api
     module V2
-      class HostgroupClassesController < V2::BaseController
+      class HostgroupClassesController < ::ForemanPuppet::Api::V2::PuppetBaseController
+        resource_description do
+          api_base_url '/foreman_puppet/api'
+        end
+
         before_action :find_hostgroup, only: %i[index create destroy]
 
         api :GET, '/hostgroups/:hostgroup_id/puppetclass_ids/', N_('List all Puppet class IDs for host group')

data/app/controllers/foreman_puppet/api/v2/override_values_controller.rb

@@ -1,11 +1,10 @@
 module ForemanPuppet
   module Api
     module V2
-      class OverrideValuesController < LookupsCommonController
+      class OverrideValuesController < ::ForemanPuppet::Api::V2::PuppetLookupsCommonController
         include Foreman::Controller::Parameters::LookupValue
 
         resource_description do
-          api_version '2'
           api_base_url '/foreman_puppet/api'
         end
 

data/app/controllers/foreman_puppet/api/v2/{base_controller.rb → puppet_base_controller.rb}

@@ -1,10 +1,9 @@
 module ForemanPuppet
   module Api
     module V2
-      class BaseController < ::Api::V2::BaseController
+      class PuppetBaseController < ::Api::V2::BaseController
         resource_description do
-          api_version '2'
-          api_base_url '/foreman_puppet/api'
+          api_version 'v2'
         end
 
         before_action :show_deprecation_for_core_routes

data/app/controllers/foreman_puppet/api/v2/{lookups_common_controller.rb → puppet_lookups_common_controller.rb}

@@ -1,7 +1,11 @@
 module ForemanPuppet
   module Api
     module V2
-      class LookupsCommonController < ::Api::V2::BaseController
+      class PuppetLookupsCommonController < ::Api::V2::BaseController
+        resource_description do
+          api_version 'v2'
+        end
+
         before_action :find_environment, if: :environment_id?
         before_action :find_puppetclass, if: :puppetclass_id?
         before_action :find_host, if: :host_id?
@@ -45,7 +49,7 @@ module ForemanPuppet
 
         def find_smart_class_parameter
           id = params.key?('smart_class_parameter_id') ? params['smart_class_parameter_id'] : params['id']
-          @smart_class_parameter = PuppetclassLookupKey.authorized(:view_external_parameters).smart_class_parameters.find_by(id: id.to_i) if id.to_i > 0
+          @smart_class_parameter = PuppetclassLookupKey.authorized(:view_external_parameters).smart_class_parameters.find_by(id: id.to_i) if id.to_i.positive?
           @smart_class_parameter ||= begin
             puppet_cond = { 'environment_classes.puppetclass_id' => @puppetclass.id } if @puppetclass
             env_cond = { 'environment_classes.environment_id' => @environment.id } if @environment

data/app/controllers/foreman_puppet/api/v2/puppetclasses_controller.rb

@@ -1,9 +1,13 @@
 module ForemanPuppet
   module Api
     module V2
-      class PuppetclassesController < BaseController
+      class PuppetclassesController < ::ForemanPuppet::Api::V2::PuppetBaseController
         include ForemanPuppet::Parameters::Puppetclass
 
+        resource_description do
+          api_base_url '/foreman_puppet/api'
+        end
+
         before_action :find_optional_nested_object
         before_action :find_resource, only: %w[show update destroy]
 

data/app/controllers/foreman_puppet/api/v2/smart_class_parameters_controller.rb

@@ -1,11 +1,10 @@
 module ForemanPuppet
   module Api
     module V2
-      class SmartClassParametersController < ForemanPuppet::Api::V2::LookupsCommonController
+      class SmartClassParametersController < ::ForemanPuppet::Api::V2::PuppetLookupsCommonController
         include ForemanPuppet::Parameters::PuppetclassLookupKey
 
         resource_description do
-          api_version '2'
           api_base_url '/foreman_puppet/api'
         end
 

data/app/controllers/foreman_puppet/puppetclasses_controller.rb

@@ -3,6 +3,8 @@ module ForemanPuppet
     include Foreman::Controller::AutoCompleteSearch
     include Foreman::Controller::Parameters::Host
     include Foreman::Controller::Parameters::Hostgroup
+    include ForemanPuppet::Extensions::ParametersHost
+    include ForemanPuppet::Extensions::ParametersHostgroup
     include ForemanPuppet::Parameters::Environment
     include ForemanPuppet::Parameters::Puppetclass
     include ForemanPuppet::EnvironmentsImport
@@ -93,11 +95,11 @@ module ForemanPuppet
           @obj.type = 'Host::Managed'
         end
         # puppetclass_ids and config_group_ids need to be removed so they don't cause automatic insertsgroup
-        @obj.attributes = host_params('host')
+        @obj.attributes = host_params('host').tap { |params| strip_relation_ids(params) }
       elsif params['hostgroup']
         # hostgroup.id is assigned to params['host_id'] by host_edit.js#load_puppet_class_parameters
         @obj = Hostgroup.find(host_id)
-        @obj.attributes = hostgroup_params('hostgroup')
+        @obj.attributes = hostgroup_params('hostgroup').tap { |params| strip_relation_ids(params) }
       end
       @obj
     end
@@ -110,5 +112,10 @@ module ForemanPuppet
         super
       end
     end
+
+    def strip_relation_ids(params)
+      return unless params[:puppet_attributes]
+      params[:puppet_attributes].except!(:puppetclass_ids, :config_group_ids)
+    end
   end
 end

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/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/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

@@ -6,7 +6,9 @@ module ForemanPuppet
       included do
         prepend PrependedMethods
 
-        unless ForemanPuppet.extracted_from_core?
+        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')
 
@@ -81,9 +83,9 @@ module ForemanPuppet
           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 })
+                                                 operatingsystem_id: operatingsystem_id,
+                                                 hostgroup_id: hostgroup_id,
+                                                 environment_id: puppet&.environment_id })
           end.compact
         end
 

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

@@ -8,8 +8,12 @@ module ForemanPuppet
           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]
 

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

@@ -24,18 +24,24 @@ 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