puppet 6.14.0-x64-mingw32 → 6.19.0-x64-mingw32
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CODEOWNERS +2 -7
- data/Gemfile +4 -2
- data/Gemfile.lock +36 -34
- data/README.md +3 -4
- data/Rakefile +4 -12
- data/ext/windows/service/daemon.rb +3 -3
- data/lib/puppet.rb +33 -9
- data/lib/puppet/agent.rb +20 -14
- data/lib/puppet/agent/locker.rb +0 -7
- data/lib/puppet/application/agent.rb +25 -9
- data/lib/puppet/application/apply.rb +18 -20
- data/lib/puppet/application/device.rb +1 -1
- data/lib/puppet/application/doc.rb +1 -1
- data/lib/puppet/application/filebucket.rb +5 -14
- data/lib/puppet/application/lookup.rb +16 -4
- data/lib/puppet/application/plugin.rb +1 -0
- data/lib/puppet/application/ssl.rb +3 -3
- data/lib/puppet/configurer.rb +68 -24
- data/lib/puppet/configurer/downloader.rb +31 -10
- data/lib/puppet/configurer/plugin_handler.rb +1 -1
- data/lib/puppet/confine.rb +2 -2
- data/lib/puppet/confine/any.rb +1 -1
- data/lib/puppet/context/trusted_information.rb +14 -8
- data/lib/puppet/daemon.rb +13 -27
- data/lib/puppet/defaults.rb +141 -41
- data/lib/puppet/environments.rb +55 -15
- data/lib/puppet/face/catalog.rb +1 -1
- data/lib/puppet/face/config.rb +46 -16
- data/lib/puppet/face/facts.rb +1 -1
- data/lib/puppet/face/help.rb +29 -3
- data/lib/puppet/face/module/search.rb +5 -0
- data/lib/puppet/face/node.rb +3 -3
- data/lib/puppet/face/node/clean.rb +2 -2
- data/lib/puppet/face/plugin.rb +2 -2
- data/lib/puppet/face/status.rb +1 -1
- data/lib/puppet/feature/base.rb +1 -1
- data/lib/puppet/file_bucket/dipper.rb +1 -1
- data/lib/puppet/file_serving/http_metadata.rb +14 -2
- data/lib/puppet/file_serving/metadata.rb +4 -1
- 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 +17 -13
- data/lib/puppet/file_system/uniquefile.rb +12 -16
- data/lib/puppet/forge.rb +1 -1
- data/lib/puppet/forge/cache.rb +1 -1
- data/lib/puppet/forge/repository.rb +4 -7
- data/lib/puppet/functions/call.rb +1 -1
- data/lib/puppet/functions/filter.rb +1 -0
- data/lib/puppet/functions/lstrip.rb +4 -4
- data/lib/puppet/functions/new.rb +8 -3
- data/lib/puppet/functions/reduce.rb +2 -4
- 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/gettext/config.rb +5 -5
- data/lib/puppet/gettext/module_translations.rb +4 -4
- data/lib/puppet/http.rb +3 -0
- data/lib/puppet/http/client.rb +215 -60
- data/lib/puppet/http/external_client.rb +90 -0
- data/lib/puppet/http/redirector.rb +43 -7
- data/lib/puppet/http/resolver.rb +43 -3
- data/lib/puppet/http/resolver/server_list.rb +66 -24
- data/lib/puppet/http/resolver/settings.rb +21 -1
- data/lib/puppet/http/resolver/srv.rb +28 -2
- data/lib/puppet/http/response.rb +82 -1
- data/lib/puppet/http/retry_after_handler.rb +39 -0
- data/lib/puppet/http/service.rb +70 -2
- data/lib/puppet/http/service/ca.rb +71 -9
- data/lib/puppet/http/service/compiler.rb +214 -12
- data/lib/puppet/http/service/file_server.rb +106 -5
- data/lib/puppet/http/service/puppetserver.rb +39 -0
- data/lib/puppet/http/service/report.rb +36 -3
- data/lib/puppet/http/session.rb +60 -8
- data/lib/puppet/indirector.rb +1 -1
- data/lib/puppet/indirector/catalog/compiler.rb +1 -1
- data/lib/puppet/indirector/catalog/rest.rb +2 -1
- data/lib/puppet/indirector/exec.rb +1 -1
- data/lib/puppet/indirector/facts/facter.rb +3 -3
- data/lib/puppet/indirector/facts/rest.rb +2 -1
- data/lib/puppet/indirector/facts/yaml.rb +1 -1
- data/lib/puppet/indirector/file_bucket_file/rest.rb +48 -0
- data/lib/puppet/indirector/file_content/http.rb +5 -0
- data/lib/puppet/indirector/file_content/rest.rb +1 -1
- data/lib/puppet/indirector/file_metadata/http.rb +28 -8
- data/lib/puppet/indirector/file_metadata/rest.rb +6 -4
- data/lib/puppet/indirector/hiera.rb +4 -0
- data/lib/puppet/indirector/indirection.rb +1 -1
- data/lib/puppet/indirector/json.rb +1 -1
- data/lib/puppet/indirector/msgpack.rb +1 -1
- data/lib/puppet/indirector/node/rest.rb +2 -1
- data/lib/puppet/indirector/report/processor.rb +2 -2
- data/lib/puppet/indirector/report/yaml.rb +23 -0
- data/lib/puppet/indirector/request.rb +5 -5
- data/lib/puppet/indirector/rest.rb +7 -1
- data/lib/puppet/indirector/status/rest.rb +2 -1
- data/lib/puppet/indirector/yaml.rb +1 -1
- data/lib/puppet/metatype/manager.rb +80 -80
- data/lib/puppet/module.rb +1 -2
- data/lib/puppet/network/format_support.rb +2 -2
- data/lib/puppet/network/http/api/indirected_routes.rb +1 -1
- data/lib/puppet/network/http/api/master/v3/environment.rb +3 -0
- data/lib/puppet/network/http/api/master/v3/environments.rb +0 -1
- data/lib/puppet/network/http/base_pool.rb +6 -1
- data/lib/puppet/network/http/compression.rb +7 -0
- data/lib/puppet/network/http/connection.rb +2 -0
- data/lib/puppet/network/http/connection_adapter.rb +184 -0
- data/lib/puppet/network/http/nocache_pool.rb +1 -0
- data/lib/puppet/network/http/pool.rb +2 -4
- data/lib/puppet/network/http/route.rb +2 -2
- data/lib/puppet/network/http_pool.rb +2 -1
- data/lib/puppet/node/environment.rb +22 -5
- data/lib/puppet/node/facts.rb +17 -0
- data/lib/puppet/pal/catalog_compiler.rb +5 -0
- data/lib/puppet/pal/pal_impl.rb +30 -31
- 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 -4
- data/lib/puppet/parser/compiler.rb +43 -33
- data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +2 -0
- data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +2 -0
- data/lib/puppet/parser/environment_compiler.rb +4 -1
- data/lib/puppet/parser/functions.rb +18 -9
- data/lib/puppet/parser/functions/create_resources.rb +11 -7
- data/lib/puppet/parser/functions/filter.rb +1 -0
- data/lib/puppet/parser/resource.rb +3 -2
- 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 +5 -5
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +2 -2
- data/lib/puppet/pops/issues.rb +5 -0
- data/lib/puppet/pops/loader/runtime3_type_loader.rb +4 -2
- data/lib/puppet/pops/loaders.rb +24 -15
- data/lib/puppet/pops/lookup/context.rb +1 -1
- data/lib/puppet/pops/lookup/hiera_config.rb +14 -1
- data/lib/puppet/pops/resource/resource_type_impl.rb +2 -0
- 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/validation/checker4_0.rb +29 -15
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -0
- data/lib/puppet/provider/file/windows.rb +1 -1
- data/lib/puppet/provider/group/windows_adsi.rb +3 -3
- data/lib/puppet/provider/package/aix.rb +17 -2
- data/lib/puppet/provider/package/apt.rb +98 -1
- data/lib/puppet/provider/package/aptitude.rb +1 -1
- data/lib/puppet/provider/package/dnfmodule.rb +61 -14
- data/lib/puppet/provider/package/dpkg.rb +1 -1
- data/lib/puppet/provider/package/gem.rb +45 -9
- data/lib/puppet/provider/package/pacman.rb +2 -5
- data/lib/puppet/provider/package/pip.rb +143 -48
- data/lib/puppet/provider/package/pip2.rb +17 -0
- data/lib/puppet/provider/package/pip3.rb +0 -2
- data/lib/puppet/provider/package/pkgdmg.rb +1 -1
- data/lib/puppet/provider/package/pkgng.rb +16 -4
- data/lib/puppet/provider/package/portage.rb +2 -2
- data/lib/puppet/provider/package/puppet_gem.rb +11 -2
- data/lib/puppet/provider/package/puppetserver_gem.rb +180 -0
- data/lib/puppet/provider/package/rpm.rb +6 -213
- data/lib/puppet/provider/package/yum.rb +101 -20
- data/lib/puppet/provider/package/zypper.rb +62 -1
- data/lib/puppet/provider/service/systemd.rb +22 -4
- data/lib/puppet/provider/service/windows.rb +23 -7
- data/lib/puppet/provider/user/aix.rb +1 -1
- data/lib/puppet/provider/user/user_role_add.rb +1 -1
- data/lib/puppet/provider/user/useradd.rb +16 -5
- data/lib/puppet/provider/user/windows_adsi.rb +18 -1
- data/lib/puppet/reports/http.rb +15 -9
- data/lib/puppet/resource.rb +2 -1
- data/lib/puppet/resource/type.rb +10 -1
- data/lib/puppet/resource/type_collection.rb +20 -16
- data/lib/puppet/rest/route.rb +2 -2
- data/lib/puppet/runtime.rb +25 -2
- data/lib/puppet/settings.rb +20 -6
- data/lib/puppet/ssl.rb +1 -0
- data/lib/puppet/ssl/host.rb +4 -4
- data/lib/puppet/ssl/oids.rb +1 -0
- data/lib/puppet/ssl/ssl_context.rb +2 -2
- data/lib/puppet/ssl/ssl_provider.rb +20 -1
- data/lib/puppet/ssl/state_machine.rb +79 -37
- data/lib/puppet/ssl/validator/default_validator.rb +1 -1
- data/lib/puppet/ssl/verifier_adapter.rb +9 -1
- data/lib/puppet/test/test_helper.rb +19 -14
- data/lib/puppet/transaction.rb +2 -2
- data/lib/puppet/transaction/persistence.rb +1 -1
- data/lib/puppet/transaction/report.rb +14 -10
- data/lib/puppet/trusted_external.rb +29 -1
- data/lib/puppet/type.rb +21 -8
- data/lib/puppet/type/file.rb +40 -15
- data/lib/puppet/type/file/checksum.rb +4 -4
- data/lib/puppet/type/file/source.rb +35 -13
- data/lib/puppet/type/filebucket.rb +1 -1
- data/lib/puppet/type/notify.rb +2 -2
- data/lib/puppet/type/package.rb +41 -3
- data/lib/puppet/type/service.rb +59 -8
- data/lib/puppet/type/user.rb +19 -29
- data/lib/puppet/util.rb +41 -3
- data/lib/puppet/util/at_fork.rb +1 -1
- data/lib/puppet/util/autoload.rb +13 -25
- data/lib/puppet/util/character_encoding.rb +9 -5
- data/lib/puppet/util/checksums.rb +19 -4
- data/lib/puppet/util/connection.rb +8 -8
- data/lib/puppet/util/execution.rb +2 -2
- data/lib/puppet/util/fileparsing.rb +2 -2
- data/lib/puppet/util/instance_loader.rb +14 -10
- data/lib/puppet/util/log/destinations.rb +1 -10
- data/lib/puppet/util/package/version/debian.rb +175 -0
- data/lib/puppet/util/package/version/gem.rb +15 -0
- data/lib/puppet/util/package/version/pip.rb +167 -0
- data/lib/puppet/util/package/version/range.rb +53 -0
- data/lib/puppet/util/package/version/range/eq.rb +14 -0
- data/lib/puppet/util/package/version/range/gt.rb +14 -0
- data/lib/puppet/util/package/version/range/gt_eq.rb +14 -0
- data/lib/puppet/util/package/version/range/lt.rb +14 -0
- data/lib/puppet/util/package/version/range/lt_eq.rb +14 -0
- data/lib/puppet/util/package/version/range/min_max.rb +21 -0
- data/lib/puppet/util/package/version/range/simple.rb +11 -0
- data/lib/puppet/util/package/version/rpm.rb +73 -0
- data/lib/puppet/util/pidlock.rb +13 -7
- data/lib/puppet/util/platform.rb +5 -0
- data/lib/puppet/util/provider_features.rb +1 -1
- data/lib/puppet/util/reference.rb +1 -1
- data/lib/puppet/util/rpm_compare.rb +193 -0
- data/lib/puppet/util/run_mode.rb +5 -1
- data/lib/puppet/util/windows.rb +1 -0
- data/lib/puppet/util/windows/adsi.rb +2 -2
- data/lib/puppet/util/windows/api_types.rb +60 -33
- data/lib/puppet/util/windows/eventlog.rb +1 -6
- data/lib/puppet/util/windows/monkey_patches/dir.rb +40 -0
- data/lib/puppet/util/windows/principal.rb +8 -6
- data/lib/puppet/util/windows/process.rb +15 -14
- data/lib/puppet/util/windows/registry.rb +11 -11
- data/lib/puppet/util/windows/security.rb +5 -4
- data/lib/puppet/util/windows/service.rb +43 -26
- data/lib/puppet/util/windows/sid.rb +3 -3
- data/lib/puppet/util/windows/user.rb +242 -8
- data/lib/puppet/version.rb +1 -1
- data/locales/puppet.pot +627 -507
- data/man/man5/puppet.conf.5 +93 -20
- 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 +1 -1
- data/man/man8/puppet-filebucket.8 +1 -1
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +6 -3
- data/man/man8/puppet-key.8 +1 -1
- data/man/man8/puppet-lookup.8 +2 -2
- data/man/man8/puppet-man.8 +1 -1
- data/man/man8/puppet-module.8 +4 -1
- data/man/man8/puppet-node.8 +4 -4
- 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-status.8 +2 -2
- 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/ssl/unknown-127.0.0.1-key.pem +67 -0
- data/spec/fixtures/ssl/unknown-127.0.0.1.pem +48 -0
- data/spec/fixtures/ssl/unknown-ca-key.pem +67 -0
- data/spec/fixtures/ssl/unknown-ca.pem +59 -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/dnfmodule/{dnf-module-list-installed.txt → dnf-module-list.txt} +8 -0
- data/spec/fixtures/unit/provider/package/pkgng/pkg.version +2 -0
- data/spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages +30 -0
- data/spec/fixtures/unit/provider/package/yum/yum-check-update-subscription-manager.txt +9 -0
- data/spec/fixtures/unit/provider/package/zypper/zypper-search-uninstalled.out +13 -0
- data/spec/fixtures/unit/provider/service/systemd/list_unit_files_services +9 -0
- data/spec/integration/application/agent_spec.rb +479 -0
- data/spec/integration/application/apply_spec.rb +279 -150
- data/spec/integration/application/config_spec.rb +74 -0
- data/spec/integration/application/doc_spec.rb +16 -6
- data/spec/integration/application/filebucket_spec.rb +239 -0
- data/spec/integration/application/help_spec.rb +42 -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 +123 -0
- data/spec/integration/configurer_spec.rb +14 -0
- data/spec/integration/data_binding_spec.rb +82 -0
- data/spec/integration/defaults_spec.rb +27 -3
- data/spec/integration/directory_environments_spec.rb +17 -17
- data/spec/integration/http/client_spec.rb +39 -40
- data/spec/integration/indirector/facts/facter_spec.rb +8 -6
- data/spec/integration/indirector/report/yaml.rb +83 -0
- data/spec/integration/network/http_pool_spec.rb +84 -19
- data/spec/integration/node/environment_spec.rb +15 -0
- data/spec/integration/parser/compiler_spec.rb +11 -0
- data/spec/integration/type/file_spec.rb +1 -1
- data/spec/integration/util/execution_spec.rb +22 -0
- data/spec/integration/util/windows/adsi_spec.rb +8 -3
- data/spec/integration/util/windows/monkey_patches/dir_spec.rb +11 -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/user_spec.rb +47 -5
- data/spec/integration/util_spec.rb +7 -33
- data/spec/lib/puppet/test_ca.rb +2 -2
- data/spec/lib/puppet_spec/https.rb +16 -7
- data/spec/lib/puppet_spec/matchers.rb +0 -80
- data/spec/lib/puppet_spec/puppetserver.rb +127 -0
- data/spec/shared_contexts/https.rb +29 -0
- data/spec/shared_contexts/types_setup.rb +2 -0
- data/spec/unit/agent_spec.rb +80 -26
- data/spec/unit/application/agent_spec.rb +12 -9
- data/spec/unit/application/device_spec.rb +2 -2
- 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 +41 -10
- data/spec/unit/application/filebucket_spec.rb +22 -2
- data/spec/unit/application/man_spec.rb +52 -0
- data/spec/unit/application/resource_spec.rb +3 -1
- data/spec/unit/application/ssl_spec.rb +15 -2
- data/spec/unit/application_spec.rb +9 -4
- data/spec/unit/configurer/downloader_spec.rb +10 -0
- data/spec/unit/configurer/fact_handler_spec.rb +4 -4
- data/spec/unit/configurer_spec.rb +87 -38
- data/spec/unit/confine_spec.rb +2 -1
- data/spec/unit/context/trusted_information_spec.rb +25 -2
- data/spec/unit/daemon_spec.rb +5 -64
- data/spec/unit/defaults_spec.rb +24 -1
- data/spec/unit/environments_spec.rb +107 -32
- data/spec/unit/face/config_spec.rb +59 -1
- data/spec/unit/face/module/search_spec.rb +17 -0
- data/spec/unit/face/node_spec.rb +2 -2
- 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 +29 -0
- data/spec/unit/file_system_spec.rb +11 -2
- data/spec/unit/http/client_spec.rb +173 -59
- data/spec/unit/http/external_client_spec.rb +201 -0
- data/spec/unit/http/resolver_spec.rb +44 -5
- data/spec/unit/http/response_spec.rb +6 -0
- data/spec/unit/http/service/ca_spec.rb +27 -5
- data/spec/unit/http/service/compiler_spec.rb +186 -9
- data/spec/unit/http/service/file_server_spec.rb +37 -6
- data/spec/unit/http/service/puppetserver_spec.rb +82 -0
- data/spec/unit/http/service/report_spec.rb +5 -4
- data/spec/unit/http/service_spec.rb +3 -4
- data/spec/unit/http/session_spec.rb +48 -12
- data/spec/unit/indirector/catalog/compiler_spec.rb +1 -0
- 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/rest_spec.rb +1 -1
- data/spec/unit/indirector/file_bucket_file/rest_spec.rb +82 -2
- data/spec/unit/indirector/file_metadata/http_spec.rb +194 -0
- data/spec/unit/indirector/file_metadata/rest_spec.rb +15 -14
- data/spec/unit/indirector/json_spec.rb +8 -8
- data/spec/unit/indirector/msgpack_spec.rb +8 -8
- data/spec/unit/indirector/node/rest_spec.rb +1 -1
- data/spec/unit/indirector/request_spec.rb +5 -5
- data/spec/unit/indirector/rest_spec.rb +14 -1
- data/spec/unit/indirector/status/rest_spec.rb +1 -1
- 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/format_support_spec.rb +3 -2
- data/spec/unit/network/http/api/indirected_routes_spec.rb +2 -1
- data/spec/unit/network/http/api/master/v3/environments_spec.rb +12 -23
- data/spec/unit/network/http/connection_spec.rb +552 -190
- data/spec/unit/network/http/nocache_pool_spec.rb +22 -0
- data/spec/unit/network/http/pool_spec.rb +3 -3
- data/spec/unit/network/http_pool_spec.rb +63 -57
- data/spec/unit/network/http_spec.rb +1 -1
- data/spec/unit/node/environment_spec.rb +33 -0
- data/spec/unit/parser/ast/block_expression_spec.rb +1 -1
- data/spec/unit/parser/environment_compiler_spec.rb +7 -0
- data/spec/unit/parser/scope_spec.rb +1 -1
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +15 -1
- data/spec/unit/pops/loaders/loaders_spec.rb +71 -1
- data/spec/unit/pops/lookup/lookup_spec.rb +25 -0
- data/spec/unit/pops/types/type_calculator_spec.rb +1 -11
- data/spec/unit/provider/exec_spec.rb +4 -3
- data/spec/unit/provider/group/windows_adsi_spec.rb +43 -10
- data/spec/unit/provider/package/aix_spec.rb +29 -0
- data/spec/unit/provider/package/apt_spec.rb +107 -0
- data/spec/unit/provider/package/aptitude_spec.rb +1 -0
- data/spec/unit/provider/package/dnfmodule_spec.rb +54 -15
- data/spec/unit/provider/package/dpkg_spec.rb +22 -7
- data/spec/unit/provider/package/gem_spec.rb +40 -0
- data/spec/unit/provider/package/openbsd_spec.rb +2 -0
- data/spec/unit/provider/package/pacman_spec.rb +6 -21
- data/spec/unit/provider/package/pip2_spec.rb +36 -0
- data/spec/unit/provider/package/pip_spec.rb +68 -19
- data/spec/unit/provider/package/pkgdmg_spec.rb +1 -1
- data/spec/unit/provider/package/pkgng_spec.rb +38 -0
- data/spec/unit/provider/package/portage_spec.rb +5 -0
- data/spec/unit/provider/package/puppet_gem_spec.rb +12 -1
- data/spec/unit/provider/package/puppetserver_gem_spec.rb +137 -0
- data/spec/unit/provider/package/rpm_spec.rb +0 -212
- data/spec/unit/provider/package/yum_spec.rb +274 -1
- data/spec/unit/provider/package/zypper_spec.rb +98 -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 +46 -5
- data/spec/unit/provider/service/launchd_spec.rb +5 -6
- data/spec/unit/provider/service/openbsd_spec.rb +9 -0
- data/spec/unit/provider/service/openrc_spec.rb +4 -5
- data/spec/unit/provider/service/openwrt_spec.rb +2 -1
- data/spec/unit/provider/service/redhat_spec.rb +10 -1
- data/spec/unit/provider/service/runit_spec.rb +2 -1
- data/spec/unit/provider/service/smf_spec.rb +1 -1
- data/spec/unit/provider/service/src_spec.rb +3 -5
- data/spec/unit/provider/service/systemd_spec.rb +95 -18
- data/spec/unit/provider/service/upstart_spec.rb +4 -5
- data/spec/unit/provider/service/windows_spec.rb +50 -14
- data/spec/unit/provider/user/openbsd_spec.rb +1 -0
- data/spec/unit/provider/user/useradd_spec.rb +30 -16
- data/spec/unit/provider/user/windows_adsi_spec.rb +85 -3
- data/spec/unit/puppet_pal_2pec.rb +11 -0
- data/spec/unit/puppet_pal_catalog_spec.rb +43 -0
- data/spec/unit/puppet_spec.rb +33 -0
- data/spec/unit/reports/http_spec.rb +70 -52
- data/spec/unit/reports/store_spec.rb +17 -13
- data/spec/unit/resource_spec.rb +3 -3
- data/spec/unit/rest/route_spec.rb +4 -4
- data/spec/unit/settings_spec.rb +44 -22
- data/spec/unit/ssl/host_spec.rb +4 -2
- data/spec/unit/ssl/oids_spec.rb +1 -0
- data/spec/unit/ssl/ssl_provider_spec.rb +69 -43
- data/spec/unit/ssl/state_machine_spec.rb +90 -14
- 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 +7 -1
- data/spec/unit/type/file/source_spec.rb +4 -4
- data/spec/unit/type/file_spec.rb +122 -96
- data/spec/unit/type/filebucket_spec.rb +1 -1
- data/spec/unit/type/service_spec.rb +218 -8
- data/spec/unit/type/user_spec.rb +32 -3
- data/spec/unit/type_spec.rb +50 -0
- data/spec/unit/util/at_fork_spec.rb +2 -2
- data/spec/unit/util/autoload_spec.rb +2 -1
- 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/log/destinations_spec.rb +1 -29
- data/spec/unit/util/package/version/debian_spec.rb +83 -0
- data/spec/unit/util/package/version/pip_spec.rb +464 -0
- data/spec/unit/util/package/version/range_spec.rb +175 -0
- data/spec/unit/util/package/version/rpm_spec.rb +121 -0
- data/spec/unit/util/pidlock_spec.rb +83 -47
- data/spec/unit/util/rpm_compare_spec.rb +196 -0
- data/spec/unit/util/run_mode_spec.rb +6 -6
- data/spec/unit/util/windows/adsi_spec.rb +4 -4
- 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/sid_spec.rb +2 -2
- data/spec/unit/util_spec.rb +3 -3
- data/spec/unit/x509/cert_provider_spec.rb +1 -1
- data/tasks/generate_cert_fixtures.rake +15 -1
- data/tasks/manpages.rake +5 -35
- metadata +90 -51
- data/spec/integration/faces/config_spec.rb +0 -91
- data/spec/integration/faces/documentation_spec.rb +0 -57
- data/spec/integration/faces/plugin_spec.rb +0 -63
- 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 -64
- data/spec/integration/module_tool/tar/mini_spec.rb +0 -28
- 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/face/man_spec.rb +0 -25
- data/spec/unit/man_spec.rb +0 -31
@@ -1,101 +1,119 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
require 'puppet/reports'
|
3
3
|
|
4
|
-
|
4
|
+
describe Puppet::Reports.report(:http) do
|
5
|
+
subject { Puppet::Transaction::Report.new.extend(described_class) }
|
5
6
|
|
6
|
-
|
7
|
-
|
7
|
+
let(:url) { "https://puppet.example.com/report/upload" }
|
8
|
+
|
9
|
+
before :each do
|
10
|
+
Puppet[:reporturl] = url
|
11
|
+
end
|
8
12
|
|
9
13
|
describe "when setting up the connection" do
|
10
|
-
|
11
|
-
|
14
|
+
it "raises if the connection fails" do
|
15
|
+
stub_request(:post, url).to_raise(Errno::ECONNREFUSED.new('Connection refused - connect(2)'))
|
12
16
|
|
13
|
-
|
14
|
-
|
17
|
+
expect {
|
18
|
+
subject.process
|
19
|
+
}.to raise_error(Puppet::HTTP::HTTPError, /Request to #{url} failed after .* seconds: .*Connection refused/)
|
15
20
|
end
|
16
21
|
|
17
22
|
it "configures the connection for ssl when using https" do
|
18
|
-
|
23
|
+
stub_request(:post, url)
|
19
24
|
|
20
|
-
|
21
|
-
|
22
|
-
|
25
|
+
expect_any_instance_of(Net::HTTP).to receive(:start) do |http|
|
26
|
+
expect(http).to be_use_ssl
|
27
|
+
expect(http.verify_mode).to eq(OpenSSL::SSL::VERIFY_PEER)
|
28
|
+
end
|
23
29
|
|
24
30
|
subject.process
|
25
31
|
end
|
26
32
|
|
27
33
|
it "does not configure the connection for ssl when using http" do
|
28
|
-
Puppet[:reporturl] = 'http://
|
34
|
+
Puppet[:reporturl] = 'http://puppet.example.com:8080/the/path'
|
35
|
+
stub_request(:post, Puppet[:reporturl])
|
29
36
|
|
30
|
-
|
31
|
-
|
32
|
-
|
37
|
+
expect_any_instance_of(Net::HTTP).to receive(:start) do |http|
|
38
|
+
expect(http).to_not be_use_ssl
|
39
|
+
end
|
33
40
|
|
34
41
|
subject.process
|
35
42
|
end
|
36
43
|
end
|
37
44
|
|
38
45
|
describe "when making a request" do
|
39
|
-
|
40
|
-
|
41
|
-
|
46
|
+
it "uses the path specified by the 'reporturl' setting" do
|
47
|
+
req = stub_request(:post, url)
|
48
|
+
|
49
|
+
subject.process
|
42
50
|
|
43
|
-
|
44
|
-
expect(Puppet::Network::HttpPool).to receive(:connection).and_return(connection)
|
51
|
+
expect(req).to have_been_requested
|
45
52
|
end
|
46
53
|
|
47
|
-
it "
|
48
|
-
|
49
|
-
|
54
|
+
it "uses the username and password specified by the 'reporturl' setting" do
|
55
|
+
Puppet[:reporturl] = "https://user:pass@puppet.example.com/report/upload"
|
56
|
+
|
57
|
+
req = stub_request(:post, %r{/report/upload}).with(basic_auth: ['user', 'pass'])
|
50
58
|
|
51
59
|
subject.process
|
60
|
+
|
61
|
+
expect(req).to have_been_requested
|
52
62
|
end
|
53
63
|
|
54
|
-
it "
|
55
|
-
|
64
|
+
it "passes metric_id options" do
|
65
|
+
stub_request(:post, url)
|
56
66
|
|
57
|
-
expect(
|
58
|
-
{:metric_id => [:puppet, :report, :http],
|
59
|
-
:basic_auth => {
|
60
|
-
:user => 'user',
|
61
|
-
:password => 'pass'
|
62
|
-
}}).and_return(httpok)
|
67
|
+
expect(Puppet.runtime[:http]).to receive(:post).with(anything, anything, hash_including(options: hash_including(metric_id: [:puppet, :report, :http]))).and_call_original
|
63
68
|
|
64
69
|
subject.process
|
65
70
|
end
|
66
71
|
|
67
|
-
it "
|
68
|
-
|
72
|
+
it "passes the report as YAML" do
|
73
|
+
req = stub_request(:post, url).with(body: subject.to_yaml)
|
69
74
|
|
70
75
|
subject.process
|
76
|
+
|
77
|
+
expect(req).to have_been_requested
|
71
78
|
end
|
72
79
|
|
73
|
-
it "
|
74
|
-
|
80
|
+
it "sets content-type to 'application/x-yaml'" do
|
81
|
+
req = stub_request(:post, url).with(headers: {'Content-Type' => 'application/x-yaml'})
|
75
82
|
|
76
83
|
subject.process
|
84
|
+
|
85
|
+
expect(req).to have_been_requested
|
77
86
|
end
|
78
87
|
|
79
|
-
|
80
|
-
|
81
|
-
it "should succeed on http code #{code}" do
|
82
|
-
response = klass.new('1.1', code, '')
|
83
|
-
expect(connection).to receive(:post).and_return(response)
|
88
|
+
it "doesn't log anything if the request succeeds" do
|
89
|
+
req = stub_request(:post, url).to_return(status: [200, "OK"])
|
84
90
|
|
85
|
-
|
86
|
-
subject.process
|
87
|
-
end
|
88
|
-
end
|
91
|
+
subject.process
|
89
92
|
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
expect(connection).to receive(:post).and_return(response)
|
93
|
+
expect(req).to have_been_requested
|
94
|
+
expect(@logs).to eq([])
|
95
|
+
end
|
94
96
|
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
97
|
+
it "follows redirects" do
|
98
|
+
location = {headers: {'Location' => url}}
|
99
|
+
|
100
|
+
req = stub_request(:post, url)
|
101
|
+
.to_return(**location, status: [301, "Moved Permanently"]).then
|
102
|
+
.to_return(**location, status: [302, "Found"]).then
|
103
|
+
.to_return(**location, status: [307, "Temporary Redirect"]).then
|
104
|
+
.to_return(status: [200, "OK"])
|
105
|
+
|
106
|
+
subject.process
|
107
|
+
|
108
|
+
expect(req).to have_been_requested.times(4)
|
109
|
+
end
|
110
|
+
|
111
|
+
it "logs an error if the request fails" do
|
112
|
+
stub_request(:post, url).to_return(status: [500, "Internal Server Error"])
|
113
|
+
|
114
|
+
subject.process
|
115
|
+
|
116
|
+
expect(@logs).to include(having_attributes(level: :err, message: "Unable to submit report to #{url} [500] Internal Server Error"))
|
99
117
|
end
|
100
118
|
end
|
101
119
|
end
|
@@ -6,53 +6,57 @@ require 'pathname'
|
|
6
6
|
require 'tempfile'
|
7
7
|
require 'fileutils'
|
8
8
|
|
9
|
-
|
10
|
-
|
11
|
-
describe processor do
|
9
|
+
describe Puppet::Reports.report(:store) do
|
12
10
|
describe "#process" do
|
13
11
|
include PuppetSpec::Files
|
12
|
+
|
14
13
|
before :each do
|
15
14
|
Puppet[:reportdir] = File.join(tmpdir('reports'), 'reports')
|
16
|
-
|
15
|
+
end
|
16
|
+
|
17
|
+
let(:report) do
|
18
|
+
report = YAML.load_file(File.join(PuppetSpec::FIXTURE_DIR, 'yaml/report2.6.x.yaml'))
|
19
|
+
report.extend(described_class)
|
20
|
+
report
|
17
21
|
end
|
18
22
|
|
19
23
|
it "should create a report directory for the client if one doesn't exist" do
|
20
|
-
|
24
|
+
report.process
|
21
25
|
|
22
|
-
expect(File).to be_directory(File.join(Puppet[:reportdir],
|
26
|
+
expect(File).to be_directory(File.join(Puppet[:reportdir], report.host))
|
23
27
|
end
|
24
28
|
|
25
29
|
it "should write the report to the file in YAML" do
|
26
30
|
allow(Time).to receive(:now).and_return(Time.utc(2011,01,06,12,00,00))
|
27
|
-
|
31
|
+
report.process
|
28
32
|
|
29
|
-
expect(File.read(File.join(Puppet[:reportdir],
|
33
|
+
expect(File.read(File.join(Puppet[:reportdir], report.host, "201101061200.yaml"))).to eq(report.to_yaml)
|
30
34
|
end
|
31
35
|
|
32
36
|
it "rejects invalid hostnames" do
|
33
|
-
|
37
|
+
report.host = ".."
|
34
38
|
expect(Puppet::FileSystem).not_to receive(:exist?)
|
35
|
-
expect {
|
39
|
+
expect { report.process }.to raise_error(ArgumentError, /Invalid node/)
|
36
40
|
end
|
37
41
|
end
|
38
42
|
|
39
43
|
describe "::destroy" do
|
40
44
|
it "rejects invalid hostnames" do
|
41
45
|
expect(Puppet::FileSystem).not_to receive(:unlink)
|
42
|
-
expect {
|
46
|
+
expect { described_class.destroy("..") }.to raise_error(ArgumentError, /Invalid node/)
|
43
47
|
end
|
44
48
|
end
|
45
49
|
|
46
50
|
describe "::validate_host" do
|
47
51
|
['..', 'hello/', '/hello', 'he/llo', 'hello/..', '.'].each do |node|
|
48
52
|
it "rejects #{node.inspect}" do
|
49
|
-
expect {
|
53
|
+
expect { described_class.validate_host(node) }.to raise_error(ArgumentError, /Invalid node/)
|
50
54
|
end
|
51
55
|
end
|
52
56
|
|
53
57
|
['.hello', 'hello.', '..hi', 'hi..'].each do |node|
|
54
58
|
it "accepts #{node.inspect}" do
|
55
|
-
|
59
|
+
described_class.validate_host(node)
|
56
60
|
end
|
57
61
|
end
|
58
62
|
end
|
data/spec/unit/resource_spec.rb
CHANGED
@@ -283,7 +283,7 @@ describe Puppet::Resource do
|
|
283
283
|
let(:scope) { Puppet::Parser::Scope.new(compiler) }
|
284
284
|
|
285
285
|
def ast_leaf(value)
|
286
|
-
Puppet::Parser::AST::Leaf.new(
|
286
|
+
Puppet::Parser::AST::Leaf.new(value: value)
|
287
287
|
end
|
288
288
|
|
289
289
|
it "should fail when asked to set default values and it is not a parser resource" do
|
@@ -389,7 +389,7 @@ describe Puppet::Resource do
|
|
389
389
|
context "when a value is provided" do
|
390
390
|
let(:port_parameter) do
|
391
391
|
Puppet::Parser::Resource::Param.new(
|
392
|
-
|
392
|
+
name: 'port', value: '8080'
|
393
393
|
)
|
394
394
|
end
|
395
395
|
|
@@ -414,7 +414,7 @@ describe Puppet::Resource do
|
|
414
414
|
expect_lookup('apache::port', returns: '443')
|
415
415
|
|
416
416
|
rs = Puppet::Parser::Resource.new("class", "apache", :scope => scope,
|
417
|
-
:parameters => [Puppet::Parser::Resource::Param.new(
|
417
|
+
:parameters => [Puppet::Parser::Resource::Param.new(name: 'port', value: nil)])
|
418
418
|
|
419
419
|
rs.resource_type.set_resource_parameters(rs, scope)
|
420
420
|
expect(rs[:port]).to eq('443')
|
@@ -30,7 +30,7 @@ describe Puppet::Rest::Route do
|
|
30
30
|
|
31
31
|
it "yields a base URL with Puppet's configured server and port when no defaults are specified" do
|
32
32
|
Puppet[:server] = 'configured.net'
|
33
|
-
Puppet[:
|
33
|
+
Puppet[:serverport] = 8140
|
34
34
|
fallback_route = Puppet::Rest::Route.new(api: '/fakeapi/v1/')
|
35
35
|
count = 0
|
36
36
|
rval = fallback_route.with_base_url(dns_resolver) do |url|
|
@@ -55,9 +55,9 @@ describe Puppet::Rest::Route do
|
|
55
55
|
expect(rval).to eq('Block return value')
|
56
56
|
end
|
57
57
|
|
58
|
-
it 'falls back to :server and :
|
58
|
+
it 'falls back to :server and :serverport if nil is passed' do
|
59
59
|
Puppet[:server] = 'one.net'
|
60
|
-
Puppet[:
|
60
|
+
Puppet[:serverport] = 111
|
61
61
|
nil_route = Puppet::Rest::Route.new(api: '/fakeapi/v1/',
|
62
62
|
server_setting: nil,
|
63
63
|
port_setting: nil)
|
@@ -109,7 +109,7 @@ describe Puppet::Rest::Route do
|
|
109
109
|
|
110
110
|
it "should fall back to the default server when the block raises a SystemCallError" do
|
111
111
|
Puppet[:server] = "testserver"
|
112
|
-
Puppet[:
|
112
|
+
Puppet[:serverport] = 555
|
113
113
|
|
114
114
|
count = 0
|
115
115
|
rval = route.with_base_url(Puppet::Network::Resolver.new) do |url|
|
data/spec/unit/settings_spec.rb
CHANGED
@@ -9,7 +9,7 @@ describe Puppet::Settings do
|
|
9
9
|
include Matchers::Resource
|
10
10
|
|
11
11
|
let(:main_config_file_default_location) do
|
12
|
-
File.join(Puppet::Util::RunMode[:
|
12
|
+
File.join(Puppet::Util::RunMode[:server].conf_dir, "puppet.conf")
|
13
13
|
end
|
14
14
|
|
15
15
|
let(:user_config_file_default_location) do
|
@@ -112,9 +112,9 @@ describe Puppet::Settings do
|
|
112
112
|
# case behaviors / uses. However, until that time... we need to make sure that our private run_mode=
|
113
113
|
# setter method gets properly called during app initialization.
|
114
114
|
it "sets the preferred run mode when initializing the app defaults" do
|
115
|
-
@settings.initialize_app_defaults(default_values.merge(:run_mode => :
|
115
|
+
@settings.initialize_app_defaults(default_values.merge(:run_mode => :server))
|
116
116
|
|
117
|
-
expect(@settings.preferred_run_mode).to eq(:
|
117
|
+
expect(@settings.preferred_run_mode).to eq(:server)
|
118
118
|
end
|
119
119
|
|
120
120
|
it "creates ancestor directories for all required app settings" do
|
@@ -326,7 +326,7 @@ describe Puppet::Settings do
|
|
326
326
|
end
|
327
327
|
|
328
328
|
it "should identify configured settings from the specified run mode" do
|
329
|
-
user_config_text = "[
|
329
|
+
user_config_text = "[server]\nmyval = foo"
|
330
330
|
|
331
331
|
allow(Puppet.features).to receive(:root?).and_return(false)
|
332
332
|
expect(Puppet::FileSystem).to receive(:exist?).
|
@@ -337,7 +337,7 @@ describe Puppet::Settings do
|
|
337
337
|
and_return(user_config_text).ordered
|
338
338
|
|
339
339
|
@settings.send(:parse_config_files)
|
340
|
-
expect(@settings.set_by_config?(:myval, nil, :
|
340
|
+
expect(@settings.set_by_config?(:myval, nil, :server)).to be_truthy
|
341
341
|
end
|
342
342
|
|
343
343
|
it "should not identify configured settings from an unspecified run mode" do
|
@@ -382,7 +382,7 @@ describe Puppet::Settings do
|
|
382
382
|
|
383
383
|
it "should clear the cache when the preferred_run_mode is changed" do
|
384
384
|
expect(@settings).to receive(:flush_cache)
|
385
|
-
@settings.preferred_run_mode = :
|
385
|
+
@settings.preferred_run_mode = :server
|
386
386
|
end
|
387
387
|
|
388
388
|
it "should not clear other values when setting getopt-specific values" do
|
@@ -658,6 +658,28 @@ describe Puppet::Settings do
|
|
658
658
|
expect(@settings[:one]).to eq("modeval")
|
659
659
|
end
|
660
660
|
|
661
|
+
[:master, :server].each do |run_mode|
|
662
|
+
describe "when run mode is '#{run_mode}'" do
|
663
|
+
before(:each) { @settings.preferred_run_mode = run_mode }
|
664
|
+
|
665
|
+
it "returns values set in the 'master' section if the 'server' section does not exist" do
|
666
|
+
text = "[main]\none = mainval\n[master]\none = modeval\n"
|
667
|
+
allow(@settings).to receive(:read_file).and_return(text)
|
668
|
+
@settings.send(:parse_config_files)
|
669
|
+
|
670
|
+
expect(@settings[:one]).to eq("modeval")
|
671
|
+
end
|
672
|
+
|
673
|
+
it "prioritizes values set in the 'server' section if set" do
|
674
|
+
text = "[main]\none = mainval\n[server]\none = serverval\n[master]\none = masterval\n"
|
675
|
+
allow(@settings).to receive(:read_file).and_return(text)
|
676
|
+
@settings.send(:parse_config_files)
|
677
|
+
|
678
|
+
expect(@settings[:one]).to eq("serverval")
|
679
|
+
end
|
680
|
+
end
|
681
|
+
end
|
682
|
+
|
661
683
|
it "should not return values outside of its search path" do
|
662
684
|
text = "[other]\none = oval\n"
|
663
685
|
allow(@settings).to receive(:read_file).and_return(text)
|
@@ -854,10 +876,10 @@ describe Puppet::Settings do
|
|
854
876
|
default_values[key] = 'default value'
|
855
877
|
end
|
856
878
|
@settings.define_settings :main, PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS
|
857
|
-
@settings.define_settings :
|
879
|
+
@settings.define_settings :server, :myfile => { :type => :file, :default => make_absolute("/myfile"), :desc => "a" }
|
858
880
|
|
859
881
|
otherfile = make_absolute("/other/file")
|
860
|
-
text = "[
|
882
|
+
text = "[server]
|
861
883
|
myfile = #{otherfile} {mode = 664}
|
862
884
|
"
|
863
885
|
expect(@settings).to receive(:read_file).and_return(text)
|
@@ -866,9 +888,9 @@ describe Puppet::Settings do
|
|
866
888
|
expect(@settings.preferred_run_mode).to eq(:user)
|
867
889
|
@settings.send(:parse_config_files)
|
868
890
|
|
869
|
-
# change app run_mode to
|
870
|
-
@settings.initialize_app_defaults(default_values.merge(:run_mode => :
|
871
|
-
expect(@settings.preferred_run_mode).to eq(:
|
891
|
+
# change app run_mode to server
|
892
|
+
@settings.initialize_app_defaults(default_values.merge(:run_mode => :server))
|
893
|
+
expect(@settings.preferred_run_mode).to eq(:server)
|
872
894
|
|
873
895
|
# initializing the app should have reloaded the metadata based on run_mode
|
874
896
|
expect(@settings[:myfile]).to eq(otherfile)
|
@@ -884,9 +906,9 @@ describe Puppet::Settings do
|
|
884
906
|
file = make_absolute("/file")
|
885
907
|
default_mode = "0600"
|
886
908
|
@settings.define_settings :main, PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS
|
887
|
-
@settings.define_settings :
|
909
|
+
@settings.define_settings :server, :myfile => { :type => :file, :default => file, :desc => "a", :mode => default_mode }
|
888
910
|
|
889
|
-
text = "[
|
911
|
+
text = "[server]
|
890
912
|
myfile = #{file}/foo
|
891
913
|
[agent]
|
892
914
|
myfile = #{file} {mode = 664}
|
@@ -897,9 +919,9 @@ describe Puppet::Settings do
|
|
897
919
|
expect(@settings.preferred_run_mode).to eq(:user)
|
898
920
|
@settings.send(:parse_config_files)
|
899
921
|
|
900
|
-
# change app run_mode to
|
901
|
-
@settings.initialize_app_defaults(default_values.merge(:run_mode => :
|
902
|
-
expect(@settings.preferred_run_mode).to eq(:
|
922
|
+
# change app run_mode to server
|
923
|
+
@settings.initialize_app_defaults(default_values.merge(:run_mode => :server))
|
924
|
+
expect(@settings.preferred_run_mode).to eq(:server)
|
903
925
|
|
904
926
|
# initializing the app should have reloaded the metadata based on run_mode
|
905
927
|
expect(@settings[:myfile]).to eq("#{file}/foo")
|
@@ -1900,18 +1922,18 @@ describe Puppet::Settings do
|
|
1900
1922
|
end
|
1901
1923
|
|
1902
1924
|
it "should set preferred run mode from --run_mode <foo> string without error" do
|
1903
|
-
args = ["--run_mode", "
|
1904
|
-
expect(settings).not_to receive(:handlearg).with("--run_mode", "
|
1925
|
+
args = ["--run_mode", "server"]
|
1926
|
+
expect(settings).not_to receive(:handlearg).with("--run_mode", "server")
|
1905
1927
|
expect { settings.send(:parse_global_options, args) } .to_not raise_error
|
1906
|
-
expect(Puppet.settings.preferred_run_mode).to eq(:
|
1928
|
+
expect(Puppet.settings.preferred_run_mode).to eq(:server)
|
1907
1929
|
expect(args.empty?).to eq(true)
|
1908
1930
|
end
|
1909
1931
|
|
1910
1932
|
it "should set preferred run mode from --run_mode=<foo> string without error" do
|
1911
|
-
args = ["--run_mode=
|
1912
|
-
expect(settings).not_to receive(:handlearg).with("--run_mode", "
|
1933
|
+
args = ["--run_mode=server"]
|
1934
|
+
expect(settings).not_to receive(:handlearg).with("--run_mode", "server")
|
1913
1935
|
expect { settings.send(:parse_global_options, args) }.to_not raise_error
|
1914
|
-
expect(Puppet.settings.preferred_run_mode).to eq(:
|
1936
|
+
expect(Puppet.settings.preferred_run_mode).to eq(:server)
|
1915
1937
|
expect(args.empty?).to eq(true)
|
1916
1938
|
end
|
1917
1939
|
end
|
data/spec/unit/ssl/host_spec.rb
CHANGED
@@ -51,8 +51,10 @@ describe Puppet::SSL::Host, if: !Puppet::Util::Platform.jruby? do
|
|
51
51
|
allow_any_instance_of(Puppet::SSL::Host).to receive(:generate)
|
52
52
|
end
|
53
53
|
|
54
|
-
it "
|
55
|
-
|
54
|
+
it "is deprecated" do
|
55
|
+
Puppet::SSL::Host.localhost
|
56
|
+
|
57
|
+
expect(@logs).to include(an_object_having_attributes(message: /Puppet::SSL::Host is deprecated/))
|
56
58
|
end
|
57
59
|
|
58
60
|
it "should allow to reset localhost" do
|