foreman_puppet 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9b85d7949eb3fc600be28a75d652d3945cb37f41e1f78d3f9ea607ce58f54e8
-  data.tar.gz: '087e0a820caf4656d82c687c39696fb08fdc1fecca8cf305a8d78d3cbda50137'
+  metadata.gz: ad4345e5b4481b1263e0d9a6af568f6d899288fb6e25843dbc0bb5cabf86b5b9
+  data.tar.gz: 61e41f2886a32d9b73b42513b69d1eb5f0ba28b3151a68c0be21a14b62ca039f
 SHA512:
-  metadata.gz: '078f8509685aef37991c64e86aa3578e63ba03adf5d26c9d825de30954450895768101944fcb6e2328e6ed71f37fea1b9f907825e392f6cf932090ef5b3419f5'
-  data.tar.gz: f1226b5e4974c139ec1d5206941e1e420387356836b3497cd63052fc5e563c355d9ada7595881b99e4241b02bad5b8af272c15c944de9eeaf9978c5e847ce79d
+  metadata.gz: ae6266081bbf344be643d88bbd57dfa2a8028f897dee6df45d6e08d5c7bddc451cae45b49759c484d8561a84fd8d96b35636fc5aa4165df49193e5b17d65edc8
+  data.tar.gz: 829314db4098020a1471276f94f6f1e8bc3421f7f3c1af3d5d08228f4ac811e999c5ce48bade42871a86775f9e630f40e991044a4411a07fb343a9ed8f9a2811

data/lib/foreman_puppet/engine.rb

@@ -58,6 +58,7 @@ module ForemanPuppet
       ::Api::V2::TemplateCombinationsController.include ForemanPuppet::Extensions::ApiTemplateCombinationsController
       ::Api::V2::HostsController.include ForemanPuppet::Extensions::ParametersHost
       ::Api::V2::HostgroupsController.include ForemanPuppet::Extensions::ParametersHostgroup
+      ::ComputeResourcesVmsController.helper ForemanPuppet::HostsAndHostgroupsHelper
       ::OperatingsystemsController.prepend ForemanPuppet::Extensions::OperatingsystemsController
       ::HostsController.include ForemanPuppet::Extensions::HostsControllerExtensions
       ::HostsController.include ForemanPuppet::Extensions::ParametersHost

data/lib/foreman_puppet/version.rb

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

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

