puppet 6.20.0-x86-mingw32 → 7.4.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 -4
- data/Gemfile.lock +13 -13
- data/README.md +1 -1
- data/conf/fileserver.conf +5 -10
- data/ext/build_defaults.yaml +1 -2
- data/ext/osx/file_mapping.yaml +0 -5
- data/ext/project_data.yaml +2 -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 +13 -9
- data/lib/puppet/application/ssl.rb +1 -1
- data/lib/puppet/configurer.rb +27 -29
- data/lib/puppet/configurer/plugin_handler.rb +21 -19
- data/lib/puppet/defaults.rb +57 -162
- data/lib/puppet/environments.rb +8 -23
- data/lib/puppet/face/facts.rb +73 -49
- data/lib/puppet/face/help.rb +1 -1
- data/lib/puppet/face/node/clean.rb +8 -0
- 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 +6 -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/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/facts/facter.rb +25 -3
- data/lib/puppet/indirector/facts/rest.rb +3 -22
- 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/node/rest.rb +2 -4
- 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 +67 -0
- 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 +3 -1
- 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 +0 -5
- 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/property/list.rb +1 -1
- data/lib/puppet/provider.rb +0 -13
- data/lib/puppet/provider/group/groupadd.rb +13 -8
- data/lib/puppet/provider/nameservice.rb +0 -18
- data/lib/puppet/provider/package/apt.rb +30 -2
- data/lib/puppet/provider/package/aptitude.rb +6 -0
- 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/debian.rb +2 -0
- data/lib/puppet/provider/service/smf.rb +191 -73
- data/lib/puppet/provider/user/directoryservice.rb +0 -10
- data/lib/puppet/provider/user/useradd.rb +55 -8
- data/lib/puppet/reference/configuration.rb +7 -5
- 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/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 +8 -16
- data/lib/puppet/type/user.rb +1 -1
- 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/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 +521 -1226
- data/man/man5/puppet.conf.5 +35 -95
- 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 +57 -36
- data/man/man8/puppet-filebucket.8 +4 -4
- 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 +1 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +1 -1
- data/man/man8/puppet-resource.8 +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 +57 -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/indirector/file_content/file_server_spec.rb +0 -2
- data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -2
- 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 +1 -0
- data/spec/spec_helper.rb +2 -0
- data/spec/unit/agent_spec.rb +0 -2
- data/spec/unit/application/facts_spec.rb +86 -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 +22 -47
- data/spec/unit/environments_spec.rb +0 -3
- data/spec/unit/face/facts_spec.rb +4 -0
- data/spec/unit/face/node_spec.rb +14 -2
- 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 +22 -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/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 +0 -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 +0 -1
- 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 +113 -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/report/rest_spec.rb +2 -17
- 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 -129
- data/spec/unit/network/authorization_spec.rb +2 -55
- data/spec/unit/network/formats_spec.rb +45 -4
- data/spec/unit/network/http/api/indirected_routes_spec.rb +1 -92
- 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 -1
- 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/group/groupadd_spec.rb +5 -2
- data/spec/unit/provider/nameservice_spec.rb +0 -57
- data/spec/unit/provider/package/apt_spec.rb +24 -15
- data/spec/unit/provider/package/aptitude_spec.rb +1 -1
- 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/user/useradd_spec.rb +55 -3
- data/spec/unit/provider_spec.rb +0 -12
- 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 +17 -0
- data/spec/unit/ssl/base_spec.rb +36 -3
- data/spec/unit/ssl/certificate_request_spec.rb +19 -55
- data/spec/unit/ssl/certificate_spec.rb +2 -11
- 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/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 +48 -219
- 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/fact_dif.rb +0 -62
- 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/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/key_spec.rb +0 -9
- data/spec/unit/face/module/search_spec.rb +0 -231
- 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 -78
- 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 -148
- data/spec/unit/rest/route_spec.rb +0 -132
- data/spec/unit/ssl/host_spec.rb +0 -645
- 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
@@ -11,7 +11,6 @@ describe Puppet::HTTP::Service::Compiler do
|
|
11
11
|
let(:node) { Puppet::Node.new(certname) }
|
12
12
|
let(:facts) { Puppet::Node::Facts.new(certname) }
|
13
13
|
let(:catalog) { Puppet::Resource::Catalog.new(certname) }
|
14
|
-
let(:status) { Puppet::Status.new }
|
15
14
|
let(:formatter) { Puppet::Network::FormatHandler.format(:json) }
|
16
15
|
|
17
16
|
before :each do
|
@@ -466,67 +465,6 @@ describe Puppet::HTTP::Service::Compiler do
|
|
466
465
|
end
|
467
466
|
end
|
468
467
|
|
469
|
-
context 'when getting status' do
|
470
|
-
let(:uri) { %r{/puppet/v3/status/ziggy} }
|
471
|
-
let(:status_response) { { body: formatter.render(status), headers: {'Content-Type' => formatter.mime } } }
|
472
|
-
|
473
|
-
it 'always sends production' do
|
474
|
-
stub_request(:get, uri)
|
475
|
-
.with(query: hash_including("environment" => "production"))
|
476
|
-
.to_return(**status_response)
|
477
|
-
|
478
|
-
subject.get_status(certname)
|
479
|
-
end
|
480
|
-
|
481
|
-
it 'returns a deserialized status' do
|
482
|
-
stub_request(:get, uri)
|
483
|
-
.to_return(**status_response)
|
484
|
-
|
485
|
-
_, s = subject.get_status(certname)
|
486
|
-
expect(s).to be_a(Puppet::Status)
|
487
|
-
expect(s.status).to eq("is_alive" => true)
|
488
|
-
end
|
489
|
-
|
490
|
-
it 'returns the request response' do
|
491
|
-
stub_request(:get, uri)
|
492
|
-
.to_return(**status_response)
|
493
|
-
|
494
|
-
resp, _ = subject.get_status(certname)
|
495
|
-
expect(resp).to be_a(Puppet::HTTP::Response)
|
496
|
-
end
|
497
|
-
|
498
|
-
it 'raises a response error if unsuccessful' do
|
499
|
-
stub_request(:get, uri)
|
500
|
-
.to_return(status: [500, "Server Error"])
|
501
|
-
|
502
|
-
expect {
|
503
|
-
subject.get_status(certname)
|
504
|
-
}.to raise_error do |err|
|
505
|
-
expect(err).to be_an_instance_of(Puppet::HTTP::ResponseError)
|
506
|
-
expect(err.message).to eq('Server Error')
|
507
|
-
expect(err.response.code).to eq(500)
|
508
|
-
end
|
509
|
-
end
|
510
|
-
|
511
|
-
it 'raises a protocol error if the content-type header is missing' do
|
512
|
-
stub_request(:get, uri)
|
513
|
-
.to_return(body: "content-type is missing")
|
514
|
-
|
515
|
-
expect {
|
516
|
-
subject.get_status(certname)
|
517
|
-
}.to raise_error(Puppet::HTTP::ProtocolError, /No content type in http response; cannot parse/)
|
518
|
-
end
|
519
|
-
|
520
|
-
it 'raises a serialization error if the content is invalid' do
|
521
|
-
stub_request(:get, uri)
|
522
|
-
.to_return(body: "this isn't valid JSON", headers: {'Content-Type' => 'application/json'})
|
523
|
-
|
524
|
-
expect {
|
525
|
-
subject.get_status(certname)
|
526
|
-
}.to raise_error(Puppet::HTTP::SerializationError, /Failed to deserialize Puppet::Status from json/)
|
527
|
-
end
|
528
|
-
end
|
529
|
-
|
530
468
|
context 'filebucket' do
|
531
469
|
let(:filebucket_file) { Puppet::FileBucket::File.new('file to store') }
|
532
470
|
let(:formatter) { Puppet::Network::FormatHandler.format(:binary) }
|
@@ -41,7 +41,7 @@ describe Puppet::HTTP::Service::FileServer do
|
|
41
41
|
|
42
42
|
context 'retrieving file metadata' do
|
43
43
|
let(:path) { tmpfile('get_file_metadata') }
|
44
|
-
let(:url) { "https://www.example.com/puppet/v3/file_metadata/:mount/#{path}?checksum_type=
|
44
|
+
let(:url) { "https://www.example.com/puppet/v3/file_metadata/:mount/#{path}?checksum_type=sha256&environment=testing&links=manage&source_permissions=ignore" }
|
45
45
|
let(:filemetadata) { Puppet::FileServing::Metadata.new(path) }
|
46
46
|
let(:request_path) { "/:mount/#{path}"}
|
47
47
|
|
@@ -122,7 +122,7 @@ describe Puppet::HTTP::Service::FileServer do
|
|
122
122
|
|
123
123
|
context 'retrieving multiple file metadatas' do
|
124
124
|
let(:path) { tmpfile('get_file_metadatas') }
|
125
|
-
let(:url) { "https://www.example.com/puppet/v3/file_metadatas/:mount/#{path}?checksum_type=
|
125
|
+
let(:url) { "https://www.example.com/puppet/v3/file_metadatas/:mount/#{path}?checksum_type=sha256&links=manage&recurse=false&source_permissions=ignore&environment=testing" }
|
126
126
|
let(:filemetadatas) { [Puppet::FileServing::Metadata.new(path)] }
|
127
127
|
let(:formatter) { Puppet::Network::FormatHandler.format(:json) }
|
128
128
|
let(:request_path) { "/:mount/#{path}"}
|
@@ -158,7 +158,7 @@ describe Puppet::HTTP::Service::FileServer do
|
|
158
158
|
end
|
159
159
|
|
160
160
|
it 'automatically converts an array of parameters to the stringified query' do
|
161
|
-
url = "https://www.example.com/puppet/v3/file_metadatas/:mount/#{path}?checksum_type=
|
161
|
+
url = "https://www.example.com/puppet/v3/file_metadatas/:mount/#{path}?checksum_type=sha256&environment=testing&ignore=CVS&ignore=.git&ignore=.hg&links=manage&recurse=false&source_permissions=ignore"
|
162
162
|
stub_request(:get, url).with(
|
163
163
|
headers: {'Accept'=>'application/json, application/x-msgpack, text/pson',}
|
164
164
|
).to_return(
|
@@ -12,7 +12,7 @@ describe Puppet::HTTP::Service::Puppetserver do
|
|
12
12
|
|
13
13
|
context 'when making requests' do
|
14
14
|
it 'includes default HTTP headers' do
|
15
|
-
stub_request(:get, "https://puppetserver.example.com:8140/status/v1/simple/
|
15
|
+
stub_request(:get, "https://puppetserver.example.com:8140/status/v1/simple/server").with do |request|
|
16
16
|
expect(request.headers).to include({'X-Puppet-Version' => /./, 'User-Agent' => /./})
|
17
17
|
expect(request.headers).to_not include('X-Puppet-Profiling')
|
18
18
|
end.to_return(body: "running", headers: {'Content-Type' => 'text/plain;charset=utf-8'})
|
@@ -23,7 +23,7 @@ describe Puppet::HTTP::Service::Puppetserver do
|
|
23
23
|
it 'includes extra headers' do
|
24
24
|
Puppet[:http_extra_headers] = 'region:us-west'
|
25
25
|
|
26
|
-
stub_request(:get, "https://puppetserver.example.com:8140/status/v1/simple/
|
26
|
+
stub_request(:get, "https://puppetserver.example.com:8140/status/v1/simple/server")
|
27
27
|
.with(headers: {'Region' => 'us-west'})
|
28
28
|
.to_return(body: "running", headers: {'Content-Type' => 'text/plain;charset=utf-8'})
|
29
29
|
|
@@ -36,7 +36,7 @@ describe Puppet::HTTP::Service::Puppetserver do
|
|
36
36
|
Puppet[:server] = 'compiler2.example.com'
|
37
37
|
Puppet[:serverport] = 8141
|
38
38
|
|
39
|
-
stub_request(:get, "https://compiler2.example.com:8141/status/v1/simple/
|
39
|
+
stub_request(:get, "https://compiler2.example.com:8141/status/v1/simple/server")
|
40
40
|
.to_return(body: "running", headers: {'Content-Type' => 'text/plain;charset=utf-8'})
|
41
41
|
|
42
42
|
subject.get_simple_status
|
@@ -44,7 +44,7 @@ describe Puppet::HTTP::Service::Puppetserver do
|
|
44
44
|
end
|
45
45
|
|
46
46
|
context 'when getting puppetserver status' do
|
47
|
-
let(:url) { "https://puppetserver.example.com:8140/status/v1/simple/
|
47
|
+
let(:url) { "https://puppetserver.example.com:8140/status/v1/simple/server" }
|
48
48
|
|
49
49
|
it 'returns the request response and status' do
|
50
50
|
stub_request(:get, url)
|
@@ -79,4 +79,34 @@ describe Puppet::HTTP::Service::Puppetserver do
|
|
79
79
|
service.get_simple_status(ssl_context: other_ctx)
|
80
80
|
end
|
81
81
|
end
|
82
|
+
|
83
|
+
context 'when /status/v1/simple/server returns not found' do
|
84
|
+
it 'calls /status/v1/simple/master' do
|
85
|
+
stub_request(:get, "https://puppetserver.example.com:8140/status/v1/simple/server")
|
86
|
+
.to_return(status: [404, 'not found: server'])
|
87
|
+
|
88
|
+
stub_request(:get, "https://puppetserver.example.com:8140/status/v1/simple/master")
|
89
|
+
.to_return(body: "running", headers: {'Content-Type' => 'text/plain;charset=utf-8'})
|
90
|
+
|
91
|
+
resp, status = subject.get_simple_status
|
92
|
+
expect(resp).to be_a(Puppet::HTTP::Response)
|
93
|
+
expect(status).to eq('running')
|
94
|
+
end
|
95
|
+
|
96
|
+
it 'raises a response error if fallback is unsuccessful' do
|
97
|
+
stub_request(:get, "https://puppetserver.example.com:8140/status/v1/simple/server")
|
98
|
+
.to_return(status: [404, 'not found: server'])
|
99
|
+
|
100
|
+
stub_request(:get, "https://puppetserver.example.com:8140/status/v1/simple/master")
|
101
|
+
.to_return(status: [404, 'not found: master'])
|
102
|
+
|
103
|
+
expect {
|
104
|
+
subject.get_simple_status
|
105
|
+
}.to raise_error do |err|
|
106
|
+
expect(err).to be_an_instance_of(Puppet::HTTP::ResponseError)
|
107
|
+
expect(err.message).to eq('not found: master')
|
108
|
+
expect(err.response.code).to eq(404)
|
109
|
+
end
|
110
|
+
end
|
111
|
+
end
|
82
112
|
end
|
@@ -127,7 +127,7 @@ describe Puppet::HTTP::Session do
|
|
127
127
|
Puppet[:server_list] = 'foo.example.com,bar.example.com,baz.example.com'
|
128
128
|
Puppet[:ca_server] = 'caserver.example.com'
|
129
129
|
|
130
|
-
allow_any_instance_of(Puppet::
|
130
|
+
allow_any_instance_of(Puppet::HTTP::DNS).to receive(:each_srv_record).and_yield('mars.example.srv', 8140)
|
131
131
|
service = session.route_to(:ca)
|
132
132
|
|
133
133
|
expect(service.url).to eq(URI("https://mars.example.srv:8140/puppet-ca/v1"))
|
@@ -147,9 +147,9 @@ describe Puppet::HTTP::Session do
|
|
147
147
|
Puppet[:use_srv_records] = true
|
148
148
|
Puppet[:server_list] = 'foo.example.com,bar.example.com,baz.example.com'
|
149
149
|
|
150
|
-
allow_any_instance_of(Puppet::
|
151
|
-
stub_request(:get, "https://foo.example.com:8140/status/v1/simple/
|
152
|
-
stub_request(:get, "https://bar.example.com:8140/status/v1/simple/
|
150
|
+
allow_any_instance_of(Puppet::HTTP::DNS).to receive(:each_srv_record)
|
151
|
+
stub_request(:get, "https://foo.example.com:8140/status/v1/simple/server").to_return(status: 500)
|
152
|
+
stub_request(:get, "https://bar.example.com:8140/status/v1/simple/server").to_return(status: 200)
|
153
153
|
|
154
154
|
service = session.route_to(:ca)
|
155
155
|
|
@@ -160,7 +160,7 @@ describe Puppet::HTTP::Session do
|
|
160
160
|
Puppet[:server_list] = 'foo.example.com'
|
161
161
|
|
162
162
|
expect_any_instance_of(Puppet::HTTP::Resolver::Settings).to receive(:resolve).never
|
163
|
-
stub_request(:get, "https://foo.example.com:8140/status/v1/simple/
|
163
|
+
stub_request(:get, "https://foo.example.com:8140/status/v1/simple/server").to_return(status: 500)
|
164
164
|
|
165
165
|
expect {
|
166
166
|
session.route_to(:ca)
|
@@ -179,7 +179,7 @@ describe Puppet::HTTP::Session do
|
|
179
179
|
Puppet::HTTP::Service::SERVICE_NAMES.each do |name|
|
180
180
|
it "resolves #{name} using server_list" do
|
181
181
|
Puppet[:server_list] = 'apple.example.com'
|
182
|
-
req = stub_request(:get, "https://apple.example.com:8140/status/v1/simple/
|
182
|
+
req = stub_request(:get, "https://apple.example.com:8140/status/v1/simple/server").to_return(status: 200)
|
183
183
|
|
184
184
|
session.route_to(name)
|
185
185
|
|
@@ -201,7 +201,7 @@ describe Puppet::HTTP::Session do
|
|
201
201
|
|
202
202
|
it 'resolves once for all services in a session' do
|
203
203
|
Puppet[:server_list] = 'apple.example.com'
|
204
|
-
req = stub_request(:get, "https://apple.example.com:8140/status/v1/simple/
|
204
|
+
req = stub_request(:get, "https://apple.example.com:8140/status/v1/simple/server").to_return(status: 200)
|
205
205
|
|
206
206
|
Puppet::HTTP::Service::SERVICE_NAMES.each do |name|
|
207
207
|
session.route_to(name)
|
@@ -212,7 +212,7 @@ describe Puppet::HTTP::Session do
|
|
212
212
|
|
213
213
|
it 'resolves server_list for each new session' do
|
214
214
|
Puppet[:server_list] = 'apple.example.com'
|
215
|
-
req = stub_request(:get, "https://apple.example.com:8140/status/v1/simple/
|
215
|
+
req = stub_request(:get, "https://apple.example.com:8140/status/v1/simple/server").to_return(status: 200)
|
216
216
|
|
217
217
|
client.create_session.route_to(:puppet)
|
218
218
|
client.create_session.route_to(:puppet)
|
@@ -222,6 +222,8 @@ describe Puppet::HTTP::Session do
|
|
222
222
|
end
|
223
223
|
|
224
224
|
context 'when retrieving capabilities' do
|
225
|
+
let(:response) { Puppet::HTTP::Response.new(uri, 200, 'OK') }
|
226
|
+
|
225
227
|
let(:session) do
|
226
228
|
resolver = DummyResolver.new(good_service)
|
227
229
|
described_class.new(client, [resolver])
|
@@ -242,7 +244,7 @@ describe Puppet::HTTP::Session do
|
|
242
244
|
end
|
243
245
|
|
244
246
|
it "supports locales if the cached service's version is 5.3.4 or greater" do
|
245
|
-
response
|
247
|
+
allow(response).to receive(:[]).with('X-Puppet-Version').and_return('5.3.4')
|
246
248
|
|
247
249
|
session.route_to(:puppet)
|
248
250
|
session.process_response(response)
|
@@ -251,7 +253,7 @@ describe Puppet::HTTP::Session do
|
|
251
253
|
end
|
252
254
|
|
253
255
|
it "does not support locales if the cached service's version is 5.3.3" do
|
254
|
-
response
|
256
|
+
allow(response).to receive(:[]).with('X-Puppet-Version').and_return('5.3.3')
|
255
257
|
|
256
258
|
session.route_to(:puppet)
|
257
259
|
session.process_response(response)
|
@@ -260,7 +262,7 @@ describe Puppet::HTTP::Session do
|
|
260
262
|
end
|
261
263
|
|
262
264
|
it "does not support locales if the cached service's version is missing" do
|
263
|
-
response
|
265
|
+
allow(response).to receive(:[]).with('X-Puppet-Version').and_return(nil)
|
264
266
|
|
265
267
|
session.route_to(:puppet)
|
266
268
|
session.process_response(response)
|
@@ -277,7 +279,7 @@ describe Puppet::HTTP::Session do
|
|
277
279
|
end
|
278
280
|
|
279
281
|
it "supports json if the cached service's version is 5 or greater" do
|
280
|
-
response
|
282
|
+
allow(response).to receive(:[]).with('X-Puppet-Version').and_return('5.5.12')
|
281
283
|
|
282
284
|
session.route_to(:puppet)
|
283
285
|
session.process_response(response)
|
@@ -286,7 +288,7 @@ describe Puppet::HTTP::Session do
|
|
286
288
|
end
|
287
289
|
|
288
290
|
it "does not support json if the cached service's version is less than 5.0" do
|
289
|
-
response
|
291
|
+
allow(response).to receive(:[]).with('X-Puppet-Version').and_return('4.10.1')
|
290
292
|
|
291
293
|
session.route_to(:puppet)
|
292
294
|
session.process_response(response)
|
@@ -295,7 +297,7 @@ describe Puppet::HTTP::Session do
|
|
295
297
|
end
|
296
298
|
|
297
299
|
it "supports json if the cached service's version is missing" do
|
298
|
-
response
|
300
|
+
allow(response).to receive(:[]).with('X-Puppet-Version').and_return(nil)
|
299
301
|
|
300
302
|
session.route_to(:puppet)
|
301
303
|
session.process_response(response)
|
@@ -1,14 +1,14 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
require 'puppet/
|
3
|
+
require 'puppet/http'
|
4
4
|
|
5
|
-
describe Puppet::
|
5
|
+
describe Puppet::HTTP::Site do
|
6
6
|
let(:scheme) { 'https' }
|
7
7
|
let(:host) { 'rubygems.org' }
|
8
8
|
let(:port) { 443 }
|
9
9
|
|
10
10
|
def create_site(scheme, host, port)
|
11
|
-
|
11
|
+
described_class.new(scheme, host, port)
|
12
12
|
end
|
13
13
|
|
14
14
|
it 'accepts scheme, host, and port' do
|
@@ -28,6 +28,7 @@ describe Puppet::Node::Facts::Facter do
|
|
28
28
|
@request = double('request', :key => @name)
|
29
29
|
@environment = double('environment')
|
30
30
|
allow(@request).to receive(:environment).and_return(@environment)
|
31
|
+
allow(@request).to receive(:options).and_return({})
|
31
32
|
allow(@request.environment).to receive(:modules).and_return([])
|
32
33
|
allow(@request.environment).to receive(:modulepath).and_return([])
|
33
34
|
end
|
@@ -104,6 +105,7 @@ describe Puppet::Node::Facts::Facter do
|
|
104
105
|
expect(FileTest).to receive(:directory?).with(factpath1).and_return(true)
|
105
106
|
expect(FileTest).to receive(:directory?).with(factpath2).and_return(true)
|
106
107
|
allow(@request.environment).to receive(:modulepath).and_return([modulepath])
|
108
|
+
allow(@request).to receive(:options).and_return({})
|
107
109
|
expect(Dir).to receive(:glob).with("#{modulepath}/*/lib/facter").and_return([modulelibfacter])
|
108
110
|
expect(Dir).to receive(:glob).with("#{modulepath}/*/plugins/facter").and_return([modulepluginsfacter])
|
109
111
|
|
@@ -149,4 +151,115 @@ describe Puppet::Node::Facts::Facter do
|
|
149
151
|
Puppet::Node::Facts::Facter.setup_external_search_paths @request
|
150
152
|
end
|
151
153
|
end
|
154
|
+
|
155
|
+
describe 'when :resolve_options is true' do
|
156
|
+
let(:options) { { resolve_options: true, user_query: ["os", "timezone"] } }
|
157
|
+
let(:facts) { Puppet::Node::Facts.new("foo") }
|
158
|
+
|
159
|
+
before :each do
|
160
|
+
allow(@request).to receive(:options).and_return(options)
|
161
|
+
allow(Puppet::Node::Facts).to receive(:new).and_return(facts)
|
162
|
+
allow(facts).to receive(:add_local_facts)
|
163
|
+
end
|
164
|
+
|
165
|
+
it 'should call Facter.resolve method' do
|
166
|
+
expect(Facter).to receive(:resolve).with("os timezone")
|
167
|
+
@facter.find(@request)
|
168
|
+
end
|
169
|
+
|
170
|
+
it 'should NOT add local facts' do
|
171
|
+
expect(facts).not_to receive(:add_local_facts)
|
172
|
+
|
173
|
+
@facter.find(@request)
|
174
|
+
end
|
175
|
+
|
176
|
+
context 'when --show-legacy flag is present' do
|
177
|
+
let(:options) { { resolve_options: true, user_query: ["os", "timezone"], show_legacy: true } }
|
178
|
+
|
179
|
+
it 'should call Facter.resolve method with show-legacy' do
|
180
|
+
expect(Facter).to receive(:resolve).with("os timezone --show-legacy")
|
181
|
+
@facter.find(@request)
|
182
|
+
end
|
183
|
+
end
|
184
|
+
|
185
|
+
context 'when --timing flag is present' do
|
186
|
+
let(:options) { { resolve_options: true, user_query: ["os", "timezone"], timing: true } }
|
187
|
+
|
188
|
+
it 'calls Facter.resolve with --timing' do
|
189
|
+
expect(Facter).to receive(:resolve).with("os timezone --timing")
|
190
|
+
@facter.find(@request)
|
191
|
+
end
|
192
|
+
end
|
193
|
+
|
194
|
+
describe 'when Facter version is lower than 4.0.40' do
|
195
|
+
before :each do
|
196
|
+
allow(Facter).to receive(:respond_to?).and_return(false)
|
197
|
+
allow(Facter).to receive(:respond_to?).with(:resolve).and_return(false)
|
198
|
+
end
|
199
|
+
|
200
|
+
it 'raises an error' do
|
201
|
+
expect { @facter.find(@request) }.to raise_error(Puppet::Error, "puppet facts show requires version 4.0.40 or greater of Facter.")
|
202
|
+
end
|
203
|
+
end
|
204
|
+
|
205
|
+
describe 'when setting up external search paths' do
|
206
|
+
let(:options) { { resolve_options: true, user_query: ["os", "timezone"], external_dir: 'some/dir' } }
|
207
|
+
let(:pluginfactdest) { File.expand_path 'plugin/dest' }
|
208
|
+
let(:modulepath) { File.expand_path 'module/foo' }
|
209
|
+
let(:modulefactsd) { File.expand_path 'module/foo/facts.d' }
|
210
|
+
|
211
|
+
before :each do
|
212
|
+
expect(FileTest).to receive(:directory?).with(pluginfactdest).and_return(true)
|
213
|
+
mod = Puppet::Module.new('foo', modulepath, @request.environment)
|
214
|
+
allow(@request.environment).to receive(:modules).and_return([mod])
|
215
|
+
Puppet[:pluginfactdest] = pluginfactdest
|
216
|
+
end
|
217
|
+
|
218
|
+
it 'should skip files' do
|
219
|
+
expect(File).to receive(:directory?).with(modulefactsd).and_return(false)
|
220
|
+
expect(Facter).to receive(:search_external).with([pluginfactdest, options[:external_dir]])
|
221
|
+
Puppet::Node::Facts::Facter.setup_external_search_paths @request
|
222
|
+
end
|
223
|
+
|
224
|
+
it 'should add directories' do
|
225
|
+
expect(File).to receive(:directory?).with(modulefactsd).and_return(true)
|
226
|
+
expect(Facter).to receive(:search_external).with([modulefactsd, pluginfactdest, options[:external_dir]])
|
227
|
+
Puppet::Node::Facts::Facter.setup_external_search_paths @request
|
228
|
+
end
|
229
|
+
end
|
230
|
+
|
231
|
+
describe 'when setting up search paths' do
|
232
|
+
let(:factpath1) { File.expand_path 'one' }
|
233
|
+
let(:factpath2) { File.expand_path 'two' }
|
234
|
+
let(:factpath) { [factpath1, factpath2].join(File::PATH_SEPARATOR) }
|
235
|
+
let(:modulepath) { File.expand_path 'module/foo' }
|
236
|
+
let(:modulelibfacter) { File.expand_path 'module/foo/lib/facter' }
|
237
|
+
let(:modulepluginsfacter) { File.expand_path 'module/foo/plugins/facter' }
|
238
|
+
let(:options) { { resolve_options: true, custom_dir: 'some/dir' } }
|
239
|
+
|
240
|
+
before :each do
|
241
|
+
expect(FileTest).to receive(:directory?).with(factpath1).and_return(true)
|
242
|
+
expect(FileTest).to receive(:directory?).with(factpath2).and_return(true)
|
243
|
+
allow(@request.environment).to receive(:modulepath).and_return([modulepath])
|
244
|
+
expect(Dir).to receive(:glob).with("#{modulepath}/*/lib/facter").and_return([modulelibfacter])
|
245
|
+
expect(Dir).to receive(:glob).with("#{modulepath}/*/plugins/facter").and_return([modulepluginsfacter])
|
246
|
+
|
247
|
+
Puppet[:factpath] = factpath
|
248
|
+
end
|
249
|
+
|
250
|
+
it 'should skip files' do
|
251
|
+
expect(FileTest).to receive(:directory?).with(modulelibfacter).and_return(false)
|
252
|
+
expect(FileTest).to receive(:directory?).with(modulepluginsfacter).and_return(false)
|
253
|
+
expect(Facter).to receive(:search).with(factpath1, factpath2, options[:custom_dir])
|
254
|
+
Puppet::Node::Facts::Facter.setup_search_paths @request
|
255
|
+
end
|
256
|
+
|
257
|
+
it 'should add directories' do
|
258
|
+
expect(FileTest).to receive(:directory?).with(modulelibfacter).and_return(true)
|
259
|
+
expect(FileTest).to receive(:directory?).with(modulepluginsfacter).and_return(false)
|
260
|
+
expect(Facter).to receive(:search).with(modulelibfacter, factpath1, factpath2, options[:custom_dir])
|
261
|
+
Puppet::Node::Facts::Facter.setup_search_paths @request
|
262
|
+
end
|
263
|
+
end
|
264
|
+
end
|
152
265
|
end
|
@@ -18,7 +18,7 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
|
|
18
18
|
describe "when servicing a save request" do
|
19
19
|
it "should return a result whose content is empty" do
|
20
20
|
bucket_file = Puppet::FileBucket::File.new('stuff')
|
21
|
-
result = Puppet::FileBucket::File.indirection.save(bucket_file, "
|
21
|
+
result = Puppet::FileBucket::File.indirection.save(bucket_file, "sha256/35bafb1ce99aef3ab068afbaabae8f21fd9b9f02d3a9442e364fa92c0b3eeef0")
|
22
22
|
expect(result.contents).to be_empty
|
23
23
|
end
|
24
24
|
|
@@ -34,12 +34,14 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
|
|
34
34
|
end
|
35
35
|
children.each { |child| Process.wait(child) }
|
36
36
|
|
37
|
-
paths = File.read("#{Puppet[:bucketdir]}/
|
37
|
+
paths = File.read("#{Puppet[:bucketdir]}/d/1/b/2/a/5/9/f/d1b2a59fbea7e20077af9f91b27e95e865061b270be03ff539ab3b73587882e8/paths").lines.to_a
|
38
38
|
expect(paths.length).to eq(1)
|
39
39
|
expect(Puppet::FileBucket::File.indirection.head("#{bucket_file.checksum_type}/#{bucket_file.checksum_data}/testing")).to be_truthy
|
40
40
|
end
|
41
41
|
|
42
42
|
it "fails if the contents collide with existing contents" do
|
43
|
+
Puppet[:digest_algorithm] = 'md5'
|
44
|
+
|
43
45
|
# This is the shortest known MD5 collision (little endian). See https://eprint.iacr.org/2010/643.pdf
|
44
46
|
first_contents = [0x6165300e,0x87a79a55,0xf7c60bd0,0x34febd0b,
|
45
47
|
0x6503cf04,0x854f709e,0xfb0fc034,0x874c9c65,
|
@@ -66,7 +68,7 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
|
|
66
68
|
context "when the contents file exists but is corrupted and does not match the expected checksum" do
|
67
69
|
let(:original_contents) { "a file that will get corrupted" }
|
68
70
|
let(:bucket_file) { Puppet::FileBucket::File.new(original_contents) }
|
69
|
-
let(:contents_file) { "#{Puppet[:bucketdir]}/
|
71
|
+
let(:contents_file) { "#{Puppet[:bucketdir]}/7/7/4/1/0/2/7/9/77410279bb789b799c2f38bf654b46a509dd27ddad6e47a6684805e9ba390bce/contents" }
|
70
72
|
|
71
73
|
before(:each) do
|
72
74
|
# Ensure we're starting with a clean slate - no pre-existing backup
|