puppet 8.5.0-universal-darwin → 8.6.0-universal-darwin
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +29 -26
- data/ext/windows/service/daemon.rb +49 -55
- data/lib/hiera/scope.rb +3 -3
- data/lib/hiera_puppet.rb +1 -1
- data/lib/puppet/agent/disabler.rb +1 -1
- data/lib/puppet/application/agent.rb +2 -2
- data/lib/puppet/application/apply.rb +2 -2
- data/lib/puppet/application/describe.rb +6 -6
- data/lib/puppet/application/device.rb +99 -100
- data/lib/puppet/application/doc.rb +1 -1
- data/lib/puppet/application/face_base.rb +7 -7
- data/lib/puppet/application/filebucket.rb +1 -1
- data/lib/puppet/application/lookup.rb +5 -5
- data/lib/puppet/application/resource.rb +10 -3
- data/lib/puppet/application/ssl.rb +3 -3
- data/lib/puppet/application.rb +16 -18
- data/lib/puppet/coercion.rb +1 -1
- data/lib/puppet/configurer/downloader.rb +9 -4
- data/lib/puppet/configurer/fact_handler.rb +12 -13
- data/lib/puppet/configurer.rb +16 -18
- data/lib/puppet/confine/feature.rb +1 -1
- data/lib/puppet/confine/variable.rb +1 -1
- data/lib/puppet/confine.rb +2 -2
- data/lib/puppet/confine_collection.rb +1 -1
- data/lib/puppet/confiner.rb +2 -2
- data/lib/puppet/daemon.rb +3 -3
- data/lib/puppet/datatypes.rb +5 -6
- data/lib/puppet/defaults.rb +14 -8
- data/lib/puppet/environments.rb +3 -7
- data/lib/puppet/error.rb +3 -3
- data/lib/puppet/external/dot.rb +42 -34
- data/lib/puppet/face/catalog/select.rb +1 -1
- data/lib/puppet/face/epp.rb +7 -9
- data/lib/puppet/face/help.rb +12 -12
- data/lib/puppet/face/module/changes.rb +1 -3
- data/lib/puppet/face/module/list.rb +37 -37
- data/lib/puppet/face/node/clean.rb +1 -1
- data/lib/puppet/face/parser.rb +6 -8
- data/lib/puppet/face/report.rb +5 -7
- data/lib/puppet/facter_impl.rb +1 -1
- data/lib/puppet/feature/base.rb +9 -11
- data/lib/puppet/feature/pe_license.rb +1 -1
- data/lib/puppet/feature/ssh.rb +1 -1
- data/lib/puppet/feature/telnet.rb +3 -5
- data/lib/puppet/feature/zlib.rb +1 -1
- data/lib/puppet/ffi/windows/constants.rb +1 -1
- data/lib/puppet/ffi/windows/functions.rb +2 -2
- data/lib/puppet/ffi/windows/structs.rb +3 -3
- data/lib/puppet/file_bucket/dipper.rb +4 -4
- data/lib/puppet/file_bucket/file.rb +4 -4
- data/lib/puppet/file_serving/base.rb +5 -5
- data/lib/puppet/file_serving/configuration/parser.rb +9 -9
- data/lib/puppet/file_serving/configuration.rb +3 -3
- data/lib/puppet/file_serving/fileset.rb +13 -13
- data/lib/puppet/file_serving/http_metadata.rb +1 -1
- data/lib/puppet/file_serving/metadata.rb +13 -9
- data/lib/puppet/file_serving/mount/file.rb +6 -6
- data/lib/puppet/file_serving/mount/locales.rb +2 -4
- data/lib/puppet/file_serving/mount/pluginfacts.rb +2 -4
- data/lib/puppet/file_serving/mount/plugins.rb +2 -4
- data/lib/puppet/file_serving/mount.rb +1 -1
- data/lib/puppet/file_system/file_impl.rb +3 -3
- data/lib/puppet/file_system/memory_impl.rb +1 -1
- data/lib/puppet/file_system/path_pattern.rb +1 -1
- data/lib/puppet/file_system/uniquefile.rb +17 -16
- data/lib/puppet/file_system/windows.rb +26 -18
- data/lib/puppet/forge/cache.rb +2 -2
- data/lib/puppet/forge/errors.rb +1 -1
- data/lib/puppet/forge/repository.rb +2 -2
- data/lib/puppet/forge.rb +13 -19
- data/lib/puppet/functions/abs.rb +2 -2
- data/lib/puppet/functions/camelcase.rb +1 -1
- data/lib/puppet/functions/compare.rb +2 -2
- data/lib/puppet/functions/contain.rb +1 -1
- data/lib/puppet/functions/defined.rb +2 -2
- data/lib/puppet/functions/dig.rb +1 -1
- data/lib/puppet/functions/eyaml_lookup_key.rb +11 -13
- data/lib/puppet/functions/get.rb +1 -1
- data/lib/puppet/functions/hocon_data.rb +3 -5
- data/lib/puppet/functions/import.rb +1 -1
- data/lib/puppet/functions/json_data.rb +4 -6
- data/lib/puppet/functions/max.rb +2 -2
- data/lib/puppet/functions/min.rb +2 -2
- data/lib/puppet/functions/new.rb +1 -1
- data/lib/puppet/functions/reduce.rb +6 -10
- data/lib/puppet/functions/regsubst.rb +2 -2
- data/lib/puppet/functions/require.rb +1 -1
- data/lib/puppet/functions/yaml_data.rb +11 -13
- data/lib/puppet/functions.rb +32 -37
- data/lib/puppet/generate/type.rb +2 -2
- data/lib/puppet/gettext/config.rb +9 -9
- data/lib/puppet/graph/rb_tree_map.rb +31 -23
- data/lib/puppet/graph/relationship_graph.rb +12 -12
- data/lib/puppet/graph/simple_graph.rb +8 -10
- data/lib/puppet/http/client.rb +1 -1
- data/lib/puppet/http/dns.rb +4 -4
- data/lib/puppet/http/external_client.rb +1 -1
- data/lib/puppet/http/factory.rb +1 -1
- data/lib/puppet/http/proxy.rb +15 -15
- data/lib/puppet/http/redirector.rb +6 -2
- data/lib/puppet/http/resolver.rb +2 -2
- data/lib/puppet/http/retry_after_handler.rb +2 -2
- data/lib/puppet/http/service/ca.rb +1 -1
- data/lib/puppet/http/service/compiler.rb +4 -4
- data/lib/puppet/http/service/file_server.rb +1 -1
- data/lib/puppet/http/service/report.rb +2 -2
- data/lib/puppet/http/service.rb +9 -13
- data/lib/puppet/http/session.rb +1 -1
- data/lib/puppet/http/site.rb +1 -1
- data/lib/puppet/indirector/catalog/compiler.rb +44 -45
- data/lib/puppet/indirector/catalog/rest.rb +7 -5
- data/lib/puppet/indirector/catalog/store_configs.rb +1 -1
- data/lib/puppet/indirector/exec.rb +2 -2
- data/lib/puppet/indirector/face.rb +7 -9
- data/lib/puppet/indirector/fact_search.rb +1 -1
- data/lib/puppet/indirector/facts/facter.rb +6 -6
- data/lib/puppet/indirector/facts/json.rb +1 -1
- data/lib/puppet/indirector/facts/store_configs.rb +1 -1
- data/lib/puppet/indirector/file_bucket_file/file.rb +17 -17
- data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -3
- data/lib/puppet/indirector/file_content/rest.rb +1 -1
- data/lib/puppet/indirector/file_metadata/rest.rb +1 -1
- data/lib/puppet/indirector/hiera.rb +1 -1
- data/lib/puppet/indirector/indirection.rb +27 -29
- data/lib/puppet/indirector/json.rb +4 -4
- data/lib/puppet/indirector/memory.rb +2 -2
- data/lib/puppet/indirector/msgpack.rb +5 -5
- data/lib/puppet/indirector/node/store_configs.rb +1 -1
- data/lib/puppet/indirector/none.rb +1 -1
- data/lib/puppet/indirector/report/json.rb +1 -1
- data/lib/puppet/indirector/report/yaml.rb +1 -1
- data/lib/puppet/indirector/request.rb +4 -4
- data/lib/puppet/indirector/resource/ral.rb +2 -4
- data/lib/puppet/indirector/resource/store_configs.rb +1 -1
- data/lib/puppet/indirector/terminus.rb +4 -4
- data/lib/puppet/indirector/yaml.rb +3 -3
- data/lib/puppet/info_service/class_information_service.rb +5 -8
- data/lib/puppet/info_service/task_information_service.rb +6 -7
- data/lib/puppet/interface/action.rb +5 -5
- data/lib/puppet/interface/action_manager.rb +5 -5
- data/lib/puppet/interface/documentation.rb +5 -5
- data/lib/puppet/interface/face_collection.rb +7 -7
- data/lib/puppet/interface/option.rb +2 -2
- data/lib/puppet/interface/option_manager.rb +6 -6
- data/lib/puppet/interface.rb +4 -4
- data/lib/puppet/metatype/manager.rb +2 -2
- data/lib/puppet/module/plan.rb +10 -10
- data/lib/puppet/module/task.rb +8 -8
- data/lib/puppet/module.rb +39 -41
- data/lib/puppet/module_tool/applications/application.rb +10 -8
- data/lib/puppet/module_tool/applications/installer.rb +53 -50
- data/lib/puppet/module_tool/applications/unpacker.rb +6 -8
- data/lib/puppet/module_tool/applications/upgrader.rb +37 -34
- data/lib/puppet/module_tool/checksums.rb +2 -2
- data/lib/puppet/module_tool/dependency.rb +1 -1
- data/lib/puppet/module_tool/errors/base.rb +1 -1
- data/lib/puppet/module_tool/install_directory.rb +1 -1
- data/lib/puppet/module_tool/local_tarball.rb +3 -5
- data/lib/puppet/module_tool/metadata.rb +12 -8
- data/lib/puppet/module_tool/shared_behaviors.rb +27 -12
- data/lib/puppet/module_tool/tar/mini.rb +3 -3
- data/lib/puppet/module_tool.rb +4 -4
- data/lib/puppet/network/client_request.rb +5 -3
- data/lib/puppet/network/format.rb +2 -2
- data/lib/puppet/network/format_support.rb +1 -1
- data/lib/puppet/network/formats.rb +1 -1
- data/lib/puppet/network/http/api/indirected_routes.rb +24 -44
- data/lib/puppet/network/http/api/server/v3.rb +1 -1
- data/lib/puppet/network/http/connection.rb +1 -1
- data/lib/puppet/network/http/handler.rb +8 -12
- data/lib/puppet/network/http/request.rb +1 -1
- data/lib/puppet/network/http/route.rb +9 -9
- data/lib/puppet/node/environment.rb +21 -23
- data/lib/puppet/node/facts.rb +1 -1
- data/lib/puppet/node.rb +5 -5
- data/lib/puppet/pal/json_catalog_encoder.rb +1 -1
- data/lib/puppet/pal/pal_impl.rb +48 -50
- data/lib/puppet/pal/plan_signature.rb +1 -1
- data/lib/puppet/pal/task_signature.rb +1 -1
- data/lib/puppet/parameter/package_options.rb +1 -1
- data/lib/puppet/parameter/value.rb +2 -2
- data/lib/puppet/parameter/value_collection.rb +7 -7
- data/lib/puppet/parameter.rb +8 -9
- data/lib/puppet/parser/ast/block_expression.rb +2 -2
- data/lib/puppet/parser/ast/hostclass.rb +1 -1
- data/lib/puppet/parser/ast/pops_bridge.rb +3 -4
- data/lib/puppet/parser/ast/resource.rb +4 -4
- data/lib/puppet/parser/ast/resourceparam.rb +4 -4
- data/lib/puppet/parser/ast.rb +14 -15
- data/lib/puppet/parser/compiler.rb +26 -28
- data/lib/puppet/parser/functions/create_resources.rb +3 -3
- data/lib/puppet/parser/functions/fail.rb +1 -1
- data/lib/puppet/parser/functions/generate.rb +2 -2
- data/lib/puppet/parser/functions/tag.rb +1 -1
- data/lib/puppet/parser/functions.rb +2 -2
- data/lib/puppet/parser/relationship.rb +3 -1
- data/lib/puppet/parser/resource/param.rb +2 -2
- data/lib/puppet/parser/resource.rb +23 -23
- data/lib/puppet/parser/scope.rb +10 -10
- data/lib/puppet/parser/script_compiler.rb +1 -1
- data/lib/puppet/parser/templatewrapper.rb +1 -1
- data/lib/puppet/parser/type_loader.rb +10 -12
- data/lib/puppet/parser.rb +1 -1
- data/lib/puppet/pops/adaptable.rb +1 -1
- data/lib/puppet/pops/evaluator/access_operator.rb +8 -8
- data/lib/puppet/pops/evaluator/callable_signature.rb +4 -4
- data/lib/puppet/pops/evaluator/collector_transformer.rb +4 -4
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +7 -7
- data/lib/puppet/pops/evaluator/collectors/fixed_set_collector.rb +6 -6
- data/lib/puppet/pops/evaluator/compare_operator.rb +10 -10
- data/lib/puppet/pops/evaluator/deferred_resolver.rb +1 -1
- data/lib/puppet/pops/evaluator/epp_evaluator.rb +2 -2
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +56 -60
- data/lib/puppet/pops/evaluator/literal_evaluator.rb +4 -0
- data/lib/puppet/pops/evaluator/relationship_operator.rb +2 -2
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +3 -3
- data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
- data/lib/puppet/pops/functions/dispatcher.rb +3 -3
- data/lib/puppet/pops/functions/function.rb +14 -16
- data/lib/puppet/pops/issue_reporter.rb +2 -2
- data/lib/puppet/pops/label_provider.rb +2 -2
- data/lib/puppet/pops/loader/dependency_loader.rb +3 -3
- data/lib/puppet/pops/loader/loader.rb +4 -4
- data/lib/puppet/pops/loader/loader_paths.rb +3 -3
- data/lib/puppet/pops/loader/module_loaders.rb +11 -11
- data/lib/puppet/pops/loader/ruby_data_type_instantiator.rb +1 -1
- data/lib/puppet/pops/loader/ruby_function_instantiator.rb +1 -1
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +5 -1
- data/lib/puppet/pops/loader/static_loader.rb +3 -3
- data/lib/puppet/pops/loaders.rb +3 -3
- data/lib/puppet/pops/lookup/data_dig_function_provider.rb +1 -1
- data/lib/puppet/pops/lookup/explainer.rb +2 -2
- data/lib/puppet/pops/lookup/global_data_provider.rb +1 -1
- data/lib/puppet/pops/lookup/hiera_config.rb +15 -11
- data/lib/puppet/pops/lookup/interpolation.rb +3 -3
- data/lib/puppet/pops/lookup/key_recorder.rb +1 -1
- data/lib/puppet/pops/lookup/location_resolver.rb +1 -1
- data/lib/puppet/pops/lookup/lookup_adapter.rb +7 -7
- data/lib/puppet/pops/lookup/sub_lookup.rb +1 -1
- data/lib/puppet/pops/merge_strategy.rb +6 -6
- data/lib/puppet/pops/migration/migration_checker.rb +1 -1
- data/lib/puppet/pops/model/ast_transformer.rb +9 -11
- data/lib/puppet/pops/model/factory.rb +4 -5
- data/lib/puppet/pops/parser/epp_parser.rb +2 -2
- data/lib/puppet/pops/parser/epp_support.rb +1 -1
- data/lib/puppet/pops/parser/evaluating_parser.rb +2 -2
- data/lib/puppet/pops/parser/heredoc_support.rb +4 -4
- data/lib/puppet/pops/parser/interpolation_support.rb +3 -3
- data/lib/puppet/pops/parser/lexer2.rb +20 -12
- data/lib/puppet/pops/parser/lexer_support.rb +1 -1
- data/lib/puppet/pops/parser/locator.rb +4 -4
- data/lib/puppet/pops/parser/parser_support.rb +12 -14
- data/lib/puppet/pops/parser/pn_parser.rb +3 -3
- data/lib/puppet/pops/parser/slurp_support.rb +8 -8
- data/lib/puppet/pops/patterns.rb +12 -12
- data/lib/puppet/pops/pcore.rb +1 -1
- data/lib/puppet/pops/pn.rb +2 -2
- data/lib/puppet/pops/puppet_stack.rb +1 -1
- data/lib/puppet/pops/resource/resource_type_impl.rb +1 -1
- data/lib/puppet/pops/serialization/abstract_reader.rb +2 -2
- data/lib/puppet/pops/serialization/abstract_writer.rb +3 -3
- data/lib/puppet/pops/time/timestamp.rb +1 -1
- data/lib/puppet/pops/types/class_loader.rb +4 -6
- data/lib/puppet/pops/types/iterable.rb +1 -1
- data/lib/puppet/pops/types/p_binary_type.rb +1 -1
- data/lib/puppet/pops/types/p_init_type.rb +1 -1
- data/lib/puppet/pops/types/p_object_type.rb +5 -5
- data/lib/puppet/pops/types/p_object_type_extension.rb +4 -6
- data/lib/puppet/pops/types/p_sem_ver_range_type.rb +1 -1
- data/lib/puppet/pops/types/p_sensitive_type.rb +1 -1
- data/lib/puppet/pops/types/p_timespan_type.rb +2 -2
- data/lib/puppet/pops/types/p_type_set_type.rb +10 -10
- data/lib/puppet/pops/types/p_uri_type.rb +4 -4
- data/lib/puppet/pops/types/recursion_guard.rb +4 -4
- data/lib/puppet/pops/types/ruby_generator.rb +2 -2
- data/lib/puppet/pops/types/string_converter.rb +12 -8
- data/lib/puppet/pops/types/tree_iterators.rb +4 -6
- data/lib/puppet/pops/types/type_calculator.rb +10 -10
- data/lib/puppet/pops/types/type_factory.rb +7 -3
- data/lib/puppet/pops/types/type_formatter.rb +22 -24
- data/lib/puppet/pops/types/type_mismatch_describer.rb +24 -24
- data/lib/puppet/pops/types/types.rb +28 -24
- data/lib/puppet/pops/utils.rb +38 -42
- data/lib/puppet/pops/validation/checker4_0.rb +10 -10
- data/lib/puppet/pops/validation/tasks_checker.rb +1 -1
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +2 -0
- data/lib/puppet/pops/validation.rb +4 -4
- data/lib/puppet/pops/visitor.rb +2 -2
- data/lib/puppet/property/ensure.rb +12 -14
- data/lib/puppet/property/keyvalue.rb +4 -4
- data/lib/puppet/property/list.rb +4 -4
- data/lib/puppet/property/ordered_list.rb +1 -1
- data/lib/puppet/property.rb +31 -33
- data/lib/puppet/provider/exec.rb +2 -2
- data/lib/puppet/provider/file/posix.rb +19 -17
- data/lib/puppet/provider/file/windows.rb +13 -19
- data/lib/puppet/provider/group/directoryservice.rb +3 -2
- data/lib/puppet/provider/group/groupadd.rb +4 -4
- data/lib/puppet/provider/group/windows_adsi.rb +2 -2
- data/lib/puppet/provider/nameservice/directoryservice.rb +29 -29
- data/lib/puppet/provider/nameservice/objectadd.rb +2 -4
- data/lib/puppet/provider/nameservice/pw.rb +1 -2
- data/lib/puppet/provider/nameservice.rb +8 -8
- data/lib/puppet/provider/package/aix.rb +19 -19
- data/lib/puppet/provider/package/appdmg.rb +2 -2
- data/lib/puppet/provider/package/apple.rb +1 -1
- data/lib/puppet/provider/package/apt.rb +18 -18
- data/lib/puppet/provider/package/aptitude.rb +1 -3
- data/lib/puppet/provider/package/aptrpm.rb +9 -9
- data/lib/puppet/provider/package/blastwave.rb +10 -14
- data/lib/puppet/provider/package/dnfmodule.rb +3 -3
- data/lib/puppet/provider/package/dpkg.rb +11 -13
- data/lib/puppet/provider/package/fink.rb +14 -14
- data/lib/puppet/provider/package/freebsd.rb +1 -1
- data/lib/puppet/provider/package/gem.rb +12 -14
- data/lib/puppet/provider/package/macports.rb +2 -2
- data/lib/puppet/provider/package/nim.rb +10 -10
- data/lib/puppet/provider/package/openbsd.rb +22 -22
- data/lib/puppet/provider/package/opkg.rb +6 -6
- data/lib/puppet/provider/package/pacman.rb +35 -29
- data/lib/puppet/provider/package/pip.rb +25 -24
- data/lib/puppet/provider/package/pkg.rb +15 -15
- data/lib/puppet/provider/package/pkgdmg.rb +10 -10
- data/lib/puppet/provider/package/pkgin.rb +2 -2
- data/lib/puppet/provider/package/pkgng.rb +5 -5
- data/lib/puppet/provider/package/pkgutil.rb +17 -21
- data/lib/puppet/provider/package/portage.rb +59 -61
- data/lib/puppet/provider/package/ports.rb +12 -11
- data/lib/puppet/provider/package/portupgrade.rb +35 -35
- data/lib/puppet/provider/package/puppetserver_gem.rb +10 -9
- data/lib/puppet/provider/package/rpm.rb +26 -26
- data/lib/puppet/provider/package/rug.rb +7 -9
- data/lib/puppet/provider/package/sun.rb +4 -4
- data/lib/puppet/provider/package/up2date.rb +5 -7
- data/lib/puppet/provider/package/urpmi.rb +6 -6
- data/lib/puppet/provider/package/windows/exe_package.rb +7 -7
- data/lib/puppet/provider/package/windows/msi_package.rb +3 -3
- data/lib/puppet/provider/package/windows/package.rb +2 -2
- data/lib/puppet/provider/package/windows.rb +3 -5
- data/lib/puppet/provider/package/yum.rb +33 -37
- data/lib/puppet/provider/package/zypper.rb +12 -14
- data/lib/puppet/provider/package.rb +1 -1
- data/lib/puppet/provider/package_targetable.rb +1 -1
- data/lib/puppet/provider/parsedfile.rb +9 -9
- data/lib/puppet/provider/service/base.rb +16 -21
- data/lib/puppet/provider/service/bsd.rb +4 -4
- data/lib/puppet/provider/service/daemontools.rb +31 -31
- data/lib/puppet/provider/service/debian.rb +6 -6
- data/lib/puppet/provider/service/freebsd.rb +36 -36
- data/lib/puppet/provider/service/gentoo.rb +6 -6
- data/lib/puppet/provider/service/init.rb +19 -19
- data/lib/puppet/provider/service/launchd.rb +22 -22
- data/lib/puppet/provider/service/openbsd.rb +10 -10
- data/lib/puppet/provider/service/openrc.rb +1 -1
- data/lib/puppet/provider/service/openwrt.rb +3 -3
- data/lib/puppet/provider/service/rcng.rb +3 -3
- data/lib/puppet/provider/service/redhat.rb +4 -4
- data/lib/puppet/provider/service/runit.rb +6 -6
- data/lib/puppet/provider/service/service.rb +5 -7
- data/lib/puppet/provider/service/smf.rb +28 -27
- data/lib/puppet/provider/service/src.rb +7 -7
- data/lib/puppet/provider/service/systemd.rb +31 -37
- data/lib/puppet/provider/service/upstart.rb +17 -17
- data/lib/puppet/provider/service/windows.rb +7 -7
- data/lib/puppet/provider/user/aix.rb +4 -2
- data/lib/puppet/provider/user/directoryservice.rb +34 -36
- data/lib/puppet/provider/user/hpux.rb +10 -14
- data/lib/puppet/provider/user/pw.rb +1 -1
- data/lib/puppet/provider/user/user_role_add.rb +16 -18
- data/lib/puppet/provider/user/useradd.rb +7 -7
- data/lib/puppet/provider/user/windows_adsi.rb +1 -1
- data/lib/puppet/provider.rb +8 -8
- data/lib/puppet/reference/indirection.rb +3 -0
- data/lib/puppet/reference/metaparameter.rb +1 -1
- data/lib/puppet/reference/providers.rb +3 -3
- data/lib/puppet/reference/type.rb +1 -1
- data/lib/puppet/relationship.rb +4 -5
- data/lib/puppet/reports/http.rb +1 -1
- data/lib/puppet/reports/log.rb +2 -2
- data/lib/puppet/reports/store.rb +4 -4
- data/lib/puppet/reports.rb +2 -2
- data/lib/puppet/resource/catalog.rb +16 -16
- data/lib/puppet/resource/status.rb +3 -3
- data/lib/puppet/resource/type.rb +8 -8
- data/lib/puppet/resource/type_collection.rb +1 -1
- data/lib/puppet/resource.rb +41 -41
- data/lib/puppet/scheduler/scheduler.rb +1 -1
- data/lib/puppet/settings/alias_setting.rb +3 -5
- data/lib/puppet/settings/base_setting.rb +11 -11
- data/lib/puppet/settings/boolean_setting.rb +2 -2
- data/lib/puppet/settings/config_file.rb +5 -4
- data/lib/puppet/settings/duration_setting.rb +2 -2
- data/lib/puppet/settings/environment_conf.rb +3 -3
- data/lib/puppet/settings/file_or_directory_setting.rb +2 -2
- data/lib/puppet/settings/file_setting.rb +11 -11
- data/lib/puppet/settings/ini_file.rb +3 -3
- data/lib/puppet/settings/port_setting.rb +1 -1
- data/lib/puppet/settings/priority_setting.rb +2 -2
- data/lib/puppet/settings/ttl_setting.rb +2 -2
- data/lib/puppet/settings/value_translator.rb +8 -8
- data/lib/puppet/settings.rb +65 -70
- data/lib/puppet/ssl/base.rb +2 -4
- data/lib/puppet/ssl/certificate_request.rb +18 -22
- data/lib/puppet/ssl/certificate_request_attributes.rb +3 -3
- data/lib/puppet/ssl/oids.rb +2 -2
- data/lib/puppet/ssl/openssl_loader.rb +4 -4
- data/lib/puppet/syntax_checkers/base64.rb +3 -3
- data/lib/puppet/syntax_checkers/epp.rb +3 -3
- data/lib/puppet/syntax_checkers/json.rb +3 -3
- data/lib/puppet/syntax_checkers/pp.rb +3 -3
- data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
- data/lib/puppet/transaction/event.rb +2 -2
- data/lib/puppet/transaction/event_manager.rb +5 -5
- data/lib/puppet/transaction/persistence.rb +12 -14
- data/lib/puppet/transaction/report.rb +4 -4
- data/lib/puppet/transaction/resource_harness.rb +2 -2
- data/lib/puppet/transaction.rb +14 -18
- data/lib/puppet/type/component.rb +3 -3
- data/lib/puppet/type/exec.rb +43 -45
- data/lib/puppet/type/file/checksum_value.rb +1 -1
- data/lib/puppet/type/file/content.rb +6 -6
- data/lib/puppet/type/file/ctime.rb +2 -2
- data/lib/puppet/type/file/data_sync.rb +3 -3
- data/lib/puppet/type/file/ensure.rb +16 -15
- data/lib/puppet/type/file/mode.rb +9 -9
- data/lib/puppet/type/file/mtime.rb +2 -2
- data/lib/puppet/type/file/selcontext.rb +14 -14
- data/lib/puppet/type/file/source.rb +19 -21
- data/lib/puppet/type/file/target.rb +11 -11
- data/lib/puppet/type/file.rb +21 -21
- data/lib/puppet/type/filebucket.rb +3 -3
- data/lib/puppet/type/group.rb +3 -3
- data/lib/puppet/type/notify.rb +2 -2
- data/lib/puppet/type/package.rb +4 -4
- data/lib/puppet/type/resources.rb +6 -6
- data/lib/puppet/type/schedule.rb +9 -9
- data/lib/puppet/type/service.rb +6 -8
- data/lib/puppet/type/tidy.rb +22 -24
- data/lib/puppet/type/user.rb +13 -13
- data/lib/puppet/type.rb +76 -88
- data/lib/puppet/util/at_fork/solaris.rb +33 -37
- data/lib/puppet/util/autoload.rb +2 -2
- data/lib/puppet/util/backups.rb +9 -9
- data/lib/puppet/util/character_encoding.rb +7 -6
- data/lib/puppet/util/checksums.rb +2 -2
- data/lib/puppet/util/classgen.rb +8 -8
- data/lib/puppet/util/colors.rb +1 -1
- data/lib/puppet/util/command_line/puppet_option_parser.rb +1 -1
- data/lib/puppet/util/command_line/trollop.rb +42 -46
- data/lib/puppet/util/command_line.rb +2 -2
- data/lib/puppet/util/constant_inflector.rb +2 -2
- data/lib/puppet/util/diff.rb +19 -21
- data/lib/puppet/util/docs.rb +2 -2
- data/lib/puppet/util/errors.rb +9 -9
- data/lib/puppet/util/execution.rb +32 -9
- data/lib/puppet/util/feature.rb +1 -1
- data/lib/puppet/util/fileparsing.rb +12 -16
- data/lib/puppet/util/filetype.rb +36 -40
- data/lib/puppet/util/inifile.rb +6 -12
- data/lib/puppet/util/ldap/connection.rb +1 -1
- data/lib/puppet/util/ldap/manager.rb +10 -12
- data/lib/puppet/util/lockfile.rb +6 -8
- data/lib/puppet/util/log/destination.rb +2 -2
- data/lib/puppet/util/log/destinations.rb +4 -4
- data/lib/puppet/util/log.rb +12 -9
- data/lib/puppet/util/logging.rb +11 -11
- data/lib/puppet/util/metric.rb +3 -3
- data/lib/puppet/util/monkey_patches.rb +5 -7
- data/lib/puppet/util/network_device/config.rb +3 -3
- data/lib/puppet/util/package/version/debian.rb +27 -28
- data/lib/puppet/util/package/version/pip.rb +5 -5
- data/lib/puppet/util/package/version/range/eq.rb +1 -1
- data/lib/puppet/util/package/version/rpm.rb +1 -1
- data/lib/puppet/util/package.rb +2 -2
- data/lib/puppet/util/pidlock.rb +2 -2
- data/lib/puppet/util/platform.rb +1 -1
- data/lib/puppet/util/plist.rb +8 -10
- data/lib/puppet/util/posix.rb +17 -17
- data/lib/puppet/util/profiler/aggregate.rb +1 -1
- data/lib/puppet/util/provider_features.rb +3 -3
- data/lib/puppet/util/rdoc/code_objects.rb +3 -3
- data/lib/puppet/util/rdoc/generators/puppet_generator.rb +63 -64
- data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +23 -23
- data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +12 -12
- data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +1 -1
- data/lib/puppet/util/rdoc/parser.rb +1 -1
- data/lib/puppet/util/reference.rb +13 -9
- data/lib/puppet/util/retry_action.rb +1 -1
- data/lib/puppet/util/rpm_compare.rb +17 -18
- data/lib/puppet/util/rubygems.rb +1 -1
- data/lib/puppet/util/selinux.rb +7 -7
- data/lib/puppet/util/storage.rb +10 -12
- data/lib/puppet/util/suidmanager.rb +18 -19
- data/lib/puppet/util/symbolic_file_mode.rb +71 -75
- data/lib/puppet/util/tag_set.rb +2 -2
- data/lib/puppet/util/tagging.rb +8 -10
- data/lib/puppet/util/terminal.rb +4 -4
- data/lib/puppet/util/user_attr.rb +7 -7
- data/lib/puppet/util/watcher.rb +3 -5
- data/lib/puppet/util/windows/access_control_list.rb +1 -1
- data/lib/puppet/util/windows/adsi.rb +42 -42
- data/lib/puppet/util/windows/daemon.rb +64 -68
- data/lib/puppet/util/windows/error.rb +2 -2
- data/lib/puppet/util/windows/file.rb +18 -25
- data/lib/puppet/util/windows/monkey_patches/process.rb +1 -1
- data/lib/puppet/util/windows/principal.rb +8 -8
- data/lib/puppet/util/windows/process.rb +16 -28
- data/lib/puppet/util/windows/registry.rb +16 -15
- data/lib/puppet/util/windows/root_certs.rb +2 -2
- data/lib/puppet/util/windows/security.rb +31 -31
- data/lib/puppet/util/windows/service.rb +11 -11
- data/lib/puppet/util/windows/sid.rb +8 -8
- data/lib/puppet/util/windows/user.rb +18 -20
- data/lib/puppet/util/yaml.rb +1 -1
- data/lib/puppet/util.rb +55 -46
- data/lib/puppet/version.rb +2 -2
- data/lib/puppet/x509/pem_store.rb +1 -1
- data/lib/puppet.rb +3 -3
- data/man/man5/puppet.conf.5 +10 -2
- data/man/man8/puppet-agent.8 +1 -1
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +1 -1
- data/man/man8/puppet-filebucket.8 +1 -1
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-module.8 +1 -1
- data/man/man8/puppet-node.8 +1 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +1 -1
- data/man/man8/puppet-resource.8 +5 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-ssl.8 +1 -1
- data/man/man8/puppet.8 +2 -2
- metadata +2 -2
@@ -102,7 +102,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
|
|
102
102
|
|
103
103
|
unless @users
|
104
104
|
unless Puppet::FileSystem.exist?(passwd_file)
|
105
|
-
raise Puppet::Error
|
105
|
+
raise Puppet::Error, "Forcelocal set for user resource '#{resource[:name]}', but #{passwd_file} does not exist"
|
106
106
|
end
|
107
107
|
|
108
108
|
@users = []
|
@@ -163,7 +163,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
|
|
163
163
|
@groups_of[user] = []
|
164
164
|
|
165
165
|
unless Puppet::FileSystem.exist?(group_file)
|
166
|
-
raise Puppet::Error
|
166
|
+
raise Puppet::Error, "Forcelocal set for user resource '#{user}', but #{group_file} does not exist"
|
167
167
|
end
|
168
168
|
|
169
169
|
Puppet::FileSystem.each_line(group_file) do |line|
|
@@ -225,7 +225,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
|
|
225
225
|
end
|
226
226
|
|
227
227
|
has_features :manages_homedir, :allows_duplicates, :manages_expiry
|
228
|
-
has_features :system_users unless %w
|
228
|
+
has_features :system_users unless %w[HP-UX Solaris].include? Puppet.runtime[:facter].value('os.name')
|
229
229
|
|
230
230
|
has_features :manages_passwords, :manages_password_age if Puppet.features.libshadow?
|
231
231
|
has_features :manages_shell
|
@@ -235,11 +235,11 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
|
|
235
235
|
# because by default duplicates are allowed. This check is
|
236
236
|
# to ensure consistent behaviour of the useradd provider when
|
237
237
|
# using both useradd and luseradd
|
238
|
-
if
|
238
|
+
if !@resource.allowdupe? && @resource.forcelocal?
|
239
239
|
if @resource.should(:uid) && finduser(:uid, @resource.should(:uid).to_s)
|
240
240
|
raise(Puppet::Error, "UID #{@resource.should(:uid)} already exists, use allowdupe to force user creation")
|
241
241
|
end
|
242
|
-
elsif @resource.allowdupe? &&
|
242
|
+
elsif @resource.allowdupe? && !@resource.forcelocal?
|
243
243
|
return ["-o"]
|
244
244
|
end
|
245
245
|
[]
|
@@ -324,7 +324,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
|
|
324
324
|
else
|
325
325
|
cmd = [command(:add)]
|
326
326
|
end
|
327
|
-
if
|
327
|
+
if !@resource.should(:gid) && Puppet::Util.gid(@resource[:name])
|
328
328
|
cmd += ["-g", @resource[:name]]
|
329
329
|
end
|
330
330
|
cmd += add_properties
|
@@ -401,7 +401,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
|
|
401
401
|
end
|
402
402
|
super
|
403
403
|
if @resource.forcelocal?
|
404
|
-
set(:groups, @resource[:groups]) if
|
404
|
+
set(:groups, @resource[:groups]) if groups?
|
405
405
|
set(:expiry, @resource[:expiry]) if @resource[:expiry]
|
406
406
|
end
|
407
407
|
set(:password, @resource[:password]) if @resource[:password]
|
data/lib/puppet/provider.rb
CHANGED
@@ -241,7 +241,7 @@ class Puppet::Provider
|
|
241
241
|
end
|
242
242
|
|
243
243
|
def command
|
244
|
-
|
244
|
+
unless @optional
|
245
245
|
@confiner.confine :exists => @path, :for_binary => true
|
246
246
|
end
|
247
247
|
|
@@ -290,7 +290,7 @@ class Puppet::Provider
|
|
290
290
|
def self.fact_match(fact, values)
|
291
291
|
fact_val = Puppet.runtime[:facter].value(fact).to_s.downcase
|
292
292
|
if fact_val.empty?
|
293
|
-
|
293
|
+
false
|
294
294
|
else
|
295
295
|
values = [values] unless values.is_a?(Array)
|
296
296
|
values.any? do |value|
|
@@ -380,7 +380,7 @@ class Puppet::Provider
|
|
380
380
|
# @raise [Puppet::DevError] Error indicating that the method should have been implemented by subclass.
|
381
381
|
# @see prefetch
|
382
382
|
def self.instances
|
383
|
-
raise Puppet::DevError, _("To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api") % { provider:
|
383
|
+
raise Puppet::DevError, _("To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api") % { provider: name }
|
384
384
|
end
|
385
385
|
|
386
386
|
# Creates getter- and setter- methods for each property supported by the resource type.
|
@@ -415,7 +415,7 @@ class Puppet::Provider
|
|
415
415
|
end
|
416
416
|
end
|
417
417
|
|
418
|
-
|
418
|
+
initvars
|
419
419
|
|
420
420
|
# This method is used to generate a method for a command.
|
421
421
|
# @return [void]
|
@@ -437,7 +437,7 @@ class Puppet::Provider
|
|
437
437
|
# @return [String] Returns the data source, which is the provider name if no other source has been set.
|
438
438
|
# @todo Unclear what "the source" is used for?
|
439
439
|
def self.source
|
440
|
-
@source ||=
|
440
|
+
@source ||= name
|
441
441
|
end
|
442
442
|
|
443
443
|
# Returns true if the given attribute/parameter is supported by the provider.
|
@@ -536,8 +536,8 @@ class Puppet::Provider
|
|
536
536
|
def name
|
537
537
|
n = @property_hash[:name]
|
538
538
|
if n
|
539
|
-
|
540
|
-
elsif
|
539
|
+
n
|
540
|
+
elsif resource
|
541
541
|
resource.name
|
542
542
|
else
|
543
543
|
raise Puppet::DevError, _("No resource and no name in property hash in %{class_name} instance") % { class_name: self.class.name }
|
@@ -579,7 +579,7 @@ class Puppet::Provider
|
|
579
579
|
return nil unless other.is_a? Puppet::Provider
|
580
580
|
|
581
581
|
# Otherwise, order by the providers class name.
|
582
|
-
|
582
|
+
self.class.name <=> other.class.name
|
583
583
|
end
|
584
584
|
|
585
585
|
# @comment Document prefetch here as it does not exist anywhere else (called from transaction if implemented)
|
@@ -15,6 +15,9 @@ reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirect
|
|
15
15
|
text << Puppet::Util::Docs.scrub(ind.doc) + "\n\n"
|
16
16
|
|
17
17
|
Puppet::Indirector::Terminus.terminus_classes(ind.name).sort_by(&:to_s).each do |terminus|
|
18
|
+
# this is an "abstract" terminus, ignore it
|
19
|
+
next if ind.name == :resource && terminus == :validator
|
20
|
+
|
18
21
|
terminus_name = terminus.to_s
|
19
22
|
term_class = Puppet::Indirector::Terminus.terminus_class(ind.name, terminus)
|
20
23
|
if term_class
|
@@ -13,7 +13,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
|
|
13
13
|
command_line = Puppet::Util::CommandLine.new
|
14
14
|
types.reject! { |type| !command_line.args.include?(type.name.to_s) } unless command_line.args.empty?
|
15
15
|
|
16
|
-
ret = "Details about this host:\n\n"
|
16
|
+
ret = "Details about this host:\n\n".dup
|
17
17
|
|
18
18
|
# Throw some facts in there, so we know where the report is from.
|
19
19
|
ret << option('Ruby Version', Facter.value('ruby.version'))
|
@@ -30,7 +30,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
|
|
30
30
|
ret << "\n" # add a trailing newline
|
31
31
|
|
32
32
|
# Now build up a table of provider suitability.
|
33
|
-
headers = %w
|
33
|
+
headers = %w[Provider Suitable?] + features.collect(&:to_s).sort
|
34
34
|
|
35
35
|
table_data = {}
|
36
36
|
|
@@ -71,7 +71,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
|
|
71
71
|
when :false
|
72
72
|
details << _(" - Got %{values} false tests that should have been true\n") % { values: values }
|
73
73
|
when :feature
|
74
|
-
details << _(" - Missing features %{values}\n") % { values: values.collect
|
74
|
+
details << _(" - Missing features %{values}\n") % { values: values.collect(&:to_s).join(",") }
|
75
75
|
end
|
76
76
|
end
|
77
77
|
notes << details
|
@@ -50,7 +50,7 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
|
|
50
50
|
Resource types define features they can use, and providers can be tested to see
|
51
51
|
which features they provide.
|
52
52
|
|
53
|
-
}
|
53
|
+
}.dup
|
54
54
|
|
55
55
|
types.sort_by(&:to_s).each { |name, type|
|
56
56
|
str << "
|
data/lib/puppet/relationship.rb
CHANGED
@@ -34,7 +34,8 @@ class Puppet::Relationship
|
|
34
34
|
end
|
35
35
|
|
36
36
|
def initialize(source, target, options = {})
|
37
|
-
@source
|
37
|
+
@source = source
|
38
|
+
@target = target
|
38
39
|
|
39
40
|
options = (options || {}).each_with_object({}) { |a, h| h[a[0].to_sym] = a[1]; }
|
40
41
|
[:callback, :event].each do |option|
|
@@ -47,11 +48,9 @@ class Puppet::Relationship
|
|
47
48
|
# of :NONE comes from.
|
48
49
|
def match?(event)
|
49
50
|
if self.event.nil? or event == :NONE or self.event == :NONE
|
50
|
-
|
51
|
-
elsif self.event == :ALL_EVENTS or event == self.event
|
52
|
-
return true
|
51
|
+
false
|
53
52
|
else
|
54
|
-
|
53
|
+
self.event == :ALL_EVENTS or event == self.event
|
55
54
|
end
|
56
55
|
end
|
57
56
|
|
data/lib/puppet/reports/http.rb
CHANGED
@@ -36,7 +36,7 @@ Puppet::Reports.register_report(:http) do
|
|
36
36
|
end
|
37
37
|
|
38
38
|
client = Puppet.runtime[:http]
|
39
|
-
client.post(url,
|
39
|
+
client.post(url, to_yaml, headers: headers, options: options) do |response|
|
40
40
|
unless response.success?
|
41
41
|
Puppet.err _("Unable to submit report to %{url} [%{code}] %{message}") % { url: Puppet[:reporturl].to_s, code: response.code, message: response.reason }
|
42
42
|
end
|
data/lib/puppet/reports/log.rb
CHANGED
@@ -7,8 +7,8 @@ Puppet::Reports.register_report(:log) do
|
|
7
7
|
the log destination is syslog."
|
8
8
|
|
9
9
|
def process
|
10
|
-
|
11
|
-
log.source = "//#{
|
10
|
+
logs.each do |log|
|
11
|
+
log.source = "//#{host}/#{log.source}"
|
12
12
|
Puppet::Util::Log.newmessage(log)
|
13
13
|
end
|
14
14
|
end
|
data/lib/puppet/reports/store.rb
CHANGED
@@ -19,14 +19,14 @@ Puppet::Reports.register_report(:store) do
|
|
19
19
|
|
20
20
|
dir = File.join(Puppet[:reportdir], host)
|
21
21
|
|
22
|
-
|
22
|
+
unless Puppet::FileSystem.exist?(dir)
|
23
23
|
FileUtils.mkdir_p(dir)
|
24
|
-
FileUtils.chmod_R(
|
24
|
+
FileUtils.chmod_R(0o750, dir)
|
25
25
|
end
|
26
26
|
|
27
27
|
# Now store the report.
|
28
28
|
now = Time.now.gmtime
|
29
|
-
name = %w
|
29
|
+
name = %w[year month day hour min].collect do |method|
|
30
30
|
# Make sure we're at least two digits everywhere
|
31
31
|
"%02d" % now.send(method).to_s
|
32
32
|
end.join("") + ".yaml"
|
@@ -34,7 +34,7 @@ Puppet::Reports.register_report(:store) do
|
|
34
34
|
file = File.join(dir, name)
|
35
35
|
|
36
36
|
begin
|
37
|
-
Puppet::FileSystem.replace_file(file,
|
37
|
+
Puppet::FileSystem.replace_file(file, 0o640) do |fh|
|
38
38
|
fh.print to_yaml
|
39
39
|
end
|
40
40
|
rescue => detail
|
data/lib/puppet/reports.rb
CHANGED
@@ -77,8 +77,8 @@ class Puppet::Reports
|
|
77
77
|
# Use this method so they all get loaded
|
78
78
|
instance_loader(:report).loadall(Puppet.lookup(:current_environment))
|
79
79
|
loaded_instances(:report).sort_by(&:to_s).each do |name|
|
80
|
-
mod =
|
81
|
-
docs << "#{name}\n#{
|
80
|
+
mod = report(name)
|
81
|
+
docs << "#{name}\n#{'-' * name.to_s.length}\n"
|
82
82
|
|
83
83
|
docs << Puppet::Util::Docs.scrub(mod.doc) << "\n\n"
|
84
84
|
end
|
@@ -93,7 +93,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
|
|
93
93
|
else
|
94
94
|
a = [nil, nil]
|
95
95
|
end
|
96
|
-
|
96
|
+
a
|
97
97
|
end
|
98
98
|
|
99
99
|
def add_resource_before(other, *resources)
|
@@ -184,7 +184,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
|
|
184
184
|
def alias(resource, key)
|
185
185
|
ref = resource.ref
|
186
186
|
ref =~ /^(.+)\[/
|
187
|
-
class_name =
|
187
|
+
class_name = ::Regexp.last_match(1) || resource.class.name
|
188
188
|
|
189
189
|
newref = [class_name, key].flatten
|
190
190
|
|
@@ -272,7 +272,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
|
|
272
272
|
def clear(remove_resources = true)
|
273
273
|
super()
|
274
274
|
# We have to do this so that the resources clean themselves up.
|
275
|
-
@resource_table.values.each
|
275
|
+
@resource_table.values.each(&:remove) if remove_resources
|
276
276
|
@resource_table.clear
|
277
277
|
@resources = []
|
278
278
|
|
@@ -304,7 +304,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
|
|
304
304
|
def finalize
|
305
305
|
make_default_resources
|
306
306
|
|
307
|
-
@resource_table.values.each
|
307
|
+
@resource_table.values.each(&:finish)
|
308
308
|
|
309
309
|
write_graph(:resources)
|
310
310
|
end
|
@@ -467,10 +467,10 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
|
|
467
467
|
end
|
468
468
|
|
469
469
|
def to_data_hash
|
470
|
-
metadata_hash = metadata.transform_values
|
470
|
+
metadata_hash = metadata.transform_values(&:to_data_hash)
|
471
471
|
recursive_metadata_hash = recursive_metadata.transform_values do |source_to_meta_hash|
|
472
472
|
source_to_meta_hash.transform_values do |metas|
|
473
|
-
metas.map
|
473
|
+
metas.map(&:to_data_hash)
|
474
474
|
end
|
475
475
|
end
|
476
476
|
|
@@ -483,7 +483,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
|
|
483
483
|
'catalog_format' => catalog_format,
|
484
484
|
'environment' => environment.to_s,
|
485
485
|
'resources' => @resources.map { |v| @resource_table[v].to_data_hash },
|
486
|
-
'edges' => edges.map
|
486
|
+
'edges' => edges.map(&:to_data_hash),
|
487
487
|
'classes' => classes,
|
488
488
|
}.merge(metadata_hash.empty? ?
|
489
489
|
{} : { 'metadata' => metadata_hash }).merge(recursive_metadata_hash.empty? ?
|
@@ -539,7 +539,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
|
|
539
539
|
to_print = resources.filter_map do |resource|
|
540
540
|
next unless resource.managed?
|
541
541
|
|
542
|
-
|
542
|
+
resource.ref.downcase.to_s
|
543
543
|
end
|
544
544
|
f.puts to_print.join("\n")
|
545
545
|
end
|
@@ -590,14 +590,14 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
|
|
590
590
|
# This pretty much just converts all of the resources from one class to another, using
|
591
591
|
# a conversion method.
|
592
592
|
def to_catalog(convert)
|
593
|
-
result = self.class.new(
|
593
|
+
result = self.class.new(name, environment_instance)
|
594
594
|
|
595
|
-
result.version =
|
596
|
-
result.code_id =
|
597
|
-
result.catalog_uuid =
|
598
|
-
result.catalog_format =
|
599
|
-
result.metadata =
|
600
|
-
result.recursive_metadata =
|
595
|
+
result.version = version
|
596
|
+
result.code_id = code_id
|
597
|
+
result.catalog_uuid = catalog_uuid
|
598
|
+
result.catalog_format = catalog_format
|
599
|
+
result.metadata = metadata
|
600
|
+
result.recursive_metadata = recursive_metadata
|
601
601
|
|
602
602
|
map = {}
|
603
603
|
resources.each do |resource|
|
@@ -643,7 +643,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
|
|
643
643
|
|
644
644
|
map.clear
|
645
645
|
|
646
|
-
result.add_class(*
|
646
|
+
result.add_class(*classes)
|
647
647
|
result.merge_tags_from(self)
|
648
648
|
|
649
649
|
result
|
@@ -102,7 +102,7 @@ module Puppet
|
|
102
102
|
end
|
103
103
|
|
104
104
|
def self.from_data_hash(data)
|
105
|
-
obj =
|
105
|
+
obj = allocate
|
106
106
|
obj.initialize_from_hash(data)
|
107
107
|
obj
|
108
108
|
end
|
@@ -216,13 +216,13 @@ module Puppet
|
|
216
216
|
'tags' => @tags.to_a,
|
217
217
|
'time' => @time.iso8601(9),
|
218
218
|
'failed' => @failed,
|
219
|
-
'failed_to_restart' =>
|
219
|
+
'failed_to_restart' => failed_to_restart?,
|
220
220
|
'changed' => @changed,
|
221
221
|
'out_of_sync' => @out_of_sync,
|
222
222
|
'skipped' => @skipped,
|
223
223
|
'change_count' => @change_count,
|
224
224
|
'out_of_sync_count' => @out_of_sync_count,
|
225
|
-
'events' => @events.map
|
225
|
+
'events' => @events.map(&:to_data_hash),
|
226
226
|
'corrective_change' => @corrective_change,
|
227
227
|
}
|
228
228
|
end
|
data/lib/puppet/resource/type.rb
CHANGED
@@ -47,7 +47,7 @@ class Puppet::Resource::Type
|
|
47
47
|
attr_reader :type
|
48
48
|
|
49
49
|
RESOURCE_KINDS.each do |t|
|
50
|
-
define_method("#{t}?") {
|
50
|
+
define_method("#{t}?") { type == t }
|
51
51
|
end
|
52
52
|
|
53
53
|
# Are we a child of the passed class? Do a recursive search up our
|
@@ -56,7 +56,7 @@ class Puppet::Resource::Type
|
|
56
56
|
return true if override
|
57
57
|
return false unless parent
|
58
58
|
|
59
|
-
|
59
|
+
(klass == parent_type ? true : parent_type.child_of?(klass))
|
60
60
|
end
|
61
61
|
|
62
62
|
# Now evaluate the code associated with this class or definition.
|
@@ -140,7 +140,7 @@ class Puppet::Resource::Type
|
|
140
140
|
# This might just be an empty, stub class.
|
141
141
|
return unless other.code
|
142
142
|
|
143
|
-
unless
|
143
|
+
unless code
|
144
144
|
self.code = other.code
|
145
145
|
return
|
146
146
|
end
|
@@ -189,7 +189,7 @@ class Puppet::Resource::Type
|
|
189
189
|
parent_type(scope).ensure_in_catalog(scope)
|
190
190
|
end
|
191
191
|
|
192
|
-
if [
|
192
|
+
if %w[Class Node].include? resource.type
|
193
193
|
scope.catalog.merge_tags_from(resource)
|
194
194
|
end
|
195
195
|
end
|
@@ -237,7 +237,7 @@ class Puppet::Resource::Type
|
|
237
237
|
scope[TITLE] = resource.title
|
238
238
|
scope[NAME] = resource.name
|
239
239
|
end
|
240
|
-
scope.class_set(
|
240
|
+
scope.class_set(name, scope) if hostclass? || node?
|
241
241
|
|
242
242
|
param_hash = scope.with_parameter_scope(resource.to_s, arguments.keys) do |param_scope|
|
243
243
|
# Assign directly to the parameter scope to avoid scope parameter validation at this point. It
|
@@ -376,7 +376,7 @@ class Puppet::Resource::Type
|
|
376
376
|
ary = fullname.split(DOUBLE_COLON)
|
377
377
|
n = ary.pop || ""
|
378
378
|
ns = ary.join(DOUBLE_COLON)
|
379
|
-
|
379
|
+
[ns, n]
|
380
380
|
end
|
381
381
|
|
382
382
|
def parent_scope(scope, klass)
|
@@ -401,9 +401,9 @@ class Puppet::Resource::Type
|
|
401
401
|
return unless Puppet::Type.metaparamclass(param)
|
402
402
|
|
403
403
|
if default
|
404
|
-
warnonce _("%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition") % { param: param, name:
|
404
|
+
warnonce _("%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition") % { param: param, name: name }
|
405
405
|
else
|
406
|
-
raise Puppet::ParseError, _("%{param} is a metaparameter; please choose another parameter name in the %{name} definition") % { param: param, name:
|
406
|
+
raise Puppet::ParseError, _("%{param} is a metaparameter; please choose another parameter name in the %{name} definition") % { param: param, name: name }
|
407
407
|
end
|
408
408
|
end
|
409
409
|
|