openvox 7.37.2 → 8.19.0
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/CHANGELOG.md +6 -19
- data/Gemfile +18 -17
- data/README.md +25 -30
- data/Rakefile +44 -34
- data/bin/puppet +1 -0
- data/examples/hiera/README.md +68 -57
- data/examples/hiera/data/common.yaml +12 -0
- data/examples/hiera/data/dc1.yaml +6 -0
- data/examples/hiera/hiera.yaml +15 -0
- data/examples/hiera/modules/ntp/data/common.yaml +4 -0
- data/examples/hiera/modules/ntp/hiera.yaml +9 -0
- data/examples/hiera/modules/ntp/manifests/config.pp +16 -4
- data/examples/hiera/modules/ntp/templates/ntp.conf.epp +3 -0
- data/examples/hiera/modules/users/manifests/common.pp +7 -2
- data/examples/hiera/modules/users/manifests/dc1.pp +7 -2
- data/examples/hiera/site.pp +1 -1
- data/ext/build_defaults.yaml +1 -1
- data/ext/windows/service/daemon.rb +54 -60
- data/install.rb +21 -92
- data/lib/hiera/puppet_function.rb +8 -6
- data/lib/hiera/scope.rb +15 -13
- data/lib/hiera_puppet.rb +4 -6
- data/lib/puppet/agent/disabler.rb +5 -3
- data/lib/puppet/agent/locker.rb +2 -2
- data/lib/puppet/agent.rb +6 -4
- data/lib/puppet/application/agent.rb +305 -301
- data/lib/puppet/application/apply.rb +124 -117
- data/lib/puppet/application/catalog.rb +2 -0
- data/lib/puppet/application/config.rb +2 -0
- data/lib/puppet/application/describe.rb +50 -48
- data/lib/puppet/application/device.rb +224 -223
- data/lib/puppet/application/doc.rb +57 -58
- data/lib/puppet/application/epp.rb +2 -0
- data/lib/puppet/application/face_base.rb +18 -17
- data/lib/puppet/application/facts.rb +2 -0
- data/lib/puppet/application/filebucket.rb +174 -168
- data/lib/puppet/application/generate.rb +3 -1
- data/lib/puppet/application/help.rb +2 -0
- data/lib/puppet/application/indirection_base.rb +2 -0
- data/lib/puppet/application/lookup.rb +181 -181
- data/lib/puppet/application/module.rb +2 -0
- data/lib/puppet/application/node.rb +2 -0
- data/lib/puppet/application/parser.rb +2 -0
- data/lib/puppet/application/plugin.rb +2 -0
- data/lib/puppet/application/report.rb +2 -0
- data/lib/puppet/application/resource.rb +106 -96
- data/lib/puppet/application/script.rb +76 -74
- data/lib/puppet/application/ssl.rb +100 -92
- data/lib/puppet/application.rb +32 -32
- data/lib/puppet/application_support.rb +3 -2
- data/lib/puppet/coercion.rb +5 -3
- data/lib/puppet/compilable_resource_type.rb +4 -2
- data/lib/puppet/concurrent/lock.rb +2 -3
- data/lib/puppet/concurrent/synchronized.rb +2 -2
- data/lib/puppet/concurrent/thread_local_singleton.rb +1 -0
- data/lib/puppet/concurrent.rb +2 -0
- data/lib/puppet/configurer/downloader.rb +11 -5
- data/lib/puppet/configurer/fact_handler.rb +17 -16
- data/lib/puppet/configurer/plugin_handler.rb +2 -0
- data/lib/puppet/configurer.rb +40 -36
- data/lib/puppet/confine/any.rb +3 -1
- data/lib/puppet/confine/boolean.rb +3 -1
- data/lib/puppet/confine/exists.rb +3 -1
- data/lib/puppet/confine/false.rb +3 -1
- data/lib/puppet/confine/feature.rb +3 -2
- data/lib/puppet/confine/true.rb +3 -1
- data/lib/puppet/confine/variable.rb +4 -2
- data/lib/puppet/confine.rb +5 -2
- data/lib/puppet/confine_collection.rb +6 -3
- data/lib/puppet/confiner.rb +5 -3
- data/lib/puppet/context/trusted_information.rb +12 -10
- data/lib/puppet/context.rb +2 -0
- data/lib/puppet/daemon.rb +26 -10
- data/lib/puppet/data_binding.rb +3 -1
- data/lib/puppet/datatypes/error.rb +3 -1
- data/lib/puppet/datatypes/impl/error.rb +2 -0
- data/lib/puppet/datatypes.rb +12 -7
- data/lib/puppet/defaults.rb +164 -125
- data/lib/puppet/environments.rb +13 -15
- data/lib/puppet/error.rb +19 -15
- data/lib/puppet/etc.rb +10 -5
- data/lib/puppet/external/dot.rb +65 -75
- data/lib/puppet/face/catalog/select.rb +4 -2
- data/lib/puppet/face/catalog.rb +7 -5
- data/lib/puppet/face/config.rb +30 -31
- data/lib/puppet/face/epp.rb +25 -26
- data/lib/puppet/face/facts.rb +8 -6
- data/lib/puppet/face/generate.rb +5 -2
- data/lib/puppet/face/help/action.erb +0 -1
- data/lib/puppet/face/help/face.erb +0 -1
- data/lib/puppet/face/help/global.erb +1 -1
- data/lib/puppet/face/help.rb +80 -62
- data/lib/puppet/face/module/changes.rb +4 -3
- data/lib/puppet/face/module/install.rb +7 -4
- data/lib/puppet/face/module/list.rb +52 -53
- data/lib/puppet/face/module/uninstall.rb +2 -0
- data/lib/puppet/face/module/upgrade.rb +5 -3
- data/lib/puppet/face/module.rb +3 -1
- data/lib/puppet/face/node/clean.rb +4 -2
- data/lib/puppet/face/node.rb +5 -3
- data/lib/puppet/face/parser.rb +18 -19
- data/lib/puppet/face/plugin.rb +10 -8
- data/lib/puppet/face/report.rb +10 -10
- data/lib/puppet/face/resource.rb +2 -0
- data/lib/puppet/face.rb +2 -0
- data/lib/puppet/facter_impl.rb +1 -1
- data/lib/puppet/feature/base.rb +13 -13
- data/lib/puppet/feature/bolt.rb +2 -0
- data/lib/puppet/feature/cfpropertylist.rb +2 -0
- data/lib/puppet/feature/eventlog.rb +2 -0
- data/lib/puppet/feature/hiera_eyaml.rb +2 -0
- data/lib/puppet/feature/hocon.rb +2 -0
- data/lib/puppet/feature/libuser.rb +5 -3
- data/lib/puppet/feature/msgpack.rb +2 -0
- data/lib/puppet/feature/pe_license.rb +4 -2
- data/lib/puppet/feature/pson.rb +6 -0
- data/lib/puppet/feature/selinux.rb +2 -0
- data/lib/puppet/feature/ssh.rb +3 -1
- data/lib/puppet/feature/telnet.rb +3 -7
- data/lib/puppet/feature/zlib.rb +3 -1
- data/lib/puppet/ffi/posix/constants.rb +3 -1
- data/lib/puppet/ffi/posix/functions.rb +2 -1
- data/lib/puppet/ffi/posix.rb +2 -0
- data/lib/puppet/ffi/windows/api_types.rb +3 -1
- data/lib/puppet/ffi/windows/constants.rb +80 -78
- data/lib/puppet/ffi/windows/functions.rb +76 -75
- data/lib/puppet/ffi/windows/structs.rb +6 -5
- data/lib/puppet/ffi/windows.rb +2 -0
- data/lib/puppet/file_bucket/dipper.rb +20 -11
- data/lib/puppet/file_bucket/file.rb +8 -6
- data/lib/puppet/file_bucket.rb +2 -0
- data/lib/puppet/file_serving/base.rb +17 -9
- data/lib/puppet/file_serving/configuration/parser.rb +13 -10
- data/lib/puppet/file_serving/configuration.rb +10 -7
- data/lib/puppet/file_serving/content.rb +2 -0
- data/lib/puppet/file_serving/fileset.rb +23 -19
- data/lib/puppet/file_serving/http_metadata.rb +3 -4
- data/lib/puppet/file_serving/metadata.rb +26 -23
- data/lib/puppet/file_serving/mount/file.rb +15 -11
- data/lib/puppet/file_serving/mount/locales.rb +5 -5
- data/lib/puppet/file_serving/mount/modules.rb +3 -0
- data/lib/puppet/file_serving/mount/pluginfacts.rb +5 -5
- data/lib/puppet/file_serving/mount/plugins.rb +5 -5
- data/lib/puppet/file_serving/mount/scripts.rb +3 -0
- data/lib/puppet/file_serving/mount/tasks.rb +3 -0
- data/lib/puppet/file_serving/mount.rb +4 -1
- data/lib/puppet/file_serving/terminus_helper.rb +2 -0
- data/lib/puppet/file_serving/terminus_selector.rb +3 -1
- data/lib/puppet/file_serving.rb +2 -0
- data/lib/puppet/file_system/file_impl.rb +9 -8
- data/lib/puppet/file_system/jruby.rb +2 -0
- data/lib/puppet/file_system/memory_file.rb +3 -0
- data/lib/puppet/file_system/memory_impl.rb +5 -1
- data/lib/puppet/file_system/path_pattern.rb +4 -2
- data/lib/puppet/file_system/posix.rb +7 -2
- data/lib/puppet/file_system/uniquefile.rb +33 -31
- data/lib/puppet/file_system/windows.rb +33 -22
- data/lib/puppet/file_system.rb +5 -3
- data/lib/puppet/forge/cache.rb +4 -3
- data/lib/puppet/forge/errors.rb +3 -4
- data/lib/puppet/forge/repository.rb +6 -3
- data/lib/puppet/forge.rb +20 -22
- data/lib/puppet/functions/abs.rb +7 -4
- data/lib/puppet/functions/alert.rb +2 -0
- data/lib/puppet/functions/all.rb +3 -1
- data/lib/puppet/functions/annotate.rb +2 -0
- data/lib/puppet/functions/any.rb +3 -1
- data/lib/puppet/functions/assert_type.rb +5 -2
- data/lib/puppet/functions/binary_file.rb +4 -1
- data/lib/puppet/functions/break.rb +4 -2
- data/lib/puppet/functions/call.rb +2 -1
- data/lib/puppet/functions/camelcase.rb +4 -3
- data/lib/puppet/functions/capitalize.rb +4 -3
- data/lib/puppet/functions/ceiling.rb +3 -2
- data/lib/puppet/functions/chomp.rb +3 -2
- data/lib/puppet/functions/chop.rb +3 -2
- data/lib/puppet/functions/compare.rb +5 -3
- data/lib/puppet/functions/contain.rb +7 -4
- data/lib/puppet/functions/convert_to.rb +2 -0
- data/lib/puppet/functions/crit.rb +2 -0
- data/lib/puppet/functions/debug.rb +2 -0
- data/lib/puppet/functions/defined.rb +10 -6
- data/lib/puppet/functions/dig.rb +13 -10
- data/lib/puppet/functions/downcase.rb +4 -2
- data/lib/puppet/functions/each.rb +2 -0
- data/lib/puppet/functions/emerg.rb +2 -0
- data/lib/puppet/functions/empty.rb +2 -0
- data/lib/puppet/functions/epp.rb +2 -1
- data/lib/puppet/functions/err.rb +2 -0
- data/lib/puppet/functions/eyaml_lookup_key.rb +17 -16
- data/lib/puppet/functions/filter.rb +8 -7
- data/lib/puppet/functions/find_file.rb +6 -0
- data/lib/puppet/functions/find_template.rb +2 -0
- data/lib/puppet/functions/flatten.rb +2 -0
- data/lib/puppet/functions/floor.rb +3 -2
- data/lib/puppet/functions/get.rb +4 -2
- data/lib/puppet/functions/getvar.rb +7 -5
- data/lib/puppet/functions/group_by.rb +2 -2
- data/lib/puppet/functions/hiera.rb +2 -0
- data/lib/puppet/functions/hiera_array.rb +2 -0
- data/lib/puppet/functions/hiera_hash.rb +2 -0
- data/lib/puppet/functions/hiera_include.rb +3 -0
- data/lib/puppet/functions/hocon_data.rb +5 -5
- data/lib/puppet/functions/import.rb +3 -1
- data/lib/puppet/functions/include.rb +5 -2
- data/lib/puppet/functions/index.rb +5 -4
- data/lib/puppet/functions/info.rb +2 -0
- data/lib/puppet/functions/inline_epp.rb +2 -1
- data/lib/puppet/functions/join.rb +4 -2
- data/lib/puppet/functions/json_data.rb +6 -6
- data/lib/puppet/functions/keys.rb +2 -0
- data/lib/puppet/functions/length.rb +2 -1
- data/lib/puppet/functions/lest.rb +2 -0
- data/lib/puppet/functions/lookup.rb +12 -12
- data/lib/puppet/functions/lstrip.rb +3 -2
- data/lib/puppet/functions/map.rb +4 -2
- data/lib/puppet/functions/match.rb +8 -5
- data/lib/puppet/functions/max.rb +75 -8
- data/lib/puppet/functions/min.rb +75 -8
- data/lib/puppet/functions/module_directory.rb +2 -0
- data/lib/puppet/functions/new.rb +5 -3
- data/lib/puppet/functions/next.rb +3 -1
- data/lib/puppet/functions/notice.rb +2 -0
- data/lib/puppet/functions/reduce.rb +8 -11
- data/lib/puppet/functions/regsubst.rb +15 -16
- data/lib/puppet/functions/require.rb +7 -3
- data/lib/puppet/functions/return.rb +2 -0
- data/lib/puppet/functions/reverse_each.rb +2 -0
- data/lib/puppet/functions/round.rb +2 -0
- data/lib/puppet/functions/rstrip.rb +3 -2
- data/lib/puppet/functions/scanf.rb +2 -0
- data/lib/puppet/functions/size.rb +2 -2
- data/lib/puppet/functions/slice.rb +4 -1
- data/lib/puppet/functions/sort.rb +2 -0
- data/lib/puppet/functions/split.rb +2 -0
- data/lib/puppet/functions/step.rb +2 -0
- data/lib/puppet/functions/strftime.rb +5 -3
- data/lib/puppet/functions/strip.rb +3 -2
- data/lib/puppet/functions/then.rb +3 -0
- data/lib/puppet/functions/tree_each.rb +4 -3
- data/lib/puppet/functions/type.rb +2 -0
- data/lib/puppet/functions/unique.rb +12 -9
- data/lib/puppet/functions/unwrap.rb +2 -0
- data/lib/puppet/functions/upcase.rb +4 -2
- data/lib/puppet/functions/values.rb +2 -0
- data/lib/puppet/functions/versioncmp.rb +2 -1
- data/lib/puppet/functions/warning.rb +2 -0
- data/lib/puppet/functions/with.rb +2 -0
- data/lib/puppet/functions/yaml_data.rb +13 -13
- data/lib/puppet/functions.rb +57 -61
- data/lib/puppet/generate/models/type/property.rb +4 -1
- data/lib/puppet/generate/models/type/type.rb +5 -2
- data/lib/puppet/generate/type.rb +11 -5
- data/lib/puppet/gettext/config.rb +16 -9
- data/lib/puppet/gettext/module_translations.rb +2 -1
- data/lib/puppet/gettext/stubs.rb +2 -0
- data/lib/puppet/graph/key.rb +2 -0
- data/lib/puppet/graph/prioritizer.rb +2 -0
- data/lib/puppet/graph/rb_tree_map.rb +43 -24
- data/lib/puppet/graph/relationship_graph.rb +31 -29
- data/lib/puppet/graph/sequential_prioritizer.rb +2 -0
- data/lib/puppet/graph/simple_graph.rb +63 -57
- data/lib/puppet/graph.rb +2 -0
- data/lib/puppet/http/client.rb +10 -6
- data/lib/puppet/http/dns.rb +12 -12
- data/lib/puppet/http/errors.rb +4 -2
- data/lib/puppet/http/external_client.rb +4 -3
- data/lib/puppet/http/factory.rb +3 -1
- data/lib/puppet/http/pool.rb +3 -1
- data/lib/puppet/http/pool_entry.rb +2 -0
- data/lib/puppet/http/proxy.rb +21 -19
- data/lib/puppet/http/redirector.rb +5 -3
- data/lib/puppet/http/resolver/server_list.rb +5 -4
- data/lib/puppet/http/resolver/settings.rb +2 -1
- data/lib/puppet/http/resolver/srv.rb +2 -1
- data/lib/puppet/http/resolver.rb +4 -2
- data/lib/puppet/http/response.rb +2 -0
- data/lib/puppet/http/response_converter.rb +4 -3
- data/lib/puppet/http/response_net_http.rb +2 -1
- data/lib/puppet/http/retry_after_handler.rb +4 -3
- data/lib/puppet/http/service/ca.rb +37 -5
- data/lib/puppet/http/service/compiler.rb +13 -10
- data/lib/puppet/http/service/file_server.rb +5 -3
- data/lib/puppet/http/service/puppetserver.rb +3 -2
- data/lib/puppet/http/service/report.rb +5 -7
- data/lib/puppet/http/service.rb +17 -22
- data/lib/puppet/http/session.rb +6 -4
- data/lib/puppet/http/site.rb +3 -1
- data/lib/puppet/http.rb +4 -2
- data/lib/puppet/indirector/catalog/compiler.rb +81 -80
- data/lib/puppet/indirector/catalog/json.rb +2 -0
- data/lib/puppet/indirector/catalog/msgpack.rb +2 -0
- data/lib/puppet/indirector/catalog/rest.rb +2 -0
- data/lib/puppet/indirector/catalog/store_configs.rb +3 -3
- data/lib/puppet/indirector/catalog/yaml.rb +2 -0
- data/lib/puppet/indirector/code.rb +2 -0
- data/lib/puppet/indirector/data_binding/hiera.rb +2 -1
- data/lib/puppet/indirector/data_binding/none.rb +2 -0
- data/lib/puppet/indirector/direct_file_server.rb +4 -1
- data/lib/puppet/indirector/envelope.rb +2 -0
- data/lib/puppet/indirector/errors.rb +2 -0
- data/lib/puppet/indirector/exec.rb +5 -3
- data/lib/puppet/indirector/face.rb +17 -28
- data/lib/puppet/indirector/fact_search.rb +4 -2
- data/lib/puppet/indirector/facts/facter.rb +10 -7
- data/lib/puppet/indirector/facts/json.rb +4 -2
- data/lib/puppet/indirector/facts/memory.rb +2 -0
- data/lib/puppet/indirector/facts/network_device.rb +2 -0
- data/lib/puppet/indirector/facts/rest.rb +2 -0
- data/lib/puppet/indirector/facts/store_configs.rb +3 -2
- data/lib/puppet/indirector/facts/yaml.rb +2 -0
- data/lib/puppet/indirector/file_bucket_file/file.rb +33 -27
- data/lib/puppet/indirector/file_bucket_file/rest.rb +6 -3
- data/lib/puppet/indirector/file_bucket_file/selector.rb +2 -1
- data/lib/puppet/indirector/file_content/file.rb +2 -0
- data/lib/puppet/indirector/file_content/file_server.rb +2 -0
- data/lib/puppet/indirector/file_content/rest.rb +3 -1
- data/lib/puppet/indirector/file_content/selector.rb +2 -0
- data/lib/puppet/indirector/file_content.rb +2 -0
- data/lib/puppet/indirector/file_metadata/file.rb +2 -0
- data/lib/puppet/indirector/file_metadata/file_server.rb +2 -0
- data/lib/puppet/indirector/file_metadata/http.rb +4 -2
- data/lib/puppet/indirector/file_metadata/rest.rb +3 -1
- data/lib/puppet/indirector/file_metadata/selector.rb +2 -0
- data/lib/puppet/indirector/file_metadata.rb +2 -0
- data/lib/puppet/indirector/file_server.rb +3 -0
- data/lib/puppet/indirector/generic_http.rb +2 -0
- data/lib/puppet/indirector/hiera.rb +8 -7
- data/lib/puppet/indirector/indirection.rb +50 -41
- data/lib/puppet/indirector/json.rb +9 -6
- data/lib/puppet/indirector/memory.rb +5 -2
- data/lib/puppet/indirector/msgpack.rb +11 -7
- data/lib/puppet/indirector/node/exec.rb +6 -6
- data/lib/puppet/indirector/node/json.rb +2 -1
- data/lib/puppet/indirector/node/memory.rb +2 -0
- data/lib/puppet/indirector/node/msgpack.rb +2 -0
- data/lib/puppet/indirector/node/plain.rb +2 -0
- data/lib/puppet/indirector/node/rest.rb +2 -0
- data/lib/puppet/indirector/node/store_configs.rb +3 -3
- data/lib/puppet/indirector/node/yaml.rb +2 -0
- data/lib/puppet/indirector/none.rb +3 -2
- data/lib/puppet/indirector/plain.rb +2 -0
- data/lib/puppet/indirector/report/json.rb +4 -2
- data/lib/puppet/indirector/report/msgpack.rb +3 -1
- data/lib/puppet/indirector/report/processor.rb +3 -0
- data/lib/puppet/indirector/report/rest.rb +2 -13
- data/lib/puppet/indirector/report/yaml.rb +4 -2
- data/lib/puppet/indirector/request.rb +15 -12
- data/lib/puppet/indirector/resource/ral.rb +10 -10
- data/lib/puppet/indirector/resource/store_configs.rb +3 -1
- data/lib/puppet/indirector/resource/validator.rb +2 -0
- data/lib/puppet/indirector/rest.rb +3 -1
- data/lib/puppet/indirector/store_configs.rb +2 -0
- data/lib/puppet/indirector/terminus.rb +8 -4
- data/lib/puppet/indirector/yaml.rb +7 -5
- data/lib/puppet/indirector.rb +3 -0
- data/lib/puppet/info_service/class_information_service.rb +16 -17
- data/lib/puppet/info_service/plan_information_service.rb +5 -3
- data/lib/puppet/info_service/task_information_service.rb +10 -9
- data/lib/puppet/info_service.rb +1 -0
- data/lib/puppet/interface/action.rb +46 -42
- data/lib/puppet/interface/action_builder.rb +12 -6
- data/lib/puppet/interface/action_manager.rb +9 -6
- data/lib/puppet/interface/documentation.rb +40 -34
- data/lib/puppet/interface/face_collection.rb +18 -14
- data/lib/puppet/interface/option.rb +23 -11
- data/lib/puppet/interface/option_builder.rb +14 -9
- data/lib/puppet/interface/option_manager.rb +12 -10
- data/lib/puppet/interface.rb +9 -8
- data/lib/puppet/loaders.rb +2 -1
- data/lib/puppet/metatype/manager.rb +16 -15
- data/lib/puppet/module/plan.rb +22 -15
- data/lib/puppet/module/task.rb +33 -28
- data/lib/puppet/module.rb +59 -47
- data/lib/puppet/module_tool/applications/application.rb +17 -12
- data/lib/puppet/module_tool/applications/checksummer.rb +3 -3
- data/lib/puppet/module_tool/applications/installer.rb +78 -87
- data/lib/puppet/module_tool/applications/uninstaller.rb +24 -22
- data/lib/puppet/module_tool/applications/unpacker.rb +11 -9
- data/lib/puppet/module_tool/applications/upgrader.rb +66 -60
- data/lib/puppet/module_tool/applications.rb +2 -0
- data/lib/puppet/module_tool/checksums.rb +4 -3
- data/lib/puppet/module_tool/dependency.rb +5 -4
- data/lib/puppet/module_tool/errors/base.rb +3 -1
- data/lib/puppet/module_tool/errors/installer.rb +6 -5
- data/lib/puppet/module_tool/errors/shared.rb +16 -15
- data/lib/puppet/module_tool/errors/uninstaller.rb +3 -2
- data/lib/puppet/module_tool/errors/upgrader.rb +4 -3
- data/lib/puppet/module_tool/errors.rb +2 -0
- data/lib/puppet/module_tool/install_directory.rb +8 -5
- data/lib/puppet/module_tool/installed_modules.rb +5 -2
- data/lib/puppet/module_tool/local_tarball.rb +10 -8
- data/lib/puppet/module_tool/metadata.rb +36 -30
- data/lib/puppet/module_tool/shared_behaviors.rb +61 -43
- data/lib/puppet/module_tool/tar/gnu.rb +12 -8
- data/lib/puppet/module_tool/tar/mini.rb +6 -4
- data/lib/puppet/module_tool/tar.rb +4 -2
- data/lib/puppet/module_tool.rb +11 -11
- data/lib/puppet/network/authconfig.rb +2 -0
- data/lib/puppet/network/authorization.rb +2 -0
- data/lib/puppet/network/client_request.rb +7 -4
- data/lib/puppet/network/format.rb +9 -3
- data/lib/puppet/network/format_handler.rb +9 -7
- data/lib/puppet/network/format_support.rb +8 -7
- data/lib/puppet/network/formats.rb +34 -25
- data/lib/puppet/network/http/api/indirected_routes.rb +38 -45
- data/lib/puppet/network/http/api/indirection_type.rb +2 -1
- data/lib/puppet/network/http/api/master/v3/environments.rb +2 -1
- data/lib/puppet/network/http/api/master/v3.rb +2 -1
- data/lib/puppet/network/http/api/master.rb +2 -0
- data/lib/puppet/network/http/api/server/v3/environments.rb +21 -15
- data/lib/puppet/network/http/api/server/v3.rb +14 -13
- data/lib/puppet/network/http/api/server.rb +2 -0
- data/lib/puppet/network/http/api.rb +20 -18
- data/lib/puppet/network/http/connection.rb +6 -4
- data/lib/puppet/network/http/error.rb +5 -3
- data/lib/puppet/network/http/handler.rb +12 -14
- data/lib/puppet/network/http/issues.rb +2 -0
- data/lib/puppet/network/http/memory_response.rb +3 -1
- data/lib/puppet/network/http/request.rb +22 -10
- data/lib/puppet/network/http/response.rb +2 -0
- data/lib/puppet/network/http/route.rb +14 -11
- data/lib/puppet/network/http.rb +2 -0
- data/lib/puppet/network/http_pool.rb +4 -3
- data/lib/puppet/network/uri.rb +2 -0
- data/lib/puppet/network.rb +2 -0
- data/lib/puppet/node/environment.rb +36 -33
- data/lib/puppet/node/facts.rb +10 -10
- data/lib/puppet/node/server_facts.rb +7 -7
- data/lib/puppet/node.rb +12 -12
- data/lib/puppet/pal/catalog_compiler.rb +2 -3
- data/lib/puppet/pal/compiler.rb +11 -6
- data/lib/puppet/pal/function_signature.rb +5 -3
- data/lib/puppet/pal/json_catalog_encoder.rb +7 -2
- data/lib/puppet/pal/pal_api.rb +2 -0
- data/lib/puppet/pal/pal_impl.rb +103 -108
- data/lib/puppet/pal/plan_signature.rb +4 -2
- data/lib/puppet/pal/script_compiler.rb +4 -2
- data/lib/puppet/pal/task_signature.rb +15 -9
- data/lib/puppet/parameter/boolean.rb +2 -0
- data/lib/puppet/parameter/package_options.rb +3 -1
- data/lib/puppet/parameter/path.rb +7 -3
- data/lib/puppet/parameter/value.rb +5 -3
- data/lib/puppet/parameter/value_collection.rb +17 -16
- data/lib/puppet/parameter.rb +17 -16
- data/lib/puppet/parser/abstract_compiler.rb +2 -3
- data/lib/puppet/parser/ast/block_expression.rb +4 -2
- data/lib/puppet/parser/ast/branch.rb +2 -0
- data/lib/puppet/parser/ast/hostclass.rb +4 -2
- data/lib/puppet/parser/ast/leaf.rb +3 -0
- data/lib/puppet/parser/ast/node.rb +2 -0
- data/lib/puppet/parser/ast/pops_bridge.rb +13 -13
- data/lib/puppet/parser/ast/resource.rb +8 -8
- data/lib/puppet/parser/ast/resource_instance.rb +3 -0
- data/lib/puppet/parser/ast/resourceparam.rb +9 -7
- data/lib/puppet/parser/ast/top_level_construct.rb +2 -0
- data/lib/puppet/parser/ast.rb +16 -15
- data/lib/puppet/parser/catalog_compiler.rb +3 -3
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +4 -2
- data/lib/puppet/parser/compiler/catalog_validator.rb +2 -0
- data/lib/puppet/parser/compiler.rb +45 -44
- data/lib/puppet/parser/e4_parser_adapter.rb +17 -16
- data/lib/puppet/parser/files.rb +8 -6
- data/lib/puppet/parser/functions/assert_type.rb +43 -41
- data/lib/puppet/parser/functions/binary_file.rb +16 -14
- data/lib/puppet/parser/functions/break.rb +29 -27
- data/lib/puppet/parser/functions/contain.rb +3 -1
- data/lib/puppet/parser/functions/create_resources.rb +18 -14
- data/lib/puppet/parser/functions/defined.rb +104 -102
- data/lib/puppet/parser/functions/dig.rb +26 -24
- data/lib/puppet/parser/functions/digest.rb +3 -1
- data/lib/puppet/parser/functions/each.rb +101 -99
- data/lib/puppet/parser/functions/epp.rb +4 -3
- data/lib/puppet/parser/functions/fail.rb +11 -9
- data/lib/puppet/parser/functions/file.rb +16 -14
- data/lib/puppet/parser/functions/filter.rb +57 -55
- data/lib/puppet/parser/functions/find_file.rb +19 -18
- data/lib/puppet/parser/functions/fqdn_rand.rb +25 -23
- data/lib/puppet/parser/functions/generate.rb +23 -21
- data/lib/puppet/parser/functions/hiera.rb +95 -93
- data/lib/puppet/parser/functions/hiera_array.rb +83 -82
- data/lib/puppet/parser/functions/hiera_hash.rb +93 -92
- data/lib/puppet/parser/functions/hiera_include.rb +93 -92
- data/lib/puppet/parser/functions/include.rb +5 -3
- data/lib/puppet/parser/functions/inline_epp.rb +4 -3
- data/lib/puppet/parser/functions/inline_template.rb +15 -13
- data/lib/puppet/parser/functions/lest.rb +36 -34
- data/lib/puppet/parser/functions/lookup.rb +132 -130
- data/lib/puppet/parser/functions/map.rb +54 -52
- data/lib/puppet/parser/functions/match.rb +31 -29
- data/lib/puppet/parser/functions/md5.rb +4 -2
- data/lib/puppet/parser/functions/new.rb +916 -915
- data/lib/puppet/parser/functions/next.rb +36 -34
- data/lib/puppet/parser/functions/realize.rb +13 -11
- data/lib/puppet/parser/functions/reduce.rb +134 -132
- data/lib/puppet/parser/functions/regsubst.rb +8 -5
- data/lib/puppet/parser/functions/require.rb +8 -5
- data/lib/puppet/parser/functions/return.rb +90 -88
- data/lib/puppet/parser/functions/reverse_each.rb +59 -57
- data/lib/puppet/parser/functions/scanf.rb +25 -23
- data/lib/puppet/parser/functions/sha1.rb +4 -2
- data/lib/puppet/parser/functions/sha256.rb +3 -1
- data/lib/puppet/parser/functions/shellquote.rb +2 -0
- data/lib/puppet/parser/functions/slice.rb +27 -25
- data/lib/puppet/parser/functions/split.rb +7 -6
- data/lib/puppet/parser/functions/sprintf.rb +8 -7
- data/lib/puppet/parser/functions/step.rb +62 -60
- data/lib/puppet/parser/functions/strftime.rb +175 -173
- data/lib/puppet/parser/functions/tag.rb +10 -7
- data/lib/puppet/parser/functions/tagged.rb +16 -13
- data/lib/puppet/parser/functions/template.rb +27 -24
- data/lib/puppet/parser/functions/then.rb +54 -52
- data/lib/puppet/parser/functions/type.rb +36 -34
- data/lib/puppet/parser/functions/versioncmp.rb +3 -2
- data/lib/puppet/parser/functions/with.rb +22 -20
- data/lib/puppet/parser/functions.rb +12 -9
- data/lib/puppet/parser/parser_factory.rb +2 -0
- data/lib/puppet/parser/relationship.rb +9 -3
- data/lib/puppet/parser/resource/param.rb +4 -2
- data/lib/puppet/parser/resource.rb +42 -40
- data/lib/puppet/parser/scope.rb +84 -70
- data/lib/puppet/parser/script_compiler.rb +12 -12
- data/lib/puppet/parser/templatewrapper.rb +3 -2
- data/lib/puppet/parser/type_loader.rb +31 -30
- data/lib/puppet/parser.rb +3 -1
- data/lib/puppet/plugins/configuration.rb +2 -0
- data/lib/puppet/plugins/syntax_checkers.rb +2 -1
- data/lib/puppet/plugins.rb +3 -1
- data/lib/puppet/pops/adaptable.rb +5 -3
- data/lib/puppet/pops/adapters.rb +4 -1
- data/lib/puppet/pops/evaluator/access_operator.rb +133 -120
- data/lib/puppet/pops/evaluator/callable_signature.rb +6 -5
- data/lib/puppet/pops/evaluator/closure.rb +272 -277
- data/lib/puppet/pops/evaluator/collector_transformer.rb +18 -15
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +10 -8
- data/lib/puppet/pops/evaluator/collectors/catalog_collector.rb +4 -3
- data/lib/puppet/pops/evaluator/collectors/exported_collector.rb +6 -5
- data/lib/puppet/pops/evaluator/collectors/fixed_set_collector.rb +10 -10
- data/lib/puppet/pops/evaluator/compare_operator.rb +36 -21
- data/lib/puppet/pops/evaluator/deferred_resolver.rb +19 -17
- data/lib/puppet/pops/evaluator/epp_evaluator.rb +19 -18
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +245 -245
- data/lib/puppet/pops/evaluator/external_syntax_support.rb +3 -2
- data/lib/puppet/pops/evaluator/json_strict_literal_evaluator.rb +6 -5
- data/lib/puppet/pops/evaluator/literal_evaluator.rb +5 -5
- data/lib/puppet/pops/evaluator/puppet_proc.rb +6 -3
- data/lib/puppet/pops/evaluator/relationship_operator.rb +14 -11
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +34 -30
- data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +35 -35
- data/lib/puppet/pops/evaluator/runtime3_support.rb +32 -39
- data/lib/puppet/pops/functions/dispatch.rb +7 -7
- data/lib/puppet/pops/functions/dispatcher.rb +8 -7
- data/lib/puppet/pops/functions/function.rb +18 -20
- data/lib/puppet/pops/issue_reporter.rb +25 -22
- data/lib/puppet/pops/issues.rb +10 -5
- data/lib/puppet/pops/label_provider.rb +6 -4
- data/lib/puppet/pops/loader/base_loader.rb +4 -4
- data/lib/puppet/pops/loader/dependency_loader.rb +8 -4
- data/lib/puppet/pops/loader/gem_support.rb +5 -2
- data/lib/puppet/pops/loader/generic_plan_instantiator.rb +2 -0
- data/lib/puppet/pops/loader/loader.rb +8 -8
- data/lib/puppet/pops/loader/loader_paths.rb +42 -41
- data/lib/puppet/pops/loader/module_loaders.rb +45 -49
- data/lib/puppet/pops/loader/predefined_loader.rb +3 -3
- data/lib/puppet/pops/loader/puppet_function_instantiator.rb +6 -2
- data/lib/puppet/pops/loader/puppet_plan_instantiator.rb +6 -2
- data/lib/puppet/pops/loader/puppet_resource_type_impl_instantiator.rb +6 -5
- data/lib/puppet/pops/loader/ruby_data_type_instantiator.rb +5 -1
- data/lib/puppet/pops/loader/ruby_function_instantiator.rb +5 -1
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +18 -8
- data/lib/puppet/pops/loader/runtime3_type_loader.rb +4 -3
- data/lib/puppet/pops/loader/simple_environment_loader.rb +3 -3
- data/lib/puppet/pops/loader/static_loader.rb +29 -27
- data/lib/puppet/pops/loader/task_instantiator.rb +4 -2
- data/lib/puppet/pops/loader/type_definition_instantiator.rb +9 -5
- data/lib/puppet/pops/loader/typed_name.rb +4 -2
- data/lib/puppet/pops/loader/uri_helper.rb +3 -1
- data/lib/puppet/pops/loaders.rb +27 -23
- data/lib/puppet/pops/lookup/configured_data_provider.rb +2 -0
- data/lib/puppet/pops/lookup/context.rb +32 -23
- data/lib/puppet/pops/lookup/data_adapter.rb +2 -0
- data/lib/puppet/pops/lookup/data_dig_function_provider.rb +8 -7
- data/lib/puppet/pops/lookup/data_hash_function_provider.rb +5 -3
- data/lib/puppet/pops/lookup/data_provider.rb +2 -0
- data/lib/puppet/pops/lookup/environment_data_provider.rb +2 -0
- data/lib/puppet/pops/lookup/explainer.rb +47 -45
- data/lib/puppet/pops/lookup/function_provider.rb +8 -6
- data/lib/puppet/pops/lookup/global_data_provider.rb +4 -3
- data/lib/puppet/pops/lookup/hiera_config.rb +208 -160
- data/lib/puppet/pops/lookup/interpolation.rb +21 -10
- data/lib/puppet/pops/lookup/invocation.rb +4 -0
- data/lib/puppet/pops/lookup/key_recorder.rb +6 -3
- data/lib/puppet/pops/lookup/location_resolver.rb +4 -2
- data/lib/puppet/pops/lookup/lookup_adapter.rb +39 -34
- data/lib/puppet/pops/lookup/lookup_key.rb +3 -1
- data/lib/puppet/pops/lookup/lookup_key_function_provider.rb +4 -2
- data/lib/puppet/pops/lookup/module_data_provider.rb +12 -9
- data/lib/puppet/pops/lookup/sub_lookup.rb +7 -3
- data/lib/puppet/pops/lookup.rb +16 -11
- data/lib/puppet/pops/merge_strategy.rb +22 -16
- data/lib/puppet/pops/migration/migration_checker.rb +8 -5
- data/lib/puppet/pops/model/ast.rb +786 -685
- data/lib/puppet/pops/model/ast_transformer.rb +18 -18
- data/lib/puppet/pops/model/factory.rb +33 -31
- data/lib/puppet/pops/model/model_label_provider.rb +5 -2
- data/lib/puppet/pops/model/model_tree_dumper.rb +32 -30
- data/lib/puppet/pops/model/pn_transformer.rb +5 -6
- data/lib/puppet/pops/model/tree_dumper.rb +7 -4
- data/lib/puppet/pops/parser/code_merger.rb +3 -3
- data/lib/puppet/pops/parser/epp_parser.rb +6 -5
- data/lib/puppet/pops/parser/epp_support.rb +10 -9
- data/lib/puppet/pops/parser/evaluating_parser.rb +13 -9
- data/lib/puppet/pops/parser/heredoc_support.rb +14 -14
- data/lib/puppet/pops/parser/interpolation_support.rb +25 -25
- data/lib/puppet/pops/parser/lexer2.rb +74 -62
- data/lib/puppet/pops/parser/lexer_support.rb +57 -57
- data/lib/puppet/pops/parser/locatable.rb +2 -2
- data/lib/puppet/pops/parser/locator.rb +47 -43
- data/lib/puppet/pops/parser/parser_support.rb +22 -21
- data/lib/puppet/pops/parser/pn_parser.rb +10 -9
- data/lib/puppet/pops/parser/slurp_support.rb +41 -40
- data/lib/puppet/pops/patterns.rb +14 -14
- data/lib/puppet/pops/pcore.rb +7 -6
- data/lib/puppet/pops/pn.rb +8 -5
- data/lib/puppet/pops/puppet_stack.rb +3 -1
- data/lib/puppet/pops/resource/param.rb +13 -12
- data/lib/puppet/pops/resource/resource_type_impl.rb +47 -45
- data/lib/puppet/pops/semantic_error.rb +3 -1
- data/lib/puppet/pops/serialization/abstract_reader.rb +6 -4
- data/lib/puppet/pops/serialization/abstract_writer.rb +11 -9
- data/lib/puppet/pops/serialization/deserializer.rb +3 -0
- data/lib/puppet/pops/serialization/extension.rb +8 -0
- data/lib/puppet/pops/serialization/from_data_converter.rb +16 -9
- data/lib/puppet/pops/serialization/instance_reader.rb +2 -0
- data/lib/puppet/pops/serialization/instance_writer.rb +2 -0
- data/lib/puppet/pops/serialization/json.rb +9 -5
- data/lib/puppet/pops/serialization/json_path.rb +3 -1
- data/lib/puppet/pops/serialization/object.rb +6 -3
- data/lib/puppet/pops/serialization/serializer.rb +20 -16
- data/lib/puppet/pops/serialization/time_factory.rb +2 -1
- data/lib/puppet/pops/serialization/to_data_converter.rb +9 -6
- data/lib/puppet/pops/serialization/to_stringified_converter.rb +8 -7
- data/lib/puppet/pops/serialization.rb +10 -8
- data/lib/puppet/pops/time/timespan.rb +33 -21
- data/lib/puppet/pops/time/timestamp.rb +12 -5
- data/lib/puppet/pops/types/annotatable.rb +3 -2
- data/lib/puppet/pops/types/annotation.rb +6 -4
- data/lib/puppet/pops/types/class_loader.rb +17 -15
- data/lib/puppet/pops/types/implementation_registry.rb +4 -1
- data/lib/puppet/pops/types/iterable.rb +24 -14
- data/lib/puppet/pops/types/p_binary_type.rb +6 -6
- data/lib/puppet/pops/types/p_init_type.rb +15 -12
- data/lib/puppet/pops/types/p_meta_type.rb +6 -5
- data/lib/puppet/pops/types/p_object_type.rb +104 -79
- data/lib/puppet/pops/types/p_object_type_extension.rb +15 -14
- data/lib/puppet/pops/types/p_runtime_type.rb +12 -10
- data/lib/puppet/pops/types/p_sem_ver_range_type.rb +3 -2
- data/lib/puppet/pops/types/p_sem_ver_type.rb +8 -8
- data/lib/puppet/pops/types/p_sensitive_type.rb +3 -5
- data/lib/puppet/pops/types/p_timespan_type.rb +7 -5
- data/lib/puppet/pops/types/p_timestamp_type.rb +4 -3
- data/lib/puppet/pops/types/p_type_set_type.rb +51 -44
- data/lib/puppet/pops/types/p_uri_type.rb +41 -33
- data/lib/puppet/pops/types/puppet_object.rb +2 -1
- data/lib/puppet/pops/types/recursion_guard.rb +12 -6
- data/lib/puppet/pops/types/ruby_generator.rb +19 -14
- data/lib/puppet/pops/types/ruby_method.rb +8 -7
- data/lib/puppet/pops/types/string_converter.rb +113 -103
- data/lib/puppet/pops/types/tree_iterators.rb +16 -20
- data/lib/puppet/pops/types/type_acceptor.rb +2 -0
- data/lib/puppet/pops/types/type_asserter.rb +5 -3
- data/lib/puppet/pops/types/type_assertion_error.rb +1 -1
- data/lib/puppet/pops/types/type_calculator.rb +56 -49
- data/lib/puppet/pops/types/type_conversion_error.rb +2 -10
- data/lib/puppet/pops/types/type_factory.rb +25 -16
- data/lib/puppet/pops/types/type_formatter.rb +60 -65
- data/lib/puppet/pops/types/type_mismatch_describer.rb +62 -53
- data/lib/puppet/pops/types/type_parser.rb +124 -117
- data/lib/puppet/pops/types/type_set_reference.rb +3 -0
- data/lib/puppet/pops/types/type_with_members.rb +2 -2
- data/lib/puppet/pops/types/types.rb +267 -249
- data/lib/puppet/pops/utils.rb +43 -45
- data/lib/puppet/pops/validation/checker4_0.rb +65 -58
- data/lib/puppet/pops/validation/tasks_checker.rb +7 -5
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +2 -2
- data/lib/puppet/pops/validation.rb +26 -23
- data/lib/puppet/pops/visitable.rb +2 -0
- data/lib/puppet/pops/visitor.rb +18 -4
- data/lib/puppet/pops.rb +6 -3
- data/lib/puppet/property/boolean.rb +2 -0
- data/lib/puppet/property/ensure.rb +17 -16
- data/lib/puppet/property/keyvalue.rb +15 -14
- data/lib/puppet/property/list.rb +10 -9
- data/lib/puppet/property/ordered_list.rb +6 -5
- data/lib/puppet/property.rb +47 -48
- data/lib/puppet/provider/aix_object.rb +15 -9
- data/lib/puppet/provider/command.rb +2 -0
- data/lib/puppet/provider/confine.rb +2 -0
- data/lib/puppet/provider/exec/posix.rb +4 -1
- data/lib/puppet/provider/exec/shell.rb +2 -0
- data/lib/puppet/provider/exec/windows.rb +6 -4
- data/lib/puppet/provider/exec.rb +6 -4
- data/lib/puppet/provider/file/posix.rb +37 -19
- data/lib/puppet/provider/file/windows.rb +28 -29
- data/lib/puppet/provider/group/aix.rb +4 -2
- data/lib/puppet/provider/group/directoryservice.rb +7 -5
- data/lib/puppet/provider/group/groupadd.rb +16 -10
- data/lib/puppet/provider/group/ldap.rb +3 -0
- data/lib/puppet/provider/group/pw.rb +4 -3
- data/lib/puppet/provider/group/windows_adsi.rb +10 -7
- data/lib/puppet/provider/ldap.rb +5 -3
- data/lib/puppet/provider/nameservice/directoryservice.rb +72 -62
- data/lib/puppet/provider/nameservice/objectadd.rb +4 -4
- data/lib/puppet/provider/nameservice/pw.rb +8 -8
- data/lib/puppet/provider/nameservice.rb +23 -19
- data/lib/puppet/provider/network_device.rb +2 -2
- data/lib/puppet/provider/package/aix.rb +29 -27
- data/lib/puppet/provider/package/appdmg.rb +24 -22
- data/lib/puppet/provider/package/apple.rb +7 -5
- data/lib/puppet/provider/package/apt.rb +28 -25
- data/lib/puppet/provider/package/aptitude.rb +3 -3
- data/lib/puppet/provider/package/aptrpm.rb +18 -14
- data/lib/puppet/provider/package/blastwave.rb +19 -22
- data/lib/puppet/provider/package/dnf.rb +12 -5
- data/lib/puppet/provider/package/dnfmodule.rb +17 -15
- data/lib/puppet/provider/package/dpkg.rb +24 -25
- data/lib/puppet/provider/package/fink.rb +17 -15
- data/lib/puppet/provider/package/freebsd.rb +6 -4
- data/lib/puppet/provider/package/gem.rb +29 -26
- data/lib/puppet/provider/package/hpux.rb +9 -7
- data/lib/puppet/provider/package/macports.rb +6 -4
- data/lib/puppet/provider/package/nim.rb +27 -28
- data/lib/puppet/provider/package/openbsd.rb +37 -34
- data/lib/puppet/provider/package/opkg.rb +17 -14
- data/lib/puppet/provider/package/pacman.rb +39 -42
- data/lib/puppet/provider/package/pip.rb +32 -31
- data/lib/puppet/provider/package/pip2.rb +3 -2
- data/lib/puppet/provider/package/pip3.rb +3 -2
- data/lib/puppet/provider/package/pkg.rb +46 -41
- data/lib/puppet/provider/package/pkgdmg.rb +23 -17
- data/lib/puppet/provider/package/pkgin.rb +14 -13
- data/lib/puppet/provider/package/pkgng.rb +20 -15
- data/lib/puppet/provider/package/pkgutil.rb +40 -41
- data/lib/puppet/provider/package/portage.rb +73 -69
- data/lib/puppet/provider/package/ports.rb +19 -16
- data/lib/puppet/provider/package/portupgrade.rb +48 -55
- data/lib/puppet/provider/package/puppet_gem.rb +6 -15
- data/lib/puppet/provider/package/puppetserver_gem.rb +16 -13
- data/lib/puppet/provider/package/rpm.rb +45 -40
- data/lib/puppet/provider/package/rug.rb +11 -11
- data/lib/puppet/provider/package/sun.rb +28 -24
- data/lib/puppet/provider/package/sunfreeware.rb +3 -1
- data/lib/puppet/provider/package/tdnf.rb +9 -2
- data/lib/puppet/provider/package/up2date.rb +10 -10
- data/lib/puppet/provider/package/urpmi.rb +9 -7
- data/lib/puppet/provider/package/windows/exe_package.rb +11 -9
- data/lib/puppet/provider/package/windows/msi_package.rb +5 -3
- data/lib/puppet/provider/package/windows/package.rb +8 -5
- data/lib/puppet/provider/package/windows.rb +10 -9
- data/lib/puppet/provider/package/xbps.rb +127 -0
- data/lib/puppet/provider/package/yum.rb +65 -62
- data/lib/puppet/provider/package/zypper.rb +29 -29
- data/lib/puppet/provider/package.rb +9 -7
- data/lib/puppet/provider/package_targetable.rb +5 -3
- data/lib/puppet/provider/parsedfile.rb +21 -17
- data/lib/puppet/provider/service/base.rb +19 -23
- data/lib/puppet/provider/service/bsd.rb +7 -5
- data/lib/puppet/provider/service/daemontools.rb +42 -39
- data/lib/puppet/provider/service/debian.rb +12 -10
- data/lib/puppet/provider/service/freebsd.rb +50 -52
- data/lib/puppet/provider/service/gentoo.rb +11 -9
- data/lib/puppet/provider/service/init.rb +33 -31
- data/lib/puppet/provider/service/launchd.rb +38 -31
- data/lib/puppet/provider/service/openbsd.rb +17 -16
- data/lib/puppet/provider/service/openrc.rb +6 -5
- data/lib/puppet/provider/service/openwrt.rb +7 -6
- data/lib/puppet/provider/service/rcng.rb +7 -5
- data/lib/puppet/provider/service/redhat.rb +10 -7
- data/lib/puppet/provider/service/runit.rb +16 -15
- data/lib/puppet/provider/service/service.rb +7 -8
- data/lib/puppet/provider/service/smf.rb +42 -37
- data/lib/puppet/provider/service/src.rb +29 -29
- data/lib/puppet/provider/service/systemd.rb +48 -48
- data/lib/puppet/provider/service/upstart.rb +37 -37
- data/lib/puppet/provider/service/windows.rb +45 -48
- data/lib/puppet/provider/user/aix.rb +24 -20
- data/lib/puppet/provider/user/directoryservice.rb +98 -91
- data/lib/puppet/provider/user/hpux.rb +33 -35
- data/lib/puppet/provider/user/ldap.rb +13 -10
- data/lib/puppet/provider/user/openbsd.rb +24 -22
- data/lib/puppet/provider/user/pw.rb +8 -7
- data/lib/puppet/provider/user/user_role_add.rb +40 -36
- data/lib/puppet/provider/user/useradd.rb +64 -53
- data/lib/puppet/provider/user/windows_adsi.rb +14 -10
- data/lib/puppet/provider.rb +20 -19
- data/lib/puppet/reference/configuration.rb +55 -47
- data/lib/puppet/reference/function.rb +2 -0
- data/lib/puppet/reference/indirection.rb +33 -28
- data/lib/puppet/reference/metaparameter.rb +3 -1
- data/lib/puppet/reference/providers.rb +12 -10
- data/lib/puppet/reference/report.rb +2 -0
- data/lib/puppet/reference/type.rb +7 -5
- data/lib/puppet/relationship.rb +10 -9
- data/lib/puppet/reports/http.rb +3 -2
- data/lib/puppet/reports/log.rb +4 -3
- data/lib/puppet/reports/store.rb +9 -6
- data/lib/puppet/reports.rb +8 -6
- data/lib/puppet/resource/catalog.rb +54 -53
- data/lib/puppet/resource/status.rb +9 -7
- data/lib/puppet/resource/type.rb +65 -41
- data/lib/puppet/resource/type_collection.rb +10 -6
- data/lib/puppet/resource.rb +91 -81
- data/lib/puppet/runtime.rb +2 -0
- data/lib/puppet/scheduler/job.rb +2 -0
- data/lib/puppet/scheduler/scheduler.rb +4 -2
- data/lib/puppet/scheduler/splay_job.rb +16 -3
- data/lib/puppet/scheduler/timer.rb +2 -0
- data/lib/puppet/scheduler.rb +3 -1
- data/lib/puppet/settings/alias_setting.rb +5 -5
- data/lib/puppet/settings/array_setting.rb +2 -1
- data/lib/puppet/settings/autosign_setting.rb +2 -1
- data/lib/puppet/settings/base_setting.rb +23 -18
- data/lib/puppet/settings/boolean_setting.rb +5 -3
- data/lib/puppet/settings/certificate_revocation_setting.rb +2 -1
- data/lib/puppet/settings/config_file.rb +11 -9
- data/lib/puppet/settings/directory_setting.rb +2 -0
- data/lib/puppet/settings/duration_setting.rb +5 -4
- data/lib/puppet/settings/enum_setting.rb +3 -1
- data/lib/puppet/settings/environment_conf.rb +19 -15
- data/lib/puppet/settings/errors.rb +6 -3
- data/lib/puppet/settings/file_or_directory_setting.rb +4 -7
- data/lib/puppet/settings/file_setting.rb +15 -24
- data/lib/puppet/settings/http_extra_headers_setting.rb +2 -1
- data/lib/puppet/settings/ini_file.rb +5 -3
- data/lib/puppet/settings/integer_setting.rb +3 -1
- data/lib/puppet/settings/path_setting.rb +2 -0
- data/lib/puppet/settings/port_setting.rb +4 -2
- data/lib/puppet/settings/priority_setting.rb +13 -12
- data/lib/puppet/settings/server_list_setting.rb +7 -6
- data/lib/puppet/settings/string_setting.rb +2 -0
- data/lib/puppet/settings/symbolic_enum_setting.rb +3 -1
- data/lib/puppet/settings/terminus_setting.rb +2 -0
- data/lib/puppet/settings/ttl_setting.rb +7 -5
- data/lib/puppet/settings/value_translator.rb +9 -7
- data/lib/puppet/settings.rb +171 -163
- data/lib/puppet/ssl/base.rb +9 -6
- data/lib/puppet/ssl/certificate.rb +6 -4
- data/lib/puppet/ssl/certificate_request.rb +34 -38
- data/lib/puppet/ssl/certificate_request_attributes.rb +7 -4
- data/lib/puppet/ssl/certificate_signer.rb +3 -3
- data/lib/puppet/ssl/digest.rb +2 -0
- data/lib/puppet/ssl/error.rb +3 -0
- data/lib/puppet/ssl/oids.rb +11 -9
- data/lib/puppet/ssl/openssl_loader.rb +6 -4
- data/lib/puppet/ssl/ssl_context.rb +2 -0
- data/lib/puppet/ssl/ssl_provider.rb +13 -9
- data/lib/puppet/ssl/state_machine.rb +153 -22
- data/lib/puppet/ssl/verifier.rb +3 -2
- data/lib/puppet/ssl.rb +3 -1
- data/lib/puppet/syntax_checkers/base64.rb +7 -5
- data/lib/puppet/syntax_checkers/epp.rb +7 -6
- data/lib/puppet/syntax_checkers/json.rb +7 -7
- data/lib/puppet/syntax_checkers/pp.rb +7 -6
- data/lib/puppet/syntax_checkers.rb +3 -1
- data/lib/puppet/test/test_helper.rb +30 -44
- data/lib/puppet/thread_local.rb +2 -0
- data/lib/puppet/transaction/additional_resource_generator.rb +12 -7
- data/lib/puppet/transaction/event.rb +8 -5
- data/lib/puppet/transaction/event_manager.rb +12 -11
- data/lib/puppet/transaction/persistence.rb +16 -16
- data/lib/puppet/transaction/report.rb +34 -27
- data/lib/puppet/transaction/resource_harness.rb +17 -9
- data/lib/puppet/transaction.rb +37 -35
- data/lib/puppet/trusted_external.rb +10 -5
- data/lib/puppet/type/component.rb +14 -7
- data/lib/puppet/type/exec.rb +71 -61
- data/lib/puppet/type/file/checksum.rb +6 -2
- data/lib/puppet/type/file/checksum_value.rb +6 -4
- data/lib/puppet/type/file/content.rb +24 -20
- data/lib/puppet/type/file/ctime.rb +5 -4
- data/lib/puppet/type/file/data_sync.rb +9 -6
- data/lib/puppet/type/file/ensure.rb +24 -25
- data/lib/puppet/type/file/group.rb +3 -1
- data/lib/puppet/type/file/mode.rb +14 -11
- data/lib/puppet/type/file/mtime.rb +5 -3
- data/lib/puppet/type/file/owner.rb +3 -2
- data/lib/puppet/type/file/selcontext.rb +24 -23
- data/lib/puppet/type/file/source.rb +31 -30
- data/lib/puppet/type/file/target.rb +23 -25
- data/lib/puppet/type/file/type.rb +3 -2
- data/lib/puppet/type/file.rb +60 -54
- data/lib/puppet/type/filebucket.rb +6 -4
- data/lib/puppet/type/group.rb +14 -13
- data/lib/puppet/type/notify.rb +4 -3
- data/lib/puppet/type/package.rb +47 -45
- data/lib/puppet/type/resources.rb +39 -34
- data/lib/puppet/type/schedule.rb +21 -21
- data/lib/puppet/type/service.rb +19 -18
- data/lib/puppet/type/stage.rb +2 -0
- data/lib/puppet/type/tidy.rb +40 -34
- data/lib/puppet/type/user.rb +62 -56
- data/lib/puppet/type/whit.rb +2 -1
- data/lib/puppet/type.rb +180 -227
- data/lib/puppet/util/at_fork/noop.rb +2 -0
- data/lib/puppet/util/at_fork/solaris.rb +37 -39
- data/lib/puppet/util/at_fork.rb +3 -1
- data/lib/puppet/util/autoload.rb +10 -4
- data/lib/puppet/util/backups.rb +13 -11
- data/lib/puppet/util/character_encoding.rb +9 -6
- data/lib/puppet/util/checksums.rb +16 -12
- data/lib/puppet/util/classgen.rb +18 -23
- data/lib/puppet/util/colors.rb +67 -65
- data/lib/puppet/util/command_line/puppet_option_parser.rb +18 -16
- data/lib/puppet/util/command_line/trollop.rb +695 -673
- data/lib/puppet/util/command_line.rb +7 -5
- data/lib/puppet/util/constant_inflector.rb +4 -3
- data/lib/puppet/util/diff.rb +17 -18
- data/lib/puppet/util/docs.rb +8 -4
- data/lib/puppet/util/errors.rb +13 -11
- data/lib/puppet/util/execution.rb +58 -36
- data/lib/puppet/util/execution_stub.rb +2 -0
- data/lib/puppet/util/feature.rb +9 -9
- data/lib/puppet/util/file_watcher.rb +3 -0
- data/lib/puppet/util/fileparsing.rb +20 -24
- data/lib/puppet/util/filetype.rb +43 -43
- data/lib/puppet/util/http_proxy.rb +2 -0
- data/lib/puppet/util/inifile.rb +13 -18
- data/lib/puppet/util/instance_loader.rb +3 -0
- data/lib/puppet/util/json.rb +2 -0
- data/lib/puppet/util/json_lockfile.rb +4 -1
- data/lib/puppet/util/ldap/connection.rb +21 -19
- data/lib/puppet/util/ldap/generator.rb +2 -0
- data/lib/puppet/util/ldap/manager.rb +20 -21
- data/lib/puppet/util/ldap.rb +2 -0
- data/lib/puppet/util/libuser.rb +3 -2
- data/lib/puppet/util/limits.rb +2 -0
- data/lib/puppet/util/lockfile.rb +8 -8
- data/lib/puppet/util/log/destination.rb +4 -3
- data/lib/puppet/util/log/destinations.rb +20 -20
- data/lib/puppet/util/log.rb +40 -31
- data/lib/puppet/util/logging.rb +34 -30
- data/lib/puppet/util/metaid.rb +2 -1
- data/lib/puppet/util/metric.rb +9 -6
- data/lib/puppet/util/monkey_patches.rb +22 -30
- data/lib/puppet/util/multi_match.rb +9 -5
- data/lib/puppet/util/network_device/base.rb +3 -2
- data/lib/puppet/util/network_device/config.rb +9 -9
- data/lib/puppet/util/network_device/transport/base.rb +1 -1
- data/lib/puppet/util/network_device/transport.rb +2 -0
- data/lib/puppet/util/network_device.rb +2 -0
- data/lib/puppet/util/package/version/debian.rb +33 -31
- data/lib/puppet/util/package/version/gem.rb +3 -0
- data/lib/puppet/util/package/version/pip.rb +14 -8
- data/lib/puppet/util/package/version/range/eq.rb +4 -1
- data/lib/puppet/util/package/version/range/gt.rb +3 -0
- data/lib/puppet/util/package/version/range/gt_eq.rb +3 -0
- data/lib/puppet/util/package/version/range/lt.rb +4 -1
- data/lib/puppet/util/package/version/range/lt_eq.rb +3 -0
- data/lib/puppet/util/package/version/range/min_max.rb +5 -0
- data/lib/puppet/util/package/version/range/simple.rb +2 -0
- data/lib/puppet/util/package/version/range.rb +9 -5
- data/lib/puppet/util/package/version/rpm.rb +7 -5
- data/lib/puppet/util/package.rb +5 -2
- data/lib/puppet/util/pidlock.rb +11 -10
- data/lib/puppet/util/platform.rb +5 -3
- data/lib/puppet/util/plist.rb +16 -16
- data/lib/puppet/util/posix.rb +27 -24
- data/lib/puppet/util/profiler/aggregate.rb +7 -10
- data/lib/puppet/util/profiler/around_profiler.rb +2 -1
- data/lib/puppet/util/profiler/logging.rb +3 -1
- data/lib/puppet/util/profiler/object_counts.rb +2 -0
- data/lib/puppet/util/profiler/wall_clock.rb +6 -5
- data/lib/puppet/util/profiler.rb +2 -0
- data/lib/puppet/util/provider_features.rb +10 -6
- data/lib/puppet/util/psych_support.rb +2 -0
- data/lib/puppet/util/rdoc/code_objects.rb +18 -20
- data/lib/puppet/util/rdoc/generators/puppet_generator.rb +118 -128
- data/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +62 -79
- data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb +32 -29
- data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb +3 -1
- data/lib/puppet/util/rdoc/parser.rb +3 -1
- data/lib/puppet/util/rdoc.rb +10 -9
- data/lib/puppet/util/reference.rb +7 -32
- data/lib/puppet/util/resource_template.rb +3 -1
- data/lib/puppet/util/retry_action.rb +6 -5
- data/lib/puppet/util/rpm_compare.rb +31 -28
- data/lib/puppet/util/rubygems.rb +3 -3
- data/lib/puppet/util/run_mode.rb +46 -4
- data/lib/puppet/util/selinux.rb +72 -38
- data/lib/puppet/util/skip_tags.rb +2 -0
- data/lib/puppet/util/splayer.rb +2 -0
- data/lib/puppet/util/storage.rb +13 -13
- data/lib/puppet/util/suidmanager.rb +38 -37
- data/lib/puppet/util/symbolic_file_mode.rb +76 -76
- data/lib/puppet/util/tag_set.rb +4 -2
- data/lib/puppet/util/tagging.rb +12 -13
- data/lib/puppet/util/terminal.rb +6 -4
- data/lib/puppet/util/user_attr.rb +9 -7
- data/lib/puppet/util/warnings.rb +4 -0
- data/lib/puppet/util/watched_file.rb +4 -1
- data/lib/puppet/util/watcher/change_watcher.rb +2 -0
- data/lib/puppet/util/watcher/periodic_watcher.rb +2 -1
- data/lib/puppet/util/watcher/timer.rb +2 -0
- data/lib/puppet/util/watcher.rb +5 -5
- data/lib/puppet/util/windows/access_control_entry.rb +3 -1
- data/lib/puppet/util/windows/access_control_list.rb +10 -7
- data/lib/puppet/util/windows/adsi.rb +82 -74
- data/lib/puppet/util/windows/com.rb +10 -7
- data/lib/puppet/util/windows/daemon.rb +77 -80
- data/lib/puppet/util/windows/error.rb +7 -5
- data/lib/puppet/util/windows/eventlog.rb +13 -9
- data/lib/puppet/util/windows/file.rb +49 -45
- data/lib/puppet/util/windows/monkey_patches/process.rb +2 -3
- data/lib/puppet/util/windows/principal.rb +37 -34
- data/lib/puppet/util/windows/process.rb +36 -40
- data/lib/puppet/util/windows/registry.rb +60 -58
- data/lib/puppet/util/windows/root_certs.rb +5 -3
- data/lib/puppet/util/windows/security.rb +92 -90
- data/lib/puppet/util/windows/security_descriptor.rb +2 -0
- data/lib/puppet/util/windows/service.rb +24 -12
- data/lib/puppet/util/windows/sid.rb +23 -21
- data/lib/puppet/util/windows/string.rb +2 -0
- data/lib/puppet/util/windows/user.rb +56 -55
- data/lib/puppet/util/windows.rb +8 -1
- data/lib/puppet/util/yaml.rb +3 -1
- data/lib/puppet/util.rb +112 -161
- data/lib/puppet/vendor.rb +3 -1
- data/lib/puppet/version.rb +5 -2
- data/lib/puppet/x509/cert_provider.rb +48 -12
- data/lib/puppet/x509/pem_store.rb +3 -1
- data/lib/puppet/x509.rb +2 -0
- data/lib/puppet.rb +22 -19
- data/lib/puppet_pal.rb +2 -0
- data/lib/puppet_x.rb +2 -0
- data/locales/puppet.pot +9723 -5
- data/man/man5/puppet.conf.5 +121 -912
- data/man/man8/puppet-agent.8 +39 -107
- data/man/man8/puppet-apply.8 +18 -51
- data/man/man8/puppet-catalog.8 +25 -122
- data/man/man8/puppet-config.8 +22 -70
- data/man/man8/puppet-describe.8 +6 -22
- data/man/man8/puppet-device.8 +13 -49
- data/man/man8/puppet-doc.8 +8 -24
- data/man/man8/puppet-epp.8 +23 -168
- data/man/man8/puppet-facts.8 +14 -92
- data/man/man8/puppet-filebucket.8 +22 -54
- data/man/man8/puppet-generate.8 +5 -35
- data/man/man8/puppet-help.8 +8 -29
- data/man/man8/puppet-lookup.8 +25 -61
- data/man/man8/puppet-module.8 +19 -124
- data/man/man8/puppet-node.8 +47 -68
- data/man/man8/puppet-parser.8 +12 -55
- data/man/man8/puppet-plugin.8 +10 -33
- data/man/man8/puppet-report.8 +10 -53
- data/man/man8/puppet-resource.8 +19 -44
- data/man/man8/puppet-script.8 +11 -33
- data/man/man8/puppet-ssl.8 +12 -30
- data/man/man8/puppet.8 +90 -20
- data/tasks/tag.rake +34 -0
- metadata +77 -65
- data/CONTRIBUTING.md +0 -161
- data/examples/hiera/etc/hiera.yaml +0 -15
- data/examples/hiera/etc/hieradb/common.yaml +0 -3
- data/examples/hiera/etc/hieradb/dc1.yaml +0 -6
- data/examples/hiera/etc/hieradb/development.yaml +0 -2
- data/examples/hiera/etc/puppet.conf +0 -3
- data/examples/hiera/modules/data/manifests/common.pp +0 -4
- data/examples/hiera/modules/ntp/manifests/data.pp +0 -4
- data/examples/hiera/modules/ntp/templates/ntp.conf.erb +0 -3
- data/examples/hiera/modules/users/manifests/development.pp +0 -4
- data/lib/puppet/external/pson/common.rb +0 -374
- data/lib/puppet/external/pson/pure/generator.rb +0 -395
- data/lib/puppet/external/pson/pure/parser.rb +0 -308
- data/lib/puppet/external/pson/pure.rb +0 -15
- data/lib/puppet/external/pson/version.rb +0 -8
- data/lib/puppet/module_tool/contents_description.rb +0 -89
- data/tasks/benchmark.rake +0 -180
- data/tasks/ci.rake +0 -24
- data/tasks/generate_ast_model.rake +0 -90
- data/tasks/generate_cert_fixtures.rake +0 -194
- data/tasks/manpages.rake +0 -67
- data/tasks/memwalk.rake +0 -195
- data/tasks/parallel.rake +0 -410
- data/tasks/parser.rake +0 -22
- data/tasks/yard.rake +0 -59
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
require 'tmpdir'
|
|
2
4
|
require 'fileutils'
|
|
3
5
|
|
|
@@ -33,7 +35,7 @@ module Puppet::Test
|
|
|
33
35
|
# Call this method once, as early as possible, such as before loading tests
|
|
34
36
|
# that call Puppet.
|
|
35
37
|
# @return nil
|
|
36
|
-
def self.initialize
|
|
38
|
+
def self.initialize
|
|
37
39
|
# This meta class instance variable is used as a guard to ensure that
|
|
38
40
|
# before_each, and after_each are only called once. This problem occurs
|
|
39
41
|
# when there are more than one puppet test infrastructure orchestrator in use.
|
|
@@ -51,9 +53,9 @@ module Puppet::Test
|
|
|
51
53
|
Dir.mkdir("#{@environmentpath}/production")
|
|
52
54
|
owner = Process.pid
|
|
53
55
|
Puppet.push_context(Puppet.base_context({
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
56
|
+
:environmentpath => @environmentpath,
|
|
57
|
+
:basemodulepath => "",
|
|
58
|
+
}), "Initial for specs")
|
|
57
59
|
Puppet::Parser::Functions.reset
|
|
58
60
|
|
|
59
61
|
ObjectSpace.define_finalizer(Puppet.lookup(:environments), proc {
|
|
@@ -67,21 +69,15 @@ module Puppet::Test
|
|
|
67
69
|
# Call this method once, when beginning a test run--prior to running
|
|
68
70
|
# any individual tests.
|
|
69
71
|
# @return nil
|
|
70
|
-
def self.before_all_tests
|
|
72
|
+
def self.before_all_tests
|
|
71
73
|
# The process environment is a shared, persistent resource.
|
|
72
|
-
|
|
73
|
-
if (!!File::ALT_SEPARATOR)
|
|
74
|
-
mode = :windows
|
|
75
|
-
else
|
|
76
|
-
mode = :posix
|
|
77
|
-
end
|
|
78
|
-
$old_env = Puppet::Util.get_environment(mode)
|
|
74
|
+
$old_env = ENV.to_hash
|
|
79
75
|
end
|
|
80
76
|
|
|
81
77
|
# Call this method once, at the end of a test run, when no more tests
|
|
82
78
|
# will be run.
|
|
83
79
|
# @return nil
|
|
84
|
-
def self.after_all_tests
|
|
80
|
+
def self.after_all_tests
|
|
85
81
|
end
|
|
86
82
|
|
|
87
83
|
# The name of the rollback mark used in the Puppet.context. This is what
|
|
@@ -91,7 +87,7 @@ module Puppet::Test
|
|
|
91
87
|
|
|
92
88
|
# Call this method once per test, prior to execution of each individual test.
|
|
93
89
|
# @return nil
|
|
94
|
-
def self.before_each_test
|
|
90
|
+
def self.before_each_test
|
|
95
91
|
# When using both rspec-puppet and puppet-rspec-helper, there are two packages trying
|
|
96
92
|
# to be helpful and orchestrate the callback sequence. We let only the first win, the
|
|
97
93
|
# second callback results in a no-op.
|
|
@@ -99,6 +95,7 @@ module Puppet::Test
|
|
|
99
95
|
# only once.
|
|
100
96
|
#
|
|
101
97
|
return unless @@reentry_count == 0
|
|
98
|
+
|
|
102
99
|
@@reentry_count = 1
|
|
103
100
|
|
|
104
101
|
Puppet.mark_context(ROLLBACK_MARK)
|
|
@@ -121,10 +118,10 @@ module Puppet::Test
|
|
|
121
118
|
indirections.each do |indirector|
|
|
122
119
|
$saved_indirection_state[indirector.name] = {
|
|
123
120
|
:@terminus_class => indirector.instance_variable_get(:@terminus_class).value,
|
|
124
|
-
:@cache_class
|
|
121
|
+
:@cache_class => indirector.instance_variable_get(:@cache_class).value,
|
|
125
122
|
# dup the termini hash so termini created and registered during
|
|
126
123
|
# the test aren't stored in our saved_indirection_state
|
|
127
|
-
:@termini
|
|
124
|
+
:@termini => indirector.instance_variable_get(:@termini).dup
|
|
128
125
|
}
|
|
129
126
|
end
|
|
130
127
|
|
|
@@ -140,7 +137,8 @@ module Puppet::Test
|
|
|
140
137
|
ssl_context: Puppet::SSL::SSLContext.new(cacerts: []).freeze,
|
|
141
138
|
http_session: proc { Puppet.runtime[:http].create_session }
|
|
142
139
|
},
|
|
143
|
-
"Context for specs"
|
|
140
|
+
"Context for specs"
|
|
141
|
+
)
|
|
144
142
|
|
|
145
143
|
# trigger `require 'facter'`
|
|
146
144
|
Puppet.runtime[:facter]
|
|
@@ -158,10 +156,11 @@ module Puppet::Test
|
|
|
158
156
|
|
|
159
157
|
# Call this method once per test, after execution of each individual test.
|
|
160
158
|
# @return nil
|
|
161
|
-
def self.after_each_test
|
|
159
|
+
def self.after_each_test
|
|
162
160
|
# Ensure that a matching tear down only happens once per completed setup
|
|
163
161
|
# (see #before_each_test).
|
|
164
162
|
return unless @@reentry_count == 1
|
|
163
|
+
|
|
165
164
|
@@reentry_count = 0
|
|
166
165
|
|
|
167
166
|
Puppet.settings.send(:clear_everything_for_tests)
|
|
@@ -173,7 +172,7 @@ module Puppet::Test
|
|
|
173
172
|
Puppet.clear_deprecation_warnings
|
|
174
173
|
|
|
175
174
|
# uncommenting and manipulating this can be useful when tracking down calls to deprecated code
|
|
176
|
-
#Puppet.log_deprecations_to_file("deprecations.txt", /^Puppet::Util.exec/)
|
|
175
|
+
# Puppet.log_deprecations_to_file("deprecations.txt", /^Puppet::Util.exec/)
|
|
177
176
|
|
|
178
177
|
# Restore the indirector configuration. See before hook.
|
|
179
178
|
indirections = Puppet::Indirector::Indirection.send(:class_variable_get, :@@indirections)
|
|
@@ -188,51 +187,38 @@ module Puppet::Test
|
|
|
188
187
|
end
|
|
189
188
|
$saved_indirection_state = nil
|
|
190
189
|
|
|
191
|
-
#
|
|
192
|
-
|
|
193
|
-
mode = :windows
|
|
194
|
-
else
|
|
195
|
-
mode = :posix
|
|
196
|
-
end
|
|
197
|
-
# Restore the global process environment. Can't just assign because this
|
|
198
|
-
# is a magic variable, sadly, and doesn't do that™. It is sufficiently
|
|
199
|
-
# faster to use the compare-then-set model to avoid excessive work that it
|
|
200
|
-
# justifies the complexity. --daniel 2012-03-15
|
|
201
|
-
unless Puppet::Util.get_environment(mode) == $old_env
|
|
202
|
-
Puppet::Util.clear_environment(mode)
|
|
203
|
-
$old_env.each {|k, v| Puppet::Util.set_env(k, v, mode) }
|
|
204
|
-
end
|
|
190
|
+
# Restore the global process environment.
|
|
191
|
+
ENV.replace($old_env)
|
|
205
192
|
|
|
206
193
|
# Clear all environments
|
|
207
194
|
Puppet.lookup(:environments).clear_all
|
|
208
195
|
|
|
209
196
|
# Restore the load_path late, to avoid messing with stubs from the test.
|
|
210
197
|
$LOAD_PATH.clear
|
|
211
|
-
$old_load_path.each {|x| $LOAD_PATH << x }
|
|
198
|
+
$old_load_path.each { |x| $LOAD_PATH << x }
|
|
212
199
|
|
|
213
200
|
Puppet.rollback_context(ROLLBACK_MARK)
|
|
214
201
|
end
|
|
215
202
|
|
|
216
|
-
|
|
217
203
|
#########################################################################################
|
|
218
204
|
# PRIVATE METHODS (not part of the public TestHelper API--do not call these from outside
|
|
219
205
|
# of this class!)
|
|
220
206
|
#########################################################################################
|
|
221
207
|
|
|
222
|
-
def self.app_defaults_for_tests
|
|
208
|
+
def self.app_defaults_for_tests
|
|
223
209
|
{
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
210
|
+
:logdir => "/dev/null",
|
|
211
|
+
:confdir => "/dev/null",
|
|
212
|
+
:publicdir => "/dev/null",
|
|
213
|
+
:codedir => "/dev/null",
|
|
214
|
+
:vardir => "/dev/null",
|
|
215
|
+
:rundir => "/dev/null",
|
|
216
|
+
:hiera_config => "/dev/null",
|
|
231
217
|
}
|
|
232
218
|
end
|
|
233
219
|
private_class_method :app_defaults_for_tests
|
|
234
220
|
|
|
235
|
-
def self.initialize_settings_before_each
|
|
221
|
+
def self.initialize_settings_before_each
|
|
236
222
|
Puppet.settings.preferred_run_mode = "user"
|
|
237
223
|
# Initialize "app defaults" settings to a good set of test values
|
|
238
224
|
Puppet.settings.initialize_app_defaults(app_defaults_for_tests)
|
data/lib/puppet/thread_local.rb
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
# Adds additional resources to the catalog and relationship graph that are
|
|
2
4
|
# generated by existing resources. There are two ways that a resource can
|
|
3
5
|
# generate additional resources, either through the #generate method or the
|
|
@@ -18,6 +20,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
|
|
|
18
20
|
|
|
19
21
|
def generate_additional_resources(resource)
|
|
20
22
|
return unless resource.respond_to?(:generate)
|
|
23
|
+
|
|
21
24
|
begin
|
|
22
25
|
generated = resource.generate
|
|
23
26
|
rescue => detail
|
|
@@ -25,6 +28,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
|
|
|
25
28
|
resource.log_exception(detail, _("Failed to generate additional resources using 'generate': %{detail}") % { detail: detail })
|
|
26
29
|
end
|
|
27
30
|
return unless generated
|
|
31
|
+
|
|
28
32
|
generated = [generated] unless generated.is_a?(Array)
|
|
29
33
|
generated.collect! do |res|
|
|
30
34
|
@catalog.resource(res.ref) || res
|
|
@@ -52,18 +56,19 @@ class Puppet::Transaction::AdditionalResourceGenerator
|
|
|
52
56
|
def eval_generate(resource)
|
|
53
57
|
return false unless resource.respond_to?(:eval_generate)
|
|
54
58
|
raise Puppet::DevError, _("Depthfirst resources are not supported by eval_generate") if resource.depthfirst?
|
|
59
|
+
|
|
55
60
|
begin
|
|
56
61
|
generated = replace_duplicates_with_catalog_resources(resource.eval_generate)
|
|
57
62
|
return false if generated.empty?
|
|
58
63
|
rescue => detail
|
|
59
64
|
@resources_failed_to_generate = true
|
|
60
|
-
#TRANSLATORS eval_generate is a method name and should be left untranslated
|
|
65
|
+
# TRANSLATORS eval_generate is a method name and should be left untranslated
|
|
61
66
|
resource.log_exception(detail, _("Failed to generate additional resources using 'eval_generate': %{detail}") % { detail: detail })
|
|
62
67
|
return false
|
|
63
68
|
end
|
|
64
69
|
add_resources(generated, resource)
|
|
65
70
|
|
|
66
|
-
made =
|
|
71
|
+
made = generated.map(&:name).zip(generated).to_h
|
|
67
72
|
contain_generated_resources_in(resource, made)
|
|
68
73
|
connect_resources_to_ancestors(resource, made)
|
|
69
74
|
|
|
@@ -129,7 +134,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
|
|
|
129
134
|
end
|
|
130
135
|
end
|
|
131
136
|
|
|
132
|
-
def add_resource(res, parent_resource, priority=nil)
|
|
137
|
+
def add_resource(res, parent_resource, priority = nil)
|
|
133
138
|
if @catalog.resource(res.ref).nil?
|
|
134
139
|
res.merge_tags_from(parent_resource)
|
|
135
140
|
if parent_resource.depthfirst?
|
|
@@ -152,7 +157,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
|
|
|
152
157
|
# add correct edge for depth- or breadth- first traversal of
|
|
153
158
|
# generated resource. Skip generating the edge if there is already
|
|
154
159
|
# some sort of edge between the two resources.
|
|
155
|
-
def add_generated_directed_dependency(parent, child, label=nil)
|
|
160
|
+
def add_generated_directed_dependency(parent, child, label = nil)
|
|
156
161
|
if parent.depthfirst?
|
|
157
162
|
source = child
|
|
158
163
|
target = parent
|
|
@@ -186,7 +191,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
|
|
|
186
191
|
parent_contains || child_contains
|
|
187
192
|
}
|
|
188
193
|
|
|
189
|
-
|
|
194
|
+
unless edge_exists
|
|
190
195
|
# We *cannot* use target.to_resource here!
|
|
191
196
|
#
|
|
192
197
|
# For reasons that are beyond my (and, perhaps, human)
|
|
@@ -208,13 +213,13 @@ class Puppet::Transaction::AdditionalResourceGenerator
|
|
|
208
213
|
|
|
209
214
|
# Copy an important relationships from the parent to the newly-generated
|
|
210
215
|
# child resource.
|
|
211
|
-
def add_conditional_directed_dependency(parent, child, label=nil)
|
|
216
|
+
def add_conditional_directed_dependency(parent, child, label = nil)
|
|
212
217
|
@relationship_graph.add_vertex(child)
|
|
213
218
|
edge = parent.depthfirst? ? [child, parent] : [parent, child]
|
|
214
219
|
if @relationship_graph.edge?(*edge.reverse)
|
|
215
220
|
parent.debug "Skipping automatic relationship to #{child}"
|
|
216
221
|
else
|
|
217
|
-
@relationship_graph.add_relationship(edge[0],edge[1],label)
|
|
222
|
+
@relationship_graph.add_relationship(edge[0], edge[1], label)
|
|
218
223
|
end
|
|
219
224
|
end
|
|
220
225
|
end
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
require_relative '../../puppet/transaction'
|
|
2
4
|
require_relative '../../puppet/util/tagging'
|
|
3
5
|
require_relative '../../puppet/util/logging'
|
|
@@ -14,10 +16,10 @@ class Puppet::Transaction::Event
|
|
|
14
16
|
attr_accessor :time
|
|
15
17
|
attr_reader :default_log_level
|
|
16
18
|
|
|
17
|
-
EVENT_STATUSES = %w
|
|
19
|
+
EVENT_STATUSES = %w[noop success failure audit]
|
|
18
20
|
|
|
19
21
|
def self.from_data_hash(data)
|
|
20
|
-
obj =
|
|
22
|
+
obj = allocate
|
|
21
23
|
obj.initialize_from_hash(data)
|
|
22
24
|
obj
|
|
23
25
|
end
|
|
@@ -67,9 +69,9 @@ class Puppet::Transaction::Event
|
|
|
67
69
|
|
|
68
70
|
def initialize_from_hash(data)
|
|
69
71
|
data = Puppet::Pops::Serialization::FromDataConverter.convert(data, {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
72
|
+
:allow_unresolved => true,
|
|
73
|
+
:loader => Puppet::Pops::Loaders.static_loader
|
|
74
|
+
})
|
|
73
75
|
@audited = data['audited']
|
|
74
76
|
@property = data['property']
|
|
75
77
|
@previous_value = data['previous_value']
|
|
@@ -122,6 +124,7 @@ class Puppet::Transaction::Event
|
|
|
122
124
|
|
|
123
125
|
def status=(value)
|
|
124
126
|
raise ArgumentError, _("Event status can only be %{statuses}") % { statuses: EVENT_STATUSES.join(', ') } unless EVENT_STATUSES.include?(value)
|
|
127
|
+
|
|
125
128
|
@status = value
|
|
126
129
|
end
|
|
127
130
|
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
require_relative '../../puppet/transaction'
|
|
2
4
|
|
|
3
5
|
# This class stores, routes, and responds to events generated while evaluating
|
|
@@ -5,7 +7,6 @@ require_relative '../../puppet/transaction'
|
|
|
5
7
|
#
|
|
6
8
|
# @api private
|
|
7
9
|
class Puppet::Transaction::EventManager
|
|
8
|
-
|
|
9
10
|
# @!attribute [r] transaction
|
|
10
11
|
# @return [Puppet::Transaction] The transaction associated with this event manager.
|
|
11
12
|
attr_reader :transaction
|
|
@@ -49,15 +50,14 @@ class Puppet::Transaction::EventManager
|
|
|
49
50
|
# @param events [Array<Puppet::Transaction::Event>] All events generated by this resource
|
|
50
51
|
# @return [void]
|
|
51
52
|
def queue_events(resource, events)
|
|
52
|
-
|
|
53
|
+
# @events += events
|
|
53
54
|
|
|
54
55
|
# Do some basic normalization so we're not doing so many
|
|
55
56
|
# graph queries for large sets of events.
|
|
56
|
-
events.
|
|
57
|
+
events.each_with_object({}) do |event, collection|
|
|
57
58
|
collection[event.name] ||= []
|
|
58
59
|
collection[event.name] << event
|
|
59
|
-
|
|
60
|
-
end.collect do |name, list|
|
|
60
|
+
end.collect do |_name, list|
|
|
61
61
|
# It doesn't matter which event we use - they all have the same source
|
|
62
62
|
# and name here.
|
|
63
63
|
event = list[0]
|
|
@@ -76,10 +76,10 @@ class Puppet::Transaction::EventManager
|
|
|
76
76
|
end
|
|
77
77
|
@events << event if received
|
|
78
78
|
|
|
79
|
-
queue_events_for_resource(resource, resource, :refresh, [event]) if resource.self_refresh? and !
|
|
79
|
+
queue_events_for_resource(resource, resource, :refresh, [event]) if resource.self_refresh? and !resource.deleting?
|
|
80
80
|
end
|
|
81
81
|
|
|
82
|
-
dequeue_events_for_resource(resource, :refresh) if events.detect
|
|
82
|
+
dequeue_events_for_resource(resource, :refresh) if events.detect(&:invalidate_refreshes)
|
|
83
83
|
end
|
|
84
84
|
|
|
85
85
|
def dequeue_all_events_for_resource(target)
|
|
@@ -117,6 +117,7 @@ class Puppet::Transaction::EventManager
|
|
|
117
117
|
def queued_events(resource)
|
|
118
118
|
callbacks = @event_queues[resource]
|
|
119
119
|
return unless callbacks
|
|
120
|
+
|
|
120
121
|
callbacks.each do |callback, events|
|
|
121
122
|
yield callback, events unless events.empty?
|
|
122
123
|
end
|
|
@@ -141,27 +142,27 @@ class Puppet::Transaction::EventManager
|
|
|
141
142
|
# associated with this callback and resource.
|
|
142
143
|
# @return [true, false] Whether the callback was successfully run.
|
|
143
144
|
def process_callback(resource, callback, events)
|
|
144
|
-
|
|
145
|
+
unless process_callback?(resource, events)
|
|
145
146
|
process_noop_events(resource, callback, events)
|
|
146
147
|
return false
|
|
147
148
|
end
|
|
148
149
|
|
|
149
150
|
resource.send(callback)
|
|
150
151
|
|
|
151
|
-
|
|
152
|
+
unless resource.is_a?(Puppet::Type.type(:whit))
|
|
152
153
|
message = n_("Triggered '%{callback}' from %{count} event", "Triggered '%{callback}' from %{count} events", events.length) % { count: events.length, callback: callback }
|
|
153
154
|
resource.notice message
|
|
154
155
|
add_callback_status_event(resource, callback, message, "success")
|
|
155
156
|
end
|
|
156
157
|
|
|
157
|
-
|
|
158
|
+
true
|
|
158
159
|
rescue => detail
|
|
159
160
|
resource_error_message = _("Failed to call %{callback}: %{detail}") % { callback: callback, detail: detail }
|
|
160
161
|
resource.err(resource_error_message)
|
|
161
162
|
transaction.resource_status(resource).failed_to_restart = true
|
|
162
163
|
transaction.resource_status(resource).fail_with_event(resource_error_message)
|
|
163
164
|
resource.log_exception(detail)
|
|
164
|
-
|
|
165
|
+
false
|
|
165
166
|
end
|
|
166
167
|
|
|
167
168
|
def add_callback_status_event(resource, callback, message, status)
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
require 'yaml'
|
|
2
4
|
require_relative '../../puppet/util/yaml'
|
|
3
5
|
|
|
@@ -6,7 +8,6 @@ require_relative '../../puppet/util/yaml'
|
|
|
6
8
|
# as calculating corrective_change).
|
|
7
9
|
# @api private
|
|
8
10
|
class Puppet::Transaction::Persistence
|
|
9
|
-
|
|
10
11
|
def self.allowed_classes
|
|
11
12
|
@allowed_classes ||= [
|
|
12
13
|
Symbol,
|
|
@@ -20,7 +21,7 @@ class Puppet::Transaction::Persistence
|
|
|
20
21
|
Puppet::Pops::Time::Timestamp,
|
|
21
22
|
Puppet::Pops::Time::TimeData,
|
|
22
23
|
Puppet::Pops::Time::Timespan,
|
|
23
|
-
Puppet::Pops::Types::PBinaryType::Binary
|
|
24
|
+
Puppet::Pops::Types::PBinaryType::Binary
|
|
24
25
|
# Puppet::Pops::Types::PSensitiveType::Sensitive values are excluded from
|
|
25
26
|
# the persistence store, ignore it.
|
|
26
27
|
].freeze
|
|
@@ -28,7 +29,7 @@ class Puppet::Transaction::Persistence
|
|
|
28
29
|
|
|
29
30
|
def initialize
|
|
30
31
|
@old_data = {}
|
|
31
|
-
@new_data = {"resources" => {}}
|
|
32
|
+
@new_data = { "resources" => {} }
|
|
32
33
|
end
|
|
33
34
|
|
|
34
35
|
# Obtain the full raw data from the persistence store.
|
|
@@ -63,7 +64,7 @@ class Puppet::Transaction::Persistence
|
|
|
63
64
|
def copy_skipped(resource_name)
|
|
64
65
|
@old_data["resources"] ||= {}
|
|
65
66
|
old_value = @old_data["resources"][resource_name]
|
|
66
|
-
|
|
67
|
+
unless old_value.nil?
|
|
67
68
|
@new_data["resources"][resource_name] = old_value
|
|
68
69
|
end
|
|
69
70
|
end
|
|
@@ -74,6 +75,7 @@ class Puppet::Transaction::Persistence
|
|
|
74
75
|
unless Puppet::FileSystem.exist?(filename)
|
|
75
76
|
return
|
|
76
77
|
end
|
|
78
|
+
|
|
77
79
|
unless File.file?(filename)
|
|
78
80
|
Puppet.warning(_("Transaction store file %{filename} is not a file, ignoring") % { filename: filename })
|
|
79
81
|
return
|
|
@@ -81,20 +83,18 @@ class Puppet::Transaction::Persistence
|
|
|
81
83
|
|
|
82
84
|
result = nil
|
|
83
85
|
Puppet::Util.benchmark(:debug, _("Loaded transaction store file in %{seconds} seconds")) do
|
|
86
|
+
result = Puppet::Util::Yaml.safe_load_file(filename, self.class.allowed_classes)
|
|
87
|
+
rescue Puppet::Util::Yaml::YamlLoadError => detail
|
|
88
|
+
Puppet.log_exception(detail, _("Transaction store file %{filename} is corrupt (%{detail}); replacing") % { filename: filename, detail: detail })
|
|
89
|
+
|
|
84
90
|
begin
|
|
85
|
-
|
|
86
|
-
rescue
|
|
87
|
-
Puppet.log_exception(detail, _("
|
|
88
|
-
|
|
89
|
-
begin
|
|
90
|
-
File.rename(filename, filename + ".bad")
|
|
91
|
-
rescue => detail
|
|
92
|
-
Puppet.log_exception(detail, _("Unable to rename corrupt transaction store file: %{detail}") % { detail: detail })
|
|
93
|
-
raise Puppet::Error, _("Could not rename corrupt transaction store file %{filename}; remove manually") % { filename: filename }, detail.backtrace
|
|
94
|
-
end
|
|
95
|
-
|
|
96
|
-
result = {}
|
|
91
|
+
File.rename(filename, filename + ".bad")
|
|
92
|
+
rescue => detail
|
|
93
|
+
Puppet.log_exception(detail, _("Unable to rename corrupt transaction store file: %{detail}") % { detail: detail })
|
|
94
|
+
raise Puppet::Error, _("Could not rename corrupt transaction store file %{filename}; remove manually") % { filename: filename }, detail.backtrace
|
|
97
95
|
end
|
|
96
|
+
|
|
97
|
+
result = {}
|
|
98
98
|
end
|
|
99
99
|
|
|
100
100
|
unless result.is_a?(Hash)
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
1
3
|
require_relative '../../puppet'
|
|
2
4
|
require_relative '../../puppet/indirector'
|
|
3
5
|
|
|
@@ -139,10 +141,10 @@ class Puppet::Transaction::Report
|
|
|
139
141
|
#
|
|
140
142
|
attr_accessor :transaction_completed
|
|
141
143
|
|
|
142
|
-
TOTAL = "total"
|
|
144
|
+
TOTAL = "total"
|
|
143
145
|
|
|
144
146
|
def self.from_data_hash(data)
|
|
145
|
-
obj =
|
|
147
|
+
obj = allocate
|
|
146
148
|
obj.initialize_from_hash(data)
|
|
147
149
|
obj
|
|
148
150
|
end
|
|
@@ -204,7 +206,7 @@ class Puppet::Transaction::Report
|
|
|
204
206
|
|
|
205
207
|
# @api private
|
|
206
208
|
def prune_internal_data
|
|
207
|
-
resource_statuses.delete_if {|
|
|
209
|
+
resource_statuses.delete_if { |_name, res| res.resource_type == 'Whit' }
|
|
208
210
|
end
|
|
209
211
|
|
|
210
212
|
# @api private
|
|
@@ -215,14 +217,14 @@ class Puppet::Transaction::Report
|
|
|
215
217
|
resource_metrics = add_metric(:resources, calculate_resource_metrics)
|
|
216
218
|
add_metric(:time, calculate_time_metrics)
|
|
217
219
|
change_metric = calculate_change_metric
|
|
218
|
-
add_metric(:changes, {TOTAL => change_metric})
|
|
220
|
+
add_metric(:changes, { TOTAL => change_metric })
|
|
219
221
|
add_metric(:events, calculate_event_metrics)
|
|
220
222
|
@status = compute_status(resource_metrics, change_metric)
|
|
221
|
-
@noop_pending = @resource_statuses.any? { |
|
|
223
|
+
@noop_pending = @resource_statuses.any? { |_name, res| has_noop_events?(res) }
|
|
222
224
|
end
|
|
223
225
|
|
|
224
226
|
# @api private
|
|
225
|
-
def initialize(configuration_version=nil, environment=nil, transaction_uuid=nil, job_id=nil, start_time=Time.now)
|
|
227
|
+
def initialize(configuration_version = nil, environment = nil, transaction_uuid = nil, job_id = nil, start_time = Time.now)
|
|
226
228
|
@metrics = {}
|
|
227
229
|
@logs = []
|
|
228
230
|
@resource_statuses = {}
|
|
@@ -300,12 +302,16 @@ class Puppet::Transaction::Report
|
|
|
300
302
|
|
|
301
303
|
@resource_statuses = {}
|
|
302
304
|
data['resource_statuses'].map do |key, rs|
|
|
303
|
-
@resource_statuses[key] =
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
305
|
+
@resource_statuses[key] =
|
|
306
|
+
if rs == Puppet::Resource::EMPTY_HASH
|
|
307
|
+
nil
|
|
308
|
+
elsif rs.is_a?(Puppet::Resource::Status)
|
|
309
|
+
# Older versions contain tags that causes Psych to create instances
|
|
310
|
+
# directly
|
|
311
|
+
rs
|
|
312
|
+
else
|
|
313
|
+
Puppet::Resource::Status.from_data_hash(rs)
|
|
314
|
+
end
|
|
309
315
|
end
|
|
310
316
|
end
|
|
311
317
|
|
|
@@ -322,7 +328,7 @@ class Puppet::Transaction::Report
|
|
|
322
328
|
else
|
|
323
329
|
@resource_statuses
|
|
324
330
|
end
|
|
325
|
-
|
|
331
|
+
resource_statuses.transform_values { |rs| rs.nil? ? nil : rs.to_data_hash }
|
|
326
332
|
end
|
|
327
333
|
|
|
328
334
|
def to_data_hash
|
|
@@ -338,8 +344,8 @@ class Puppet::Transaction::Report
|
|
|
338
344
|
'noop' => @noop,
|
|
339
345
|
'noop_pending' => @noop_pending,
|
|
340
346
|
'environment' => @environment,
|
|
341
|
-
'logs' => @logs.map
|
|
342
|
-
'metrics' =>
|
|
347
|
+
'logs' => @logs.map(&:to_data_hash),
|
|
348
|
+
'metrics' => @metrics.transform_values(&:to_data_hash),
|
|
343
349
|
'resource_statuses' => calculate_resource_statuses,
|
|
344
350
|
'corrective_change' => @corrective_change,
|
|
345
351
|
}
|
|
@@ -368,11 +374,11 @@ class Puppet::Transaction::Report
|
|
|
368
374
|
def summary
|
|
369
375
|
report = raw_summary
|
|
370
376
|
|
|
371
|
-
ret =
|
|
377
|
+
ret = ''.dup
|
|
372
378
|
report.keys.sort_by(&:to_s).each do |key|
|
|
373
379
|
ret += "#{Puppet::Util::Metric.labelize(key)}:\n"
|
|
374
380
|
|
|
375
|
-
report[key].keys.sort { |a,b|
|
|
381
|
+
report[key].keys.sort { |a, b|
|
|
376
382
|
# sort by label
|
|
377
383
|
if a == TOTAL
|
|
378
384
|
1
|
|
@@ -384,6 +390,7 @@ class Puppet::Transaction::Report
|
|
|
384
390
|
}.each do |label|
|
|
385
391
|
value = report[key][label]
|
|
386
392
|
next if value == 0
|
|
393
|
+
|
|
387
394
|
value = "%0.2f" % value if value.is_a?(Float)
|
|
388
395
|
ret += " %15s %s\n" % [Puppet::Util::Metric.labelize(label) + ":", value]
|
|
389
396
|
end
|
|
@@ -408,10 +415,10 @@ class Puppet::Transaction::Report
|
|
|
408
415
|
}
|
|
409
416
|
}
|
|
410
417
|
|
|
411
|
-
@metrics.each do |
|
|
418
|
+
@metrics.each do |_name, metric|
|
|
412
419
|
key = metric.name.to_s
|
|
413
420
|
report[key] = {}
|
|
414
|
-
metric.values.each do |metric_name,
|
|
421
|
+
metric.values.each do |metric_name, _label, value|
|
|
415
422
|
report[key][metric_name.to_s] = value
|
|
416
423
|
end
|
|
417
424
|
report[key][TOTAL] = 0 unless key == "time" or report[key].include?(TOTAL)
|
|
@@ -433,8 +440,8 @@ class Puppet::Transaction::Report
|
|
|
433
440
|
def exit_status
|
|
434
441
|
status = 0
|
|
435
442
|
if @metrics["changes"] && @metrics["changes"][TOTAL] &&
|
|
436
|
-
|
|
437
|
-
|
|
443
|
+
@metrics["resources"] && @metrics["resources"]["failed"] &&
|
|
444
|
+
@metrics["resources"]["failed_to_restart"]
|
|
438
445
|
status |= 2 if @metrics["changes"][TOTAL] > 0
|
|
439
446
|
status |= 4 if @metrics["resources"]["failed"] > 0
|
|
440
447
|
status |= 4 if @metrics["resources"]["failed_to_restart"] > 0
|
|
@@ -448,19 +455,19 @@ class Puppet::Transaction::Report
|
|
|
448
455
|
|
|
449
456
|
# Mark the report as corrective, if there are any resource_status marked corrective.
|
|
450
457
|
def calculate_report_corrective_change
|
|
451
|
-
@corrective_change = resource_statuses.any? do |
|
|
458
|
+
@corrective_change = resource_statuses.any? do |_name, status|
|
|
452
459
|
status.corrective_change
|
|
453
460
|
end
|
|
454
461
|
end
|
|
455
462
|
|
|
456
463
|
def calculate_change_metric
|
|
457
|
-
resource_statuses.map { |
|
|
464
|
+
resource_statuses.map { |_name, status| status.change_count || 0 }.inject(0) { |a, b| a + b }
|
|
458
465
|
end
|
|
459
466
|
|
|
460
467
|
def calculate_event_metrics
|
|
461
468
|
metrics = Hash.new(0)
|
|
462
|
-
%w
|
|
463
|
-
resource_statuses.each do |
|
|
469
|
+
%w[total failure success].each { |m| metrics[m] = 0 }
|
|
470
|
+
resource_statuses.each do |_name, status|
|
|
464
471
|
metrics[TOTAL] += status.events.length
|
|
465
472
|
status.events.each do |event|
|
|
466
473
|
metrics[event.status] += 1
|
|
@@ -480,7 +487,7 @@ class Puppet::Transaction::Report
|
|
|
480
487
|
metrics[state.to_s] = 0
|
|
481
488
|
end
|
|
482
489
|
|
|
483
|
-
resource_statuses.each do |
|
|
490
|
+
resource_statuses.each do |_name, status|
|
|
484
491
|
Puppet::Resource::Status::STATES.each do |state|
|
|
485
492
|
metrics[state.to_s] += 1 if status.send(state)
|
|
486
493
|
end
|
|
@@ -491,7 +498,7 @@ class Puppet::Transaction::Report
|
|
|
491
498
|
|
|
492
499
|
def calculate_time_metrics
|
|
493
500
|
metrics = Hash.new(0)
|
|
494
|
-
resource_statuses.each do |
|
|
501
|
+
resource_statuses.each do |_name, status|
|
|
495
502
|
metrics[status.resource_type.downcase] += status.evaluation_time if status.evaluation_time
|
|
496
503
|
end
|
|
497
504
|
|