@@ -1,6 +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';
@@ -9,24 +10,22 @@ import ENCPreview from './SubTabs/ENCPreview';
 const SecondaryTabRoutes = ({ hostName, hostInfo, status }) => (
   <Switch>
     <Route path={route('reports')}>
-      {hostName ? (
-        <Reports hostName={hostName} hostInfo={hostInfo} status={status} />
-      ) : (
-        <EmptyPage header="Reports" />
-      )}
+      <Reports hostName={hostName} hostInfo={hostInfo} status={status} />
     </Route>
     <Route path={route('assigned')}>
-      <EmptyPage header="Assigned classes" />
+      <EmptyPage
+        header={__('Assigned classes')}
+        description={__('This tab is still a work in progress')}
+      />
     </Route>
     <Route path={route('smart-classes')}>
-      <EmptyPage header="Smart class parameters" />
+      <EmptyPage
+        header={__('Smart class parameters')}
+        description={__('This tab is still a work in progress')}
+      />
     </Route>
     <Route path={route('yaml')}>
-      {hostName ? (
-        <ENCPreview hostName={hostName} />
-      ) : (
-        <EmptyPage header="ENC Preview" />
-      )}
+      <ENCPreview hostName={hostName} />
     </Route>
     <Redirect to={route('reports')} />
   </Switch>

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

@@ -23,21 +23,20 @@ const ENCPreview = ({ hostName }) => {
     return <Skeleton count={5} />;
   }
 
-  if (status === STATUS.ERROR) {
+  if (status === STATUS.ERROR || !hostName) {
+    const description = !hostName
+      ? __("Couldn't find any ENC data for this host")
+      : response?.response?.data?.message;
     const icon = (
       <EmptyStateIcon icon={ExclamationCircleIcon} color={dangerColor.value} />
     );
     return (
-      <EmptyState
-        header={__('Error!')}
-        icon={icon}
-        description={response?.response?.data?.message}
-      />
+      <EmptyState header={__('Error!')} icon={icon} description={description} />
     );
   }
   if (response !== '' || response !== undefined) {
     return (
-      <div className="yaml-tab" padding="16px 24px">
+      <div className="enc-preview-tab" padding="16px 24px">
         <ENCTab encData={response} />
       </div>
     );
@@ -47,7 +46,11 @@ const ENCPreview = ({ hostName }) => {
 };
 
 ENCPreview.propTypes = {
-  hostName: PropTypes.string.isRequired,
+  hostName: PropTypes.string,
+};
+
+ENCPreview.defaultProps = {
+  hostName: undefined,
 };
 
 export default ENCPreview;

data/webpack/src/Extends/Host/PuppetTab/SubTabs/EmptyPage.js

@@ -2,18 +2,19 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import PFEmptyPage from 'foremanReact/components/common/EmptyState/EmptyStatePattern';
 
-const EmptyPage = ({ header }) => (
+const EmptyPage = ({ header, description }) => (
   <div className="host-details-tab-item">
-    <PFEmptyPage
-      icon="enterprise"
-      header={header}
-      description="This is a demo for adding content to the new host page"
-    />
+    <PFEmptyPage icon="enterprise" header={header} description={description} />
   </div>
 );
 
 EmptyPage.propTypes = {
   header: PropTypes.string.isRequired,
+  description: PropTypes.string,
+};
+
+EmptyPage.defaultProps = {
+  description: null,
 };
 
 export default EmptyPage;

data/webpack/src/Extends/Host/PuppetTab/SubTabs/Reports/components/DescriptionCard.js

@@ -12,7 +12,14 @@ import DefaultLoaderEmptyState from 'foremanReact/components/HostDetails/Details
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 
-const DescriptionCard = ({ proxyName, caProxy, env, status }) => (
+const DescriptionCard = ({
+  proxyName,
+  caProxy,
+  proxyId,
+  caProxyId,
+  env,
+  status,
+}) => (
   <CardTemplate header={__('Puppet details')} expandable>
     <DescriptionList isCompact>
       <DescriptionListGroup>
@@ -23,30 +30,36 @@ const DescriptionCard = ({ proxyName, caProxy, env, status }) => (
             status={status}
           >
             {env && (
-              <a href={`/foreman_puppet/environments/${env}/edit`}>{env}</a>
+              <a href={`/foreman_puppet/environments/?search=name+%3D+${env}`}>
+                {env}
+              </a>
             )}
           </SkeletonLoader>
         </DescriptionListDescription>
       </DescriptionListGroup>
       <DescriptionListGroup>
-        <DescriptionListTerm>{__('Puppet smart proxy')}</DescriptionListTerm>
+        <DescriptionListTerm>{__('Puppet Smart Proxy')}</DescriptionListTerm>
         <DescriptionListDescription>
           <SkeletonLoader
             emptyState={<DefaultLoaderEmptyState />}
             status={status}
           >
-            {proxyName}
+            {proxyName && (
+              <a href={`/smart_proxies/${proxyId}#puppet`}>{proxyName}</a>
+            )}
           </SkeletonLoader>
         </DescriptionListDescription>
       </DescriptionListGroup>
       <DescriptionListGroup>
-        <DescriptionListTerm>{__('Puppet server CA')}</DescriptionListTerm>
+        <DescriptionListTerm>{__('Puppet CA Smart Proxy')}</DescriptionListTerm>
         <DescriptionListDescription>
           <SkeletonLoader
             emptyState={<DefaultLoaderEmptyState />}
             status={status}
           >
-            {caProxy}
+            {caProxy && (
+              <a href={`/smart_proxies/${caProxyId}#puppet-ca`}>{caProxy}</a>
+            )}
           </SkeletonLoader>
         </DescriptionListDescription>
       </DescriptionListGroup>
@@ -56,14 +69,18 @@ const DescriptionCard = ({ proxyName, caProxy, env, status }) => (
 
 DescriptionCard.propTypes = {
   caProxy: PropTypes.string,
+  caProxyId: PropTypes.number,
   env: PropTypes.string,
+  proxyId: PropTypes.number,
   proxyName: PropTypes.string,
   status: PropTypes.string,
 };
 
 DescriptionCard.defaultProps = {
   caProxy: undefined,
+  caProxyId: undefined,
   env: undefined,
+  proxyId: undefined,
   proxyName: undefined,
   status: STATUS.PENDING,
 };

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

@@ -12,6 +12,8 @@ const Reports = ({
     puppet_proxy_name: proxyName,
     puppet_ca_proxy_name: caProxy,
     environment_name: env,
+    puppet_proxy_id: proxyId,
+    puppet_ca_proxy_id: caProxyId,
   },
 }) => (
   <div className="report-tab">
@@ -20,6 +22,8 @@ const Reports = ({
         <DescriptionCard
           proxyName={proxyName}
           caProxy={caProxy}
+          proxyId={proxyId}
+          caProxyId={caProxyId}
           env={env}
           status={status}
         />
@@ -32,12 +36,13 @@ const Reports = ({
 );
 
 Reports.propTypes = {
-  hostName: PropTypes.string.isRequired,
+  hostName: PropTypes.string,
   hostInfo: PropTypes.object,
   status: PropTypes.string,
 };
 
 Reports.defaultProps = {
+  hostName: undefined,
   hostInfo: {},
   status: undefined,
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -218,81 +218,43 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/ca/LC_MESSAGES/foreman_puppet.mo
-- locale/ca/foreman_puppet.edit.po
 - locale/ca/foreman_puppet.po
-- locale/ca/foreman_puppet.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/foreman_puppet.mo
-- locale/cs_CZ/foreman_puppet.edit.po
 - locale/cs_CZ/foreman_puppet.po
-- locale/cs_CZ/foreman_puppet.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_puppet.mo
-- locale/de/foreman_puppet.edit.po
 - locale/de/foreman_puppet.po
-- locale/de/foreman_puppet.po.time_stamp
 - 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/en_GB/LC_MESSAGES/foreman_puppet.mo
-- locale/en_GB/foreman_puppet.edit.po
 - locale/en_GB/foreman_puppet.po
-- locale/en_GB/foreman_puppet.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_puppet.mo
-- locale/es/foreman_puppet.edit.po
 - locale/es/foreman_puppet.po
-- locale/es/foreman_puppet.po.time_stamp
 - locale/foreman_puppet.pot
 - locale/fr/LC_MESSAGES/foreman_puppet.mo
-- locale/fr/foreman_puppet.edit.po
 - locale/fr/foreman_puppet.po
-- locale/fr/foreman_puppet.po.time_stamp
 - locale/gemspec.rb
 - locale/gl/LC_MESSAGES/foreman_puppet.mo
-- locale/gl/foreman_puppet.edit.po
 - locale/gl/foreman_puppet.po
-- locale/gl/foreman_puppet.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_puppet.mo
-- locale/it/foreman_puppet.edit.po
 - locale/it/foreman_puppet.po
-- locale/it/foreman_puppet.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_puppet.mo
-- locale/ja/foreman_puppet.edit.po
 - locale/ja/foreman_puppet.po
-- locale/ja/foreman_puppet.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_puppet.mo
-- locale/ko/foreman_puppet.edit.po
 - locale/ko/foreman_puppet.po
-- locale/ko/foreman_puppet.po.time_stamp
-- locale/messages.mo
 - locale/nl_NL/LC_MESSAGES/foreman_puppet.mo
-- locale/nl_NL/foreman_puppet.edit.po
 - locale/nl_NL/foreman_puppet.po
-- locale/nl_NL/foreman_puppet.po.time_stamp
 - locale/pl/LC_MESSAGES/foreman_puppet.mo
-- locale/pl/foreman_puppet.edit.po
 - locale/pl/foreman_puppet.po
-- locale/pl/foreman_puppet.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_puppet.mo
-- locale/pt_BR/foreman_puppet.edit.po
 - locale/pt_BR/foreman_puppet.po
-- locale/pt_BR/foreman_puppet.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_puppet.mo
-- locale/ru/foreman_puppet.edit.po
 - locale/ru/foreman_puppet.po
-- locale/ru/foreman_puppet.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_puppet.mo
-- locale/sv_SE/foreman_puppet.edit.po
 - locale/sv_SE/foreman_puppet.po
-- locale/sv_SE/foreman_puppet.po.time_stamp
 - locale/zh_CN/LC_MESSAGES/foreman_puppet.mo
-- locale/zh_CN/foreman_puppet.edit.po
 - locale/zh_CN/foreman_puppet.po
-- locale/zh_CN/foreman_puppet.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_puppet.mo
-- locale/zh_TW/foreman_puppet.edit.po
 - locale/zh_TW/foreman_puppet.po
-- locale/zh_TW/foreman_puppet.po.time_stamp
 - package.json
 - test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
@@ -418,70 +380,70 @@ signing_key:
 specification_version: 4
 summary: Add Puppet features to Foreman
 test_files:
-- test/unit/foreman_puppet_test.rb
-- test/unit/foreman_puppet/puppet_class_importer_test.rb
-- test/unit/foreman_puppet/template_rendering_test.rb
-- test/unit/foreman_puppet/access_permissions_test.rb
-- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
-- test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
-- test/helpers/foreman_puppet/puppetclasses_helper_test.rb
-- test/integration/foreman_puppet/dashboard_js_test.rb
-- test/integration/foreman_puppet/host_js_test.rb
-- test/integration/foreman_puppet/hostgroup_js_test.rb
-- test/integration/foreman_puppet/smartclass_parameter_js_test.rb
-- test/integration/foreman_puppet/puppetclass_js_test.rb
-- test/integration/foreman_puppet/environment_js_test.rb
-- test/factories/foreman_puppet_factories.rb
-- test/factories/host_puppet_enhancements.rb
-- test/factories/proxy_puppet_enhancements.rb
-- test/integration_puppet_helper.rb
-- test/models/foreman_puppet/config_group_test.rb
+- test/test_puppet_helper.rb
 - test/models/foreman_puppet/report_test.rb
-- test/models/foreman_puppet/host_puppet_facet_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/models/foreman_puppet/provisioning_template_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/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/hostgroup_test.rb
-- test/models/foreman_puppet/hostgroup_puppet_facet_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/puppetclass_test.rb
-- test/models/foreman_puppet/config_group_class_test.rb
-- test/models/foreman_puppet/smart_proxy_test.rb
-- test/graphql/queries/hostgroup_puppet_query_test.rb
-- test/graphql/queries/puppetclass_query_test.rb
+- test/models/foreman_puppet/hostgroup_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/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_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/puppetclasses_query_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/mutations/hosts/create_mutation_test.rb
-- test/test_puppet_helper.rb
-- test/controllers/provisioning_templates_controller_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/template_combinations_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/host_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/environments_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
-- test/controllers/foreman_puppet/api/v2/hostgroup_classes_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/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/foreman_puppet/config_groups_controller_test.rb
-- test/services/foreman_puppet/input_type/puppet_parameter_input_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/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