foreman_puppet 0.0.1 → 1.0.0.rc.2

data/test/unit/foreman_puppet/puppet_class_importer_test.rb

@@ -3,6 +3,7 @@ require 'test_puppet_helper'
 module ForemanPuppet
   class PuppetClassImporterTest < ActiveSupport::TestCase
     def setup
+      FactoryBot.create(:environment, name: 'production') if ForemanPuppet.extracted_from_core?
       ProxyAPI::Puppet.any_instance.stubs(:environments).returns(%w[foreman-testing foreman-testing-1])
       ProxyAPI::Puppet.any_instance.stubs(:classes).returns(mocked_classes)
       User.current = users(:admin)
@@ -209,7 +210,8 @@ module ForemanPuppet
       org_b = FactoryBot.create(:organization, name: 'OrgB')
       loc_b = FactoryBot.create(:location, name: 'LocB')
       b_role = roles(:manager).clone name: 'b_role'
-      b_role.add_permissions! %i[destroy_external_parameters edit_external_parameters create_external_parameters view_external_parameters]
+      b_role.add_permissions! %i[destroy_external_parameters edit_external_parameters create_external_parameters view_external_parameters
+                                 import_puppetclasses view_environments import_environments create_environments]
       a_user = FactoryBot.create(:user, organizations: [org_a], locations: [loc_a], roles: [roles(:manager)], login: 'a_user')
       b_user = FactoryBot.create(:user, organizations: [org_b], locations: [loc_b], roles: [b_role], login: 'b_user')
       proxy = FactoryBot.build(:puppet_smart_proxy, organizations: [org_a, org_b], locations: [loc_a, loc_b])
@@ -231,6 +233,18 @@ module ForemanPuppet
       assert_not Environment.find_by(name: 'b_env_new')
     end
 
+    test 'should tax create audits correctly' do
+      env = FactoryBot.create(:environment)
+      klass_changes = { 'apache::new_nicecls' => {} }
+      importer.obsolete_and_new('new' => { env.name => klass_changes.to_json })
+      pc = Puppetclass.find_by(name: 'apache::new_nicecls')
+      assert pc && pc.persisted?
+      assert_equal 1, pc.audits.count
+      audit = pc.audits.first
+      assert_equal env.location_ids, audit.location_ids.sort
+      assert_equal env.organization_ids, audit.organization_ids.sort
+    end
+
     private
 
     def mocked_classes
@@ -241,7 +255,7 @@ module ForemanPuppet
           'module' => 'apache',
         },
       }]
-      Hash[pcs.map { |k| [k.keys.first, Foreman::ImporterPuppetclass.new(k.values.first)] }]
+      pcs.map { |k| [k.keys.first, Foreman::ImporterPuppetclass.new(k.values.first)] }.to_h
     end
   end
 end

data/webpack/index.js

@@ -5,6 +5,7 @@ import componentRegistry from 'foremanReact/components/componentRegistry';
 import { registerReducer } from 'foremanReact/common/MountingService';
 import reducers from './src/reducers';
 import ForemanPuppet from './src/ForemanPuppet';
