puppet 6.13.0-x86-mingw32 → 6.18.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/CODEOWNERS +2 -7
- data/CONTRIBUTING.md +7 -13
- data/Gemfile +4 -2
- data/Gemfile.lock +36 -32
- data/README.md +17 -24
- data/ext/windows/service/daemon.rb +3 -3
- data/lib/puppet.rb +33 -9
- data/lib/puppet/agent.rb +20 -14
- data/lib/puppet/application/agent.rb +26 -17
- data/lib/puppet/application/apply.rb +18 -20
- data/lib/puppet/application/describe.rb +7 -5
- data/lib/puppet/application/device.rb +2 -2
- data/lib/puppet/application/filebucket.rb +19 -15
- data/lib/puppet/application/lookup.rb +16 -4
- data/lib/puppet/application/plugin.rb +1 -0
- data/lib/puppet/application/ssl.rb +4 -4
- data/lib/puppet/configurer.rb +58 -57
- data/lib/puppet/configurer/downloader.rb +31 -10
- data/lib/puppet/configurer/plugin_handler.rb +10 -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 +92 -12
- data/lib/puppet/environments.rb +4 -5
- 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/plugin.rb +2 -2
- data/lib/puppet/feature/base.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/eyaml_lookup_key.rb +13 -8
- data/lib/puppet/functions/filter.rb +1 -0
- data/lib/puppet/functions/lstrip.rb +4 -4
- 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 +263 -73
- data/lib/puppet/http/external_client.rb +90 -0
- data/lib/puppet/http/redirector.rb +43 -7
- data/lib/puppet/http/resolver.rb +46 -3
- data/lib/puppet/http/resolver/server_list.rb +76 -16
- data/lib/puppet/http/resolver/settings.rb +23 -3
- data/lib/puppet/http/resolver/srv.rb +29 -3
- data/lib/puppet/http/response.rb +87 -1
- data/lib/puppet/http/retry_after_handler.rb +39 -0
- data/lib/puppet/http/service.rb +97 -12
- data/lib/puppet/http/service/ca.rb +76 -14
- data/lib/puppet/http/service/compiler.rb +249 -16
- data/lib/puppet/http/service/file_server.rb +141 -20
- data/lib/puppet/http/service/report.rb +47 -17
- data/lib/puppet/http/session.rb +96 -7
- data/lib/puppet/indirector.rb +1 -1
- data/lib/puppet/indirector/catalog/rest.rb +34 -0
- data/lib/puppet/indirector/exec.rb +1 -1
- data/lib/puppet/indirector/facts/facter.rb +3 -3
- data/lib/puppet/indirector/facts/rest.rb +42 -0
- 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 +30 -0
- data/lib/puppet/indirector/file_metadata/http.rb +28 -8
- data/lib/puppet/indirector/file_metadata/rest.rb +52 -0
- data/lib/puppet/indirector/hiera.rb +4 -0
- data/lib/puppet/indirector/indirection.rb +1 -1
- data/lib/puppet/indirector/node/rest.rb +24 -0
- data/lib/puppet/indirector/report/processor.rb +2 -2
- data/lib/puppet/indirector/report/rest.rb +19 -0
- data/lib/puppet/indirector/report/yaml.rb +23 -0
- data/lib/puppet/indirector/request.rb +1 -1
- data/lib/puppet/indirector/rest.rb +12 -0
- data/lib/puppet/indirector/status/rest.rb +18 -0
- data/lib/puppet/loaders.rb +6 -0
- 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/base_pool.rb +7 -2
- 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 +8 -5
- 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/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/evaluator_impl.rb +5 -5
- 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/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/groupadd.rb +9 -4
- 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/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/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/rpm.rb +6 -213
- data/lib/puppet/provider/package/yum.rb +100 -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 +8 -0
- data/lib/puppet/resource/type_collection.rb +20 -16
- data/lib/puppet/runtime.rb +31 -1
- data/lib/puppet/settings.rb +3 -1
- data/lib/puppet/settings/http_extra_headers_setting.rb +25 -0
- 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 +81 -35
- 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 +21 -14
- data/lib/puppet/transaction.rb +2 -2
- data/lib/puppet/transaction/persistence.rb +1 -1
- data/lib/puppet/transaction/report.rb +3 -3
- data/lib/puppet/trusted_external.rb +29 -1
- data/lib/puppet/type.rb +21 -8
- data/lib/puppet/type/file.rb +51 -13
- data/lib/puppet/type/file/checksum.rb +4 -4
- data/lib/puppet/type/file/source.rb +75 -64
- 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/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/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 +641 -511
- data/man/man5/puppet.conf.5 +75 -10
- data/man/man8/puppet-agent.8 +7 -7
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +2 -2
- 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 +17 -2
- 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 +1 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +1 -1
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-ssl.8 +2 -2
- data/man/man8/puppet-status.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/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/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/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_fetch_if_not_on_the_local_disk.yml +1 -67
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_not_update_if_content_on_disk_is_up-to-date.yml +1 -69
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_update_if_content_differs_on_disk.yml +1 -69
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_mtime_is_older_on_disk.yml +1 -67
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_no_header_specified.yml +1 -65
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_not_on_the_local_disk.yml +1 -67
- data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_not_update_if_mtime_is_newer_on_disk.yml +1 -67
- data/spec/integration/application/agent_spec.rb +475 -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/data_binding_spec.rb +82 -0
- data/spec/integration/defaults_spec.rb +1 -2
- data/spec/integration/directory_environments_spec.rb +17 -17
- data/spec/integration/http/client_spec.rb +47 -37
- 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 +93 -20
- 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 +6 -1
- 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/unit/agent_spec.rb +80 -26
- data/spec/unit/application/agent_spec.rb +12 -9
- data/spec/unit/application/describe_spec.rb +88 -50
- data/spec/unit/application/device_spec.rb +2 -2
- data/spec/unit/application/face_base_spec.rb +6 -4
- data/spec/unit/application/facts_spec.rb +39 -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/configurer/downloader_spec.rb +10 -0
- data/spec/unit/configurer/fact_handler_spec.rb +4 -4
- data/spec/unit/configurer/plugin_handler_spec.rb +36 -19
- data/spec/unit/configurer_spec.rb +64 -46
- 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 +8 -0
- data/spec/unit/face/config_spec.rb +3 -1
- data/spec/unit/face/module/search_spec.rb +17 -0
- data/spec/unit/face/plugin_spec.rb +12 -10
- 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 +10 -0
- data/spec/unit/functions/lookup_spec.rb +13 -0
- data/spec/unit/http/client_spec.rb +321 -36
- data/spec/unit/http/external_client_spec.rb +201 -0
- data/spec/unit/http/resolver_spec.rb +34 -3
- data/spec/unit/http/response_spec.rb +75 -0
- data/spec/unit/http/service/ca_spec.rb +53 -12
- data/spec/unit/http/service/compiler_spec.rb +332 -28
- data/spec/unit/http/service/file_server_spec.rb +100 -12
- data/spec/unit/http/service/report_spec.rb +19 -9
- data/spec/unit/http/service_spec.rb +94 -6
- data/spec/unit/http/session_spec.rb +159 -8
- data/spec/unit/indirector/catalog/compiler_spec.rb +1 -0
- data/spec/unit/indirector/catalog/rest_spec.rb +59 -2
- data/spec/unit/indirector/facts/rest_spec.rb +79 -24
- data/spec/unit/indirector/file_bucket_file/rest_spec.rb +82 -2
- data/spec/unit/indirector/file_content/rest_spec.rb +53 -2
- data/spec/unit/indirector/file_metadata/http_spec.rb +194 -0
- data/spec/unit/indirector/file_metadata/rest_spec.rb +110 -2
- data/spec/unit/indirector/node/rest_spec.rb +57 -2
- data/spec/unit/indirector/report/rest_spec.rb +58 -51
- data/spec/unit/indirector/request_spec.rb +1 -1
- data/spec/unit/indirector/resource/ral_spec.rb +7 -8
- data/spec/unit/indirector/rest_spec.rb +13 -0
- data/spec/unit/indirector/status/rest_spec.rb +43 -2
- 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/connection_spec.rb +552 -190
- data/spec/unit/network/http/nocache_pool_spec.rb +22 -0
- data/spec/unit/network/http/pool_spec.rb +59 -13
- 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/group/groupadd_spec.rb +22 -8
- 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/gem_spec.rb +40 -0
- data/spec/unit/provider/package/pacman_spec.rb +6 -21
- 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/rpm_spec.rb +0 -212
- data/spec/unit/provider/package/yum_spec.rb +243 -1
- data/spec/unit/provider/package/zypper_spec.rb +98 -0
- data/spec/unit/provider/service/init_spec.rb +42 -0
- data/spec/unit/provider/service/openbsd_spec.rb +9 -0
- data/spec/unit/provider/service/openwrt_spec.rb +1 -0
- data/spec/unit/provider/service/redhat_spec.rb +9 -0
- data/spec/unit/provider/service/systemd_spec.rb +93 -18
- 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/settings/autosign_setting_spec.rb +1 -1
- data/spec/unit/settings/http_extra_headers_spec.rb +64 -0
- 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 +99 -13
- 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 +5 -1
- data/spec/unit/transaction_spec.rb +0 -2
- data/spec/unit/type/file/ensure_spec.rb +1 -2
- data/spec/unit/type/file/source_spec.rb +89 -38
- data/spec/unit/type/file_spec.rb +122 -96
- 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 +3 -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 +102 -54
- data/spec/unit/util/rpm_compare_spec.rb +196 -0
- 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 +84 -52
- data/COMMITTERS.md +0 -244
- 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 -61
- 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
@@ -3,8 +3,116 @@ require 'spec_helper'
|
|
3
3
|
require 'puppet/indirector/file_metadata'
|
4
4
|
require 'puppet/indirector/file_metadata/rest'
|
5
5
|
|
6
|
-
describe
|
7
|
-
|
6
|
+
describe Puppet::Indirector::FileMetadata::Rest do
|
7
|
+
let(:certname) { 'ziggy' }
|
8
|
+
let(:formatter) { Puppet::Network::FormatHandler.format(:json) }
|
9
|
+
let(:model) { described_class.model }
|
10
|
+
|
11
|
+
before :each do
|
12
|
+
described_class.indirection.terminus_class = :rest
|
13
|
+
end
|
14
|
+
|
15
|
+
def metadata_response(metadata)
|
16
|
+
{ body: formatter.render(metadata), headers: {'Content-Type' => formatter.mime } }
|
17
|
+
end
|
18
|
+
|
19
|
+
context "when finding" do
|
20
|
+
let(:uri) { %r{/puppet/v3/file_metadata/:mount/path/to/file} }
|
21
|
+
let(:key) { "puppet:///:mount/path/to/file" }
|
22
|
+
let(:metadata) { model.new('/path/to/file') }
|
23
|
+
|
24
|
+
it "returns file metadata" do
|
25
|
+
stub_request(:get, uri)
|
26
|
+
.to_return(status: 200, **metadata_response(metadata))
|
27
|
+
|
28
|
+
result = model.indirection.find(key)
|
29
|
+
expect(result.path).to eq('/path/to/file')
|
30
|
+
end
|
31
|
+
|
32
|
+
it "URL encodes special characters" do
|
33
|
+
stub_request(:get, %r{/puppet/v3/file_metadata/:mount/path%20to%20file})
|
34
|
+
.to_return(status: 200, **metadata_response(metadata))
|
35
|
+
|
36
|
+
model.indirection.find('puppet:///:mount/path to file')
|
37
|
+
end
|
38
|
+
|
39
|
+
it "returns nil if the content doesn't exist" do
|
40
|
+
stub_request(:get, uri).to_return(status: 404)
|
41
|
+
|
42
|
+
expect(model.indirection.find(key)).to be_nil
|
43
|
+
end
|
44
|
+
|
45
|
+
it "raises if fail_on_404 is true" do
|
46
|
+
stub_request(:get, uri).to_return(status: 404, headers: { 'Content-Type' => 'application/json'}, body: "{}")
|
47
|
+
|
48
|
+
expect {
|
49
|
+
model.indirection.find(key, fail_on_404: true)
|
50
|
+
}.to raise_error(Puppet::Error, %r{Find /puppet/v3/file_metadata/:mount/path/to/file resulted in 404 with the message: {}})
|
51
|
+
end
|
52
|
+
|
53
|
+
it "raises an error on HTTP 500" do
|
54
|
+
stub_request(:get, uri).to_return(status: 500, headers: { 'Content-Type' => 'application/json'}, body: "{}")
|
55
|
+
|
56
|
+
expect {
|
57
|
+
model.indirection.find(key)
|
58
|
+
}.to raise_error(Net::HTTPError, %r{Error 500 on SERVER: })
|
59
|
+
end
|
60
|
+
|
61
|
+
it "connects to a specific host" do
|
62
|
+
stub_request(:get, %r{https://example.com:8140/puppet/v3/file_metadata/:mount/path/to/file})
|
63
|
+
.to_return(status: 200, **metadata_response(metadata))
|
64
|
+
|
65
|
+
model.indirection.find("puppet://example.com:8140/:mount/path/to/file")
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
context "when searching" do
|
70
|
+
let(:uri) { %r{/puppet/v3/file_metadatas/:mount/path/to/dir} }
|
71
|
+
let(:key) { "puppet:///:mount/path/to/dir" }
|
72
|
+
let(:metadatas) { [model.new('/path/to/dir')] }
|
73
|
+
|
74
|
+
it "returns an array of file metadata" do
|
75
|
+
stub_request(:get, uri)
|
76
|
+
.to_return(status: 200, **metadata_response(metadatas))
|
77
|
+
|
78
|
+
result = model.indirection.search(key)
|
79
|
+
expect(result.first.path).to eq('/path/to/dir')
|
80
|
+
end
|
81
|
+
|
82
|
+
it "URL encodes special characters" do
|
83
|
+
stub_request(:get, %r{/puppet/v3/file_metadatas/:mount/path%20to%20dir})
|
84
|
+
.to_return(status: 200, **metadata_response(metadatas))
|
85
|
+
|
86
|
+
model.indirection.search('puppet:///:mount/path to dir')
|
87
|
+
end
|
88
|
+
|
89
|
+
it "returns an empty array if the metadata doesn't exist" do
|
90
|
+
stub_request(:get, uri).to_return(status: 404)
|
91
|
+
|
92
|
+
expect(model.indirection.search(key)).to eq([])
|
93
|
+
end
|
94
|
+
|
95
|
+
it "returns an empty array if the metadata doesn't exist and fail_on_404 is true" do
|
96
|
+
stub_request(:get, uri).to_return(status: 404, headers: { 'Content-Type' => 'application/json'}, body: "{}")
|
97
|
+
|
98
|
+
expect(model.indirection.search(key, fail_on_404: true)).to eq([])
|
99
|
+
end
|
100
|
+
|
101
|
+
it "raises an error on HTTP 500" do
|
102
|
+
stub_request(:get, uri).to_return(status: 500, headers: { 'Content-Type' => 'application/json'}, body: "{}")
|
103
|
+
|
104
|
+
expect {
|
105
|
+
model.indirection.search(key)
|
106
|
+
}.to raise_error(Net::HTTPError, %r{Error 500 on SERVER: })
|
107
|
+
end
|
108
|
+
|
109
|
+
it "connects to a specific host" do
|
110
|
+
stub_request(:get, %r{https://example.com:8140/puppet/v3/file_metadatas/:mount/path/to/dir})
|
111
|
+
.to_return(status: 200, **metadata_response(metadatas))
|
112
|
+
|
113
|
+
model.indirection.search("puppet://example.com:8140/:mount/path/to/dir")
|
114
|
+
end
|
115
|
+
end
|
8
116
|
|
9
117
|
it "should use the :fileserver SRV service" do
|
10
118
|
expect(Puppet::Indirector::FileMetadata::Rest.srv_service).to eq(:fileserver)
|
@@ -3,9 +3,64 @@ require 'spec_helper'
|
|
3
3
|
require 'puppet/indirector/node/rest'
|
4
4
|
|
5
5
|
describe Puppet::Node::Rest do
|
6
|
-
|
7
|
-
|
6
|
+
let(:certname) { 'ziggy' }
|
7
|
+
let(:uri) { %r{/puppet/v3/node/ziggy} }
|
8
|
+
let(:formatter) { Puppet::Network::FormatHandler.format(:json) }
|
9
|
+
let(:node) { Puppet::Node.new(certname) }
|
10
|
+
|
11
|
+
before :each do
|
12
|
+
Puppet[:server] = 'compiler.example.com'
|
13
|
+
Puppet[:masterport] = 8140
|
14
|
+
|
15
|
+
described_class.indirection.terminus_class = :rest
|
16
|
+
end
|
17
|
+
|
18
|
+
def node_response(node)
|
19
|
+
{ body: formatter.render(node), headers: {'Content-Type' => formatter.mime } }
|
8
20
|
end
|
9
21
|
|
22
|
+
it 'finds a node' do
|
23
|
+
stub_request(:get, uri).to_return(**node_response(node))
|
24
|
+
|
25
|
+
expect(described_class.indirection.find(certname)).to be_a(Puppet::Node)
|
26
|
+
end
|
27
|
+
|
28
|
+
it "serializes the environment" do
|
29
|
+
stub_request(:get, uri)
|
30
|
+
.with(query: hash_including('environment' => 'outerspace'))
|
31
|
+
.to_return(**node_response(node))
|
32
|
+
|
33
|
+
described_class.indirection.find(certname, environment: Puppet::Node::Environment.remote('outerspace'))
|
34
|
+
end
|
35
|
+
|
36
|
+
it 'preserves the node environment_name as a symbol' do
|
37
|
+
env = Puppet::Node::Environment.remote('outerspace')
|
38
|
+
node = Puppet::Node.new(certname, environment: env)
|
39
|
+
|
40
|
+
stub_request(:get, uri).to_return(**node_response(node))
|
10
41
|
|
42
|
+
expect(described_class.indirection.find(certname).environment_name).to eq(:outerspace)
|
43
|
+
end
|
44
|
+
|
45
|
+
it 'returns nil if the node does not exist' do
|
46
|
+
stub_request(:get, uri).to_return(status: 404, headers: { 'Content-Type' => 'application/json' }, body: "{}")
|
47
|
+
|
48
|
+
expect(described_class.indirection.find(certname)).to be_nil
|
49
|
+
end
|
50
|
+
|
51
|
+
it 'raises if fail_on_404 is specified' do
|
52
|
+
stub_request(:get, uri).to_return(status: 404, headers: { 'Content-Type' => 'application/json' }, body: "{}")
|
53
|
+
|
54
|
+
expect{
|
55
|
+
described_class.indirection.find(certname, fail_on_404: true)
|
56
|
+
}.to raise_error(Puppet::Error, %r{Find /puppet/v3/node/ziggy resulted in 404 with the message: {}})
|
57
|
+
end
|
58
|
+
|
59
|
+
it 'raises Net::HTTPError on 500' do
|
60
|
+
stub_request(:get, uri).to_return(status: 500)
|
61
|
+
|
62
|
+
expect{
|
63
|
+
described_class.indirection.find(certname)
|
64
|
+
}.to raise_error(Net::HTTPError, %r{Error 500 on SERVER: })
|
65
|
+
end
|
11
66
|
end
|
@@ -3,8 +3,21 @@ require 'spec_helper'
|
|
3
3
|
require 'puppet/indirector/report/rest'
|
4
4
|
|
5
5
|
describe Puppet::Transaction::Report::Rest do
|
6
|
-
|
7
|
-
|
6
|
+
let(:certname) { 'ziggy' }
|
7
|
+
let(:uri) { %r{/puppet/v3/report/ziggy} }
|
8
|
+
let(:formatter) { Puppet::Network::FormatHandler.format(:json) }
|
9
|
+
let(:report) do
|
10
|
+
report = Puppet::Transaction::Report.new
|
11
|
+
report.host = certname
|
12
|
+
report
|
13
|
+
end
|
14
|
+
|
15
|
+
before(:each) do
|
16
|
+
described_class.indirection.terminus_class = :rest
|
17
|
+
end
|
18
|
+
|
19
|
+
def report_response
|
20
|
+
{ body: formatter.render(["store", "http"]), headers: {'Content-Type' => formatter.mime } }
|
8
21
|
end
|
9
22
|
|
10
23
|
it "should use the :report_server setting in preference to :server" do
|
@@ -22,71 +35,65 @@ describe Puppet::Transaction::Report::Rest do
|
|
22
35
|
expect(Puppet::Transaction::Report::Rest.srv_service).to eq(:report)
|
23
36
|
end
|
24
37
|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
let(:indirection) { model.indirection }
|
38
|
+
it "saves a report " do
|
39
|
+
stub_request(:put, uri)
|
40
|
+
.to_return(status: 200, **report_response)
|
29
41
|
|
30
|
-
|
31
|
-
Puppet::Transaction::Report.indirection.terminus_class = :rest
|
42
|
+
described_class.indirection.save(report)
|
32
43
|
end
|
33
44
|
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
45
|
+
it "serializes the environment" do
|
46
|
+
stub_request(:put, uri)
|
47
|
+
.with(query: hash_including('environment' => 'outerspace'))
|
48
|
+
.to_return(**report_response)
|
49
|
+
|
50
|
+
described_class.indirection.save(report, nil, environment: Puppet::Node::Environment.remote('outerspace'))
|
40
51
|
end
|
41
52
|
|
42
|
-
|
43
|
-
|
53
|
+
it "deserializes the response as an array of report processor names" do
|
54
|
+
stub_request(:put, %r{/puppet/v3/report})
|
55
|
+
.to_return(status: 200, **report_response)
|
56
|
+
|
57
|
+
expect(described_class.indirection.save(report)).to eq(["store", "http"])
|
44
58
|
end
|
45
59
|
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
let(:instance) { model.new('the thing', 'some contents') }
|
50
|
-
let(:request) { save_request(instance.name, instance) }
|
51
|
-
let(:body) { ["store", "http"].to_pson }
|
60
|
+
it "returns nil if the node does not exist" do
|
61
|
+
stub_request(:put, uri)
|
62
|
+
.to_return(status: 404, headers: { 'Content-Type' => 'application/json' }, body: "{}")
|
52
63
|
|
53
|
-
|
54
|
-
|
55
|
-
end
|
64
|
+
expect(described_class.indirection.save(report)).to be_nil
|
65
|
+
end
|
56
66
|
|
57
|
-
|
58
|
-
|
59
|
-
|
67
|
+
it "parses charset from response content-type" do
|
68
|
+
stub_request(:put, uri)
|
69
|
+
.to_return(status: 200, body: JSON.dump(["store"]), headers: { 'Content-Type' => 'application/json;charset=utf-8' })
|
60
70
|
|
61
|
-
|
62
|
-
|
71
|
+
expect(described_class.indirection.save(report)).to eq(["store"])
|
72
|
+
end
|
63
73
|
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
Puppet[:preferred_serialization_format] = "json"
|
74
|
+
describe "when the server major version is less than 5" do
|
75
|
+
it "raises if the save fails and we're not using pson" do
|
76
|
+
Puppet[:preferred_serialization_format] = "json"
|
68
77
|
|
69
|
-
|
70
|
-
|
71
|
-
|
78
|
+
stub_request(:put, uri)
|
79
|
+
.to_return(status: 500,
|
80
|
+
headers: { 'Content-Type' => 'text/pson', Puppet::Network::HTTP::HEADER_PUPPET_VERSION => '4.10.1' })
|
72
81
|
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
82
|
+
expect {
|
83
|
+
described_class.indirection.save(report)
|
84
|
+
}.to raise_error(Puppet::Error, /To submit reports to a server running puppetserver 4.10.1, set preferred_serialization_format to pson/)
|
85
|
+
end
|
77
86
|
|
78
|
-
|
79
|
-
|
87
|
+
it "raises with HTTP 500 if the save fails and we're already using pson" do
|
88
|
+
Puppet[:preferred_serialization_format] = "pson"
|
80
89
|
|
81
|
-
|
82
|
-
|
83
|
-
|
90
|
+
stub_request(:put, uri)
|
91
|
+
.to_return(status: 500,
|
92
|
+
headers: { 'Content-Type' => 'text/pson', Puppet::Network::HTTP::HEADER_PUPPET_VERSION => '4.10.1' })
|
84
93
|
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
end
|
89
|
-
end
|
94
|
+
expect {
|
95
|
+
described_class.indirection.save(report)
|
96
|
+
}.to raise_error(Net::HTTPError, /Error 500 on SERVER/)
|
90
97
|
end
|
91
98
|
end
|
92
99
|
end
|
@@ -94,7 +94,7 @@ describe Puppet::Indirector::Request do
|
|
94
94
|
|
95
95
|
describe "and the URI is a 'file' URI" do
|
96
96
|
before do
|
97
|
-
@request = Puppet::Indirector::Request.new(:ind, :method, "#{
|
97
|
+
@request = Puppet::Indirector::Request.new(:ind, :method, "#{Puppet::Util.uri_unescape(Puppet::Util.path_to_uri(file).to_s)}", nil)
|
98
98
|
end
|
99
99
|
|
100
100
|
it "should set the request key to the unescaped full file path" do
|
@@ -1,5 +1,4 @@
|
|
1
1
|
require 'spec_helper'
|
2
|
-
require 'puppet/type/user'
|
3
2
|
require 'puppet/indirector/resource/ral'
|
4
3
|
|
5
4
|
describe "Puppet::Resource::Ral" do
|
@@ -18,7 +17,7 @@ describe "Puppet::Resource::Ral" do
|
|
18
17
|
wrong_instance = double("wrong user", :name => "bob")
|
19
18
|
my_instance = double("my user", :name => "root", :to_resource => my_resource)
|
20
19
|
|
21
|
-
expect(Puppet::Type
|
20
|
+
expect(Puppet::Type.type(:user)).to receive(:instances).and_return([ wrong_instance, my_instance, wrong_instance ])
|
22
21
|
expect(Puppet::Resource::Ral.new.find(@request)).to eq(my_resource)
|
23
22
|
end
|
24
23
|
|
@@ -32,8 +31,8 @@ describe "Puppet::Resource::Ral" do
|
|
32
31
|
root = double("Root User")
|
33
32
|
root_resource = double("Root Resource")
|
34
33
|
|
35
|
-
expect(Puppet::Type
|
36
|
-
expect(Puppet::Type
|
34
|
+
expect(Puppet::Type.type(:user)).to receive(:instances).and_return([ wrong_instance, wrong_instance ])
|
35
|
+
expect(Puppet::Type.type(:user)).to receive(:new).with(hash_including(name: "root")).and_return(root)
|
37
36
|
expect(root).to receive(:to_resource).and_return(root_resource)
|
38
37
|
|
39
38
|
result = Puppet::Resource::Ral.new.find(@request)
|
@@ -51,7 +50,7 @@ describe "Puppet::Resource::Ral" do
|
|
51
50
|
my_resource = double("my user resource", :title => "my user resource")
|
52
51
|
my_instance = double("my user", :name => "root", :to_resource => my_resource)
|
53
52
|
|
54
|
-
expect(Puppet::Type
|
53
|
+
expect(Puppet::Type.type(:user)).to receive(:instances).and_return([ my_instance ])
|
55
54
|
expect(Puppet::Resource::Ral.new.search(@request)).to eq([my_resource])
|
56
55
|
end
|
57
56
|
|
@@ -69,7 +68,7 @@ describe "Puppet::Resource::Ral" do
|
|
69
68
|
|
70
69
|
@request = double('request', :key => "user/root", :options => {})
|
71
70
|
|
72
|
-
expect(Puppet::Type
|
71
|
+
expect(Puppet::Type.type(:user)).to receive(:instances).and_return([ my_instance, wrong_instance ])
|
73
72
|
expect(Puppet::Resource::Ral.new.search(@request)).to eq([my_resource])
|
74
73
|
end
|
75
74
|
|
@@ -87,7 +86,7 @@ describe "Puppet::Resource::Ral" do
|
|
87
86
|
|
88
87
|
@request = double('request', :key => "user/", :options => {:name => "bob"})
|
89
88
|
|
90
|
-
expect(Puppet::Type
|
89
|
+
expect(Puppet::Type.type(:user)).to receive(:instances).and_return([ my_instance, wrong_instance ])
|
91
90
|
expect(Puppet::Resource::Ral.new.search(@request)).to eq([my_resource])
|
92
91
|
end
|
93
92
|
|
@@ -105,7 +104,7 @@ describe "Puppet::Resource::Ral" do
|
|
105
104
|
|
106
105
|
@request = double('request', :key => "user/", :options => {})
|
107
106
|
|
108
|
-
expect(Puppet::Type
|
107
|
+
expect(Puppet::Type.type(:user)).to receive(:instances).and_return([ b_instance, a_instance ])
|
109
108
|
expect(Puppet::Resource::Ral.new.search(@request)).to eq([a_resource, b_resource])
|
110
109
|
end
|
111
110
|
end
|
@@ -45,6 +45,19 @@ shared_examples_for "a REST terminus method" do |terminus_method|
|
|
45
45
|
|
46
46
|
expect(Puppet[:preferred_serialization_format]).to eq("pson")
|
47
47
|
end
|
48
|
+
|
49
|
+
it "logs a deprecation warning" do
|
50
|
+
terminus.send(terminus_method, request)
|
51
|
+
|
52
|
+
expect(@logs).to include(an_object_having_attributes(level: :warning, message: /Puppet::Indirector::Rest##{terminus_method} is deprecated. Use Puppet::HTTP::Client instead./))
|
53
|
+
end
|
54
|
+
|
55
|
+
it "omits the warning when deprecations are disabled" do
|
56
|
+
Puppet[:disable_warnings] = 'deprecations'
|
57
|
+
terminus.send(terminus_method, request)
|
58
|
+
|
59
|
+
expect(@logs).to eq([])
|
60
|
+
end
|
48
61
|
end
|
49
62
|
|
50
63
|
HTTP_ERROR_CODES.each do |code|
|
@@ -3,7 +3,48 @@ require 'spec_helper'
|
|
3
3
|
require 'puppet/indirector/status/rest'
|
4
4
|
|
5
5
|
describe Puppet::Indirector::Status::Rest do
|
6
|
-
|
7
|
-
|
6
|
+
let(:certname) { 'ziggy' }
|
7
|
+
let(:uri) { %r{/puppet/v3/status/ziggy} }
|
8
|
+
let(:formatter) { Puppet::Network::FormatHandler.format(:json) }
|
9
|
+
|
10
|
+
before :each do
|
11
|
+
Puppet[:server] = 'compiler.example.com'
|
12
|
+
Puppet[:masterport] = 8140
|
13
|
+
|
14
|
+
described_class.indirection.terminus_class = :rest
|
15
|
+
end
|
16
|
+
|
17
|
+
def status_response(node)
|
18
|
+
{ body: formatter.render(node), headers: {'Content-Type' => formatter.mime } }
|
19
|
+
end
|
20
|
+
|
21
|
+
it 'finds server status' do
|
22
|
+
node = Puppet::Status.new(certname)
|
23
|
+
|
24
|
+
stub_request(:get, uri).to_return(**status_response(node))
|
25
|
+
|
26
|
+
expect(described_class.indirection.find(certname)).to be_a(Puppet::Status)
|
27
|
+
end
|
28
|
+
|
29
|
+
it 'returns nil if the node does not exist' do
|
30
|
+
stub_request(:get, uri).to_return(status: 404, headers: { 'Content-Type' => 'application/json' }, body: "{}")
|
31
|
+
|
32
|
+
expect(described_class.indirection.find(certname)).to be_nil
|
33
|
+
end
|
34
|
+
|
35
|
+
it 'raises if fail_on_404 is specified' do
|
36
|
+
stub_request(:get, uri).to_return(status: 404, headers: { 'Content-Type' => 'application/json' }, body: "{}")
|
37
|
+
|
38
|
+
expect{
|
39
|
+
described_class.indirection.find(certname, fail_on_404: true)
|
40
|
+
}.to raise_error(Puppet::Error, %r{Find /puppet/v3/status/ziggy resulted in 404 with the message: {}})
|
41
|
+
end
|
42
|
+
|
43
|
+
it 'raises Net::HTTPError on 500' do
|
44
|
+
stub_request(:get, uri).to_return(status: 500)
|
45
|
+
|
46
|
+
expect{
|
47
|
+
described_class.indirection.find(certname)
|
48
|
+
}.to raise_error(Net::HTTPError, %r{Error 500 on SERVER: })
|
8
49
|
end
|
9
50
|
end
|