puppet 6.16.0-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 +5 -3
- data/Gemfile.lock +31 -33
- data/README.md +4 -5
- data/Rakefile +4 -12
- 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/agent.rb +2 -2
- data/lib/puppet/agent/locker.rb +0 -7
- data/lib/puppet/application.rb +172 -98
- data/lib/puppet/application/agent.rb +22 -6
- data/lib/puppet/application/apply.rb +18 -20
- data/lib/puppet/application/device.rb +100 -104
- data/lib/puppet/application/doc.rb +1 -1
- data/lib/puppet/application/filebucket.rb +15 -11
- data/lib/puppet/application/lookup.rb +16 -4
- data/lib/puppet/application/ssl.rb +1 -1
- data/lib/puppet/configurer.rb +66 -31
- data/lib/puppet/configurer/downloader.rb +31 -10
- data/lib/puppet/configurer/plugin_handler.rb +21 -19
- data/lib/puppet/confine.rb +2 -2
- data/lib/puppet/confine/any.rb +1 -1
- data/lib/puppet/defaults.rb +166 -169
- data/lib/puppet/environments.rb +41 -15
- data/lib/puppet/face/catalog.rb +1 -1
- data/lib/puppet/face/config.rb +56 -16
- 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/node.rb +3 -3
- data/lib/puppet/face/node/clean.rb +2 -2
- data/lib/puppet/face/plugin.rb +5 -8
- data/lib/puppet/feature/base.rb +1 -1
- 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_bucket/dipper.rb +1 -1
- 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 +13 -1
- data/lib/puppet/file_serving/metadata.rb +4 -1
- data/lib/puppet/file_serving/mount.rb +1 -2
- data/lib/puppet/file_serving/mount/locales.rb +1 -2
- data/lib/puppet/file_serving/mount/pluginfacts.rb +1 -2
- data/lib/puppet/file_serving/mount/plugins.rb +1 -2
- data/lib/puppet/file_serving/terminus_selector.rb +7 -8
- data/lib/puppet/file_system/file_impl.rb +4 -4
- data/lib/puppet/file_system/uniquefile.rb +8 -16
- data/lib/puppet/forge.rb +1 -1
- data/lib/puppet/forge/cache.rb +1 -1
- data/lib/puppet/forge/repository.rb +3 -8
- data/lib/puppet/functions/epp.rb +1 -0
- data/lib/puppet/functions/inline_epp.rb +1 -0
- data/lib/puppet/functions/lstrip.rb +4 -4
- data/lib/puppet/functions/new.rb +8 -3
- data/lib/puppet/functions/reverse_each.rb +1 -1
- data/lib/puppet/functions/rstrip.rb +4 -4
- data/lib/puppet/functions/step.rb +1 -1
- data/lib/puppet/functions/strip.rb +4 -4
- data/lib/puppet/generate/models/type/type.rb +4 -1
- data/lib/puppet/gettext/config.rb +5 -5
- data/lib/puppet/gettext/module_translations.rb +4 -4
- data/lib/puppet/http.rb +23 -13
- data/lib/puppet/http/client.rb +170 -115
- 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 +13 -19
- data/lib/puppet/http/resolver.rb +10 -23
- data/lib/puppet/http/resolver/server_list.rb +23 -45
- data/lib/puppet/http/resolver/settings.rb +7 -10
- data/lib/puppet/http/resolver/srv.rb +11 -15
- data/lib/puppet/http/response.rb +49 -48
- 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 +15 -27
- data/lib/puppet/http/service/ca.rb +11 -22
- data/lib/puppet/http/service/compiler.rb +23 -70
- data/lib/puppet/http/service/file_server.rb +19 -28
- data/lib/puppet/http/service/puppetserver.rb +53 -0
- data/lib/puppet/http/service/report.rb +8 -10
- data/lib/puppet/http/session.rb +16 -24
- data/lib/puppet/{network/http → http}/site.rb +1 -2
- data/lib/puppet/indirector.rb +1 -1
- data/lib/puppet/indirector/catalog/compiler.rb +1 -1
- data/lib/puppet/indirector/catalog/rest.rb +2 -4
- data/lib/puppet/indirector/exec.rb +1 -1
- data/lib/puppet/indirector/fact_search.rb +60 -0
- data/lib/puppet/indirector/facts/facter.rb +27 -6
- 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 +4 -59
- data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -9
- data/lib/puppet/indirector/file_content/rest.rb +3 -7
- data/lib/puppet/indirector/file_metadata/http.rb +25 -5
- data/lib/puppet/indirector/file_metadata/rest.rb +5 -11
- data/lib/puppet/indirector/file_server.rb +1 -8
- data/lib/puppet/indirector/generic_http.rb +0 -11
- data/lib/puppet/indirector/hiera.rb +4 -0
- data/lib/puppet/indirector/indirection.rb +1 -1
- data/lib/puppet/indirector/json.rb +5 -1
- data/lib/puppet/indirector/msgpack.rb +1 -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/processor.rb +2 -2
- data/lib/puppet/indirector/report/rest.rb +3 -8
- data/lib/puppet/indirector/request.rb +2 -103
- data/lib/puppet/indirector/rest.rb +12 -263
- data/lib/puppet/indirector/yaml.rb +1 -1
- data/lib/puppet/module.rb +1 -2
- 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/format_support.rb +2 -2
- 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 +3 -21
- data/lib/puppet/network/http/api/master/v3.rb +11 -13
- data/lib/puppet/network/http/api/master/v3/environments.rb +0 -1
- data/lib/puppet/network/http/connection.rb +247 -316
- data/lib/puppet/network/http/handler.rb +0 -1
- data/lib/puppet/network/http/route.rb +2 -2
- data/lib/puppet/network/http_pool.rb +16 -34
- data/lib/puppet/node.rb +1 -30
- data/lib/puppet/node/environment.rb +12 -5
- data/lib/puppet/node/facts.rb +17 -0
- data/lib/puppet/pal/json_catalog_encoder.rb +4 -0
- data/lib/puppet/pal/pal_impl.rb +93 -14
- data/lib/puppet/parameter.rb +1 -1
- data/lib/puppet/parser/ast/leaf.rb +5 -5
- data/lib/puppet/parser/ast/pops_bridge.rb +0 -42
- data/lib/puppet/parser/compiler.rb +1 -199
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +14 -39
- data/lib/puppet/parser/functions.rb +21 -17
- data/lib/puppet/parser/functions/create_resources.rb +11 -7
- data/lib/puppet/parser/resource.rb +3 -71
- data/lib/puppet/parser/resource/param.rb +6 -0
- data/lib/puppet/parser/type_loader.rb +2 -2
- data/lib/puppet/pops/adaptable.rb +7 -13
- data/lib/puppet/pops/adapters.rb +8 -4
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +1 -3
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +27 -13
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +2 -2
- 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/loader/ruby_legacy_function_instantiator.rb +6 -8
- data/lib/puppet/pops/loader/runtime3_type_loader.rb +4 -2
- data/lib/puppet/pops/loaders.rb +18 -11
- data/lib/puppet/pops/lookup/context.rb +1 -1
- data/lib/puppet/pops/lookup/hiera_config.rb +14 -1
- 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 -22
- data/lib/puppet/pops/types/iterable.rb +34 -8
- data/lib/puppet/pops/types/p_meta_type.rb +1 -1
- data/lib/puppet/pops/types/p_type_set_type.rb +4 -0
- 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 +28 -42
- data/lib/puppet/pops/validation/tasks_checker.rb +0 -12
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -1
- data/lib/puppet/provider.rb +0 -13
- data/lib/puppet/provider/file/windows.rb +1 -1
- data/lib/puppet/provider/nameservice.rb +0 -18
- data/lib/puppet/provider/package/apt.rb +34 -0
- data/lib/puppet/provider/package/aptitude.rb +1 -1
- data/lib/puppet/provider/package/dpkg.rb +1 -11
- data/lib/puppet/provider/package/gem.rb +27 -5
- data/lib/puppet/provider/package/pip.rb +0 -1
- data/lib/puppet/provider/package/pip2.rb +17 -0
- 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 +6 -4
- data/lib/puppet/provider/package/puppetserver_gem.rb +180 -0
- data/lib/puppet/provider/package/yum.rb +2 -1
- data/lib/puppet/provider/package/zypper.rb +3 -0
- data/lib/puppet/provider/service/smf.rb +191 -73
- data/lib/puppet/provider/service/windows.rb +23 -7
- data/lib/puppet/provider/user/aix.rb +1 -1
- data/lib/puppet/provider/user/directoryservice.rb +0 -10
- data/lib/puppet/provider/user/user_role_add.rb +1 -1
- data/lib/puppet/provider/user/useradd.rb +11 -4
- data/lib/puppet/provider/user/windows_adsi.rb +18 -1
- data/lib/puppet/reference/configuration.rb +2 -0
- data/lib/puppet/reference/indirection.rb +1 -1
- data/lib/puppet/reports/http.rb +2 -0
- data/lib/puppet/resource.rb +3 -90
- data/lib/puppet/resource/catalog.rb +1 -14
- data/lib/puppet/resource/type.rb +5 -112
- data/lib/puppet/resource/type_collection.rb +3 -48
- data/lib/puppet/runtime.rb +1 -2
- data/lib/puppet/settings.rb +84 -35
- 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_context.rb +2 -2
- data/lib/puppet/ssl/ssl_provider.rb +37 -1
- data/lib/puppet/ssl/state_machine.rb +3 -1
- data/lib/puppet/ssl/verifier.rb +2 -0
- data/lib/puppet/test/test_helper.rb +19 -16
- data/lib/puppet/transaction.rb +3 -9
- data/lib/puppet/transaction/persistence.rb +1 -1
- data/lib/puppet/transaction/report.rb +10 -8
- data/lib/puppet/trusted_external.rb +29 -1
- data/lib/puppet/type.rb +9 -77
- data/lib/puppet/type/file.rb +45 -22
- data/lib/puppet/type/file/checksum.rb +5 -5
- data/lib/puppet/type/file/source.rb +33 -13
- data/lib/puppet/type/filebucket.rb +4 -4
- data/lib/puppet/type/notify.rb +2 -2
- data/lib/puppet/type/package.rb +5 -13
- data/lib/puppet/type/service.rb +53 -0
- data/lib/puppet/type/user.rb +18 -3
- data/lib/puppet/util.rb +41 -3
- data/lib/puppet/util/autoload.rb +9 -7
- data/lib/puppet/util/character_encoding.rb +9 -5
- data/lib/puppet/util/checksums.rb +19 -4
- data/lib/puppet/util/execution.rb +2 -13
- data/lib/puppet/util/fileparsing.rb +2 -2
- data/lib/puppet/util/http_proxy.rb +2 -215
- data/lib/puppet/util/monkey_patches.rb +0 -46
- data/lib/puppet/util/provider_features.rb +1 -1
- data/lib/puppet/util/rdoc.rb +0 -7
- data/lib/puppet/util/reference.rb +1 -1
- data/lib/puppet/util/retry_action.rb +1 -1
- data/lib/puppet/util/rubygems.rb +5 -1
- data/lib/puppet/util/run_mode.rb +14 -2
- data/lib/puppet/util/windows.rb +3 -7
- 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 +5 -15
- 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/principal.rb +8 -6
- data/lib/puppet/util/windows/process.rb +4 -226
- data/lib/puppet/util/windows/registry.rb +11 -11
- data/lib/puppet/util/windows/security.rb +4 -4
- data/lib/puppet/util/windows/service.rb +52 -486
- data/lib/puppet/util/windows/string.rb +12 -13
- data/lib/puppet/util/windows/user.rb +242 -8
- 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 +713 -1380
- data/man/man5/puppet.conf.5 +84 -98
- data/man/man8/puppet-agent.8 +7 -4
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +6 -6
- 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 +2 -2
- data/man/man8/puppet-module.8 +1 -58
- data/man/man8/puppet-node.8 +7 -4
- 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/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb +2 -0
- data/spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb +25 -0
- data/spec/fixtures/unit/forge/bacula-releases.json +128 -0
- data/spec/fixtures/unit/forge/bacula.tar.gz +0 -0
- data/spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages +30 -0
- data/spec/fixtures/unit/provider/service/smf/{svcs.out → svcs_instances.out} +0 -0
- data/spec/integration/application/agent_spec.rb +157 -59
- data/spec/integration/application/apply_spec.rb +150 -150
- data/spec/integration/application/doc_spec.rb +16 -6
- data/spec/integration/application/filebucket_spec.rb +78 -29
- data/spec/integration/application/help_spec.rb +44 -0
- data/spec/integration/application/lookup_spec.rb +13 -0
- data/spec/integration/application/module_spec.rb +68 -0
- data/spec/integration/application/plugin_spec.rb +76 -4
- data/spec/integration/configurer_spec.rb +14 -0
- data/spec/integration/data_binding_spec.rb +82 -0
- data/spec/integration/defaults_spec.rb +33 -5
- data/spec/integration/directory_environments_spec.rb +17 -17
- data/spec/integration/environments/setting_hooks_spec.rb +1 -1
- data/spec/integration/indirector/facts/facter_spec.rb +8 -6
- data/spec/integration/network/http_pool_spec.rb +29 -30
- data/spec/integration/node/environment_spec.rb +1 -1
- data/spec/integration/parser/catalog_spec.rb +0 -38
- data/spec/integration/parser/compiler_spec.rb +11 -0
- 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 +6 -5
- data/spec/integration/util/execution_spec.rb +22 -0
- data/spec/integration/util/windows/adsi_spec.rb +2 -2
- data/spec/integration/util/windows/monkey_patches/process_spec.rb +231 -0
- data/spec/integration/util/windows/process_spec.rb +26 -32
- data/spec/integration/util/windows/registry_spec.rb +7 -7
- data/spec/integration/util/windows/security_spec.rb +1 -1
- data/spec/integration/util/windows/user_spec.rb +47 -5
- data/spec/integration/util_spec.rb +7 -33
- data/spec/lib/puppet_spec/matchers.rb +0 -80
- data/spec/lib/puppet_spec/puppetserver.rb +9 -1
- data/spec/lib/puppet_spec/settings.rb +7 -1
- data/spec/shared_contexts/types_setup.rb +2 -0
- data/spec/spec_helper.rb +2 -0
- data/spec/unit/agent_spec.rb +0 -2
- data/spec/unit/application/agent_spec.rb +3 -4
- data/spec/unit/application/config_spec.rb +224 -4
- data/spec/unit/application/doc_spec.rb +2 -2
- data/spec/unit/application/face_base_spec.rb +6 -4
- data/spec/unit/application/facts_spec.rb +74 -8
- data/spec/unit/application/filebucket_spec.rb +41 -39
- data/spec/unit/application/resource_spec.rb +3 -1
- data/spec/unit/application/ssl_spec.rb +17 -4
- data/spec/unit/application_spec.rb +9 -4
- data/spec/unit/certificate_factory_spec.rb +1 -1
- data/spec/unit/configurer/downloader_spec.rb +14 -0
- data/spec/unit/configurer/fact_handler_spec.rb +4 -4
- data/spec/unit/configurer/plugin_handler_spec.rb +56 -18
- data/spec/unit/configurer_spec.rb +96 -44
- data/spec/unit/confine_spec.rb +2 -1
- data/spec/unit/context/trusted_information_spec.rb +12 -10
- data/spec/unit/defaults_spec.rb +77 -28
- data/spec/unit/environments_spec.rb +96 -32
- data/spec/unit/face/config_spec.rb +65 -12
- data/spec/unit/face/facts_spec.rb +4 -0
- data/spec/unit/face/node_spec.rb +2 -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 +14 -18
- data/spec/unit/file_serving/configuration_spec.rb +6 -12
- data/spec/unit/file_serving/http_metadata_spec.rb +37 -14
- data/spec/unit/file_serving/mount/locales_spec.rb +2 -2
- data/spec/unit/file_serving/mount/pluginfacts_spec.rb +2 -2
- data/spec/unit/file_serving/mount/plugins_spec.rb +2 -2
- data/spec/unit/file_serving/terminus_selector_spec.rb +45 -26
- data/spec/unit/file_system/uniquefile_spec.rb +18 -0
- data/spec/unit/file_system_spec.rb +1 -2
- 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 +71 -17
- 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 +34 -15
- data/spec/unit/http/response_spec.rb +6 -0
- data/spec/unit/http/service/ca_spec.rb +2 -3
- data/spec/unit/http/service/compiler_spec.rb +51 -65
- data/spec/unit/http/service/file_server_spec.rb +5 -6
- data/spec/unit/http/service/puppetserver_spec.rb +112 -0
- data/spec/unit/http/service/report_spec.rb +2 -3
- data/spec/unit/http/service_spec.rb +1 -3
- data/spec/unit/http/session_spec.rb +24 -35
- data/spec/unit/{network/http → http}/site_spec.rb +3 -3
- data/spec/unit/indirector/catalog/json_spec.rb +1 -1
- data/spec/unit/indirector/catalog/rest_spec.rb +1 -1
- data/spec/unit/indirector/facts/facter_spec.rb +97 -0
- data/spec/unit/indirector/facts/json_spec.rb +255 -0
- data/spec/unit/indirector/facts/rest_spec.rb +1 -1
- 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/http_spec.rb +27 -0
- 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/json_spec.rb +8 -8
- data/spec/unit/indirector/msgpack_spec.rb +8 -8
- data/spec/unit/indirector/node/json_spec.rb +33 -0
- data/spec/unit/indirector/node/rest_spec.rb +1 -1
- 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 +3 -267
- data/spec/unit/indirector/rest_spec.rb +98 -752
- data/spec/unit/indirector/yaml_spec.rb +7 -7
- data/spec/unit/interface_spec.rb +3 -3
- data/spec/unit/module_tool/tar/mini_spec.rb +20 -0
- data/spec/unit/network/authconfig_spec.rb +2 -132
- data/spec/unit/network/authorization_spec.rb +2 -55
- data/spec/unit/network/format_support_spec.rb +3 -2
- data/spec/unit/network/formats_spec.rb +4 -4
- data/spec/unit/network/http/api/indirected_routes_spec.rb +3 -98
- data/spec/unit/network/http/api/master/v3/environments_spec.rb +12 -23
- 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 +61 -73
- 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 +51 -22
- data/spec/unit/node_spec.rb +2 -54
- data/spec/unit/parser/ast/block_expression_spec.rb +1 -1
- data/spec/unit/parser/functions/create_resources_spec.rb +2 -20
- data/spec/unit/parser/scope_spec.rb +1 -1
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +19 -8
- data/spec/unit/pops/loaders/loaders_spec.rb +77 -22
- data/spec/unit/pops/lookup/lookup_spec.rb +25 -0
- 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 +7 -17
- 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/exec_spec.rb +4 -3
- data/spec/unit/provider/nameservice_spec.rb +0 -57
- data/spec/unit/provider/package/apt_spec.rb +77 -0
- data/spec/unit/provider/package/aptitude_spec.rb +1 -0
- data/spec/unit/provider/package/dpkg_spec.rb +22 -55
- data/spec/unit/provider/package/gem_spec.rb +32 -0
- data/spec/unit/provider/package/openbsd_spec.rb +2 -0
- data/spec/unit/provider/package/pip2_spec.rb +36 -0
- data/spec/unit/provider/package/puppet_gem_spec.rb +6 -2
- data/spec/unit/provider/package/puppetserver_gem_spec.rb +137 -0
- data/spec/unit/provider/package/yum_spec.rb +31 -0
- data/spec/unit/provider/package/zypper_spec.rb +14 -0
- data/spec/unit/provider/service/base_spec.rb +2 -4
- data/spec/unit/provider/service/bsd_spec.rb +5 -1
- data/spec/unit/provider/service/daemontools_spec.rb +1 -1
- data/spec/unit/provider/service/debian_spec.rb +3 -5
- data/spec/unit/provider/service/freebsd_spec.rb +1 -1
- data/spec/unit/provider/service/gentoo_spec.rb +4 -5
- data/spec/unit/provider/service/init_spec.rb +45 -5
- data/spec/unit/provider/service/launchd_spec.rb +5 -6
- data/spec/unit/provider/service/openrc_spec.rb +4 -5
- data/spec/unit/provider/service/openwrt_spec.rb +1 -1
- data/spec/unit/provider/service/redhat_spec.rb +1 -1
- data/spec/unit/provider/service/runit_spec.rb +2 -1
- data/spec/unit/provider/service/smf_spec.rb +402 -166
- data/spec/unit/provider/service/src_spec.rb +3 -5
- data/spec/unit/provider/service/systemd_spec.rb +3 -6
- data/spec/unit/provider/service/upstart_spec.rb +4 -5
- data/spec/unit/provider/service/windows_spec.rb +50 -15
- data/spec/unit/provider/user/openbsd_spec.rb +1 -0
- data/spec/unit/provider/user/useradd_spec.rb +22 -16
- data/spec/unit/provider/user/windows_adsi_spec.rb +82 -0
- data/spec/unit/provider_spec.rb +0 -12
- data/spec/unit/puppet_pal_2pec.rb +40 -0
- data/spec/unit/puppet_pal_catalog_spec.rb +45 -0
- data/spec/unit/reports/store_spec.rb +17 -13
- data/spec/unit/resource/type_collection_spec.rb +2 -22
- data/spec/unit/resource_spec.rb +3 -59
- 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 +586 -239
- 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 +78 -49
- data/spec/unit/ssl/state_machine_spec.rb +0 -1
- data/spec/unit/ssl/verifier_spec.rb +0 -21
- data/spec/unit/test/test_helper_spec.rb +17 -0
- data/spec/unit/transaction/persistence_spec.rb +15 -0
- data/spec/unit/transaction/report_spec.rb +3 -3
- 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 +4 -5
- data/spec/unit/type/file_spec.rb +134 -102
- data/spec/unit/type/filebucket_spec.rb +1 -1
- data/spec/unit/type/package_spec.rb +1 -1
- data/spec/unit/type/service_spec.rb +209 -0
- data/spec/unit/type/user_spec.rb +31 -2
- data/spec/unit/type_spec.rb +70 -0
- data/spec/unit/util/backups_spec.rb +0 -2
- data/spec/unit/util/character_encoding_spec.rb +4 -4
- data/spec/unit/util/checksums_spec.rb +16 -0
- data/spec/unit/util/command_line_spec.rb +11 -6
- 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 +27 -127
- data/spec/unit/util/windows/api_types_spec.rb +104 -40
- data/spec/unit/util/windows/service_spec.rb +4 -4
- 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 +3 -21
- data/spec/unit/x509/cert_provider_spec.rb +1 -1
- metadata +76 -270
- 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 -85
- 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 -182
- 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 -64
- data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +0 -20
- data/lib/puppet/parser/environment_compiler.rb +0 -199
- 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 -282
- 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/faces/config_spec.rb +0 -91
- data/spec/integration/faces/documentation_spec.rb +0 -57
- data/spec/integration/file_bucket/file_spec.rb +0 -50
- data/spec/integration/file_serving/content_spec.rb +0 -7
- data/spec/integration/file_serving/fileset_spec.rb +0 -12
- data/spec/integration/file_serving/metadata_spec.rb +0 -8
- data/spec/integration/file_serving/terminus_helper_spec.rb +0 -20
- data/spec/integration/file_system/uniquefile_spec.rb +0 -26
- data/spec/integration/module_tool/forge_spec.rb +0 -51
- data/spec/integration/module_tool/tar/mini_spec.rb +0 -28
- data/spec/integration/network/authconfig_spec.rb +0 -256
- data/spec/integration/provider/service/init_spec.rb +0 -48
- data/spec/integration/provider/service/systemd_spec.rb +0 -25
- data/spec/integration/provider/service/windows_spec.rb +0 -50
- data/spec/integration/reference/providers_spec.rb +0 -21
- data/spec/integration/reports_spec.rb +0 -13
- data/spec/integration/ssl/certificate_request_spec.rb +0 -44
- data/spec/integration/ssl/host_spec.rb +0 -72
- data/spec/integration/ssl/key_spec.rb +0 -99
- data/spec/integration/test/test_helper_spec.rb +0 -31
- data/spec/shared_behaviours/file_serving_model.rb +0 -51
- 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/man_spec.rb +0 -25
- 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/man_spec.rb +0 -31
- 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 -723
- 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
@@ -1,10 +1,8 @@
|
|
1
1
|
require 'uri'
|
2
2
|
require 'spec_helper'
|
3
|
-
require 'puppet/
|
4
|
-
|
5
|
-
describe Puppet::Util::HttpProxy do
|
6
|
-
include Puppet::Network::HTTP::Compression.module
|
3
|
+
require 'puppet/http'
|
7
4
|
|
5
|
+
describe Puppet::HTTP::Proxy do
|
8
6
|
before(:all) do
|
9
7
|
ENV['http_proxy'] = nil
|
10
8
|
ENV['HTTP_PROXY'] = nil
|
@@ -346,69 +344,4 @@ describe Puppet::Util::HttpProxy do
|
|
346
344
|
end
|
347
345
|
end
|
348
346
|
end
|
349
|
-
|
350
|
-
describe '.request_with_redirects' do
|
351
|
-
let(:dest) { URI.parse('http://mydomain.com/some/path') }
|
352
|
-
|
353
|
-
it 'generates accept and accept-encoding headers' do
|
354
|
-
stub_request(:head, dest)
|
355
|
-
|
356
|
-
headers = {
|
357
|
-
'Accept' => '*/*',
|
358
|
-
'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
|
359
|
-
'User-Agent' => /Puppet/
|
360
|
-
}
|
361
|
-
stub_request(:get, dest).with(headers: headers)
|
362
|
-
|
363
|
-
subject.request_with_redirects(dest, :get, 0)
|
364
|
-
end
|
365
|
-
|
366
|
-
it 'can return a compressed response body' do
|
367
|
-
stub_request(:head, dest)
|
368
|
-
|
369
|
-
compressed_body = [
|
370
|
-
0x1f, 0x8b, 0x08, 0x08, 0xe9, 0x08, 0x7a, 0x5a, 0x00, 0x03,
|
371
|
-
0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x00, 0xcb, 0xc8, 0xe4, 0x02,
|
372
|
-
0x00, 0x7a, 0x7a, 0x6f, 0xed, 0x03, 0x00, 0x00, 0x00
|
373
|
-
].pack('C*')
|
374
|
-
|
375
|
-
stub_request(:get, dest).to_return(status: 200, body: compressed_body, headers: { 'Content-Encoding' => 'gzip' })
|
376
|
-
|
377
|
-
expect(
|
378
|
-
uncompress_body(subject.request_with_redirects(dest, :get, 0))
|
379
|
-
).to eq("hi\n")
|
380
|
-
end
|
381
|
-
|
382
|
-
it 'generates accept and accept-encoding headers when a block is provided' do
|
383
|
-
stub_request(:head, dest)
|
384
|
-
|
385
|
-
headers = {
|
386
|
-
'Accept' => '*/*',
|
387
|
-
'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
|
388
|
-
'User-Agent' => /Puppet/
|
389
|
-
}
|
390
|
-
stub_request(:get, dest).with(headers: headers)
|
391
|
-
|
392
|
-
subject.request_with_redirects(dest, :get, 0) do
|
393
|
-
# unused
|
394
|
-
end
|
395
|
-
end
|
396
|
-
|
397
|
-
it 'only makes a single HEAD request' do
|
398
|
-
stub_request(:head, dest)
|
399
|
-
|
400
|
-
subject.request_with_redirects(dest, :head, 0)
|
401
|
-
end
|
402
|
-
|
403
|
-
it 'preserves query parameters' do
|
404
|
-
url = URI.parse('http://mydomain.com/some/path?foo=bar')
|
405
|
-
|
406
|
-
stub_request(:head, url)
|
407
|
-
stub_request(:get, url)
|
408
|
-
|
409
|
-
subject.request_with_redirects(url, :get, 0) do
|
410
|
-
# unused
|
411
|
-
end
|
412
|
-
end
|
413
|
-
end
|
414
347
|
end
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require 'spec_helper'
|
2
|
-
require 'webmock/rspec'
|
3
2
|
require 'puppet/http'
|
4
3
|
|
5
4
|
describe Puppet::HTTP::Resolver do
|
@@ -29,7 +28,7 @@ describe Puppet::HTTP::Resolver do
|
|
29
28
|
end
|
30
29
|
|
31
30
|
it 'returns a service based on the current server_list setting' do
|
32
|
-
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/
|
31
|
+
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/server").to_return(status: 200)
|
33
32
|
|
34
33
|
service = subject.resolve(session, :ca)
|
35
34
|
expect(service).to be_an_instance_of(Puppet::HTTP::Service::Ca)
|
@@ -37,34 +36,54 @@ describe Puppet::HTTP::Resolver do
|
|
37
36
|
end
|
38
37
|
|
39
38
|
it 'returns a service based on the current server_list setting if the server returns any success codes' do
|
40
|
-
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/
|
39
|
+
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/server").to_return(status: 202)
|
41
40
|
|
42
41
|
service = subject.resolve(session, :ca)
|
43
42
|
expect(service).to be_an_instance_of(Puppet::HTTP::Service::Ca)
|
44
43
|
expect(service.url.to_s).to eq("https://ca.example.com:8141/puppet-ca/v1")
|
45
44
|
end
|
46
45
|
|
47
|
-
it '
|
48
|
-
Puppet[:
|
46
|
+
it 'includes extra http headers' do
|
47
|
+
Puppet[:http_extra_headers] = 'region:us-west'
|
49
48
|
|
50
|
-
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/
|
51
|
-
|
49
|
+
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/server")
|
50
|
+
.with(headers: {'Region' => 'us-west'})
|
51
|
+
|
52
|
+
subject.resolve(session, :ca)
|
53
|
+
end
|
54
|
+
|
55
|
+
it 'uses the provided ssl context during resolution' do
|
56
|
+
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/server").to_return(status: 200)
|
57
|
+
|
58
|
+
other_ctx = Puppet::SSL::SSLContext.new
|
59
|
+
expect(client).to receive(:connect).with(URI("https://ca.example.com:8141/status/v1/simple/server"), options: {ssl_context: other_ctx}).and_call_original
|
60
|
+
|
61
|
+
subject.resolve(session, :ca, ssl_context: other_ctx)
|
62
|
+
end
|
63
|
+
|
64
|
+
it 'logs unsuccessful HTTP 500 responses' do
|
65
|
+
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/server").to_return(status: [500, 'Internal Server Error'])
|
66
|
+
stub_request(:get, "https://apple.example.com:8142/status/v1/simple/server").to_return(status: 200)
|
52
67
|
|
53
68
|
subject.resolve(session, :ca)
|
54
69
|
|
55
70
|
expect(@logs.map(&:message)).to include(/Puppet server ca.example.com:8141 is unavailable: 500 Internal Server Error/)
|
56
71
|
end
|
57
72
|
|
58
|
-
it '
|
59
|
-
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/
|
60
|
-
stub_request(:get, "https://apple.example.com:8142/status/v1/simple/
|
73
|
+
it 'cancels resolution if no servers in server_list are accessible' do
|
74
|
+
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/server").to_return(status: 503)
|
75
|
+
stub_request(:get, "https://apple.example.com:8142/status/v1/simple/server").to_return(status: 503)
|
76
|
+
|
77
|
+
canceled = false
|
78
|
+
canceled_handler = lambda { |cancel| canceled = cancel }
|
61
79
|
|
62
|
-
expect
|
80
|
+
expect(subject.resolve(session, :ca, canceled_handler: canceled_handler)).to eq(nil)
|
81
|
+
expect(canceled).to eq(true)
|
63
82
|
end
|
64
83
|
|
65
84
|
it 'cycles through server_list until a valid server is found' do
|
66
|
-
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/
|
67
|
-
stub_request(:get, "https://apple.example.com:8142/status/v1/simple/
|
85
|
+
stub_request(:get, "https://ca.example.com:8141/status/v1/simple/server").to_return(status: 503)
|
86
|
+
stub_request(:get, "https://apple.example.com:8142/status/v1/simple/server").to_return(status: 200)
|
68
87
|
|
69
88
|
service = subject.resolve(session, :ca)
|
70
89
|
expect(service).to be_an_instance_of(Puppet::HTTP::Service::Ca)
|
@@ -72,8 +91,8 @@ describe Puppet::HTTP::Resolver do
|
|
72
91
|
end
|
73
92
|
|
74
93
|
it 'resolves once per session' do
|
75
|
-
failed = stub_request(:get, "https://ca.example.com:8141/status/v1/simple/
|
76
|
-
passed = stub_request(:get, "https://apple.example.com:8142/status/v1/simple/
|
94
|
+
failed = stub_request(:get, "https://ca.example.com:8141/status/v1/simple/server").to_return(status: 503)
|
95
|
+
passed = stub_request(:get, "https://apple.example.com:8142/status/v1/simple/server").to_return(status: 200)
|
77
96
|
|
78
97
|
service = subject.resolve(session, :puppet)
|
79
98
|
expect(service).to be_a(Puppet::HTTP::Service::Compiler)
|
@@ -66,4 +66,10 @@ describe Puppet::HTTP::Response do
|
|
66
66
|
|
67
67
|
expect(client.get(uri)['Content-Encoding']).to eq('gzip')
|
68
68
|
end
|
69
|
+
|
70
|
+
it "enumerates headers" do
|
71
|
+
stub_request(:get, uri).to_return(status: 200, headers: { 'Content-Encoding' => 'gzip' })
|
72
|
+
|
73
|
+
expect(client.get(uri).each_header.to_a).to eq([['content-encoding', 'gzip']])
|
74
|
+
end
|
69
75
|
end
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require 'spec_helper'
|
2
|
-
require 'webmock/rspec'
|
3
2
|
require 'puppet/http'
|
4
3
|
|
5
4
|
describe Puppet::HTTP::Service::Ca do
|
@@ -39,11 +38,11 @@ describe Puppet::HTTP::Service::Ca do
|
|
39
38
|
subject.get_certificate('ca')
|
40
39
|
end
|
41
40
|
|
42
|
-
it 'fallbacks to server and
|
41
|
+
it 'fallbacks to server and serverport' do
|
43
42
|
Puppet[:ca_server] = nil
|
44
43
|
Puppet[:ca_port] = nil
|
45
44
|
Puppet[:server] = 'ca2.example.com'
|
46
|
-
Puppet[:
|
45
|
+
Puppet[:serverport] = 8142
|
47
46
|
|
48
47
|
stub_request(:get, "https://ca2.example.com:8142/puppet-ca/v1/certificate/ca").to_return(body: pem)
|
49
48
|
|
@@ -1,6 +1,5 @@
|
|
1
1
|
# coding: utf-8
|
2
2
|
require 'spec_helper'
|
3
|
-
require 'webmock/rspec'
|
4
3
|
require 'puppet/http'
|
5
4
|
|
6
5
|
describe Puppet::HTTP::Service::Compiler do
|
@@ -12,12 +11,11 @@ describe Puppet::HTTP::Service::Compiler do
|
|
12
11
|
let(:node) { Puppet::Node.new(certname) }
|
13
12
|
let(:facts) { Puppet::Node::Facts.new(certname) }
|
14
13
|
let(:catalog) { Puppet::Resource::Catalog.new(certname) }
|
15
|
-
let(:status) { Puppet::Status.new }
|
16
14
|
let(:formatter) { Puppet::Network::FormatHandler.format(:json) }
|
17
15
|
|
18
16
|
before :each do
|
19
17
|
Puppet[:server] = 'compiler.example.com'
|
20
|
-
Puppet[:
|
18
|
+
Puppet[:serverport] = 8140
|
21
19
|
|
22
20
|
Puppet::Node::Facts.indirection.terminus_class = :memory
|
23
21
|
end
|
@@ -38,7 +36,7 @@ describe Puppet::HTTP::Service::Compiler do
|
|
38
36
|
context 'when routing to the compiler service' do
|
39
37
|
it 'defaults the server and port based on settings' do
|
40
38
|
Puppet[:server] = 'compiler2.example.com'
|
41
|
-
Puppet[:
|
39
|
+
Puppet[:serverport] = 8141
|
42
40
|
|
43
41
|
stub_request(:post, "https://compiler2.example.com:8141/puppet/v3/catalog/ziggy?environment=testing")
|
44
42
|
.to_return(body: formatter.render(catalog), headers: {'Content-Type' => formatter.mime })
|
@@ -132,6 +130,26 @@ describe Puppet::HTTP::Service::Compiler do
|
|
132
130
|
subject.post_catalog(certname, environment: 'production', facts: facts, checksum_type: %w[sha256 sha384])
|
133
131
|
end
|
134
132
|
|
133
|
+
it 'does not accept msgpack by default' do
|
134
|
+
stub_request(:post, uri)
|
135
|
+
.with(headers: {'Accept' => 'application/vnd.puppet.rich+json, application/json, text/pson'})
|
136
|
+
.to_return(**catalog_response)
|
137
|
+
|
138
|
+
allow(Puppet.features).to receive(:msgpack?).and_return(false)
|
139
|
+
|
140
|
+
subject.post_catalog(certname, environment: environment, facts: facts)
|
141
|
+
end
|
142
|
+
|
143
|
+
it 'accepts msgpack & rich_json_msgpack if the gem is present' do
|
144
|
+
stub_request(:post, uri)
|
145
|
+
.with(headers: {'Accept' => 'application/vnd.puppet.rich+json, application/json, application/vnd.puppet.rich+msgpack, application/x-msgpack, text/pson'})
|
146
|
+
.to_return(**catalog_response)
|
147
|
+
|
148
|
+
allow(Puppet.features).to receive(:msgpack?).and_return(true)
|
149
|
+
|
150
|
+
subject.post_catalog(certname, environment: environment, facts: facts)
|
151
|
+
end
|
152
|
+
|
135
153
|
it 'returns a deserialized catalog' do
|
136
154
|
stub_request(:post, uri)
|
137
155
|
.to_return(**catalog_response)
|
@@ -141,6 +159,35 @@ describe Puppet::HTTP::Service::Compiler do
|
|
141
159
|
expect(cat.name).to eq(certname)
|
142
160
|
end
|
143
161
|
|
162
|
+
it 'deserializes the catalog from msgpack', if: Puppet.features.msgpack? do
|
163
|
+
body = catalog.to_msgpack
|
164
|
+
formatter = Puppet::Network::FormatHandler.format(:msgpack)
|
165
|
+
catalog_response = { body: body, headers: {'Content-Type' => formatter.mime }}
|
166
|
+
|
167
|
+
stub_request(:post, uri)
|
168
|
+
.to_return(**catalog_response)
|
169
|
+
|
170
|
+
_, cat = subject.post_catalog(certname, environment: 'production', facts: facts)
|
171
|
+
expect(cat).to be_a(Puppet::Resource::Catalog)
|
172
|
+
expect(cat.name).to eq(certname)
|
173
|
+
end
|
174
|
+
|
175
|
+
it 'deserializes the catalog from rich msgpack', if: Puppet.features.msgpack? do
|
176
|
+
body = Puppet.override(rich_data: true) do
|
177
|
+
catalog.to_msgpack
|
178
|
+
end
|
179
|
+
|
180
|
+
formatter = Puppet::Network::FormatHandler.format(:rich_data_msgpack)
|
181
|
+
catalog_response = { body: body, headers: {'Content-Type' => formatter.mime }}
|
182
|
+
|
183
|
+
stub_request(:post, uri)
|
184
|
+
.to_return(**catalog_response)
|
185
|
+
|
186
|
+
_, cat = subject.post_catalog(certname, environment: 'production', facts: facts)
|
187
|
+
expect(cat).to be_a(Puppet::Resource::Catalog)
|
188
|
+
expect(cat.name).to eq(certname)
|
189
|
+
end
|
190
|
+
|
144
191
|
it 'returns the request response' do
|
145
192
|
stub_request(:post, uri)
|
146
193
|
.to_return(**catalog_response)
|
@@ -418,67 +465,6 @@ describe Puppet::HTTP::Service::Compiler do
|
|
418
465
|
end
|
419
466
|
end
|
420
467
|
|
421
|
-
context 'when getting status' do
|
422
|
-
let(:uri) { %r{/puppet/v3/status/ziggy} }
|
423
|
-
let(:status_response) { { body: formatter.render(status), headers: {'Content-Type' => formatter.mime } } }
|
424
|
-
|
425
|
-
it 'always sends production' do
|
426
|
-
stub_request(:get, uri)
|
427
|
-
.with(query: hash_including("environment" => "production"))
|
428
|
-
.to_return(**status_response)
|
429
|
-
|
430
|
-
subject.get_status(certname)
|
431
|
-
end
|
432
|
-
|
433
|
-
it 'returns a deserialized status' do
|
434
|
-
stub_request(:get, uri)
|
435
|
-
.to_return(**status_response)
|
436
|
-
|
437
|
-
_, s = subject.get_status(certname)
|
438
|
-
expect(s).to be_a(Puppet::Status)
|
439
|
-
expect(s.status).to eq("is_alive" => true)
|
440
|
-
end
|
441
|
-
|
442
|
-
it 'returns the request response' do
|
443
|
-
stub_request(:get, uri)
|
444
|
-
.to_return(**status_response)
|
445
|
-
|
446
|
-
resp, _ = subject.get_status(certname)
|
447
|
-
expect(resp).to be_a(Puppet::HTTP::Response)
|
448
|
-
end
|
449
|
-
|
450
|
-
it 'raises a response error if unsuccessful' do
|
451
|
-
stub_request(:get, uri)
|
452
|
-
.to_return(status: [500, "Server Error"])
|
453
|
-
|
454
|
-
expect {
|
455
|
-
subject.get_status(certname)
|
456
|
-
}.to raise_error do |err|
|
457
|
-
expect(err).to be_an_instance_of(Puppet::HTTP::ResponseError)
|
458
|
-
expect(err.message).to eq('Server Error')
|
459
|
-
expect(err.response.code).to eq(500)
|
460
|
-
end
|
461
|
-
end
|
462
|
-
|
463
|
-
it 'raises a protocol error if the content-type header is missing' do
|
464
|
-
stub_request(:get, uri)
|
465
|
-
.to_return(body: "content-type is missing")
|
466
|
-
|
467
|
-
expect {
|
468
|
-
subject.get_status(certname)
|
469
|
-
}.to raise_error(Puppet::HTTP::ProtocolError, /No content type in http response; cannot parse/)
|
470
|
-
end
|
471
|
-
|
472
|
-
it 'raises a serialization error if the content is invalid' do
|
473
|
-
stub_request(:get, uri)
|
474
|
-
.to_return(body: "this isn't valid JSON", headers: {'Content-Type' => 'application/json'})
|
475
|
-
|
476
|
-
expect {
|
477
|
-
subject.get_status(certname)
|
478
|
-
}.to raise_error(Puppet::HTTP::SerializationError, /Failed to deserialize Puppet::Status from json/)
|
479
|
-
end
|
480
|
-
end
|
481
|
-
|
482
468
|
context 'filebucket' do
|
483
469
|
let(:filebucket_file) { Puppet::FileBucket::File.new('file to store') }
|
484
470
|
let(:formatter) { Puppet::Network::FormatHandler.format(:binary) }
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require 'spec_helper'
|
2
|
-
require 'webmock/rspec'
|
3
2
|
require 'puppet/http'
|
4
3
|
|
5
4
|
describe Puppet::HTTP::Service::FileServer do
|
@@ -13,7 +12,7 @@ describe Puppet::HTTP::Service::FileServer do
|
|
13
12
|
|
14
13
|
before :each do
|
15
14
|
Puppet[:server] = 'www.example.com'
|
16
|
-
Puppet[:
|
15
|
+
Puppet[:serverport] = 443
|
17
16
|
end
|
18
17
|
|
19
18
|
context 'when making requests' do
|
@@ -32,7 +31,7 @@ describe Puppet::HTTP::Service::FileServer do
|
|
32
31
|
context 'when routing to the file service' do
|
33
32
|
it 'defaults the server and port based on settings' do
|
34
33
|
Puppet[:server] = 'file.example.com'
|
35
|
-
Puppet[:
|
34
|
+
Puppet[:serverport] = 8141
|
36
35
|
|
37
36
|
stub_request(:get, "https://file.example.com:8141/puppet/v3/file_content/:mount/:path?environment=testing")
|
38
37
|
|
@@ -42,7 +41,7 @@ describe Puppet::HTTP::Service::FileServer do
|
|
42
41
|
|
43
42
|
context 'retrieving file metadata' do
|
44
43
|
let(:path) { tmpfile('get_file_metadata') }
|
45
|
-
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" }
|
46
45
|
let(:filemetadata) { Puppet::FileServing::Metadata.new(path) }
|
47
46
|
let(:request_path) { "/:mount/#{path}"}
|
48
47
|
|
@@ -123,7 +122,7 @@ describe Puppet::HTTP::Service::FileServer do
|
|
123
122
|
|
124
123
|
context 'retrieving multiple file metadatas' do
|
125
124
|
let(:path) { tmpfile('get_file_metadatas') }
|
126
|
-
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" }
|
127
126
|
let(:filemetadatas) { [Puppet::FileServing::Metadata.new(path)] }
|
128
127
|
let(:formatter) { Puppet::Network::FormatHandler.format(:json) }
|
129
128
|
let(:request_path) { "/:mount/#{path}"}
|
@@ -159,7 +158,7 @@ describe Puppet::HTTP::Service::FileServer do
|
|
159
158
|
end
|
160
159
|
|
161
160
|
it 'automatically converts an array of parameters to the stringified query' do
|
162
|
-
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"
|
163
162
|
stub_request(:get, url).with(
|
164
163
|
headers: {'Accept'=>'application/json, application/x-msgpack, text/pson',}
|
165
164
|
).to_return(
|
@@ -0,0 +1,112 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
require 'puppet/http'
|
3
|
+
|
4
|
+
describe Puppet::HTTP::Service::Puppetserver do
|
5
|
+
let(:ssl_context) { Puppet::SSL::SSLContext.new }
|
6
|
+
let(:client) { Puppet::HTTP::Client.new(ssl_context: ssl_context) }
|
7
|
+
let(:subject) { client.create_session.route_to(:puppetserver) }
|
8
|
+
|
9
|
+
before :each do
|
10
|
+
Puppet[:server] = 'puppetserver.example.com'
|
11
|
+
end
|
12
|
+
|
13
|
+
context 'when making requests' do
|
14
|
+
it 'includes default HTTP headers' do
|
15
|
+
stub_request(:get, "https://puppetserver.example.com:8140/status/v1/simple/server").with do |request|
|
16
|
+
expect(request.headers).to include({'X-Puppet-Version' => /./, 'User-Agent' => /./})
|
17
|
+
expect(request.headers).to_not include('X-Puppet-Profiling')
|
18
|
+
end.to_return(body: "running", headers: {'Content-Type' => 'text/plain;charset=utf-8'})
|
19
|
+
|
20
|
+
subject.get_simple_status
|
21
|
+
end
|
22
|
+
|
23
|
+
it 'includes extra headers' do
|
24
|
+
Puppet[:http_extra_headers] = 'region:us-west'
|
25
|
+
|
26
|
+
stub_request(:get, "https://puppetserver.example.com:8140/status/v1/simple/server")
|
27
|
+
.with(headers: {'Region' => 'us-west'})
|
28
|
+
.to_return(body: "running", headers: {'Content-Type' => 'text/plain;charset=utf-8'})
|
29
|
+
|
30
|
+
subject.get_simple_status
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
context 'when routing to the puppetserver service' do
|
35
|
+
it 'defaults the server and port based on settings' do
|
36
|
+
Puppet[:server] = 'compiler2.example.com'
|
37
|
+
Puppet[:serverport] = 8141
|
38
|
+
|
39
|
+
stub_request(:get, "https://compiler2.example.com:8141/status/v1/simple/server")
|
40
|
+
.to_return(body: "running", headers: {'Content-Type' => 'text/plain;charset=utf-8'})
|
41
|
+
|
42
|
+
subject.get_simple_status
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
context 'when getting puppetserver status' do
|
47
|
+
let(:url) { "https://puppetserver.example.com:8140/status/v1/simple/server" }
|
48
|
+
|
49
|
+
it 'returns the request response and status' do
|
50
|
+
stub_request(:get, url)
|
51
|
+
.to_return(body: "running", headers: {'Content-Type' => 'text/plain;charset=utf-8'})
|
52
|
+
|
53
|
+
resp, status = subject.get_simple_status
|
54
|
+
expect(resp).to be_a(Puppet::HTTP::Response)
|
55
|
+
expect(status).to eq('running')
|
56
|
+
end
|
57
|
+
|
58
|
+
it 'raises a response error if unsuccessful' do
|
59
|
+
stub_request(:get, url).to_return(status: [500, 'Internal Server Error'])
|
60
|
+
|
61
|
+
expect {
|
62
|
+
subject.get_simple_status
|
63
|
+
}.to raise_error do |err|
|
64
|
+
expect(err).to be_an_instance_of(Puppet::HTTP::ResponseError)
|
65
|
+
expect(err.message).to eq("Internal Server Error")
|
66
|
+
expect(err.response.code).to eq(500)
|
67
|
+
end
|
68
|
+
end
|
69
|
+
|
70
|
+
it 'accepts an ssl context' do
|
71
|
+
stub_request(:get, url)
|
72
|
+
.to_return(body: "running", headers: {'Content-Type' => 'text/plain;charset=utf-8'})
|
73
|
+
|
74
|
+
other_ctx = Puppet::SSL::SSLContext.new
|
75
|
+
expect(client).to receive(:connect).with(URI(url), options: {ssl_context: other_ctx}).and_call_original
|
76
|
+
|
77
|
+
session = client.create_session
|
78
|
+
service = Puppet::HTTP::Service.create_service(client, session, :puppetserver, 'puppetserver.example.com', 8140)
|
79
|
+
service.get_simple_status(ssl_context: other_ctx)
|
80
|
+
end
|
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
|
112
|
+
end
|