+import { WelcomeEnv } from './src/Components/Environments/Welcome';
 
 // register reducers
 Object.entries(reducers).forEach(([key, reducer]) =>
@@ -12,7 +13,5 @@ Object.entries(reducers).forEach(([key, reducer]) =>
 );
 
 // register components for erb mounting
-componentRegistry.register({
-  name: 'ForemanPuppet',
-  type: ForemanPuppet,
-});
+componentRegistry.register({ name: 'WelcomeEnv', type: WelcomeEnv });
+componentRegistry.register({ name: 'ForemanPuppet', type: ForemanPuppet });

data/webpack/src/Components/Environments/Welcome.js

@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import EmptyState from 'foremanReact/components/common/EmptyState';
+import { foremanUrl, getManualURL } from 'foremanReact/common/helpers';
+
+export const WelcomeEnv = ({ canCreate }) => {
+  const action = canCreate && {
+    title: __('Create Puppet Environment'),
+    url: foremanUrl('environments/new'),
+  };
+
+  const content = __(`If you are planning to use Foreman as an external node classifier you should provide information about one or more environments.<br/>
+  This information is commonly imported from a pre-existing Puppet configuration by the use of the <a href=${getManualURL(
+    '4.2.2Classes'
+  )}>Puppet classes and environment importer.</a>`);
+  return (
+    <EmptyState
+      icon="th"
+      iconType="fa"
+      header={__('Environments')}
+      description={<div dangerouslySetInnerHTML={{ __html: content }} />}
+      documentation={{ url: getManualURL('4.2.1Environments') }}
+      action={action}
+    />
+  );
+};
+
+WelcomeEnv.propTypes = {
+  canCreate: PropTypes.bool,
+};
+
+WelcomeEnv.defaultProps = {
+  canCreate: false,
+};
+
+export default WelcomeEnv;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.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-02-02 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:
@@ -24,6 +24,7 @@ files:
 - app/assets/stylesheets/foreman_puppet.scss
 - app/controllers/concerns/foreman_puppet/api/import_puppetclasses_common_controller.rb
 - app/controllers/concerns/foreman_puppet/environments_import.rb
+- app/controllers/concerns/foreman_puppet/extensions/api_base_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_hostgroups_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_template_combinations_controller.rb
 - app/controllers/concerns/foreman_puppet/extensions/api_v2_hosts_controller.rb
@@ -37,13 +38,13 @@ files:
 - app/controllers/concerns/foreman_puppet/parameters/environment.rb
 - app/controllers/concerns/foreman_puppet/parameters/puppetclass.rb
 - app/controllers/concerns/foreman_puppet/parameters/puppetclass_lookup_key.rb
-- app/controllers/foreman_puppet/api/v2/base_controller.rb
 - app/controllers/foreman_puppet/api/v2/config_groups_controller.rb
 - app/controllers/foreman_puppet/api/v2/environments_controller.rb
 - app/controllers/foreman_puppet/api/v2/host_classes_controller.rb
 - app/controllers/foreman_puppet/api/v2/hostgroup_classes_controller.rb
-- app/controllers/foreman_puppet/api/v2/lookups_common_controller.rb
 - app/controllers/foreman_puppet/api/v2/override_values_controller.rb
+- app/controllers/foreman_puppet/api/v2/puppet_base_controller.rb
+- app/controllers/foreman_puppet/api/v2/puppet_lookups_common_controller.rb
 - app/controllers/foreman_puppet/api/v2/puppetclasses_controller.rb
 - app/controllers/foreman_puppet/api/v2/smart_class_parameters_controller.rb
 - app/controllers/foreman_puppet/config_groups_controller.rb
@@ -52,6 +53,14 @@ files:
 - app/controllers/foreman_puppet/puppetclass_lookup_keys_controller.rb
 - app/controllers/foreman_puppet/puppetclasses_controller.rb
 - app/controllers/foreman_puppet/react_controller.rb
+- 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
+- app/graphgl/foreman_puppet/types/puppetclass.rb
 - app/helpers/concerns/foreman_puppet/template_renderer_scope.rb
 - app/helpers/foreman_puppet/environments_helper.rb
 - app/helpers/foreman_puppet/hosts_and_hostgroups_helper.rb
@@ -62,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
@@ -70,7 +80,6 @@ files:
 - app/models/concerns/foreman_puppet/extensions/taxonomy.rb
 - app/models/concerns/foreman_puppet/extensions/template_combination.rb
 - app/models/concerns/foreman_puppet/extensions/user.rb
-- app/models/concerns/foreman_puppet/host_common.rb
 - app/models/concerns/foreman_puppet/puppet_lookup_value_extensions.rb
 - app/models/foreman_puppet/config_group.rb
 - app/models/foreman_puppet/config_group_class.rb
@@ -81,14 +90,15 @@ files:
 - app/models/foreman_puppet/host_puppet_facet.rb
 - app/models/foreman_puppet/hostgroup_class.rb
 - app/models/foreman_puppet/hostgroup_puppet_facet.rb
+- app/models/foreman_puppet/puppet_facet_common.rb
 - app/models/foreman_puppet/puppetclass.rb
 - app/models/foreman_puppet/puppetclass_lookup_key.rb
+- app/prepend_views/api/v2/template_combinations/base.json.rabl
 - app/services/foreman_puppet/host_info_providers/config_groups_info.rb
 - app/services/foreman_puppet/host_info_providers/puppet_info.rb
 - app/services/foreman_puppet/input_type/puppet_parameter_input.rb
 - app/services/foreman_puppet/proxy_status/puppet.rb
 - app/services/foreman_puppet/puppet_class_importer.rb
-- app/views/api/v2/template_combinations/base.json.erb
 - app/views/foreman_puppet/api/v2/config_groups/base.json.rabl
 - app/views/foreman_puppet/api/v2/config_groups/create.json.rabl
 - app/views/foreman_puppet/api/v2/config_groups/index.json.rabl
@@ -127,6 +137,7 @@ files:
 - app/views/foreman_puppet/api/v2/smart_class_parameters/main.json.rabl
 - app/views/foreman_puppet/api/v2/smart_class_parameters/show.json.rabl
 - app/views/foreman_puppet/api/v2/smart_class_parameters/update.json.rabl
+- app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb
 - app/views/foreman_puppet/config_groups/_config_group.html.erb
 - app/views/foreman_puppet/config_groups/_config_groups_selection.html.erb
 - app/views/foreman_puppet/config_groups/_form.html.erb
@@ -160,7 +171,9 @@ 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
 - db/migrate/20101121140000_add_environment_to_template_combinations.foreman_puppet.rb
 - db/migrate/20200720123005_migrate_puppet_core_types.foreman_puppet.rb
@@ -187,11 +200,15 @@ files:
 - lib/tasks/foreman_puppet_tasks.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/en/LC_MESSAGES/foreman_puppet.mo
 - locale/en/foreman_puppet.edit.po
 - locale/en/foreman_puppet.po
 - locale/en/foreman_puppet.po.time_stamp
+- locale/en/foreman_puppet.pox
 - locale/foreman_puppet.pot
 - locale/gemspec.rb
+- locale/messages.mo
+- package.json
 - test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/host_classes_controller_test.rb
@@ -200,6 +217,7 @@ files:
 - 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/override_values_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_class_parameters_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/template_combinations_controller_test.rb
@@ -214,6 +232,15 @@ files:
 - 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/environment_query_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/puppetclass_query_test.rb
+- test/graphql/queries/puppetclasses_query_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
 - test/helpers/foreman_puppet/puppetclasses_helper_test.rb
 - test/integration/foreman_puppet/environment_js_test.rb
@@ -233,9 +260,10 @@ files:
 - test/models/foreman_puppet/provisioning_template_test.rb
 - test/models/foreman_puppet/puppetclass_lookup_key_test.rb
 - test/models/foreman_puppet/puppetclass_test.rb
+- test/models/foreman_puppet/report_test.rb
 - test/models/foreman_puppet/smart_proxy_test.rb
-- test/qraphql/queries/host_puppet_query_test.rb
-- test/qraphql/queries/hostgroup_puppet_query_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
@@ -253,6 +281,7 @@ files:
 - webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware.js
 - webpack/fills_index.js
 - webpack/index.js
+- webpack/src/Components/Environments/Welcome.js
 - webpack/src/ForemanPuppet.js
 - webpack/src/Router/__snapshots__/routes.test.js.snap
 - webpack/src/Router/index.js
@@ -263,7 +292,7 @@ files:
 - webpack/src/foreman_puppet_host_form.test.js
 - webpack/src/index.js
 - webpack/src/reducers.js
-homepage: https://theforeman.org
+homepage: https://github.com/theforeman/foreman_puppet
 licenses:
 - GPL-3.0
 metadata: {}
@@ -278,15 +307,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 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
@@ -294,9 +324,19 @@ test_files:
 - test/integration/foreman_puppet/hostgroup_js_test.rb
 - test/integration/foreman_puppet/environment_js_test.rb
 - test/integration/foreman_puppet/host_js_test.rb
+- test/graphql/mutations/hosts/create_mutation_test.rb
+- test/graphql/queries/puppetclasses_query_test.rb
+- test/graphql/queries/host_puppet_query_test.rb
+- test/graphql/queries/puppetclass_query_test.rb
+- test/graphql/queries/organization_query_test.rb
+- test/graphql/queries/location_query_test.rb
+- test/graphql/queries/environment_query_test.rb
+- test/graphql/queries/hostgroup_puppet_query_test.rb
+- test/graphql/queries/environments_query_test.rb
 - test/helpers/foreman_puppet/puppetclasses_helper_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
 - test/models/foreman_puppet/config_group_class_test.rb
+- test/models/foreman_puppet/report_test.rb
 - test/models/foreman_puppet/puppetclass_lookup_key_test.rb
 - test/models/foreman_puppet/hostgroup_test.rb
 - test/models/foreman_puppet/config_group_test.rb
@@ -309,12 +349,11 @@ test_files:
 - test/models/foreman_puppet/smart_proxy_test.rb
 - test/models/foreman_puppet/environment_test.rb
 - test/models/foreman_puppet/provisioning_template_test.rb
+- test/models/foreman_puppet/user_test.rb
 - test/unit/foreman_puppet_test.rb
 - test/unit/foreman_puppet/puppet_class_importer_test.rb
 - test/unit/foreman_puppet/access_permissions_test.rb
 - test/unit/foreman_puppet/template_rendering_test.rb
-- test/qraphql/queries/host_puppet_query_test.rb
-- test/qraphql/queries/hostgroup_puppet_query_test.rb
 - test/factories/foreman_puppet_factories.rb
 - test/factories/proxy_puppet_enhancements.rb
 - test/factories/host_puppet_enhancements.rb
@@ -333,6 +372,7 @@ test_files:
 - test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/lookups_common_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/host_classes_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/hosts_controller_test.rb
 - test/controllers/foreman_puppet/puppetclasses_controller_test.rb