puppet 6.19.1-x86-mingw32 → 7.0.0-x86-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.
- checksums.yaml +4 -4
- data/Gemfile +1 -1
- data/Gemfile.lock +19 -20
- data/README.md +1 -1
- data/conf/fileserver.conf +5 -10
- data/ext/build_defaults.yaml +1 -1
- data/ext/osx/file_mapping.yaml +0 -5
- data/ext/project_data.yaml +1 -14
- data/ext/redhat/puppet.spec.erb +0 -1
- data/ext/windows/service/daemon.rb +6 -5
- data/install.rb +21 -17
- data/lib/puppet.rb +11 -20
- data/lib/puppet/application.rb +172 -98
- data/lib/puppet/application/device.rb +100 -104
- data/lib/puppet/application/filebucket.rb +15 -11
- data/lib/puppet/application/ssl.rb +1 -1
- data/lib/puppet/configurer.rb +28 -33
- data/lib/puppet/configurer/plugin_handler.rb +21 -19
- data/lib/puppet/defaults.rb +95 -159
- data/lib/puppet/environments.rb +10 -25
- data/lib/puppet/face/config.rb +10 -0
- data/lib/puppet/face/epp.rb +12 -2
- data/lib/puppet/face/facts.rb +66 -6
- data/lib/puppet/face/help.rb +1 -1
- data/lib/puppet/face/plugin.rb +5 -8
- data/lib/puppet/ffi/windows.rb +12 -0
- data/lib/puppet/ffi/windows/api_types.rb +311 -0
- data/lib/puppet/ffi/windows/constants.rb +404 -0
- data/lib/puppet/ffi/windows/functions.rb +628 -0
- data/lib/puppet/ffi/windows/structs.rb +338 -0
- data/lib/puppet/file_serving/configuration.rb +0 -5
- data/lib/puppet/file_serving/configuration/parser.rb +3 -32
- data/lib/puppet/file_serving/http_metadata.rb +1 -1
- data/lib/puppet/file_serving/mount.rb +1 -2
- data/lib/puppet/forge/repository.rb +0 -1
- data/lib/puppet/functions/epp.rb +1 -0
- data/lib/puppet/functions/inline_epp.rb +1 -0
- data/lib/puppet/generate/models/type/type.rb +4 -1
- data/lib/puppet/http.rb +22 -13
- data/lib/puppet/http/client.rb +164 -114
- data/lib/puppet/{network/resolver.rb → http/dns.rb} +2 -2
- data/lib/puppet/http/errors.rb +16 -0
- data/lib/puppet/http/external_client.rb +5 -7
- data/lib/puppet/{network/http → http}/factory.rb +8 -11
- data/lib/puppet/{network/http → http}/pool.rb +61 -26
- data/lib/puppet/{network/http/session.rb → http/pool_entry.rb} +2 -3
- data/lib/puppet/http/proxy.rb +137 -0
- data/lib/puppet/http/redirector.rb +4 -12
- data/lib/puppet/http/resolver.rb +5 -15
- data/lib/puppet/http/resolver/server_list.rb +6 -10
- data/lib/puppet/http/resolver/settings.rb +4 -7
- data/lib/puppet/http/resolver/srv.rb +7 -11
- data/lib/puppet/http/response.rb +36 -54
- data/lib/puppet/http/response_converter.rb +24 -0
- data/lib/puppet/http/response_net_http.rb +42 -0
- data/lib/puppet/http/retry_after_handler.rb +4 -13
- data/lib/puppet/http/service.rb +12 -26
- data/lib/puppet/http/service/ca.rb +11 -22
- data/lib/puppet/http/service/compiler.rb +22 -69
- data/lib/puppet/http/service/file_server.rb +18 -27
- data/lib/puppet/http/service/puppetserver.rb +26 -12
- data/lib/puppet/http/service/report.rb +8 -10
- data/lib/puppet/http/session.rb +11 -20
- data/lib/puppet/{network/http → http}/site.rb +1 -2
- data/lib/puppet/indirector/catalog/rest.rb +2 -4
- data/lib/puppet/indirector/fact_search.rb +60 -0
- data/lib/puppet/indirector/facts/facter.rb +24 -3
- data/lib/puppet/indirector/facts/json.rb +27 -0
- data/lib/puppet/indirector/facts/rest.rb +3 -22
- data/lib/puppet/indirector/facts/yaml.rb +3 -58
- data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -9
- data/lib/puppet/indirector/file_content/rest.rb +2 -6
- data/lib/puppet/indirector/file_metadata/rest.rb +3 -9
- data/lib/puppet/indirector/file_server.rb +1 -8
- data/lib/puppet/indirector/generic_http.rb +0 -11
- data/lib/puppet/indirector/json.rb +5 -1
- data/lib/puppet/indirector/node/json.rb +8 -0
- data/lib/puppet/indirector/node/rest.rb +2 -4
- data/lib/puppet/indirector/report/json.rb +34 -0
- data/lib/puppet/indirector/report/rest.rb +3 -8
- data/lib/puppet/indirector/request.rb +0 -101
- data/lib/puppet/indirector/rest.rb +12 -263
- data/lib/puppet/module_tool/applications.rb +0 -1
- data/lib/puppet/network/authconfig.rb +2 -96
- data/lib/puppet/network/authorization.rb +13 -35
- data/lib/puppet/network/formats.rb +2 -1
- data/lib/puppet/network/http.rb +3 -3
- data/lib/puppet/network/http/api/indirected_routes.rb +2 -20
- data/lib/puppet/network/http/api/master/v3.rb +11 -13
- data/lib/puppet/network/http/connection.rb +247 -316
- data/lib/puppet/network/http/handler.rb +0 -1
- data/lib/puppet/network/http_pool.rb +16 -34
- data/lib/puppet/node.rb +1 -30
- data/lib/puppet/pal/json_catalog_encoder.rb +4 -0
- data/lib/puppet/pal/pal_impl.rb +73 -18
- data/lib/puppet/parser/ast/pops_bridge.rb +0 -38
- data/lib/puppet/parser/compiler.rb +0 -198
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +14 -39
- data/lib/puppet/parser/resource.rb +0 -69
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +22 -8
- data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +3 -3
- data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
- data/lib/puppet/pops/issues.rb +0 -5
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +6 -8
- data/lib/puppet/pops/model/ast.pp +0 -42
- data/lib/puppet/pops/model/ast.rb +0 -290
- data/lib/puppet/pops/model/factory.rb +0 -45
- data/lib/puppet/pops/model/model_label_provider.rb +0 -5
- data/lib/puppet/pops/model/model_tree_dumper.rb +0 -22
- data/lib/puppet/pops/model/pn_transformer.rb +0 -16
- data/lib/puppet/pops/parser/egrammar.ra +0 -56
- data/lib/puppet/pops/parser/eparser.rb +1520 -1712
- data/lib/puppet/pops/parser/lexer2.rb +4 -4
- data/lib/puppet/pops/parser/parser_support.rb +0 -5
- data/lib/puppet/pops/resource/resource_type_impl.rb +2 -24
- data/lib/puppet/pops/types/type_calculator.rb +0 -7
- data/lib/puppet/pops/types/type_parser.rb +0 -4
- data/lib/puppet/pops/types/types.rb +0 -1
- data/lib/puppet/pops/validation/checker4_0.rb +9 -37
- data/lib/puppet/pops/validation/tasks_checker.rb +0 -12
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -2
- data/lib/puppet/provider.rb +0 -13
- data/lib/puppet/provider/nameservice.rb +0 -18
- data/lib/puppet/provider/package/dpkg.rb +0 -10
- data/lib/puppet/provider/package/gem.rb +23 -3
- data/lib/puppet/provider/package/pip.rb +0 -1
- data/lib/puppet/provider/package/pkg.rb +0 -4
- data/lib/puppet/provider/package/portage.rb +1 -1
- data/lib/puppet/provider/package/puppet_gem.rb +1 -4
- data/lib/puppet/provider/service/smf.rb +191 -73
- data/lib/puppet/provider/user/directoryservice.rb +0 -10
- data/lib/puppet/reference/configuration.rb +2 -0
- data/lib/puppet/reference/indirection.rb +1 -1
- data/lib/puppet/resource.rb +1 -89
- data/lib/puppet/resource/catalog.rb +1 -14
- data/lib/puppet/resource/type.rb +3 -119
- data/lib/puppet/resource/type_collection.rb +3 -48
- data/lib/puppet/runtime.rb +1 -2
- data/lib/puppet/settings.rb +45 -33
- data/lib/puppet/settings/base_setting.rb +26 -2
- data/lib/puppet/settings/integer_setting.rb +17 -0
- data/lib/puppet/settings/port_setting.rb +15 -0
- data/lib/puppet/settings/priority_setting.rb +5 -4
- data/lib/puppet/ssl.rb +10 -6
- data/lib/puppet/ssl/base.rb +3 -5
- data/lib/puppet/ssl/certificate.rb +0 -6
- data/lib/puppet/ssl/certificate_request.rb +1 -12
- data/lib/puppet/ssl/certificate_signer.rb +6 -0
- data/lib/puppet/ssl/oids.rb +3 -1
- data/lib/puppet/ssl/ssl_provider.rb +17 -0
- data/lib/puppet/ssl/state_machine.rb +3 -1
- data/lib/puppet/ssl/verifier.rb +2 -0
- data/lib/puppet/test/test_helper.rb +1 -3
- data/lib/puppet/transaction.rb +1 -7
- data/lib/puppet/transaction/report.rb +2 -4
- data/lib/puppet/type.rb +0 -76
- data/lib/puppet/type/file.rb +5 -7
- data/lib/puppet/type/file/checksum.rb +1 -1
- data/lib/puppet/type/file/source.rb +1 -1
- data/lib/puppet/type/filebucket.rb +3 -3
- data/lib/puppet/type/package.rb +5 -13
- data/lib/puppet/util/execution.rb +0 -11
- data/lib/puppet/util/http_proxy.rb +2 -215
- data/lib/puppet/util/monkey_patches.rb +0 -46
- data/lib/puppet/util/rdoc.rb +0 -7
- data/lib/puppet/util/retry_action.rb +1 -1
- data/lib/puppet/util/rubygems.rb +5 -1
- data/lib/puppet/util/run_mode.rb +9 -1
- data/lib/puppet/util/windows.rb +3 -8
- data/lib/puppet/util/windows/daemon.rb +360 -0
- data/lib/puppet/util/windows/error.rb +1 -0
- data/lib/puppet/util/windows/eventlog.rb +4 -9
- data/lib/puppet/util/windows/file.rb +8 -242
- data/lib/puppet/util/windows/monkey_patches/process.rb +414 -0
- data/lib/puppet/util/windows/process.rb +4 -226
- data/lib/puppet/util/windows/service.rb +9 -460
- data/lib/puppet/util/windows/string.rb +12 -13
- data/lib/puppet/util/yaml.rb +0 -22
- data/lib/puppet/vendor/require_vendored.rb +0 -1
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet/x509.rb +5 -1
- data/lib/puppet/x509/cert_provider.rb +29 -1
- data/locales/puppet.pot +531 -1232
- data/man/man5/puppet.conf.5 +37 -97
- data/man/man8/puppet-agent.8 +1 -1
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +55 -9
- data/man/man8/puppet-filebucket.8 +6 -6
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-module.8 +1 -58
- data/man/man8/puppet-node.8 +4 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +4 -1
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-ssl.8 +1 -1
- data/man/man8/puppet.8 +2 -2
- data/spec/fixtures/unit/provider/service/smf/{svcs.out → svcs_instances.out} +0 -0
- data/spec/integration/application/agent_spec.rb +24 -11
- data/spec/integration/application/apply_spec.rb +1 -1
- data/spec/integration/application/filebucket_spec.rb +16 -16
- data/spec/integration/application/help_spec.rb +2 -0
- data/spec/integration/application/plugin_spec.rb +23 -1
- data/spec/integration/defaults_spec.rb +7 -3
- data/spec/integration/environments/setting_hooks_spec.rb +1 -1
- data/spec/integration/network/http_pool_spec.rb +3 -21
- data/spec/integration/parser/catalog_spec.rb +0 -38
- data/spec/integration/parser/node_spec.rb +0 -9
- data/spec/integration/parser/pcore_resource_spec.rb +0 -37
- data/spec/integration/type/file_spec.rb +5 -4
- data/spec/integration/util/windows/monkey_patches/process_spec.rb +231 -0
- data/spec/integration/util/windows/security_spec.rb +1 -1
- data/spec/lib/puppet_spec/puppetserver.rb +1 -1
- data/spec/lib/puppet_spec/settings.rb +7 -1
- data/spec/spec_helper.rb +2 -0
- data/spec/unit/agent_spec.rb +0 -2
- data/spec/unit/application/config_spec.rb +224 -4
- data/spec/unit/application/facts_spec.rb +35 -0
- data/spec/unit/application/filebucket_spec.rb +41 -39
- data/spec/unit/application/ssl_spec.rb +2 -2
- data/spec/unit/certificate_factory_spec.rb +1 -1
- data/spec/unit/configurer/downloader_spec.rb +6 -2
- data/spec/unit/configurer/plugin_handler_spec.rb +56 -18
- data/spec/unit/configurer_spec.rb +12 -9
- data/spec/unit/context/trusted_information_spec.rb +2 -6
- data/spec/unit/defaults_spec.rb +77 -28
- data/spec/unit/environments_spec.rb +0 -3
- data/spec/unit/face/config_spec.rb +27 -32
- data/spec/unit/face/facts_spec.rb +4 -0
- data/spec/unit/face/plugin_spec.rb +73 -33
- data/spec/unit/file_bucket/file_spec.rb +1 -1
- data/spec/unit/file_serving/configuration/parser_spec.rb +14 -18
- data/spec/unit/file_serving/configuration_spec.rb +6 -12
- data/spec/unit/functions/camelcase_spec.rb +1 -1
- data/spec/unit/functions/capitalize_spec.rb +1 -1
- data/spec/unit/functions/downcase_spec.rb +1 -1
- data/spec/unit/functions/inline_epp_spec.rb +26 -1
- data/spec/unit/functions/upcase_spec.rb +1 -1
- data/spec/unit/http/client_spec.rb +7 -8
- data/spec/unit/{network/resolver_spec.rb → http/dns_spec.rb} +3 -3
- data/spec/unit/http/external_client_spec.rb +4 -4
- data/spec/unit/{network/http → http}/factory_spec.rb +5 -11
- data/spec/unit/{network/http/session_spec.rb → http/pool_entry_spec.rb} +3 -3
- data/spec/unit/{network/http → http}/pool_spec.rb +12 -17
- data/spec/unit/{util/http_proxy_spec.rb → http/proxy_spec.rb} +2 -69
- data/spec/unit/http/resolver_spec.rb +13 -13
- data/spec/unit/http/service/compiler_spec.rb +49 -62
- data/spec/unit/http/service/file_server_spec.rb +3 -3
- data/spec/unit/http/service/puppetserver_spec.rb +34 -4
- data/spec/unit/http/service_spec.rb +1 -2
- data/spec/unit/http/session_spec.rb +16 -14
- data/spec/unit/{network/http → http}/site_spec.rb +3 -3
- data/spec/unit/indirector/facts/facter_spec.rb +97 -0
- data/spec/unit/indirector/facts/json_spec.rb +255 -0
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +5 -3
- data/spec/unit/indirector/file_content/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_server_spec.rb +1 -15
- data/spec/unit/indirector/node/json_spec.rb +33 -0
- data/spec/{integration/indirector/report/yaml.rb → unit/indirector/report/json_spec.rb} +13 -24
- data/spec/unit/indirector/report/rest_spec.rb +2 -17
- data/spec/unit/indirector/report/yaml_spec.rb +72 -8
- data/spec/unit/indirector/request_spec.rb +0 -264
- data/spec/unit/indirector/rest_spec.rb +98 -752
- data/spec/unit/network/authconfig_spec.rb +2 -132
- data/spec/unit/network/authorization_spec.rb +2 -55
- data/spec/unit/network/formats_spec.rb +4 -4
- data/spec/unit/network/http/api/indirected_routes_spec.rb +1 -97
- data/spec/unit/network/http/api/master/v3_spec.rb +28 -7
- data/spec/unit/network/http/api_spec.rb +10 -0
- data/spec/unit/network/http/connection_spec.rb +19 -41
- data/spec/unit/network/http/handler_spec.rb +0 -6
- data/spec/unit/network/http_pool_spec.rb +0 -4
- data/spec/unit/node/environment_spec.rb +33 -21
- data/spec/unit/node_spec.rb +2 -54
- data/spec/unit/parser/functions/create_resources_spec.rb +2 -20
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +4 -7
- data/spec/unit/pops/loaders/loaders_spec.rb +6 -21
- data/spec/unit/pops/parser/parse_application_spec.rb +4 -22
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_capabilities_spec.rb +8 -21
- data/spec/unit/pops/parser/parse_site_spec.rb +20 -24
- data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -71
- data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
- data/spec/unit/pops/types/type_calculator_spec.rb +6 -6
- data/spec/unit/pops/types/type_factory_spec.rb +1 -1
- data/spec/unit/pops/validator/validator_spec.rb +61 -46
- data/spec/unit/pops/visitor_spec.rb +1 -1
- data/spec/unit/provider/nameservice_spec.rb +0 -57
- data/spec/unit/provider/package/dpkg_spec.rb +0 -48
- data/spec/unit/provider/package/gem_spec.rb +32 -0
- data/spec/unit/provider/package/puppet_gem_spec.rb +3 -2
- data/spec/unit/provider/service/smf_spec.rb +401 -165
- data/spec/unit/provider/service/windows_spec.rb +0 -1
- data/spec/unit/provider_spec.rb +0 -12
- data/spec/unit/puppet_pal_catalog_spec.rb +45 -0
- data/spec/unit/resource/type_collection_spec.rb +2 -22
- data/spec/unit/resource_spec.rb +0 -56
- data/spec/unit/settings/http_extra_headers_spec.rb +2 -4
- data/spec/unit/settings/integer_setting_spec.rb +42 -0
- data/spec/unit/settings/port_setting_spec.rb +31 -0
- data/spec/unit/settings/priority_setting_spec.rb +4 -4
- data/spec/unit/settings_spec.rb +423 -236
- data/spec/unit/ssl/base_spec.rb +36 -3
- data/spec/unit/ssl/certificate_request_spec.rb +15 -45
- data/spec/unit/ssl/certificate_spec.rb +2 -11
- data/spec/unit/ssl/ssl_provider_spec.rb +11 -8
- data/spec/unit/ssl/state_machine_spec.rb +0 -1
- data/spec/unit/ssl/verifier_spec.rb +0 -21
- data/spec/unit/transaction/report_spec.rb +0 -2
- data/spec/unit/transaction/resource_harness_spec.rb +2 -2
- data/spec/unit/transaction_spec.rb +45 -79
- data/spec/unit/type/file/checksum_spec.rb +6 -6
- data/spec/unit/type/file/content_spec.rb +1 -1
- data/spec/unit/type/file/ensure_spec.rb +1 -1
- data/spec/unit/type/file/mode_spec.rb +1 -1
- data/spec/unit/type/file/source_spec.rb +0 -1
- data/spec/unit/type/file_spec.rb +12 -6
- data/spec/unit/type/package_spec.rb +1 -1
- data/spec/unit/type_spec.rb +20 -0
- data/spec/unit/util/backups_spec.rb +0 -2
- data/spec/unit/util/execution_spec.rb +0 -29
- data/spec/unit/util/monkey_patches_spec.rb +0 -6
- data/spec/unit/util/rubygems_spec.rb +2 -2
- data/spec/unit/util/run_mode_spec.rb +21 -121
- data/spec/unit/util/windows/string_spec.rb +1 -3
- data/spec/unit/util/yaml_spec.rb +0 -54
- data/spec/unit/util_spec.rb +0 -18
- metadata +50 -232
- data/conf/auth.conf +0 -150
- data/lib/puppet/application/cert.rb +0 -76
- data/lib/puppet/application/key.rb +0 -4
- data/lib/puppet/application/man.rb +0 -4
- data/lib/puppet/application/status.rb +0 -4
- data/lib/puppet/face/key.rb +0 -16
- data/lib/puppet/face/man.rb +0 -145
- data/lib/puppet/face/module/build.rb +0 -14
- data/lib/puppet/face/module/generate.rb +0 -14
- data/lib/puppet/face/module/search.rb +0 -103
- data/lib/puppet/face/status.rb +0 -51
- data/lib/puppet/indirector/certificate/file.rb +0 -9
- data/lib/puppet/indirector/certificate/rest.rb +0 -18
- data/lib/puppet/indirector/certificate_request/file.rb +0 -9
- data/lib/puppet/indirector/certificate_request/memory.rb +0 -7
- data/lib/puppet/indirector/certificate_request/rest.rb +0 -11
- data/lib/puppet/indirector/file_content/http.rb +0 -22
- data/lib/puppet/indirector/key/file.rb +0 -46
- data/lib/puppet/indirector/key/memory.rb +0 -7
- data/lib/puppet/indirector/ssl_file.rb +0 -162
- data/lib/puppet/indirector/status.rb +0 -3
- data/lib/puppet/indirector/status/local.rb +0 -12
- data/lib/puppet/indirector/status/rest.rb +0 -27
- data/lib/puppet/module_tool/applications/searcher.rb +0 -29
- data/lib/puppet/network/auth_config_parser.rb +0 -90
- data/lib/puppet/network/authstore.rb +0 -283
- data/lib/puppet/network/http/api/master/v3/authorization.rb +0 -18
- data/lib/puppet/network/http/api/master/v3/environment.rb +0 -88
- data/lib/puppet/network/http/base_pool.rb +0 -36
- data/lib/puppet/network/http/compression.rb +0 -127
- data/lib/puppet/network/http/connection_adapter.rb +0 -184
- data/lib/puppet/network/http/nocache_pool.rb +0 -28
- data/lib/puppet/network/rest_controller.rb +0 -2
- data/lib/puppet/network/rights.rb +0 -210
- data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +0 -66
- data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +0 -22
- data/lib/puppet/parser/environment_compiler.rb +0 -202
- data/lib/puppet/pops/types/enumeration.rb +0 -16
- data/lib/puppet/resource/capability_finder.rb +0 -154
- data/lib/puppet/rest/errors.rb +0 -15
- data/lib/puppet/rest/response.rb +0 -35
- data/lib/puppet/rest/route.rb +0 -85
- data/lib/puppet/rest/routes.rb +0 -135
- data/lib/puppet/ssl/host.rb +0 -505
- data/lib/puppet/ssl/key.rb +0 -61
- data/lib/puppet/ssl/validator.rb +0 -61
- data/lib/puppet/ssl/validator/default_validator.rb +0 -209
- data/lib/puppet/ssl/validator/no_validator.rb +0 -22
- data/lib/puppet/ssl/verifier_adapter.rb +0 -58
- data/lib/puppet/status.rb +0 -40
- data/lib/puppet/util/connection.rb +0 -88
- data/lib/puppet/util/ssl.rb +0 -83
- data/lib/puppet/util/windows/api_types.rb +0 -309
- data/lib/puppet/util/windows/monkey_patches/dir.rb +0 -40
- data/lib/puppet/vendor/load_pathspec.rb +0 -1
- data/lib/puppet/vendor/pathspec/CHANGELOG.md +0 -2
- data/lib/puppet/vendor/pathspec/LICENSE +0 -201
- data/lib/puppet/vendor/pathspec/PUPPET_README.md +0 -6
- data/lib/puppet/vendor/pathspec/README.md +0 -53
- data/lib/puppet/vendor/pathspec/lib/pathspec.rb +0 -122
- data/lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb +0 -275
- data/lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb +0 -17
- data/lib/puppet/vendor/pathspec/lib/pathspec/spec.rb +0 -14
- data/man/man8/puppet-key.8 +0 -126
- data/man/man8/puppet-man.8 +0 -76
- data/man/man8/puppet-status.8 +0 -108
- data/spec/integration/application/config_spec.rb +0 -74
- data/spec/integration/network/authconfig_spec.rb +0 -256
- data/spec/integration/util/windows/monkey_patches/dir_spec.rb +0 -11
- data/spec/unit/application/man_spec.rb +0 -52
- data/spec/unit/capability_spec.rb +0 -414
- data/spec/unit/face/catalog_spec.rb +0 -6
- data/spec/unit/face/key_spec.rb +0 -9
- data/spec/unit/face/module/search_spec.rb +0 -231
- data/spec/unit/face/module_spec.rb +0 -3
- data/spec/unit/face/status_spec.rb +0 -9
- data/spec/unit/indirector/certificate/file_spec.rb +0 -14
- data/spec/unit/indirector/certificate/rest_spec.rb +0 -61
- data/spec/unit/indirector/certificate_request/file_spec.rb +0 -14
- data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -25
- data/spec/unit/indirector/key/file_spec.rb +0 -79
- data/spec/unit/indirector/ssl_file_spec.rb +0 -305
- data/spec/unit/indirector/status/local_spec.rb +0 -10
- data/spec/unit/indirector/status/rest_spec.rb +0 -50
- data/spec/unit/module_tool/applications/searcher_spec.rb +0 -38
- data/spec/unit/network/auth_config_parser_spec.rb +0 -115
- data/spec/unit/network/authstore_spec.rb +0 -422
- data/spec/unit/network/http/api/master/v3/authorization_spec.rb +0 -57
- data/spec/unit/network/http/api/master/v3/environment_spec.rb +0 -185
- data/spec/unit/network/http/compression_spec.rb +0 -240
- data/spec/unit/network/http/nocache_pool_spec.rb +0 -64
- data/spec/unit/network/http_spec.rb +0 -9
- data/spec/unit/network/rights_spec.rb +0 -439
- data/spec/unit/parser/environment_compiler_spec.rb +0 -730
- data/spec/unit/pops/types/enumeration_spec.rb +0 -51
- data/spec/unit/resource/capability_finder_spec.rb +0 -143
- data/spec/unit/rest/route_spec.rb +0 -132
- data/spec/unit/ssl/host_spec.rb +0 -650
- data/spec/unit/ssl/key_spec.rb +0 -173
- data/spec/unit/ssl/validator_spec.rb +0 -278
- data/spec/unit/status_spec.rb +0 -45
- data/spec/unit/util/ssl_spec.rb +0 -91
@@ -822,7 +822,7 @@ describe "Puppet::Util::Windows::Security", :if => Puppet::Util::Platform.window
|
|
822
822
|
end
|
823
823
|
|
824
824
|
describe "locked files" do
|
825
|
-
let (:explorer) { File.join(
|
825
|
+
let (:explorer) { File.join(ENV['SystemRoot'], "explorer.exe") }
|
826
826
|
|
827
827
|
it "should get the owner" do
|
828
828
|
expect(winsec.get_owner(explorer)).to match(/^S-1-5-/)
|
@@ -103,7 +103,7 @@ class PuppetSpec::Puppetserver
|
|
103
103
|
end
|
104
104
|
|
105
105
|
def register_mounts(mounts: {})
|
106
|
-
register_mount('/status/v1/simple/
|
106
|
+
register_mount('/status/v1/simple/server', proc { |req, res| }, nil)
|
107
107
|
register_mount('/puppet/v3/node', mounts[:node], NodeServlet)
|
108
108
|
register_mount('/puppet/v3/catalog', mounts[:catalog], CatalogServlet)
|
109
109
|
register_mount('/puppet/v3/file_metadatas', mounts[:file_metadatas], FileMetadatasServlet)
|
@@ -11,8 +11,14 @@ module PuppetSpec::Settings
|
|
11
11
|
:confdir => { :type => :directory, :default => "test", :desc => "confdir" },
|
12
12
|
:codedir => { :type => :directory, :default => "test", :desc => "codedir" },
|
13
13
|
:vardir => { :type => :directory, :default => "test", :desc => "vardir" },
|
14
|
+
:publicdir => { :type => :directory, :default => "test", :desc => "publicdir" },
|
14
15
|
:rundir => { :type => :directory, :default => "test", :desc => "rundir" },
|
15
|
-
}
|
16
|
+
}.freeze
|
17
|
+
|
18
|
+
TEST_APP_DEFAULT_VALUES = TEST_APP_DEFAULT_DEFINITIONS.inject({}) do |memo, (key, value)|
|
19
|
+
memo[key] = value[:default]
|
20
|
+
memo
|
21
|
+
end.freeze
|
16
22
|
|
17
23
|
def set_puppet_conf(confdir, settings)
|
18
24
|
write_file(File.join(confdir, "puppet.conf"), settings)
|
data/spec/spec_helper.rb
CHANGED
@@ -148,6 +148,7 @@ RSpec.configure do |config|
|
|
148
148
|
|
149
149
|
base = PuppetSpec::Files.tmpdir('tmp_settings')
|
150
150
|
Puppet[:vardir] = File.join(base, 'var')
|
151
|
+
Puppet[:publicdir] = File.join(base, 'public')
|
151
152
|
Puppet[:confdir] = File.join(base, 'etc')
|
152
153
|
Puppet[:codedir] = File.join(base, 'code')
|
153
154
|
Puppet[:logdir] = "$vardir/log"
|
@@ -155,6 +156,7 @@ RSpec.configure do |config|
|
|
155
156
|
Puppet[:hiera_config] = File.join(base, 'hiera')
|
156
157
|
|
157
158
|
FileUtils.mkdir_p Puppet[:statedir]
|
159
|
+
FileUtils.mkdir_p Puppet[:publicdir]
|
158
160
|
|
159
161
|
Puppet::Test::TestHelper.before_each_test()
|
160
162
|
end
|
data/spec/unit/agent_spec.rb
CHANGED
@@ -20,8 +20,6 @@ end
|
|
20
20
|
|
21
21
|
describe Puppet::Agent do
|
22
22
|
before do
|
23
|
-
allow(Puppet::Status.indirection).to receive(:find).and_return(Puppet::Status.new("version" => Puppet.version))
|
24
|
-
|
25
23
|
@agent = Puppet::Agent.new(AgentTestClient, false)
|
26
24
|
|
27
25
|
# make Puppet::Application safe for stubbing; restore in an :after block; silence warnings for this.
|
@@ -1,12 +1,232 @@
|
|
1
|
+
# coding: utf-8
|
1
2
|
require 'spec_helper'
|
2
3
|
require 'puppet/application/config'
|
3
4
|
|
4
5
|
describe Puppet::Application::Config do
|
5
|
-
|
6
|
-
|
6
|
+
include PuppetSpec::Files
|
7
|
+
|
8
|
+
# different UTF-8 widths
|
9
|
+
# 1-byte A
|
10
|
+
# 2-byte ۿ - http://www.fileformat.info/info/unicode/char/06ff/index.htm - 0xDB 0xBF / 219 191
|
11
|
+
# 3-byte ᚠ - http://www.fileformat.info/info/unicode/char/16A0/index.htm - 0xE1 0x9A 0xA0 / 225 154 160
|
12
|
+
# 4-byte 𠜎 - http://www.fileformat.info/info/unicode/char/2070E/index.htm - 0xF0 0xA0 0x9C 0x8E / 240 160 156 142
|
13
|
+
MIXED_UTF8 = "A\u06FF\u16A0\u{2070E}" # Aۿᚠ𠜎
|
14
|
+
|
15
|
+
let(:app) { Puppet::Application[:config] }
|
16
|
+
|
17
|
+
before :each do
|
18
|
+
Puppet[:config] = tmpfile('config')
|
19
|
+
end
|
20
|
+
|
21
|
+
def initialize_app(args)
|
22
|
+
app.command_line.args = args
|
23
|
+
# ensure global defaults are initialized prior to app defaults
|
24
|
+
Puppet.initialize_settings(args)
|
25
|
+
end
|
26
|
+
|
27
|
+
def read_utf8(path)
|
28
|
+
File.read(path, :encoding => 'UTF-8')
|
29
|
+
end
|
30
|
+
|
31
|
+
def write_utf8(path, content)
|
32
|
+
File.write(path, content, 0, :encoding => 'UTF-8')
|
33
|
+
end
|
34
|
+
|
35
|
+
context "when printing" do
|
36
|
+
it "prints a value" do
|
37
|
+
initialize_app(%w[print certname])
|
38
|
+
|
39
|
+
expect {
|
40
|
+
app.run
|
41
|
+
}.to exit_with(0)
|
42
|
+
.and output(a_string_matching(Puppet[:certname])).to_stdout
|
43
|
+
end
|
44
|
+
|
45
|
+
it "prints a value from a section" do
|
46
|
+
File.write(Puppet[:config], <<~END)
|
47
|
+
[main]
|
48
|
+
external_nodes=none
|
49
|
+
[server]
|
50
|
+
external_nodes=exec
|
51
|
+
END
|
52
|
+
|
53
|
+
initialize_app(%w[print external_nodes --section server])
|
54
|
+
|
55
|
+
expect {
|
56
|
+
app.run
|
57
|
+
}.to exit_with(0)
|
58
|
+
.and output(a_string_matching('exec')).to_stdout
|
59
|
+
end
|
60
|
+
|
61
|
+
it "doesn't require the environment to exist" do
|
62
|
+
initialize_app(%w[print certname --environment doesntexist])
|
63
|
+
|
64
|
+
expect {
|
65
|
+
app.run
|
66
|
+
}.to exit_with(0)
|
67
|
+
.and output(a_string_matching(Puppet[:certname])).to_stdout
|
68
|
+
end
|
7
69
|
end
|
8
70
|
|
9
|
-
|
10
|
-
|
71
|
+
context "when setting" do
|
72
|
+
it "sets a value in its config file" do
|
73
|
+
initialize_app(%w[set certname www.example.com])
|
74
|
+
|
75
|
+
expect {
|
76
|
+
app.run
|
77
|
+
}.to exit_with(0)
|
78
|
+
|
79
|
+
expect(File.read(Puppet[:config])).to eq("[main]\ncertname = www.example.com\n")
|
80
|
+
end
|
81
|
+
|
82
|
+
it "sets a value in the server section" do
|
83
|
+
initialize_app(%w[set external_nodes exec --section server])
|
84
|
+
|
85
|
+
expect {
|
86
|
+
app.run
|
87
|
+
}.to exit_with(0)
|
88
|
+
|
89
|
+
expect(File.read(Puppet[:config])).to eq("[server]\nexternal_nodes = exec\n")
|
90
|
+
end
|
91
|
+
|
92
|
+
{
|
93
|
+
%w[certname WWW.EXAMPLE.COM] => /Certificate names must be lower case/,
|
94
|
+
%w[log_level all] => /Invalid loglevel all/,
|
95
|
+
%w[disable_warnings true] => /Cannot disable unrecognized warning types 'true'/,
|
96
|
+
%w[strict on] => /Invalid value 'on' for parameter strict/,
|
97
|
+
%w[digest_algorithm rot13] => /Invalid value 'rot13' for parameter digest_algorithm/,
|
98
|
+
%w[http_proxy_password a#b] => /Passwords set in the http_proxy_password setting must be valid as part of a URL/,
|
99
|
+
}.each_pair do |args, message|
|
100
|
+
it "rejects #{args.join(' ')}" do
|
101
|
+
initialize_app(['set', *args])
|
102
|
+
|
103
|
+
expect {
|
104
|
+
app.run
|
105
|
+
}.to exit_with(1)
|
106
|
+
.and output(message).to_stderr
|
107
|
+
end
|
108
|
+
end
|
109
|
+
|
110
|
+
it 'sets unknown settings' do
|
111
|
+
initialize_app(['set', 'notarealsetting', 'true'])
|
112
|
+
|
113
|
+
expect {
|
114
|
+
app.run
|
115
|
+
}.to exit_with(0)
|
116
|
+
|
117
|
+
expect(File.read(Puppet[:config])).to eq("[main]\nnotarealsetting = true\n")
|
118
|
+
end
|
119
|
+
end
|
120
|
+
|
121
|
+
context "when deleting" do
|
122
|
+
it "deletes a value" do
|
123
|
+
initialize_app(%w[delete external_nodes])
|
124
|
+
|
125
|
+
File.write(Puppet[:config], <<~END)
|
126
|
+
[main]
|
127
|
+
external_nodes=none
|
128
|
+
END
|
129
|
+
|
130
|
+
expect {
|
131
|
+
app.run
|
132
|
+
}.to exit_with(0)
|
133
|
+
.and output(/Deleted setting from 'main': 'external_nodes=none'/).to_stdout
|
134
|
+
|
135
|
+
expect(File.read(Puppet[:config])).to eq("[main]\n")
|
136
|
+
end
|
137
|
+
|
138
|
+
it "warns when deleting a value that isn't set" do
|
139
|
+
initialize_app(%w[delete external_nodes])
|
140
|
+
|
141
|
+
File.write(Puppet[:config], "")
|
142
|
+
|
143
|
+
expect {
|
144
|
+
app.run
|
145
|
+
}.to exit_with(0)
|
146
|
+
.and output(a_string_matching("Warning: No setting found in configuration file for section 'main' setting name 'external_nodes'")).to_stderr
|
147
|
+
|
148
|
+
expect(File.read(Puppet[:config])).to eq("")
|
149
|
+
end
|
150
|
+
|
151
|
+
it "deletes a value from main" do
|
152
|
+
initialize_app(%w[delete external_nodes])
|
153
|
+
|
154
|
+
File.write(Puppet[:config], <<~END)
|
155
|
+
[main]
|
156
|
+
external_nodes=none
|
157
|
+
END
|
158
|
+
|
159
|
+
expect {
|
160
|
+
app.run
|
161
|
+
}.to exit_with(0)
|
162
|
+
.and output(/Deleted setting from 'main': 'external_nodes=none'/).to_stdout
|
163
|
+
|
164
|
+
expect(File.read(Puppet[:config])).to eq("[main]\n")
|
165
|
+
end
|
166
|
+
|
167
|
+
it "deletes a value from main a section" do
|
168
|
+
initialize_app(%w[delete external_nodes --section server])
|
169
|
+
|
170
|
+
File.write(Puppet[:config], <<~END)
|
171
|
+
[main]
|
172
|
+
external_nodes=none
|
173
|
+
[server]
|
174
|
+
external_nodes=exec
|
175
|
+
END
|
176
|
+
|
177
|
+
expect {
|
178
|
+
app.run
|
179
|
+
}.to exit_with(0)
|
180
|
+
.and output(/Deleted setting from 'server': 'external_nodes'/).to_stdout
|
181
|
+
|
182
|
+
expect(File.read(Puppet[:config])).to eq("[main]\nexternal_nodes=none\n[server]\n")
|
183
|
+
end
|
184
|
+
end
|
185
|
+
|
186
|
+
context "when managing UTF-8 values" do
|
187
|
+
it "reads a UTF-8 value" do
|
188
|
+
write_utf8(Puppet[:config], <<~EOF)
|
189
|
+
[main]
|
190
|
+
tags=#{MIXED_UTF8}
|
191
|
+
EOF
|
192
|
+
|
193
|
+
initialize_app(%w[print tags])
|
194
|
+
|
195
|
+
expect {
|
196
|
+
app.run
|
197
|
+
}.to exit_with(0)
|
198
|
+
.and output("#{MIXED_UTF8}\n").to_stdout
|
199
|
+
end
|
200
|
+
|
201
|
+
it "sets a UTF-8 value" do
|
202
|
+
initialize_app(['set', 'tags', MIXED_UTF8])
|
203
|
+
|
204
|
+
expect {
|
205
|
+
app.run
|
206
|
+
}.to exit_with(0)
|
207
|
+
|
208
|
+
expect(read_utf8(Puppet[:config])).to eq(<<~EOF)
|
209
|
+
[main]
|
210
|
+
tags = #{MIXED_UTF8}
|
211
|
+
EOF
|
212
|
+
end
|
213
|
+
|
214
|
+
it "deletes a UTF-8 value" do
|
215
|
+
initialize_app(%w[delete tags])
|
216
|
+
|
217
|
+
write_utf8(Puppet[:config], <<~EOF)
|
218
|
+
[main]
|
219
|
+
tags=#{MIXED_UTF8}
|
220
|
+
EOF
|
221
|
+
|
222
|
+
expect {
|
223
|
+
app.run
|
224
|
+
}.to exit_with(0)
|
225
|
+
.and output(/Deleted setting from 'main': 'tags=#{MIXED_UTF8}'/).to_stdout
|
226
|
+
|
227
|
+
expect(read_utf8(Puppet[:config])).to eq(<<~EOF)
|
228
|
+
[main]
|
229
|
+
EOF
|
230
|
+
end
|
11
231
|
end
|
12
232
|
end
|
@@ -50,4 +50,39 @@ describe Puppet::Application::Facts do
|
|
50
50
|
}.to exit_with(0)
|
51
51
|
.and output(expected).to_stdout
|
52
52
|
end
|
53
|
+
|
54
|
+
context 'when show action is called' do
|
55
|
+
let(:expected) { "{\n \"filesystems\": \"apfs,autofs,devfs\",\n \"macaddress\": \"64:52:11:22:03:25\"\n}\n" }
|
56
|
+
|
57
|
+
before :each do
|
58
|
+
Puppet::Node::Facts.indirection.terminus_class = :facter
|
59
|
+
allow(Facter).to receive(:resolve).and_return(values)
|
60
|
+
app.command_line.args = %w{show}
|
61
|
+
end
|
62
|
+
|
63
|
+
it 'correctly displays facts with default formatting' do
|
64
|
+
expect {
|
65
|
+
app.run
|
66
|
+
}.to exit_with(0)
|
67
|
+
.and output(expected).to_stdout
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
context 'when default action is called' do
|
72
|
+
let(:expected) { "---\nfilesystems: apfs,autofs,devfs\nmacaddress: 64:52:11:22:03:25\n" }
|
73
|
+
|
74
|
+
before :each do
|
75
|
+
Puppet::Node::Facts.indirection.terminus_class = :facter
|
76
|
+
allow(Facter).to receive(:resolve).and_return(values)
|
77
|
+
app.command_line.args = %w{--render-as yaml}
|
78
|
+
end
|
79
|
+
|
80
|
+
it 'calls show action' do
|
81
|
+
expect {
|
82
|
+
app.run
|
83
|
+
}.to exit_with(0)
|
84
|
+
.and output(expected).to_stdout
|
85
|
+
expect(app.action.name).to eq(:show)
|
86
|
+
end
|
87
|
+
end
|
53
88
|
end
|
@@ -115,15 +115,15 @@ describe Puppet::Application::Filebucket do
|
|
115
115
|
end
|
116
116
|
|
117
117
|
it "should default to the first good server_list entry if server_list is set" do
|
118
|
-
stub_request(:get, "https://foo:8140/status/v1/simple/
|
118
|
+
stub_request(:get, "https://foo:8140/status/v1/simple/server").to_return(status: 200)
|
119
119
|
Puppet[:server_list] = "foo,bar,baz"
|
120
120
|
expect(Puppet::FileBucket::Dipper).to receive(:new).with(hash_including(Server: "foo"))
|
121
121
|
@filebucket.setup
|
122
122
|
end
|
123
123
|
|
124
124
|
it "should walk server_list until it finds a good entry" do
|
125
|
-
stub_request(:get, "https://foo:8140/status/v1/simple/
|
126
|
-
stub_request(:get, "https://bar:8140/status/v1/simple/
|
125
|
+
stub_request(:get, "https://foo:8140/status/v1/simple/server").to_return(status: 502)
|
126
|
+
stub_request(:get, "https://bar:8140/status/v1/simple/server").to_return(status: 200)
|
127
127
|
Puppet[:server_list] = "foo,bar,baz"
|
128
128
|
expect(Puppet::FileBucket::Dipper).to receive(:new).with(hash_including(Server: "bar"))
|
129
129
|
@filebucket.setup
|
@@ -131,6 +131,8 @@ describe Puppet::Application::Filebucket do
|
|
131
131
|
|
132
132
|
# FileBucket catches any exceptions raised, logs them, then just exits
|
133
133
|
it "raises an error if there are no functional servers in server_list" do
|
134
|
+
stub_request(:get, "https://foo:8140/status/v1/simple/server").to_return(status: 404)
|
135
|
+
stub_request(:get, "https://bar:8140/status/v1/simple/server").to_return(status: 404)
|
134
136
|
stub_request(:get, "https://foo:8140/status/v1/simple/master").to_return(status: 404)
|
135
137
|
stub_request(:get, "https://bar:8140/status/v1/simple/master").to_return(status: 404)
|
136
138
|
Puppet[:server] = 'horacio'
|
@@ -146,7 +148,7 @@ describe Puppet::Application::Filebucket do
|
|
146
148
|
end
|
147
149
|
|
148
150
|
it "should take both the server and port specified in server_list" do
|
149
|
-
stub_request(:get, "https://foo:632/status/v1/simple/
|
151
|
+
stub_request(:get, "https://foo:632/status/v1/simple/server").to_return(status: 200)
|
150
152
|
Puppet[:server_list] = "foo:632,bar:6215,baz:351"
|
151
153
|
expect(Puppet::FileBucket::Dipper).to receive(:new).with({ :Server => "foo", :Port => 632 })
|
152
154
|
@filebucket.setup
|
@@ -187,11 +189,11 @@ describe Puppet::Application::Filebucket do
|
|
187
189
|
@filebucket.get
|
188
190
|
end
|
189
191
|
|
190
|
-
it "should call the client getfile method with the given
|
191
|
-
|
192
|
-
allow(@filebucket).to receive(:args).and_return([
|
192
|
+
it "should call the client getfile method with the given digest" do
|
193
|
+
digest = 'DEADBEEF'
|
194
|
+
allow(@filebucket).to receive(:args).and_return([digest])
|
193
195
|
|
194
|
-
expect(@client).to receive(:getfile).with(
|
196
|
+
expect(@client).to receive(:getfile).with(digest)
|
195
197
|
|
196
198
|
@filebucket.get
|
197
199
|
end
|
@@ -225,12 +227,12 @@ describe Puppet::Application::Filebucket do
|
|
225
227
|
end
|
226
228
|
|
227
229
|
describe "the command restore" do
|
228
|
-
it "should call the client getfile method with the given
|
229
|
-
|
230
|
-
file=
|
231
|
-
allow(@filebucket).to receive(:args).and_return([file,
|
230
|
+
it "should call the client getfile method with the given digest" do
|
231
|
+
digest = 'DEADBEEF'
|
232
|
+
file = 'testfile'
|
233
|
+
allow(@filebucket).to receive(:args).and_return([file, digest])
|
232
234
|
|
233
|
-
expect(@client).to receive(:restore).with(file,
|
235
|
+
expect(@client).to receive(:restore).with(file, digest)
|
234
236
|
|
235
237
|
@filebucket.restore
|
236
238
|
end
|
@@ -238,55 +240,55 @@ describe Puppet::Application::Filebucket do
|
|
238
240
|
|
239
241
|
describe "the command diff" do
|
240
242
|
it "should call the client diff method with 2 given checksums" do
|
241
|
-
|
242
|
-
|
243
|
+
digest_a = 'DEADBEEF'
|
244
|
+
digest_b = 'BEEF'
|
243
245
|
allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
|
244
|
-
allow(@filebucket).to receive(:args).and_return([
|
246
|
+
allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
|
245
247
|
|
246
|
-
expect(@client).to receive(:diff).with(
|
248
|
+
expect(@client).to receive(:diff).with(digest_a, digest_b, nil, nil)
|
247
249
|
|
248
250
|
@filebucket.diff
|
249
251
|
end
|
250
252
|
|
251
|
-
it "should call the
|
252
|
-
|
253
|
-
|
254
|
-
allow(Puppet::FileSystem).to receive(:exist?).with(
|
255
|
-
allow(Puppet::FileSystem).to receive(:exist?).with(
|
256
|
-
allow(@filebucket).to receive(:args).and_return([
|
253
|
+
it "should call the client diff with a path if the second argument is a file" do
|
254
|
+
digest_a = 'DEADBEEF'
|
255
|
+
digest_b = 'BEEF'
|
256
|
+
allow(Puppet::FileSystem).to receive(:exist?).with(digest_a).and_return(false)
|
257
|
+
allow(Puppet::FileSystem).to receive(:exist?).with(digest_b).and_return(true)
|
258
|
+
allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
|
257
259
|
|
258
|
-
expect(@client).to receive(:diff).with(
|
260
|
+
expect(@client).to receive(:diff).with(digest_a, nil, nil, digest_b)
|
259
261
|
|
260
262
|
@filebucket.diff
|
261
263
|
end
|
262
264
|
|
263
|
-
it "should call the
|
264
|
-
|
265
|
-
|
266
|
-
allow(Puppet::FileSystem).to receive(:exist?).with(
|
267
|
-
allow(Puppet::FileSystem).to receive(:exist?).with(
|
268
|
-
allow(@filebucket).to receive(:args).and_return([
|
265
|
+
it "should call the client diff with a path if the first argument is a file" do
|
266
|
+
digest_a = 'DEADBEEF'
|
267
|
+
digest_b = 'BEEF'
|
268
|
+
allow(Puppet::FileSystem).to receive(:exist?).with(digest_a).and_return(true)
|
269
|
+
allow(Puppet::FileSystem).to receive(:exist?).with(digest_b).and_return(false)
|
270
|
+
allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
|
269
271
|
|
270
|
-
expect(@client).to receive(:diff).with(nil,
|
272
|
+
expect(@client).to receive(:diff).with(nil, digest_b, digest_a, nil)
|
271
273
|
|
272
274
|
@filebucket.diff
|
273
275
|
end
|
274
276
|
|
275
277
|
it "should call the clien diff with paths if the both arguments are files" do
|
276
|
-
|
277
|
-
|
278
|
-
allow(Puppet::FileSystem).to receive(:exist?).with(
|
279
|
-
allow(Puppet::FileSystem).to receive(:exist?).with(
|
280
|
-
allow(@filebucket).to receive(:args).and_return([
|
278
|
+
digest_a = 'DEADBEEF'
|
279
|
+
digest_b = 'BEEF'
|
280
|
+
allow(Puppet::FileSystem).to receive(:exist?).with(digest_a).and_return(true)
|
281
|
+
allow(Puppet::FileSystem).to receive(:exist?).with(digest_b).and_return(true)
|
282
|
+
allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
|
281
283
|
|
282
|
-
expect(@client).to receive(:diff).with(nil, nil,
|
284
|
+
expect(@client).to receive(:diff).with(nil, nil, digest_a, digest_b)
|
283
285
|
|
284
286
|
@filebucket.diff
|
285
287
|
end
|
286
288
|
|
287
289
|
it "should fail if only one checksum is given" do
|
288
|
-
|
289
|
-
allow(@filebucket).to receive(:args).and_return([
|
290
|
+
digest_a = 'DEADBEEF'
|
291
|
+
allow(@filebucket).to receive(:args).and_return([digest_a])
|
290
292
|
|
291
293
|
expect { @filebucket.diff }.to raise_error Puppet::Error
|
292
294
|
end
|