puppet 5.4.0-x64-mingw32 → 5.5.0-x64-mingw32
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- data/Gemfile +3 -3
- data/MAINTAINERS +0 -19
- data/README.md +5 -5
- data/Rakefile +26 -0
- data/conf/auth.conf +5 -0
- data/ext/project_data.yaml +1 -0
- data/ext/regexp_nodes/regexp_nodes.rb +3 -4
- data/lib/puppet/application/apply.rb +1 -1
- data/lib/puppet/application/cert.rb +3 -1
- data/lib/puppet/application/device.rb +100 -13
- data/lib/puppet/application/facts.rb +5 -0
- data/lib/puppet/application/lookup.rb +12 -2
- data/lib/puppet/configurer.rb +37 -17
- data/lib/puppet/confine.rb +4 -1
- data/lib/puppet/datatypes.rb +1 -1
- data/lib/puppet/environments.rb +1 -1
- data/lib/puppet/error.rb +6 -3
- data/lib/puppet/external/dot.rb +0 -7
- data/lib/puppet/external/nagios/parser.rb +1 -1
- data/lib/puppet/face/config.rb +92 -10
- data/lib/puppet/face/epp.rb +31 -6
- data/lib/puppet/face/facts.rb +49 -0
- data/lib/puppet/face/help.rb +33 -35
- data/lib/puppet/face/help/action.erb +1 -1
- data/lib/puppet/face/help/face.erb +1 -1
- data/lib/puppet/face/man.rb +55 -12
- data/lib/puppet/face/parser.rb +30 -3
- data/lib/puppet/file_bucket/file.rb +0 -2
- data/lib/puppet/file_serving/base.rb +10 -10
- data/lib/puppet/forge.rb +3 -3
- data/lib/puppet/forge/errors.rb +3 -3
- data/lib/puppet/functions.rb +1 -3
- data/lib/puppet/functions/alert.rb +1 -1
- data/lib/puppet/functions/all.rb +6 -6
- data/lib/puppet/functions/annotate.rb +10 -10
- data/lib/puppet/functions/any.rb +6 -6
- data/lib/puppet/functions/assert_type.rb +4 -4
- data/lib/puppet/functions/binary_file.rb +14 -2
- data/lib/puppet/functions/break.rb +31 -2
- data/lib/puppet/functions/call.rb +4 -4
- data/lib/puppet/functions/contain.rb +19 -3
- data/lib/puppet/functions/convert_to.rb +6 -5
- data/lib/puppet/functions/crit.rb +1 -1
- data/lib/puppet/functions/debug.rb +1 -1
- data/lib/puppet/functions/defined.rb +11 -9
- data/lib/puppet/functions/dig.rb +26 -2
- data/lib/puppet/functions/each.rb +8 -8
- data/lib/puppet/functions/emerg.rb +1 -1
- data/lib/puppet/functions/empty.rb +79 -0
- data/lib/puppet/functions/err.rb +1 -1
- data/lib/puppet/functions/eyaml_lookup_key.rb +3 -1
- data/lib/puppet/functions/filter.rb +7 -7
- data/lib/puppet/functions/find_file.rb +15 -1
- data/lib/puppet/functions/flatten.rb +64 -0
- data/lib/puppet/functions/hiera.rb +6 -6
- data/lib/puppet/functions/hiera_array.rb +6 -6
- data/lib/puppet/functions/hiera_hash.rb +6 -6
- data/lib/puppet/functions/hiera_include.rb +8 -8
- data/lib/puppet/functions/include.rb +28 -2
- data/lib/puppet/functions/info.rb +1 -1
- data/lib/puppet/functions/inline_epp.rb +2 -2
- data/lib/puppet/functions/join.rb +56 -0
- data/lib/puppet/functions/json_data.rb +2 -2
- data/lib/puppet/functions/keys.rb +25 -0
- data/lib/puppet/functions/length.rb +44 -0
- data/lib/puppet/functions/lest.rb +39 -1
- data/lib/puppet/functions/lookup.rb +2 -1
- data/lib/puppet/functions/map.rb +10 -9
- data/lib/puppet/functions/match.rb +6 -6
- data/lib/puppet/functions/new.rb +995 -2
- data/lib/puppet/functions/next.rb +1 -1
- data/lib/puppet/functions/notice.rb +1 -1
- data/lib/puppet/functions/reduce.rb +6 -6
- data/lib/puppet/functions/regsubst.rb +9 -3
- data/lib/puppet/functions/require.rb +36 -2
- data/lib/puppet/functions/return.rb +1 -1
- data/lib/puppet/functions/reverse_each.rb +71 -2
- data/lib/puppet/functions/slice.rb +23 -9
- data/lib/puppet/functions/split.rb +12 -10
- data/lib/puppet/functions/step.rb +73 -1
- data/lib/puppet/functions/strftime.rb +176 -2
- data/lib/puppet/functions/then.rb +65 -2
- data/lib/puppet/functions/tree_each.rb +19 -19
- data/lib/puppet/functions/type.rb +42 -1
- data/lib/puppet/functions/unique.rb +13 -13
- data/lib/puppet/functions/unwrap.rb +8 -4
- data/lib/puppet/functions/values.rb +25 -0
- data/lib/puppet/functions/versioncmp.rb +1 -1
- data/lib/puppet/functions/warning.rb +1 -1
- data/lib/puppet/functions/with.rb +6 -4
- data/lib/puppet/functions/yaml_data.rb +3 -1
- data/lib/puppet/indirector/certificate_status/file.rb +1 -1
- data/lib/puppet/indirector/facts/facter.rb +1 -3
- data/lib/puppet/indirector/facts/rest.rb +21 -0
- data/lib/puppet/indirector/facts/yaml.rb +0 -4
- data/lib/puppet/indirector/rest.rb +2 -2
- data/lib/puppet/module.rb +3 -3
- data/lib/puppet/module/task.rb +2 -3
- data/lib/puppet/module_tool/applications/application.rb +4 -4
- data/lib/puppet/module_tool/applications/builder.rb +2 -2
- data/lib/puppet/module_tool/applications/checksummer.rb +3 -3
- data/lib/puppet/module_tool/applications/unpacker.rb +2 -2
- data/lib/puppet/module_tool/metadata.rb +3 -3
- data/lib/puppet/network/authconfig.rb +1 -1
- data/lib/puppet/network/format_support.rb +1 -1
- data/lib/puppet/network/formats.rb +5 -7
- data/lib/puppet/network/http/api/indirected_routes.rb +1 -0
- data/lib/puppet/network/http/api/master/v3/environment.rb +2 -2
- data/lib/puppet/network/http/api/master/v3/environments.rb +2 -2
- data/lib/puppet/network/http/error.rb +3 -3
- data/lib/puppet/network/resolver.rb +1 -2
- data/lib/puppet/parser/compiler.rb +12 -5
- data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +1 -1
- data/lib/puppet/parser/functions/fqdn_rand.rb +15 -4
- data/lib/puppet/parser/functions/new.rb +31 -46
- data/lib/puppet/parser/parser_factory.rb +1 -1
- data/lib/puppet/parser/resource.rb +1 -1
- data/lib/puppet/parser/type_loader.rb +11 -11
- data/lib/puppet/pops/evaluator/closure.rb +1 -1
- data/lib/puppet/pops/evaluator/collector_transformer.rb +1 -1
- data/lib/puppet/pops/evaluator/epp_evaluator.rb +2 -2
- data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +2 -2
- data/lib/puppet/pops/evaluator/runtime3_support.rb +5 -2
- data/lib/puppet/pops/functions/dispatch.rb +1 -1
- data/lib/puppet/pops/issue_reporter.rb +18 -1
- data/lib/puppet/pops/issues.rb +6 -3
- data/lib/puppet/pops/loader/ruby_data_type_instantiator.rb +1 -2
- data/lib/puppet/pops/loader/ruby_function_instantiator.rb +1 -2
- data/lib/puppet/pops/loader/task_instantiator.rb +5 -5
- data/lib/puppet/pops/loader/type_definition_instantiator.rb +4 -1
- data/lib/puppet/pops/loaders.rb +18 -7
- data/lib/puppet/pops/lookup/global_data_provider.rb +1 -1
- data/lib/puppet/pops/lookup/lookup_adapter.rb +55 -6
- data/lib/puppet/pops/model/factory.rb +6 -3
- data/lib/puppet/pops/model/model_tree_dumper.rb +4 -0
- data/lib/puppet/pops/model/pn_transformer.rb +400 -0
- data/lib/puppet/pops/parser/egrammar.ra +1 -1
- data/lib/puppet/pops/parser/eparser.rb +1 -1
- data/lib/puppet/pops/parser/heredoc_support.rb +1 -1
- data/lib/puppet/pops/parser/lexer_support.rb +3 -2
- data/lib/puppet/pops/parser/locator.rb +0 -2
- data/lib/puppet/pops/parser/pn_parser.rb +316 -0
- data/lib/puppet/pops/pcore.rb +17 -17
- data/lib/puppet/pops/pn.rb +236 -0
- data/lib/puppet/pops/serialization/json.rb +7 -7
- data/lib/puppet/pops/types/class_loader.rb +6 -3
- data/lib/puppet/pops/types/implementation_registry.rb +28 -35
- data/lib/puppet/pops/types/p_object_type.rb +3 -3
- data/lib/puppet/pops/types/p_timespan_type.rb +2 -2
- data/lib/puppet/pops/types/p_type_set_type.rb +24 -1
- data/lib/puppet/pops/types/ruby_generator.rb +3 -4
- data/lib/puppet/pops/types/type_calculator.rb +1 -1
- data/lib/puppet/pops/types/type_factory.rb +0 -4
- data/lib/puppet/pops/types/type_mismatch_describer.rb +1 -1
- data/lib/puppet/pops/types/type_parser.rb +14 -7
- data/lib/puppet/pops/types/types.rb +1 -1
- data/lib/puppet/pops/utils.rb +2 -2
- data/lib/puppet/pops/validation/checker4_0.rb +6 -2
- data/lib/puppet/provider/group/groupadd.rb +3 -1
- data/lib/puppet/provider/group/windows_adsi.rb +4 -7
- data/lib/puppet/provider/nameservice.rb +3 -3
- data/lib/puppet/provider/package/pacman.rb +4 -4
- data/lib/puppet/provider/package/pip.rb +3 -3
- data/lib/puppet/provider/package/pkgdmg.rb +3 -3
- data/lib/puppet/provider/package/pkgutil.rb +2 -2
- data/lib/puppet/provider/package/portage.rb +9 -9
- data/lib/puppet/provider/package/zypper.rb +2 -2
- data/lib/puppet/provider/service/base.rb +1 -1
- data/lib/puppet/provider/service/smf.rb +3 -2
- data/lib/puppet/provider/service/systemd.rb +1 -1
- data/lib/puppet/provider/user/useradd.rb +6 -2
- data/lib/puppet/provider/user/windows_adsi.rb +1 -1
- data/lib/puppet/provider/yumrepo/inifile.rb +20 -9
- data/lib/puppet/provider/zfs/zfs.rb +1 -1
- data/lib/puppet/reference/configuration.rb +2 -0
- data/lib/puppet/reference/type.rb +11 -11
- data/lib/puppet/resource.rb +1 -1
- data/lib/puppet/resource/capability_finder.rb +5 -5
- data/lib/puppet/resource/catalog.rb +6 -3
- data/lib/puppet/resource/status.rb +9 -2
- data/lib/puppet/resource/type.rb +1 -1
- data/lib/puppet/settings.rb +31 -19
- data/lib/puppet/settings/base_setting.rb +5 -0
- data/lib/puppet/settings/config_file.rb +1 -1
- data/lib/puppet/settings/ttl_setting.rb +5 -0
- data/lib/puppet/ssl/certificate_factory.rb +2 -2
- data/lib/puppet/ssl/certificate_request.rb +0 -2
- data/lib/puppet/syntax_checkers/json.rb +1 -1
- data/lib/puppet/transaction/additional_resource_generator.rb +2 -2
- data/lib/puppet/transaction/event.rb +1 -1
- data/lib/puppet/transaction/report.rb +18 -12
- data/lib/puppet/type.rb +9 -13
- data/lib/puppet/type/augeas.rb +2 -2
- data/lib/puppet/type/cron.rb +11 -6
- data/lib/puppet/type/exec.rb +1 -1
- data/lib/puppet/type/file.rb +4 -5
- data/lib/puppet/type/host.rb +1 -1
- data/lib/puppet/type/k5login.rb +30 -54
- data/lib/puppet/type/package.rb +3 -3
- data/lib/puppet/type/schedule.rb +12 -12
- data/lib/puppet/type/scheduled_task.rb +2 -2
- data/lib/puppet/type/ssh_authorized_key.rb +5 -5
- data/lib/puppet/type/sshkey.rb +2 -2
- data/lib/puppet/type/tidy.rb +1 -1
- data/lib/puppet/type/user.rb +1 -1
- data/lib/puppet/type/yumrepo.rb +26 -5
- data/lib/puppet/util.rb +0 -4
- data/lib/puppet/util/backups.rb +1 -1
- data/lib/puppet/util/inifile.rb +3 -4
- data/lib/puppet/util/json.rb +68 -0
- data/lib/puppet/util/json_lockfile.rb +3 -3
- data/lib/puppet/util/log.rb +2 -5
- data/lib/puppet/util/log/destinations.rb +2 -2
- data/lib/puppet/util/network_device/cisco/facts.rb +1 -1
- data/lib/puppet/util/plist.rb +1 -1
- data/lib/puppet/util/reference.rb +1 -8
- data/lib/puppet/util/tagging.rb +1 -1
- data/lib/puppet/util/warnings.rb +0 -2
- data/lib/puppet/util/windows/adsi.rb +15 -18
- data/lib/puppet/util/windows/com.rb +2 -1
- data/lib/puppet/util/windows/file.rb +2 -2
- data/lib/puppet/util/windows/principal.rb +7 -6
- data/lib/puppet/util/windows/sid.rb +60 -7
- data/lib/puppet/util/windows/taskscheduler.rb +0 -9
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet_pal.rb +53 -48
- data/locales/ja/puppet.po +1357 -912
- data/locales/puppet.pot +549 -466
- data/man/man5/puppet.conf.5 +103 -20
- data/man/man8/puppet-agent.8 +6 -2
- data/man/man8/puppet-apply.8 +2 -2
- data/man/man8/puppet-ca.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-cert.8 +1 -1
- data/man/man8/puppet-certificate.8 +1 -1
- data/man/man8/puppet-certificate_request.8 +1 -1
- data/man/man8/puppet-certificate_revocation_list.8 +1 -1
- data/man/man8/puppet-config.8 +35 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +33 -11
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +34 -12
- data/man/man8/puppet-facts.8 +50 -1
- data/man/man8/puppet-filebucket.8 +38 -11
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-key.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-man.8 +10 -4
- data/man/man8/puppet-master.8 +1 -1
- data/man/man8/puppet-module.8 +15 -6
- data/man/man8/puppet-node.8 +1 -1
- data/man/man8/puppet-parser.8 +31 -8
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +1 -1
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +67 -0
- data/man/man8/puppet-status.8 +1 -1
- data/man/man8/puppet.8 +3 -3
- data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome2/lib/puppet_x/awesome2/echo_scheme_handler.rb +1 -1
- data/spec/integration/application/apply_spec.rb +15 -15
- data/spec/integration/application/lookup_spec.rb +21 -0
- data/spec/integration/faces/config_spec.rb +16 -4
- data/spec/integration/network/http/api/indirected_routes_spec.rb +5 -5
- data/spec/integration/parser/catalog_spec.rb +1 -1
- data/spec/integration/parser/collection_spec.rb +2 -2
- data/spec/integration/parser/compiler_spec.rb +17 -18
- data/spec/integration/parser/pcore_resource_spec.rb +2 -2
- data/spec/integration/parser/scope_spec.rb +2 -2
- data/spec/integration/ssl/certificate_authority_spec.rb +7 -7
- data/spec/integration/ssl/certificate_revocation_list_spec.rb +1 -1
- data/spec/integration/ssl/key_spec.rb +1 -1
- data/spec/integration/transaction/report_spec.rb +3 -3
- data/spec/integration/transaction_spec.rb +0 -1
- data/spec/integration/type/file_spec.rb +10 -11
- data/spec/integration/type_spec.rb +1 -2
- data/spec/integration/util/windows/adsi_spec.rb +86 -1
- data/spec/integration/util/windows/principal_spec.rb +11 -2
- data/spec/integration/util/windows/security_spec.rb +2 -2
- data/spec/lib/matchers/json.rb +4 -4
- data/spec/lib/puppet_spec/language.rb +34 -35
- data/spec/lib/puppet_spec/module_tool/shared_functions.rb +2 -2
- data/spec/shared_behaviours/file_server_terminus.rb +0 -2
- data/spec/shared_behaviours/things_that_declare_options.rb +2 -2
- data/spec/spec_helper.rb +1 -1
- data/spec/unit/application/cert_spec.rb +21 -9
- data/spec/unit/application/device_spec.rb +96 -2
- data/spec/unit/application/face_base_spec.rb +2 -2
- data/spec/unit/application/lookup_spec.rb +0 -1
- data/spec/unit/configurer_spec.rb +14 -0
- data/spec/unit/confine_spec.rb +16 -0
- data/spec/unit/data_providers/hiera_data_provider_spec.rb +4 -4
- data/spec/unit/datatypes_spec.rb +49 -0
- data/spec/unit/environments_spec.rb +7 -0
- data/spec/unit/face/config_spec.rb +116 -12
- data/spec/unit/face/epp_face_spec.rb +53 -2
- data/spec/unit/face/facts_spec.rb +53 -0
- data/spec/unit/face/help_spec.rb +62 -69
- data/spec/unit/face/man_spec.rb +26 -0
- data/spec/unit/face/module/list_spec.rb +0 -1
- data/spec/unit/face/parser_spec.rb +78 -0
- data/spec/unit/file_bucket/dipper_spec.rb +0 -4
- data/spec/unit/file_serving/content_spec.rb +0 -1
- data/spec/unit/file_serving/fileset_spec.rb +0 -1
- data/spec/unit/file_serving/metadata_spec.rb +0 -1
- data/spec/unit/file_serving/terminus_selector_spec.rb +0 -2
- data/spec/unit/forge_spec.rb +1 -2
- data/spec/unit/functions/assert_type_spec.rb +1 -1
- data/spec/unit/functions/empty_spec.rb +77 -0
- data/spec/unit/functions/epp_spec.rb +1 -1
- data/spec/unit/functions/flatten_spec.rb +31 -0
- data/spec/unit/functions/include_spec.rb +2 -2
- data/spec/unit/functions/inline_epp_spec.rb +1 -1
- data/spec/unit/functions/join_spec.rb +33 -0
- data/spec/unit/functions/keys_spec.rb +31 -0
- data/spec/unit/functions/length_spec.rb +50 -0
- data/spec/unit/functions/lookup_fixture_spec.rb +1 -1
- data/spec/unit/functions/lookup_spec.rb +52 -0
- data/spec/unit/functions/shared.rb +1 -1
- data/spec/unit/functions/values_spec.rb +30 -0
- data/spec/unit/functions/versioncmp_spec.rb +1 -1
- data/spec/unit/functions4_spec.rb +30 -32
- data/spec/unit/graph/title_hash_prioritizer_spec.rb +2 -1
- data/spec/unit/indirector/catalog/compiler_spec.rb +0 -15
- data/spec/unit/indirector/facts/rest_spec.rb +45 -0
- data/spec/unit/indirector/facts/yaml_spec.rb +6 -0
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +2 -2
- data/spec/unit/indirector/indirection_spec.rb +1 -1
- data/spec/unit/indirector/node/ldap_spec.rb +2 -2
- data/spec/unit/indirector/request_spec.rb +0 -2
- data/spec/unit/indirector/rest_spec.rb +2 -2
- data/spec/unit/indirector_spec.rb +0 -1
- data/spec/unit/info_service_spec.rb +1 -1
- data/spec/unit/interface/action_manager_spec.rb +1 -1
- data/spec/unit/interface/action_spec.rb +1 -1
- data/spec/unit/module_spec.rb +0 -5
- data/spec/unit/module_tool/applications/builder_spec.rb +1 -1
- data/spec/unit/module_tool/applications/unpacker_spec.rb +4 -4
- data/spec/unit/network/formats_spec.rb +5 -13
- data/spec/unit/network/http/api/indirected_routes_spec.rb +6 -2
- data/spec/unit/network/http/connection_spec.rb +1 -1
- data/spec/unit/network/http/handler_spec.rb +3 -2
- data/spec/unit/node/environment_spec.rb +1 -1
- data/spec/unit/node_spec.rb +3 -3
- data/spec/unit/parser/compiler_spec.rb +9 -2
- data/spec/unit/parser/environment_compiler_spec.rb +8 -8
- data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
- data/spec/unit/parser/functions/fail_spec.rb +1 -1
- data/spec/unit/parser/functions/fqdn_rand_spec.rb +24 -0
- data/spec/unit/parser/functions/realize_spec.rb +1 -1
- data/spec/unit/parser/resource_spec.rb +0 -1
- data/spec/unit/parser/scope_spec.rb +3 -3
- data/spec/unit/parser/type_loader_spec.rb +1 -1
- data/spec/unit/pops/adaptable_spec.rb +0 -1
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +0 -3
- data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -4
- data/spec/unit/pops/factory_rspec_helper.rb +1 -1
- data/spec/unit/pops/factory_spec.rb +5 -5
- data/spec/unit/pops/issues_spec.rb +23 -8
- data/spec/unit/pops/loaders/loaders_spec.rb +24 -2
- data/spec/unit/pops/loaders/static_loader_spec.rb +1 -1
- data/spec/unit/pops/lookup/interpolation_spec.rb +5 -0
- data/spec/unit/pops/lookup/lookup_spec.rb +56 -0
- data/spec/unit/pops/model/pn_transformer_spec.rb +53 -0
- data/spec/unit/pops/parser/lexer2_spec.rb +14 -5
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +9 -9
- data/spec/unit/pops/parser/parse_calls_spec.rb +1 -1
- data/spec/unit/pops/parser/parse_functions_spec.rb +1 -1
- data/spec/unit/pops/parser/parse_heredoc_spec.rb +3 -3
- data/spec/unit/pops/parser/parse_lambda_spec.rb +1 -1
- data/spec/unit/pops/parser/parse_resource_spec.rb +35 -35
- data/spec/unit/pops/parser/pn_parser_spec.rb +101 -0
- data/spec/unit/pops/pn_spec.rb +148 -0
- data/spec/unit/pops/types/iterable_spec.rb +1 -1
- data/spec/unit/pops/types/p_object_type_spec.rb +5 -5
- data/spec/unit/pops/types/p_timespan_type_spec.rb +11 -4
- data/spec/unit/pops/types/p_timestamp_type_spec.rb +9 -2
- data/spec/unit/pops/types/p_type_set_type_spec.rb +106 -2
- data/spec/unit/pops/types/ruby_generator_spec.rb +3 -8
- data/spec/unit/pops/types/string_converter_spec.rb +3 -3
- data/spec/unit/pops/types/type_calculator_spec.rb +1 -1
- data/spec/unit/pops/validator/validator_spec.rb +3 -1
- data/spec/unit/property_spec.rb +2 -2
- data/spec/unit/provider/aixobject_spec.rb +1 -1
- data/spec/unit/provider/cron/crontab_spec.rb +3 -3
- data/spec/unit/provider/exec/posix_spec.rb +6 -6
- data/spec/unit/provider/group/groupadd_spec.rb +4 -4
- data/spec/unit/provider/group/windows_adsi_spec.rb +79 -22
- data/spec/unit/provider/ldap_spec.rb +0 -1
- data/spec/unit/provider/nameservice_spec.rb +5 -5
- data/spec/unit/provider/package/rpm_spec.rb +3 -4
- data/spec/unit/provider/package/yum_spec.rb +6 -2
- data/spec/unit/provider/parsedfile_spec.rb +1 -1
- data/spec/unit/provider/service/base_spec.rb +2 -4
- data/spec/unit/provider/service/init_spec.rb +2 -2
- data/spec/unit/provider/service/openrc_spec.rb +2 -2
- data/spec/unit/provider/service/redhat_spec.rb +2 -2
- data/spec/unit/provider/service/smf_spec.rb +2 -0
- data/spec/unit/provider/service/systemd_spec.rb +3 -3
- data/spec/unit/provider/service/upstart_spec.rb +7 -7
- data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +0 -4
- data/spec/unit/provider/sshkey/parsed_spec.rb +0 -2
- data/spec/unit/provider/user/useradd_spec.rb +15 -9
- data/spec/unit/provider/user/windows_adsi_spec.rb +4 -4
- data/spec/unit/provider/yumrepo/inifile_spec.rb +76 -0
- data/spec/unit/puppet_pal_2pec.rb +4 -5
- data/spec/unit/resource/catalog_spec.rb +8 -3
- data/spec/unit/resource/status_spec.rb +15 -4
- data/spec/unit/resource/type_spec.rb +2 -3
- data/spec/unit/settings_spec.rb +9 -4
- data/spec/unit/ssl/certificate_authority_spec.rb +1 -9
- data/spec/unit/ssl/certificate_request_spec.rb +1 -2
- data/spec/unit/transaction/report_spec.rb +41 -0
- data/spec/unit/transaction_spec.rb +1 -1
- data/spec/unit/type/exec_spec.rb +7 -9
- data/spec/unit/type/file/selinux_spec.rb +0 -1
- data/spec/unit/type/file_spec.rb +4 -3
- data/spec/unit/type/k5login_spec.rb +79 -10
- data/spec/unit/type/mount_spec.rb +1 -1
- data/spec/unit/type/nagios_spec.rb +6 -6
- data/spec/unit/type/user_spec.rb +1 -1
- data/spec/unit/type/yumrepo_spec.rb +18 -0
- data/spec/unit/type/zfs_spec.rb +1 -1
- data/spec/unit/type_spec.rb +14 -15
- data/spec/unit/util/docs_spec.rb +1 -1
- data/spec/unit/util/execution_spec.rb +0 -1
- data/spec/unit/util/inifile_spec.rb +35 -4
- data/spec/unit/util/log/destinations_spec.rb +2 -2
- data/spec/unit/util/log_spec.rb +6 -5
- data/spec/unit/util/network_device/cisco/device_spec.rb +2 -2
- data/spec/unit/util/plist_spec.rb +3 -3
- data/spec/unit/util/selinux_spec.rb +2 -2
- data/spec/unit/util/tagging_spec.rb +1 -7
- data/spec/unit/util/windows/adsi_spec.rb +31 -27
- data/spec/unit/util/windows/sid_spec.rb +86 -15
- data/spec/unit/util_spec.rb +2 -2
- data/spec/watchr.rb +0 -1
- data/tasks/benchmark.rake +37 -0
- data/tasks/manpages.rake +1 -1
- metadata +83 -11
- checksums.yaml +0 -7
@@ -31,6 +31,6 @@ describe "the versioncmp function" do
|
|
31
31
|
it "should call Puppet::Util::Package.versioncmp (included in scope)" do
|
32
32
|
Puppet::Util::Package.expects(:versioncmp).with('1.2', '1.3').returns(-1)
|
33
33
|
|
34
|
-
expect(versioncmp('1.2', '1.3')).to eq
|
34
|
+
expect(versioncmp('1.2', '1.3')).to eq(-1)
|
35
35
|
end
|
36
36
|
end
|
@@ -96,7 +96,6 @@ describe 'the 4x function api' do
|
|
96
96
|
# TODO: Bogus parameters, not yet used
|
97
97
|
func = f.new(:closure_scope, :loader)
|
98
98
|
expect(func.is_a?(Puppet::Functions::Function)).to be_truthy
|
99
|
-
signature = 'Any x, Any y'
|
100
99
|
expect do
|
101
100
|
func.call({}, 10)
|
102
101
|
end.to raise_error(ArgumentError, "'min' expects 2 arguments, got 1")
|
@@ -107,7 +106,6 @@ describe 'the 4x function api' do
|
|
107
106
|
# TODO: Bogus parameters, not yet used
|
108
107
|
func = f.new(:closure_scope, :loader)
|
109
108
|
expect(func.is_a?(Puppet::Functions::Function)).to be_truthy
|
110
|
-
signature = 'Any x, Any y'
|
111
109
|
expect do
|
112
110
|
func.call({}, 10, 10, 10)
|
113
111
|
end.to raise_error(ArgumentError, "'min' expects 2 arguments, got 3")
|
@@ -122,7 +120,7 @@ describe 'the 4x function api' do
|
|
122
120
|
|
123
121
|
it 'an error is raised if simple function-name and method are not matched' do
|
124
122
|
expect do
|
125
|
-
|
123
|
+
create_badly_named_method_function_class()
|
126
124
|
end.to raise_error(ArgumentError, /Function Creation Error, cannot create a default dispatcher for function 'mix', no method with this name found/)
|
127
125
|
end
|
128
126
|
|
@@ -477,7 +475,7 @@ describe 'the 4x function api' do
|
|
477
475
|
the_loader = loader()
|
478
476
|
here = get_binding(the_loader)
|
479
477
|
expect do
|
480
|
-
|
478
|
+
eval(<<-CODE, here)
|
481
479
|
Puppet::Functions.create_function('testing::test') do
|
482
480
|
local_types do
|
483
481
|
type 'MyType += Array[Integer]'
|
@@ -498,7 +496,7 @@ describe 'the 4x function api' do
|
|
498
496
|
the_loader = loader()
|
499
497
|
here = get_binding(the_loader)
|
500
498
|
expect do
|
501
|
-
|
499
|
+
eval(<<-CODE, here)
|
502
500
|
Puppet::Functions.create_function('testing::test') do
|
503
501
|
dispatch :test do
|
504
502
|
param 'Array[1+=1]', :x
|
@@ -647,7 +645,7 @@ describe 'the 4x function api' do
|
|
647
645
|
|
648
646
|
|
649
647
|
def create_noargs_function_class
|
650
|
-
|
648
|
+
Puppet::Functions.create_function('test') do
|
651
649
|
def test()
|
652
650
|
10
|
653
651
|
end
|
@@ -655,7 +653,7 @@ describe 'the 4x function api' do
|
|
655
653
|
end
|
656
654
|
|
657
655
|
def create_min_function_class
|
658
|
-
|
656
|
+
Puppet::Functions.create_function('min') do
|
659
657
|
def min(x,y)
|
660
658
|
x <= y ? x : y
|
661
659
|
end
|
@@ -663,7 +661,7 @@ describe 'the 4x function api' do
|
|
663
661
|
end
|
664
662
|
|
665
663
|
def create_max_function_class
|
666
|
-
|
664
|
+
Puppet::Functions.create_function('max') do
|
667
665
|
def max(x,y)
|
668
666
|
x >= y ? x : y
|
669
667
|
end
|
@@ -671,7 +669,7 @@ describe 'the 4x function api' do
|
|
671
669
|
end
|
672
670
|
|
673
671
|
def create_badly_named_method_function_class
|
674
|
-
|
672
|
+
Puppet::Functions.create_function('mix') do
|
675
673
|
def mix_up(x,y)
|
676
674
|
x <= y ? x : y
|
677
675
|
end
|
@@ -679,7 +677,7 @@ describe 'the 4x function api' do
|
|
679
677
|
end
|
680
678
|
|
681
679
|
def create_min_function_class_using_dispatch
|
682
|
-
|
680
|
+
Puppet::Functions.create_function('min') do
|
683
681
|
dispatch :min do
|
684
682
|
param 'Numeric', :a
|
685
683
|
param 'Numeric', :b
|
@@ -691,7 +689,7 @@ describe 'the 4x function api' do
|
|
691
689
|
end
|
692
690
|
|
693
691
|
def create_min_function_class_disptaching_to_two_methods
|
694
|
-
|
692
|
+
Puppet::Functions.create_function('min') do
|
695
693
|
dispatch :min do
|
696
694
|
param 'Numeric', :a
|
697
695
|
param 'Numeric', :b
|
@@ -714,7 +712,7 @@ describe 'the 4x function api' do
|
|
714
712
|
end
|
715
713
|
|
716
714
|
def create_function_with_optionals_and_repeated
|
717
|
-
|
715
|
+
Puppet::Functions.create_function('min') do
|
718
716
|
def min(x,y,a=1, b=1, *c)
|
719
717
|
x <= y ? x : y
|
720
718
|
end
|
@@ -722,7 +720,7 @@ describe 'the 4x function api' do
|
|
722
720
|
end
|
723
721
|
|
724
722
|
def create_function_with_optionals_and_repeated_via_dispatch
|
725
|
-
|
723
|
+
Puppet::Functions.create_function('min') do
|
726
724
|
dispatch :min do
|
727
725
|
param 'Numeric', :x
|
728
726
|
param 'Numeric', :y
|
@@ -737,7 +735,7 @@ describe 'the 4x function api' do
|
|
737
735
|
end
|
738
736
|
|
739
737
|
def create_function_with_optionals_and_repeated_via_multiple_dispatch
|
740
|
-
|
738
|
+
Puppet::Functions.create_function('min') do
|
741
739
|
dispatch :min do
|
742
740
|
param 'Numeric', :x
|
743
741
|
param 'Numeric', :y
|
@@ -757,7 +755,7 @@ describe 'the 4x function api' do
|
|
757
755
|
end
|
758
756
|
|
759
757
|
def create_function_with_required_repeated_via_dispatch
|
760
|
-
|
758
|
+
Puppet::Functions.create_function('min') do
|
761
759
|
dispatch :min do
|
762
760
|
param 'Numeric', :x
|
763
761
|
param 'Numeric', :y
|
@@ -770,7 +768,7 @@ describe 'the 4x function api' do
|
|
770
768
|
end
|
771
769
|
|
772
770
|
def create_function_with_repeated
|
773
|
-
|
771
|
+
Puppet::Functions.create_function('count_args') do
|
774
772
|
dispatch :count_args do
|
775
773
|
repeated_param 'Any', :c
|
776
774
|
end
|
@@ -781,7 +779,7 @@ describe 'the 4x function api' do
|
|
781
779
|
end
|
782
780
|
|
783
781
|
def create_function_with_optional_repeated
|
784
|
-
|
782
|
+
Puppet::Functions.create_function('count_args') do
|
785
783
|
dispatch :count_args do
|
786
784
|
optional_repeated_param 'Any', :c
|
787
785
|
end
|
@@ -792,7 +790,7 @@ describe 'the 4x function api' do
|
|
792
790
|
end
|
793
791
|
|
794
792
|
def create_function_with_required_repeated
|
795
|
-
|
793
|
+
Puppet::Functions.create_function('count_args') do
|
796
794
|
dispatch :count_args do
|
797
795
|
required_repeated_param 'Any', :c
|
798
796
|
end
|
@@ -803,7 +801,7 @@ describe 'the 4x function api' do
|
|
803
801
|
end
|
804
802
|
|
805
803
|
def create_function_with_inexact_dispatch
|
806
|
-
|
804
|
+
Puppet::Functions.create_function('t1') do
|
807
805
|
dispatch :t1 do
|
808
806
|
param 'Numeric', :x
|
809
807
|
param 'Numeric', :y
|
@@ -821,7 +819,7 @@ describe 'the 4x function api' do
|
|
821
819
|
end
|
822
820
|
|
823
821
|
def create_function_with_rq_after_opt
|
824
|
-
|
822
|
+
Puppet::Functions.create_function('t1') do
|
825
823
|
dispatch :t1 do
|
826
824
|
optional_param 'Numeric', :x
|
827
825
|
param 'Numeric', :y
|
@@ -833,7 +831,7 @@ describe 'the 4x function api' do
|
|
833
831
|
end
|
834
832
|
|
835
833
|
def create_function_with_rq_repeated_after_opt
|
836
|
-
|
834
|
+
Puppet::Functions.create_function('t1') do
|
837
835
|
dispatch :t1 do
|
838
836
|
optional_param 'Numeric', :x
|
839
837
|
required_repeated_param 'Numeric', :y
|
@@ -845,7 +843,7 @@ describe 'the 4x function api' do
|
|
845
843
|
end
|
846
844
|
|
847
845
|
def create_function_with_param_after_repeated
|
848
|
-
|
846
|
+
Puppet::Functions.create_function('t1') do
|
849
847
|
dispatch :t1 do
|
850
848
|
repeated_param 'Numeric', :x
|
851
849
|
param 'Numeric', :y
|
@@ -857,7 +855,7 @@ describe 'the 4x function api' do
|
|
857
855
|
end
|
858
856
|
|
859
857
|
def create_function_with_param_injection_regular
|
860
|
-
|
858
|
+
Puppet::Functions.create_function('test', Puppet::Functions::InternalFunction) do
|
861
859
|
attr_injected Puppet::Pops::Types::TypeFactory.type_of(FunctionAPISpecModule::TestDuck), :test_attr
|
862
860
|
attr_injected Puppet::Pops::Types::TypeFactory.string(), :test_attr2, "a_string"
|
863
861
|
attr_injected_producer Puppet::Pops::Types::TypeFactory.integer(), :serial, "an_int"
|
@@ -877,7 +875,7 @@ describe 'the 4x function api' do
|
|
877
875
|
end
|
878
876
|
|
879
877
|
def create_function_with_required_block_all_defaults
|
880
|
-
|
878
|
+
Puppet::Functions.create_function('test') do
|
881
879
|
dispatch :test do
|
882
880
|
param 'Integer', :x
|
883
881
|
# use defaults, any callable, name is 'block'
|
@@ -890,7 +888,7 @@ describe 'the 4x function api' do
|
|
890
888
|
end
|
891
889
|
|
892
890
|
def create_function_with_scope_required_block_all_defaults
|
893
|
-
|
891
|
+
Puppet::Functions.create_function('test', Puppet::Functions::InternalFunction) do
|
894
892
|
dispatch :test do
|
895
893
|
scope_param
|
896
894
|
param 'Integer', :x
|
@@ -904,7 +902,7 @@ describe 'the 4x function api' do
|
|
904
902
|
end
|
905
903
|
|
906
904
|
def create_function_with_required_block_default_type
|
907
|
-
|
905
|
+
Puppet::Functions.create_function('test') do
|
908
906
|
dispatch :test do
|
909
907
|
param 'Integer', :x
|
910
908
|
# use defaults, any callable, name is 'block'
|
@@ -917,7 +915,7 @@ describe 'the 4x function api' do
|
|
917
915
|
end
|
918
916
|
|
919
917
|
def create_function_with_scope_param_required_repeat
|
920
|
-
|
918
|
+
Puppet::Functions.create_function('test', Puppet::Functions::InternalFunction) do
|
921
919
|
dispatch :test do
|
922
920
|
scope_param
|
923
921
|
param 'Any', :extra
|
@@ -930,7 +928,7 @@ describe 'the 4x function api' do
|
|
930
928
|
end
|
931
929
|
|
932
930
|
def create_function_with_required_block_given_type
|
933
|
-
|
931
|
+
Puppet::Functions.create_function('test') do
|
934
932
|
dispatch :test do
|
935
933
|
param 'Integer', :x
|
936
934
|
required_block_param
|
@@ -942,7 +940,7 @@ describe 'the 4x function api' do
|
|
942
940
|
end
|
943
941
|
|
944
942
|
def create_function_with_required_block_fully_specified
|
945
|
-
|
943
|
+
Puppet::Functions.create_function('test') do
|
946
944
|
dispatch :test do
|
947
945
|
param 'Integer', :x
|
948
946
|
# use defaults, any callable, name is 'block'
|
@@ -955,7 +953,7 @@ describe 'the 4x function api' do
|
|
955
953
|
end
|
956
954
|
|
957
955
|
def create_function_with_optional_block_all_defaults
|
958
|
-
|
956
|
+
Puppet::Functions.create_function('test') do
|
959
957
|
dispatch :test do
|
960
958
|
param 'Integer', :x
|
961
959
|
# use defaults, any callable, name is 'block'
|
@@ -968,7 +966,7 @@ describe 'the 4x function api' do
|
|
968
966
|
end
|
969
967
|
|
970
968
|
def create_function_with_no_parameter_dispatch
|
971
|
-
|
969
|
+
Puppet::Functions.create_function('test') do
|
972
970
|
dispatch :test_no_args do
|
973
971
|
end
|
974
972
|
dispatch :test_one_arg do
|
@@ -984,7 +982,7 @@ describe 'the 4x function api' do
|
|
984
982
|
end
|
985
983
|
|
986
984
|
def create_function_with_mismatch_handler
|
987
|
-
|
985
|
+
Puppet::Functions.create_function('test') do
|
988
986
|
dispatch :test do
|
989
987
|
param 'Integer', :x
|
990
988
|
end
|
@@ -38,8 +38,9 @@ describe Puppet::Graph::TitleHashPrioritizer do
|
|
38
38
|
resource = resource(:notify, "title")
|
39
39
|
different_resource = resource(:notify, "title")
|
40
40
|
|
41
|
-
|
41
|
+
prioritizer.generate_priority_for(resource)
|
42
42
|
|
43
|
+
expect(prioritizer.priority_of(resource)).not_to be_nil
|
43
44
|
expect(prioritizer.priority_of(different_resource)).to be_nil
|
44
45
|
end
|
45
46
|
|
@@ -89,7 +89,6 @@ describe Puppet::Resource::Catalog::Compiler do
|
|
89
89
|
|
90
90
|
it "should pass the found node to the compiler for compiling" do
|
91
91
|
Puppet::Node.indirection.expects(:find).with(node_name, anything).returns(node)
|
92
|
-
config = mock 'config'
|
93
92
|
Puppet::Parser::Compiler.expects(:compile).with(node, anything)
|
94
93
|
compiler.find(@request)
|
95
94
|
end
|
@@ -287,10 +286,6 @@ describe Puppet::Resource::Catalog::Compiler do
|
|
287
286
|
it "accepts PSON facts from older agents" do
|
288
287
|
request = a_legacy_request_that_contains(@facts)
|
289
288
|
|
290
|
-
options = {
|
291
|
-
:environment => request.environment,
|
292
|
-
:transaction_uuid => request.options[:transaction_uuid],
|
293
|
-
}
|
294
289
|
facts = compiler.extract_facts_from_request(request)
|
295
290
|
expect(facts).to eq(@facts)
|
296
291
|
end
|
@@ -298,11 +293,6 @@ describe Puppet::Resource::Catalog::Compiler do
|
|
298
293
|
it "rejects YAML facts" do
|
299
294
|
request = a_legacy_request_that_contains(@facts, :yaml)
|
300
295
|
|
301
|
-
options = {
|
302
|
-
:environment => request.environment,
|
303
|
-
:transaction_uuid => request.options[:transaction_uuid],
|
304
|
-
}
|
305
|
-
|
306
296
|
expect {
|
307
297
|
compiler.extract_facts_from_request(request)
|
308
298
|
}.to raise_error(ArgumentError, /Unsupported facts format/)
|
@@ -312,11 +302,6 @@ describe Puppet::Resource::Catalog::Compiler do
|
|
312
302
|
request = a_request_that_contains(@facts)
|
313
303
|
request.options[:facts_format] = 'unknown-format'
|
314
304
|
|
315
|
-
options = {
|
316
|
-
:environment => request.environment,
|
317
|
-
:transaction_uuid => request.options[:transaction_uuid],
|
318
|
-
}
|
319
|
-
|
320
305
|
expect {
|
321
306
|
compiler.extract_facts_from_request(request)
|
322
307
|
}.to raise_error(ArgumentError, /Unsupported facts format/)
|
@@ -0,0 +1,45 @@
|
|
1
|
+
#! /usr/bin/env ruby
|
2
|
+
require 'spec_helper'
|
3
|
+
|
4
|
+
require 'puppet/indirector/facts/rest'
|
5
|
+
|
6
|
+
describe Puppet::Node::Facts::Rest do
|
7
|
+
it "should be a sublcass of Puppet::Indirector::REST" do
|
8
|
+
expect(Puppet::Node::Facts::Rest.superclass).to equal(Puppet::Indirector::REST)
|
9
|
+
end
|
10
|
+
|
11
|
+
let(:model) { Puppet::Node::Facts }
|
12
|
+
before(:each) { model.indirection.terminus_class = :rest }
|
13
|
+
|
14
|
+
def mock_response(code, body, content_type='text/plain', encoding=nil)
|
15
|
+
obj = stub('http response', :code => code.to_s, :body => body)
|
16
|
+
obj.stubs(:[]).with('content-type').returns(content_type)
|
17
|
+
obj.stubs(:[]).with('content-encoding').returns(encoding)
|
18
|
+
obj.stubs(:[]).with(Puppet::Network::HTTP::HEADER_PUPPET_VERSION).returns(Puppet.version)
|
19
|
+
obj
|
20
|
+
end
|
21
|
+
|
22
|
+
describe '#save' do
|
23
|
+
subject { model.indirection.terminus(:rest) }
|
24
|
+
|
25
|
+
let(:connection) { stub('mock http connection', :verify_callback= => nil) }
|
26
|
+
let(:node_name) { 'puppet.node.test' }
|
27
|
+
let(:data) { model.new(node_name, {test_fact: 'test value'}) }
|
28
|
+
let(:request) { Puppet::Indirector::Request.new(:facts, :save, node_name, data) }
|
29
|
+
|
30
|
+
before :each do
|
31
|
+
subject.stubs(:network).returns(connection)
|
32
|
+
end
|
33
|
+
|
34
|
+
context 'when a 404 response is received' do
|
35
|
+
let(:response) { mock_response(404, '{}', 'test/json') }
|
36
|
+
|
37
|
+
before(:each) { connection.expects(:put).returns response }
|
38
|
+
|
39
|
+
it 'riases with HTTP 404' do
|
40
|
+
expect{ subject.save(request) }.to raise_error(Net::HTTPError,
|
41
|
+
/Error 404 on SERVER/)
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
@@ -23,6 +23,12 @@ describe Puppet::Node::Facts::Yaml do
|
|
23
23
|
expect(Puppet::Node::Facts::Yaml.name).to eq(:yaml)
|
24
24
|
end
|
25
25
|
|
26
|
+
it "should allow network requests" do
|
27
|
+
# Doesn't allow yaml as a network format, but allows `puppet facts upload`
|
28
|
+
# to update the YAML cache on a master.
|
29
|
+
expect(Puppet::Node::Facts::Yaml.new.allow_remote_requests?).to be(true)
|
30
|
+
end
|
31
|
+
|
26
32
|
describe "#search" do
|
27
33
|
def assert_search_matches(matching, nonmatching, query)
|
28
34
|
request = Puppet::Indirector::Request.new(:inventory, :search, nil, nil, query)
|
@@ -96,7 +96,7 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
|
|
96
96
|
if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
|
97
97
|
skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
|
98
98
|
else
|
99
|
-
|
99
|
+
save_bucket_file(plaintext, "/foo/bar")
|
100
100
|
|
101
101
|
dir_path = "#{Puppet[:bucketdir]}/#{bucket_dir}"
|
102
102
|
contents_file = "#{dir_path}/contents"
|
@@ -139,7 +139,7 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
|
|
139
139
|
if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
|
140
140
|
skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
|
141
141
|
else
|
142
|
-
|
142
|
+
save_bucket_file(plaintext, "")
|
143
143
|
|
144
144
|
dir_path = "#{Puppet[:bucketdir]}/#{bucket_dir}"
|
145
145
|
expect(Puppet::FileSystem.binread("#{dir_path}/contents")).to eq(plaintext)
|
@@ -788,7 +788,7 @@ describe Puppet::Indirector::Indirection do
|
|
788
788
|
|
789
789
|
it "should not create a terminus instance until one is actually needed" do
|
790
790
|
Puppet::Indirector.expects(:terminus).never
|
791
|
-
|
791
|
+
Puppet::Indirector::Indirection.new(mock('model'), :lazytest)
|
792
792
|
end
|
793
793
|
|
794
794
|
after do
|
@@ -46,11 +46,11 @@ describe Puppet::Node::Ldap do
|
|
46
46
|
end
|
47
47
|
|
48
48
|
it "should add the entry's common name to the hash if fqdn if false" do
|
49
|
-
expect(node_indirection.entry2hash(@entry,
|
49
|
+
expect(node_indirection.entry2hash(@entry, false)[:name]).to eq("mynode")
|
50
50
|
end
|
51
51
|
|
52
52
|
it "should add the entry's fqdn name to the hash if fqdn if true" do
|
53
|
-
expect(node_indirection.entry2hash(@entry,
|
53
|
+
expect(node_indirection.entry2hash(@entry, true)[:name]).to eq("mynode.madstop.com")
|
54
54
|
end
|
55
55
|
|
56
56
|
it "should add all of the entry's classes to the hash" do
|
@@ -260,8 +260,6 @@ describe Puppet::Indirector::Request do
|
|
260
260
|
end
|
261
261
|
|
262
262
|
it "should use the current environment when none is provided" do
|
263
|
-
configured = Puppet::Node::Environment.create(:foo, [])
|
264
|
-
|
265
263
|
Puppet[:environment] = "foo"
|
266
264
|
|
267
265
|
expect(Puppet::Indirector::Request.new(:myind, :find, "my key", nil).environment).to eq(Puppet.lookup(:current_environment))
|
@@ -1,6 +1,6 @@
|
|
1
1
|
#! /usr/bin/env ruby
|
2
2
|
require 'spec_helper'
|
3
|
-
require 'json'
|
3
|
+
require 'puppet/util/json'
|
4
4
|
require 'puppet/indirector'
|
5
5
|
require 'puppet/indirector/errors'
|
6
6
|
require 'puppet/indirector/rest'
|
@@ -52,7 +52,7 @@ shared_examples_for "a REST terminus method" do |terminus_method|
|
|
52
52
|
describe "when the response code is #{code}" do
|
53
53
|
let(:message) { 'error messaged!!!' }
|
54
54
|
let(:body) do
|
55
|
-
|
55
|
+
Puppet::Util::Json.dump({
|
56
56
|
:issue_kind => 'server-error',
|
57
57
|
:message => message
|
58
58
|
})
|