puppet 6.24.0-x64-mingw32 → 7.0.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 +16 -2
- data/CONTRIBUTING.md +5 -5
- data/Gemfile +1 -3
- data/Gemfile.lock +35 -47
- data/README.md +5 -5
- data/conf/fileserver.conf +5 -10
- data/ext/build_defaults.yaml +1 -1
- data/ext/osx/file_mapping.yaml +0 -5
- data/ext/osx/puppet.plist +0 -2
- data/ext/project_data.yaml +1 -15
- 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 +14 -23
- data/lib/puppet/application.rb +178 -108
- data/lib/puppet/application/agent.rb +4 -12
- data/lib/puppet/application/apply.rb +2 -4
- data/lib/puppet/application/device.rb +100 -106
- data/lib/puppet/application/filebucket.rb +13 -10
- data/lib/puppet/application/resource.rb +3 -17
- data/lib/puppet/application/script.rb +0 -2
- data/lib/puppet/application/ssl.rb +1 -13
- data/lib/puppet/application_support.rb +0 -7
- data/lib/puppet/configurer.rb +30 -45
- data/lib/puppet/configurer/downloader.rb +1 -2
- data/lib/puppet/configurer/plugin_handler.rb +21 -19
- data/lib/puppet/defaults.rb +100 -192
- data/lib/puppet/environments.rb +60 -84
- data/lib/puppet/face/facts.rb +5 -103
- data/lib/puppet/face/help.rb +1 -1
- data/lib/puppet/face/help/action.erb +0 -1
- data/lib/puppet/face/help/face.erb +0 -1
- data/lib/puppet/face/node/clean.rb +0 -11
- data/lib/puppet/face/plugin.rb +5 -8
- data/lib/puppet/ffi/windows.rb +12 -0
- data/lib/puppet/ffi/windows/api_types.rb +311 -0
- data/lib/puppet/ffi/windows/constants.rb +404 -0
- data/lib/puppet/ffi/windows/functions.rb +628 -0
- data/lib/puppet/ffi/windows/structs.rb +338 -0
- data/lib/puppet/file_serving/configuration.rb +0 -5
- data/lib/puppet/file_serving/configuration/parser.rb +3 -32
- data/lib/puppet/file_serving/fileset.rb +2 -14
- data/lib/puppet/file_serving/http_metadata.rb +1 -1
- data/lib/puppet/file_serving/mount.rb +1 -2
- data/lib/puppet/file_system/file_impl.rb +1 -1
- data/lib/puppet/file_system/memory_file.rb +1 -8
- data/lib/puppet/file_system/windows.rb +2 -4
- data/lib/puppet/forge.rb +3 -3
- data/lib/puppet/forge/repository.rb +0 -1
- data/lib/puppet/functions/all.rb +1 -1
- data/lib/puppet/functions/camelcase.rb +1 -1
- data/lib/puppet/functions/capitalize.rb +2 -2
- data/lib/puppet/functions/downcase.rb +2 -2
- data/lib/puppet/functions/empty.rb +0 -8
- data/lib/puppet/functions/get.rb +5 -5
- data/lib/puppet/functions/group_by.rb +5 -13
- data/lib/puppet/functions/lest.rb +1 -1
- data/lib/puppet/functions/new.rb +100 -100
- data/lib/puppet/functions/partition.rb +4 -12
- data/lib/puppet/functions/require.rb +5 -5
- data/lib/puppet/functions/sort.rb +3 -3
- data/lib/puppet/functions/strftime.rb +0 -1
- data/lib/puppet/functions/tree_each.rb +9 -7
- data/lib/puppet/functions/type.rb +4 -4
- data/lib/puppet/functions/unwrap.rb +2 -17
- data/lib/puppet/functions/upcase.rb +2 -2
- data/lib/puppet/generate/models/type/type.rb +4 -1
- data/lib/puppet/http.rb +22 -13
- data/lib/puppet/http/client.rb +164 -114
- data/lib/puppet/{network/resolver.rb → http/dns.rb} +2 -2
- data/lib/puppet/http/errors.rb +16 -0
- data/lib/puppet/http/external_client.rb +5 -7
- data/lib/puppet/{network/http → http}/factory.rb +8 -15
- data/lib/puppet/{network/http → http}/pool.rb +61 -26
- data/lib/puppet/{network/http/session.rb → http/pool_entry.rb} +2 -3
- data/lib/puppet/http/proxy.rb +137 -0
- data/lib/puppet/http/redirector.rb +4 -12
- data/lib/puppet/http/resolver.rb +5 -15
- data/lib/puppet/http/resolver/server_list.rb +10 -25
- data/lib/puppet/http/resolver/settings.rb +4 -7
- data/lib/puppet/http/resolver/srv.rb +7 -11
- data/lib/puppet/http/response.rb +36 -54
- data/lib/puppet/http/response_converter.rb +24 -0
- data/lib/puppet/http/response_net_http.rb +42 -0
- data/lib/puppet/http/retry_after_handler.rb +4 -13
- data/lib/puppet/http/service.rb +12 -26
- data/lib/puppet/http/service/ca.rb +11 -22
- data/lib/puppet/http/service/compiler.rb +22 -138
- data/lib/puppet/http/service/file_server.rb +19 -29
- data/lib/puppet/http/service/puppetserver.rb +26 -12
- data/lib/puppet/http/service/report.rb +8 -10
- data/lib/puppet/http/session.rb +11 -20
- data/lib/puppet/{network/http → http}/site.rb +1 -2
- data/lib/puppet/indirector/catalog/compiler.rb +0 -1
- data/lib/puppet/indirector/catalog/rest.rb +2 -4
- data/lib/puppet/indirector/facts/rest.rb +3 -22
- data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -9
- data/lib/puppet/indirector/file_content/rest.rb +2 -6
- data/lib/puppet/indirector/file_metadata/rest.rb +3 -10
- data/lib/puppet/indirector/file_server.rb +1 -8
- data/lib/puppet/indirector/generic_http.rb +0 -11
- data/lib/puppet/indirector/node/rest.rb +2 -4
- data/lib/puppet/indirector/report/rest.rb +3 -8
- data/lib/puppet/indirector/request.rb +0 -101
- data/lib/puppet/indirector/resource/ral.rb +1 -6
- data/lib/puppet/indirector/rest.rb +12 -263
- data/lib/puppet/interface/documentation.rb +0 -1
- data/lib/puppet/module_tool/applications.rb +0 -1
- data/lib/puppet/module_tool/applications/installer.rb +2 -52
- data/lib/puppet/module_tool/errors/shared.rb +2 -34
- data/lib/puppet/network/authconfig.rb +2 -96
- data/lib/puppet/network/authorization.rb +13 -35
- data/lib/puppet/network/formats.rb +0 -67
- data/lib/puppet/network/http.rb +3 -3
- data/lib/puppet/network/http/api/indirected_routes.rb +2 -20
- data/lib/puppet/network/http/api/master/v3.rb +11 -13
- data/lib/puppet/network/http/connection.rb +247 -316
- data/lib/puppet/network/http/handler.rb +0 -1
- data/lib/puppet/network/http_pool.rb +16 -34
- data/lib/puppet/node.rb +1 -30
- data/lib/puppet/pal/json_catalog_encoder.rb +4 -0
- data/lib/puppet/pal/pal_impl.rb +3 -1
- data/lib/puppet/parser/ast/leaf.rb +2 -3
- data/lib/puppet/parser/ast/pops_bridge.rb +0 -38
- data/lib/puppet/parser/compiler.rb +0 -198
- data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +14 -39
- data/lib/puppet/parser/functions/fqdn_rand.rb +6 -14
- data/lib/puppet/parser/resource.rb +0 -69
- data/lib/puppet/parser/templatewrapper.rb +1 -1
- data/lib/puppet/pops/evaluator/deferred_resolver.rb +3 -5
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +0 -5
- data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +3 -3
- data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
- data/lib/puppet/pops/issues.rb +0 -5
- data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +6 -8
- data/lib/puppet/pops/model/ast.pp +0 -42
- data/lib/puppet/pops/model/ast.rb +0 -290
- data/lib/puppet/pops/model/ast_transformer.rb +1 -1
- data/lib/puppet/pops/model/factory.rb +0 -45
- data/lib/puppet/pops/model/model_label_provider.rb +0 -5
- data/lib/puppet/pops/model/model_tree_dumper.rb +0 -22
- data/lib/puppet/pops/model/pn_transformer.rb +0 -16
- data/lib/puppet/pops/parser/egrammar.ra +0 -56
- data/lib/puppet/pops/parser/eparser.rb +1520 -1712
- data/lib/puppet/pops/parser/lexer2.rb +4 -4
- data/lib/puppet/pops/parser/parser_support.rb +0 -5
- data/lib/puppet/pops/resource/resource_type_impl.rb +2 -24
- data/lib/puppet/pops/types/p_sem_ver_type.rb +2 -8
- data/lib/puppet/pops/types/p_sensitive_type.rb +0 -10
- data/lib/puppet/pops/types/type_calculator.rb +0 -7
- data/lib/puppet/pops/types/type_mismatch_describer.rb +1 -1
- data/lib/puppet/pops/types/type_parser.rb +0 -4
- data/lib/puppet/pops/types/types.rb +0 -1
- data/lib/puppet/pops/validation/checker4_0.rb +9 -37
- data/lib/puppet/pops/validation/tasks_checker.rb +0 -12
- data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -2
- data/lib/puppet/property/list.rb +1 -1
- data/lib/puppet/provider.rb +0 -13
- data/lib/puppet/provider/exec/posix.rb +4 -16
- data/lib/puppet/provider/group/groupadd.rb +8 -13
- data/lib/puppet/provider/nameservice.rb +0 -18
- data/lib/puppet/provider/package/apt.rb +2 -34
- data/lib/puppet/provider/package/aptitude.rb +0 -6
- data/lib/puppet/provider/package/dnfmodule.rb +1 -1
- data/lib/puppet/provider/package/dpkg.rb +0 -10
- data/lib/puppet/provider/package/gem.rb +23 -3
- data/lib/puppet/provider/package/nim.rb +6 -11
- data/lib/puppet/provider/package/pip.rb +3 -16
- data/lib/puppet/provider/package/pkg.rb +0 -4
- data/lib/puppet/provider/package/portage.rb +1 -1
- data/lib/puppet/provider/package/puppet_gem.rb +1 -4
- data/lib/puppet/provider/parsedfile.rb +0 -3
- data/lib/puppet/provider/service/debian.rb +0 -2
- data/lib/puppet/provider/service/smf.rb +191 -73
- data/lib/puppet/provider/service/systemd.rb +4 -14
- data/lib/puppet/provider/service/windows.rb +0 -38
- data/lib/puppet/provider/user/aix.rb +2 -2
- data/lib/puppet/provider/user/directoryservice.rb +10 -33
- data/lib/puppet/provider/user/useradd.rb +8 -62
- data/lib/puppet/reference/configuration.rb +8 -7
- data/lib/puppet/reference/indirection.rb +1 -1
- data/lib/puppet/resource.rb +1 -89
- data/lib/puppet/resource/catalog.rb +1 -14
- data/lib/puppet/resource/type.rb +3 -119
- data/lib/puppet/resource/type_collection.rb +3 -48
- data/lib/puppet/runtime.rb +1 -2
- data/lib/puppet/settings.rb +80 -96
- data/lib/puppet/settings/environment_conf.rb +0 -1
- data/lib/puppet/settings/integer_setting.rb +17 -0
- data/lib/puppet/settings/port_setting.rb +15 -0
- data/lib/puppet/settings/priority_setting.rb +5 -4
- data/lib/puppet/ssl.rb +10 -6
- data/lib/puppet/ssl/base.rb +3 -5
- data/lib/puppet/ssl/certificate.rb +0 -6
- data/lib/puppet/ssl/certificate_request.rb +1 -12
- data/lib/puppet/ssl/certificate_signer.rb +6 -0
- data/lib/puppet/ssl/oids.rb +3 -1
- data/lib/puppet/ssl/ssl_provider.rb +17 -0
- data/lib/puppet/ssl/state_machine.rb +3 -1
- data/lib/puppet/ssl/verifier.rb +2 -0
- data/lib/puppet/test/test_helper.rb +1 -3
- data/lib/puppet/transaction.rb +1 -7
- data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
- data/lib/puppet/transaction/report.rb +2 -4
- data/lib/puppet/type.rb +0 -76
- data/lib/puppet/type/exec.rb +3 -16
- data/lib/puppet/type/file.rb +6 -26
- data/lib/puppet/type/file/checksum.rb +1 -1
- data/lib/puppet/type/file/mode.rb +0 -6
- data/lib/puppet/type/file/selcontext.rb +1 -1
- data/lib/puppet/type/file/source.rb +1 -1
- data/lib/puppet/type/filebucket.rb +3 -3
- data/lib/puppet/type/package.rb +8 -16
- data/lib/puppet/type/service.rb +38 -18
- data/lib/puppet/type/tidy.rb +3 -22
- data/lib/puppet/type/user.rb +20 -38
- data/lib/puppet/util/autoload.rb +8 -1
- data/lib/puppet/util/execution.rb +0 -11
- data/lib/puppet/util/http_proxy.rb +2 -215
- data/lib/puppet/util/monkey_patches.rb +0 -53
- data/lib/puppet/util/posix.rb +5 -54
- data/lib/puppet/util/rdoc.rb +0 -7
- data/lib/puppet/util/retry_action.rb +1 -1
- data/lib/puppet/util/run_mode.rb +9 -1
- data/lib/puppet/util/selinux.rb +4 -30
- data/lib/puppet/util/symbolic_file_mode.rb +17 -29
- data/lib/puppet/util/windows.rb +3 -8
- data/lib/puppet/util/windows/adsi.rb +0 -46
- data/lib/puppet/util/windows/daemon.rb +360 -0
- data/lib/puppet/util/windows/error.rb +1 -0
- data/lib/puppet/util/windows/eventlog.rb +4 -9
- data/lib/puppet/util/windows/file.rb +8 -242
- data/lib/puppet/util/windows/monkey_patches/process.rb +414 -0
- data/lib/puppet/util/windows/principal.rb +2 -9
- data/lib/puppet/util/windows/process.rb +4 -226
- data/lib/puppet/util/windows/service.rb +9 -460
- data/lib/puppet/util/windows/sid.rb +2 -6
- data/lib/puppet/util/windows/string.rb +12 -13
- data/lib/puppet/util/yaml.rb +0 -22
- data/lib/puppet/vendor/require_vendored.rb +0 -1
- data/lib/puppet/version.rb +1 -1
- data/lib/puppet/x509.rb +5 -1
- data/lib/puppet/x509/cert_provider.rb +29 -1
- data/locales/puppet.pot +722 -1527
- data/man/man5/puppet.conf.5 +266 -354
- data/man/man8/puppet-agent.8 +2 -2
- data/man/man8/puppet-apply.8 +2 -2
- data/man/man8/puppet-catalog.8 +9 -9
- 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 +8 -51
- data/man/man8/puppet-filebucket.8 +4 -4
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-module.8 +1 -58
- data/man/man8/puppet-node.8 +5 -5
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +5 -5
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +2 -2
- data/man/man8/puppet-ssl.8 +1 -5
- data/man/man8/puppet.8 +2 -2
- data/spec/fixtures/ssl/127.0.0.1-key.pem +57 -107
- data/spec/fixtures/ssl/127.0.0.1.pem +31 -52
- data/spec/fixtures/ssl/bad-basic-constraints.pem +35 -57
- data/spec/fixtures/ssl/bad-int-basic-constraints.pem +35 -57
- data/spec/fixtures/ssl/ca.pem +35 -57
- data/spec/fixtures/ssl/crl.pem +18 -28
- data/spec/fixtures/ssl/ec-key.pem +11 -11
- data/spec/fixtures/ssl/ec.pem +24 -33
- data/spec/fixtures/ssl/encrypted-ec-key.pem +12 -12
- data/spec/fixtures/ssl/encrypted-key.pem +58 -108
- data/spec/fixtures/ssl/intermediate-agent-crl.pem +19 -28
- data/spec/fixtures/ssl/intermediate-agent.pem +36 -57
- data/spec/fixtures/ssl/intermediate-crl.pem +21 -31
- data/spec/fixtures/ssl/intermediate.pem +36 -57
- data/spec/fixtures/ssl/pluto-key.pem +57 -107
- data/spec/fixtures/ssl/pluto.pem +30 -52
- data/spec/fixtures/ssl/request-key.pem +57 -107
- data/spec/fixtures/ssl/request.pem +26 -47
- data/spec/fixtures/ssl/revoked-key.pem +57 -107
- data/spec/fixtures/ssl/revoked.pem +30 -52
- data/spec/fixtures/ssl/signed-key.pem +57 -107
- data/spec/fixtures/ssl/signed.pem +30 -52
- data/spec/fixtures/ssl/tampered-cert.pem +30 -52
- data/spec/fixtures/ssl/tampered-csr.pem +26 -47
- data/spec/fixtures/ssl/unknown-127.0.0.1-key.pem +57 -107
- data/spec/fixtures/ssl/unknown-127.0.0.1.pem +29 -50
- data/spec/fixtures/ssl/unknown-ca-key.pem +57 -107
- data/spec/fixtures/ssl/unknown-ca.pem +33 -55
- data/spec/fixtures/unit/provider/service/smf/{svcs.out → svcs_instances.out} +0 -0
- data/spec/fixtures/unit/provider/user/aix/aix_passwd_file.out +0 -4
- data/spec/integration/application/agent_spec.rb +27 -171
- data/spec/integration/application/apply_spec.rb +1 -20
- data/spec/integration/application/filebucket_spec.rb +16 -27
- data/spec/integration/application/help_spec.rb +2 -0
- data/spec/integration/application/module_spec.rb +0 -21
- data/spec/integration/application/plugin_spec.rb +24 -2
- data/spec/integration/defaults_spec.rb +14 -3
- data/spec/integration/environments/settings_interpolation_spec.rb +4 -0
- data/spec/integration/http/client_spec.rb +0 -12
- data/spec/integration/indirector/direct_file_server_spec.rb +3 -1
- data/spec/integration/indirector/facts/facter_spec.rb +36 -90
- data/spec/integration/network/http_pool_spec.rb +3 -21
- data/spec/integration/parser/catalog_spec.rb +0 -38
- data/spec/integration/parser/node_spec.rb +0 -9
- data/spec/integration/parser/pcore_resource_spec.rb +0 -37
- data/spec/integration/resource/type_collection_spec.rb +6 -2
- data/spec/integration/transaction_spec.rb +9 -4
- data/spec/integration/type/exec_spec.rb +45 -70
- data/spec/integration/type/file_spec.rb +5 -4
- data/spec/integration/util/windows/adsi_spec.rb +1 -21
- data/spec/integration/util/windows/monkey_patches/process_spec.rb +231 -0
- data/spec/integration/util/windows/principal_spec.rb +0 -21
- data/spec/integration/util/windows/registry_spec.rb +10 -6
- data/spec/integration/util/windows/security_spec.rb +1 -1
- data/spec/lib/matchers/include.rb +27 -0
- data/spec/lib/matchers/include_spec.rb +32 -0
- data/spec/lib/puppet/test_ca.rb +2 -7
- data/spec/lib/puppet_spec/puppetserver.rb +1 -1
- data/spec/lib/puppet_spec/settings.rb +1 -1
- data/spec/spec_helper.rb +7 -12
- data/spec/unit/agent_spec.rb +6 -10
- data/spec/unit/application/agent_spec.rb +3 -7
- data/spec/unit/application/facts_spec.rb +12 -456
- data/spec/unit/application/filebucket_spec.rb +43 -39
- data/spec/unit/application/ssl_spec.rb +2 -25
- data/spec/unit/application_spec.rb +9 -51
- data/spec/unit/certificate_factory_spec.rb +1 -1
- data/spec/unit/configurer/downloader_spec.rb +6 -8
- data/spec/unit/configurer/plugin_handler_spec.rb +56 -18
- data/spec/unit/configurer_spec.rb +12 -32
- data/spec/unit/confine/feature_spec.rb +1 -1
- data/spec/unit/confine_spec.rb +2 -8
- data/spec/unit/context/trusted_information_spec.rb +2 -6
- data/spec/unit/defaults_spec.rb +68 -54
- data/spec/unit/environments_spec.rb +68 -259
- data/spec/unit/face/node_spec.rb +11 -0
- data/spec/unit/face/plugin_spec.rb +73 -33
- data/spec/unit/file_bucket/file_spec.rb +1 -1
- data/spec/unit/file_serving/configuration/parser_spec.rb +15 -18
- data/spec/unit/file_serving/configuration_spec.rb +6 -12
- data/spec/unit/file_serving/fileset_spec.rb +0 -60
- data/spec/unit/file_serving/metadata_spec.rb +3 -3
- data/spec/unit/file_serving/terminus_helper_spec.rb +4 -11
- data/spec/unit/file_system_spec.rb +0 -15
- data/spec/unit/forge/module_release_spec.rb +7 -2
- data/spec/unit/functions/assert_type_spec.rb +1 -1
- 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/empty_spec.rb +0 -10
- data/spec/unit/functions/unwrap_spec.rb +0 -8
- data/spec/unit/functions/upcase_spec.rb +1 -1
- data/spec/unit/functions4_spec.rb +2 -2
- data/spec/unit/gettext/config_spec.rb +0 -12
- data/spec/unit/http/client_spec.rb +7 -8
- data/spec/unit/{network/resolver_spec.rb → http/dns_spec.rb} +3 -3
- data/spec/unit/http/external_client_spec.rb +4 -4
- data/spec/unit/{network/http → http}/factory_spec.rb +5 -30
- data/spec/unit/{network/http/session_spec.rb → http/pool_entry_spec.rb} +3 -3
- data/spec/unit/{network/http → http}/pool_spec.rb +12 -17
- data/spec/unit/{util/http_proxy_spec.rb → http/proxy_spec.rb} +2 -69
- data/spec/unit/http/resolver_spec.rb +13 -13
- data/spec/unit/http/service/compiler_spec.rb +0 -185
- data/spec/unit/http/service/file_server_spec.rb +3 -3
- data/spec/unit/http/service/puppetserver_spec.rb +34 -4
- data/spec/unit/http/service_spec.rb +0 -1
- data/spec/unit/http/session_spec.rb +16 -14
- data/spec/unit/{network/http → http}/site_spec.rb +3 -3
- data/spec/unit/indirector/catalog/compiler_spec.rb +10 -14
- data/spec/unit/indirector/face_spec.rb +1 -0
- data/spec/unit/indirector/facts/facter_spec.rb +3 -0
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +5 -3
- data/spec/unit/indirector/file_bucket_file/selector_spec.rb +8 -26
- data/spec/unit/indirector/file_content/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -4
- data/spec/unit/indirector/file_server_spec.rb +1 -15
- data/spec/unit/indirector/indirection_spec.rb +12 -8
- data/spec/unit/indirector/report/rest_spec.rb +2 -17
- data/spec/unit/indirector/request_spec.rb +0 -264
- data/spec/unit/indirector/resource/ral_spec.rb +75 -40
- data/spec/unit/indirector/rest_spec.rb +98 -752
- data/spec/unit/indirector_spec.rb +2 -2
- data/spec/unit/module_tool/applications/installer_spec.rb +0 -78
- data/spec/unit/network/authconfig_spec.rb +2 -129
- data/spec/unit/network/authorization_spec.rb +2 -55
- data/spec/unit/network/formats_spec.rb +4 -45
- data/spec/unit/network/http/api/indirected_routes_spec.rb +5 -92
- data/spec/unit/network/http/api/master/v3_spec.rb +28 -7
- data/spec/unit/network/http/api_spec.rb +10 -0
- data/spec/unit/network/http/connection_spec.rb +19 -41
- data/spec/unit/network/http/handler_spec.rb +0 -1
- data/spec/unit/network/http_pool_spec.rb +0 -4
- data/spec/unit/node/environment_spec.rb +33 -21
- data/spec/unit/node_spec.rb +2 -54
- data/spec/unit/parser/compiler_spec.rb +19 -3
- data/spec/unit/parser/functions/create_resources_spec.rb +2 -20
- data/spec/unit/parser/functions/fqdn_rand_spec.rb +1 -15
- data/spec/unit/parser/resource_spec.rb +8 -14
- data/spec/unit/parser/templatewrapper_spec.rb +5 -16
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +4 -7
- data/spec/unit/pops/loaders/loaders_spec.rb +6 -21
- data/spec/unit/pops/parser/parse_application_spec.rb +4 -22
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_capabilities_spec.rb +8 -21
- data/spec/unit/pops/parser/parse_site_spec.rb +20 -24
- data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -71
- data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
- data/spec/unit/pops/types/p_sem_ver_type_spec.rb +0 -18
- data/spec/unit/pops/types/p_sensitive_type_spec.rb +0 -18
- data/spec/unit/pops/types/type_calculator_spec.rb +6 -6
- data/spec/unit/pops/types/type_factory_spec.rb +1 -1
- data/spec/unit/pops/validator/validator_spec.rb +61 -46
- data/spec/unit/pops/visitor_spec.rb +1 -1
- data/spec/unit/property_spec.rb +0 -1
- data/spec/unit/provider/group/groupadd_spec.rb +2 -5
- data/spec/unit/provider/nameservice_spec.rb +64 -122
- data/spec/unit/provider/package/apt_spec.rb +23 -28
- data/spec/unit/provider/package/aptitude_spec.rb +1 -1
- data/spec/unit/provider/package/base_spec.rb +5 -6
- data/spec/unit/provider/package/dnfmodule_spec.rb +1 -10
- data/spec/unit/provider/package/dpkg_spec.rb +0 -48
- data/spec/unit/provider/package/gem_spec.rb +32 -0
- data/spec/unit/provider/package/nim_spec.rb +0 -42
- data/spec/unit/provider/package/pacman_spec.rb +12 -18
- data/spec/unit/provider/package/pip_spec.rb +11 -43
- data/spec/unit/provider/package/pkgdmg_spec.rb +4 -0
- data/spec/unit/provider/package/puppet_gem_spec.rb +3 -2
- data/spec/unit/provider/parsedfile_spec.rb +0 -10
- data/spec/unit/provider/service/init_spec.rb +0 -1
- data/spec/unit/provider/service/openwrt_spec.rb +1 -3
- data/spec/unit/provider/service/smf_spec.rb +401 -165
- data/spec/unit/provider/service/systemd_spec.rb +8 -53
- data/spec/unit/provider/service/windows_spec.rb +0 -203
- data/spec/unit/provider/user/aix_spec.rb +0 -5
- data/spec/unit/provider/user/directoryservice_spec.rb +35 -67
- data/spec/unit/provider/user/hpux_spec.rb +1 -1
- data/spec/unit/provider/user/pw_spec.rb +0 -2
- data/spec/unit/provider/user/useradd_spec.rb +3 -71
- data/spec/unit/provider_spec.rb +8 -18
- data/spec/unit/resource/catalog_spec.rb +1 -1
- data/spec/unit/resource/type_collection_spec.rb +2 -22
- data/spec/unit/resource/type_spec.rb +1 -1
- data/spec/unit/resource_spec.rb +10 -67
- 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 +79 -110
- data/spec/unit/ssl/base_spec.rb +37 -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 +2 -5
- data/spec/unit/ssl/state_machine_spec.rb +5 -20
- data/spec/unit/ssl/verifier_spec.rb +0 -21
- data/spec/unit/transaction/additional_resource_generator_spec.rb +9 -3
- data/spec/unit/transaction/event_manager_spec.rb +11 -14
- data/spec/unit/transaction/report_spec.rb +0 -2
- data/spec/unit/transaction/resource_harness_spec.rb +2 -2
- data/spec/unit/transaction_spec.rb +55 -96
- data/spec/unit/type/exec_spec.rb +29 -76
- data/spec/unit/type/file/checksum_spec.rb +6 -6
- data/spec/unit/type/file/content_spec.rb +2 -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/selinux_spec.rb +5 -3
- data/spec/unit/type/file/source_spec.rb +4 -5
- data/spec/unit/type/file_spec.rb +18 -6
- data/spec/unit/type/group_spec.rb +6 -13
- data/spec/unit/type/package_spec.rb +1 -1
- data/spec/unit/type/resources_spec.rb +7 -7
- data/spec/unit/type/service_spec.rb +189 -60
- data/spec/unit/type/tidy_spec.rb +8 -24
- data/spec/unit/type/user_spec.rb +0 -45
- data/spec/unit/type_spec.rb +22 -2
- data/spec/unit/util/at_fork_spec.rb +2 -2
- data/spec/unit/util/autoload_spec.rb +1 -5
- data/spec/unit/util/backups_spec.rb +2 -3
- data/spec/unit/util/execution_spec.rb +11 -44
- data/spec/unit/util/inifile_spec.rb +14 -6
- data/spec/unit/util/log_spec.rb +7 -8
- data/spec/unit/util/logging_spec.rb +3 -3
- data/spec/unit/util/monkey_patches_spec.rb +0 -6
- data/spec/unit/util/posix_spec.rb +15 -363
- data/spec/unit/util/run_mode_spec.rb +21 -121
- data/spec/unit/util/selinux_spec.rb +68 -163
- data/spec/unit/util/storage_spec.rb +1 -3
- data/spec/unit/util/suidmanager_spec.rb +41 -44
- data/spec/unit/util/windows/sid_spec.rb +0 -41
- 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 +6 -31
- data/tasks/generate_cert_fixtures.rake +3 -12
- metadata +45 -253
- 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/ffi/posix.rb +0 -10
- data/lib/puppet/ffi/posix/constants.rb +0 -14
- data/lib/puppet/ffi/posix/functions.rb +0 -24
- data/lib/puppet/indirector/certificate/file.rb +0 -9
- data/lib/puppet/indirector/certificate/rest.rb +0 -18
- data/lib/puppet/indirector/certificate_request/file.rb +0 -9
- data/lib/puppet/indirector/certificate_request/memory.rb +0 -7
- data/lib/puppet/indirector/certificate_request/rest.rb +0 -11
- data/lib/puppet/indirector/file_content/http.rb +0 -22
- data/lib/puppet/indirector/key/file.rb +0 -46
- data/lib/puppet/indirector/key/memory.rb +0 -7
- data/lib/puppet/indirector/ssl_file.rb +0 -162
- data/lib/puppet/indirector/status.rb +0 -3
- data/lib/puppet/indirector/status/local.rb +0 -12
- data/lib/puppet/indirector/status/rest.rb +0 -27
- data/lib/puppet/module_tool/applications/searcher.rb +0 -29
- data/lib/puppet/network/auth_config_parser.rb +0 -90
- data/lib/puppet/network/authstore.rb +0 -283
- data/lib/puppet/network/http/api/master/v3/authorization.rb +0 -18
- data/lib/puppet/network/http/api/master/v3/environment.rb +0 -88
- data/lib/puppet/network/http/base_pool.rb +0 -36
- data/lib/puppet/network/http/compression.rb +0 -127
- data/lib/puppet/network/http/connection_adapter.rb +0 -184
- data/lib/puppet/network/http/nocache_pool.rb +0 -28
- data/lib/puppet/network/rest_controller.rb +0 -2
- data/lib/puppet/network/rights.rb +0 -210
- data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +0 -66
- data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +0 -22
- data/lib/puppet/parser/environment_compiler.rb +0 -202
- data/lib/puppet/pops/types/enumeration.rb +0 -16
- data/lib/puppet/resource/capability_finder.rb +0 -154
- data/lib/puppet/rest/errors.rb +0 -15
- data/lib/puppet/rest/response.rb +0 -35
- data/lib/puppet/rest/route.rb +0 -85
- data/lib/puppet/rest/routes.rb +0 -135
- data/lib/puppet/settings/alias_setting.rb +0 -37
- data/lib/puppet/ssl/host.rb +0 -505
- data/lib/puppet/ssl/key.rb +0 -61
- data/lib/puppet/ssl/validator.rb +0 -61
- data/lib/puppet/ssl/validator/default_validator.rb +0 -209
- data/lib/puppet/ssl/validator/no_validator.rb +0 -22
- data/lib/puppet/ssl/verifier_adapter.rb +0 -58
- data/lib/puppet/status.rb +0 -40
- data/lib/puppet/util/connection.rb +0 -88
- data/lib/puppet/util/fact_dif.rb +0 -81
- data/lib/puppet/util/ssl.rb +0 -83
- data/lib/puppet/util/windows/api_types.rb +0 -309
- data/lib/puppet/util/windows/monkey_patches/dir.rb +0 -40
- data/lib/puppet/vendor/load_pathspec.rb +0 -1
- data/lib/puppet/vendor/pathspec/CHANGELOG.md +0 -2
- data/lib/puppet/vendor/pathspec/LICENSE +0 -201
- data/lib/puppet/vendor/pathspec/PUPPET_README.md +0 -6
- data/lib/puppet/vendor/pathspec/README.md +0 -53
- data/lib/puppet/vendor/pathspec/lib/pathspec.rb +0 -122
- data/lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb +0 -275
- data/lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb +0 -17
- data/lib/puppet/vendor/pathspec/lib/pathspec/spec.rb +0 -14
- data/man/man8/puppet-key.8 +0 -126
- data/man/man8/puppet-man.8 +0 -76
- data/man/man8/puppet-status.8 +0 -108
- data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +0 -91
- data/spec/fixtures/ssl/oid-key.pem +0 -117
- data/spec/fixtures/ssl/oid.pem +0 -69
- data/spec/fixtures/ssl/trusted_oid_mapping.yaml +0 -5
- data/spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset +0 -9
- data/spec/integration/application/resource_spec.rb +0 -64
- data/spec/integration/application/ssl_spec.rb +0 -20
- data/spec/integration/network/authconfig_spec.rb +0 -256
- data/spec/integration/util/windows/monkey_patches/dir_spec.rb +0 -11
- data/spec/unit/application/man_spec.rb +0 -52
- data/spec/unit/capability_spec.rb +0 -414
- data/spec/unit/face/key_spec.rb +0 -9
- data/spec/unit/face/module/search_spec.rb +0 -231
- data/spec/unit/face/status_spec.rb +0 -9
- data/spec/unit/indirector/certificate/file_spec.rb +0 -14
- data/spec/unit/indirector/certificate/rest_spec.rb +0 -61
- data/spec/unit/indirector/certificate_request/file_spec.rb +0 -14
- data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -25
- data/spec/unit/indirector/key/file_spec.rb +0 -78
- data/spec/unit/indirector/ssl_file_spec.rb +0 -305
- data/spec/unit/indirector/status/local_spec.rb +0 -10
- data/spec/unit/indirector/status/rest_spec.rb +0 -50
- data/spec/unit/module_tool/applications/searcher_spec.rb +0 -38
- data/spec/unit/network/auth_config_parser_spec.rb +0 -115
- data/spec/unit/network/authstore_spec.rb +0 -422
- data/spec/unit/network/http/api/master/v3/authorization_spec.rb +0 -57
- data/spec/unit/network/http/api/master/v3/environment_spec.rb +0 -185
- data/spec/unit/network/http/compression_spec.rb +0 -240
- data/spec/unit/network/http/nocache_pool_spec.rb +0 -64
- data/spec/unit/network/http_spec.rb +0 -9
- data/spec/unit/network/rights_spec.rb +0 -439
- data/spec/unit/parser/environment_compiler_spec.rb +0 -730
- data/spec/unit/pops/evaluator/deferred_resolver_spec.rb +0 -20
- data/spec/unit/pops/types/enumeration_spec.rb +0 -51
- data/spec/unit/resource/capability_finder_spec.rb +0 -148
- data/spec/unit/rest/route_spec.rb +0 -132
- data/spec/unit/ssl/host_spec.rb +0 -645
- data/spec/unit/ssl/key_spec.rb +0 -173
- data/spec/unit/ssl/validator_spec.rb +0 -278
- data/spec/unit/status_spec.rb +0 -45
- data/spec/unit/util/ssl_spec.rb +0 -91
@@ -65,25 +65,4 @@ describe 'puppet module', unless: Puppet::Util::Platform.jruby? do
|
|
65
65
|
.and output(%r{Unable to verify the SSL certificate}).to_stderr
|
66
66
|
end
|
67
67
|
end
|
68
|
-
|
69
|
-
it 'prints the complete URL it tried to connect to' do
|
70
|
-
response_proc = -> (req, res) { res.status = 404 }
|
71
|
-
|
72
|
-
# create a temp cacert bundle
|
73
|
-
ssl_file = tmpfile('systemstore')
|
74
|
-
File.write(ssl_file, server.ca_cert)
|
75
|
-
|
76
|
-
Puppet::Util.withenv("SSL_CERT_FILE" => ssl_file) do
|
77
|
-
server.start_server(response_proc: response_proc) do |port|
|
78
|
-
Puppet[:module_repository] = "https://127.0.0.1:#{port}/bogus_test/puppet"
|
79
|
-
|
80
|
-
expect {
|
81
|
-
app.command_line.args = ['install', 'puppetlabs-bacula']
|
82
|
-
app.run
|
83
|
-
}.to exit_with(1)
|
84
|
-
.and output(%r{Notice: Downloading from https://127.0.0.1:#{port}}).to_stdout
|
85
|
-
.and output(%r{https://127.0.0.1:#{port}/bogus_test/puppet/v3/releases}).to_stderr
|
86
|
-
end
|
87
|
-
end
|
88
|
-
end
|
89
68
|
end
|
@@ -2,14 +2,15 @@ require 'spec_helper'
|
|
2
2
|
require 'puppet/face'
|
3
3
|
require 'puppet_spec/puppetserver'
|
4
4
|
|
5
|
-
describe "puppet plugin"
|
5
|
+
describe "puppet plugin" do
|
6
6
|
include_context "https client"
|
7
7
|
|
8
8
|
let(:server) { PuppetSpec::Puppetserver.new }
|
9
9
|
let(:plugin) { Puppet::Application[:plugin] }
|
10
10
|
let(:response_body) { "[{\"path\":\"/etc/puppetlabs/code/environments/production/modules\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":0,\"group\":0,\"mode\":493,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-03-06 20:14:25 UTC\"},\"type\":\"directory\",\"destination\":null}]" }
|
11
11
|
|
12
|
-
it "downloads from plugins, pluginsfacts and locales mounts" do
|
12
|
+
it "downloads from plugins, pluginsfacts and locales mounts when i18n is enabled" do
|
13
|
+
Puppet[:disable_i18n] = false
|
13
14
|
current_version_handler = -> (req, res) {
|
14
15
|
res['X-Puppet-Version'] = Puppet.version
|
15
16
|
res['Content-Type'] = 'application/json'
|
@@ -28,6 +29,27 @@ describe "puppet plugin", unless: Puppet::Util::Platform.jruby? do
|
|
28
29
|
end
|
29
30
|
end
|
30
31
|
|
32
|
+
it "downloads from plugins, pluginsfacts but no locales mounts when i18n is disabled" do
|
33
|
+
Puppet[:disable_i18n] = true
|
34
|
+
|
35
|
+
current_version_handler = -> (req, res) {
|
36
|
+
res['X-Puppet-Version'] = Puppet.version
|
37
|
+
res['Content-Type'] = 'application/json'
|
38
|
+
res.body = response_body
|
39
|
+
}
|
40
|
+
|
41
|
+
server.start_server(mounts: {file_metadatas: current_version_handler}) do |port|
|
42
|
+
Puppet[:serverport] = port
|
43
|
+
expect {
|
44
|
+
plugin.command_line.args << 'download'
|
45
|
+
plugin.run
|
46
|
+
}.to exit_with(0)
|
47
|
+
.and output(matching(
|
48
|
+
"Downloaded these plugins: #{Regexp.escape(Puppet[:pluginfactdest])}, #{Regexp.escape(Puppet[:plugindest])}"
|
49
|
+
)).to_stdout
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
31
53
|
it "downloads from plugins and pluginsfacts from older puppetservers" do
|
32
54
|
no_locales_handler = -> (req, res) {
|
33
55
|
res['X-Puppet-Version'] = '5.3.3' # locales mount was added in 5.3.4
|
@@ -36,6 +36,13 @@ describe "Puppet defaults" do
|
|
36
36
|
end
|
37
37
|
end
|
38
38
|
|
39
|
+
describe "when setting the :serverport" do
|
40
|
+
it "should also set the :masterport to the same value" do
|
41
|
+
Puppet.settings[:serverport] = 9000
|
42
|
+
expect(Puppet.settings[:masterport]).to eq(9000)
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
39
46
|
describe "when setting the :factpath" do
|
40
47
|
it "should add the :factpath to Facter's search paths" do
|
41
48
|
expect(Facter).to receive(:search).with("/my/fact/path")
|
@@ -152,6 +159,10 @@ describe "Puppet defaults" do
|
|
152
159
|
expect(Puppet.settings.value(:preferred_serialization_format)).to eq("json")
|
153
160
|
end
|
154
161
|
|
162
|
+
it "should default to true the disable_i18n setting" do
|
163
|
+
expect(Puppet.settings.value(:disable_i18n)).to eq(true)
|
164
|
+
end
|
165
|
+
|
155
166
|
it "should have a setting for determining the configuration version and should default to an empty string" do
|
156
167
|
expect(Puppet.settings[:config_version]).to eq("")
|
157
168
|
end
|
@@ -164,18 +175,18 @@ describe "Puppet defaults" do
|
|
164
175
|
|
165
176
|
it "should use the default serverport value when report port is unspecified" do
|
166
177
|
Puppet.settings[:serverport] = "1234"
|
167
|
-
expect(Puppet.settings[:report_port]).to eq(
|
178
|
+
expect(Puppet.settings[:report_port]).to eq(1234)
|
168
179
|
end
|
169
180
|
|
170
181
|
it "should use the default masterport value when report port is unspecified" do
|
171
182
|
Puppet.settings[:masterport] = "1234"
|
172
|
-
expect(Puppet.settings[:report_port]).to eq(
|
183
|
+
expect(Puppet.settings[:report_port]).to eq(1234)
|
173
184
|
end
|
174
185
|
|
175
186
|
it "should use report_port when set" do
|
176
187
|
Puppet.settings[:serverport] = "1234"
|
177
188
|
Puppet.settings[:report_port] = "5678"
|
178
|
-
expect(Puppet.settings[:report_port]).to eq(
|
189
|
+
expect(Puppet.settings[:report_port]).to eq(5678)
|
179
190
|
end
|
180
191
|
end
|
181
192
|
|
@@ -9,6 +9,10 @@ describe "interpolating $environment" do
|
|
9
9
|
let(:confdir) { Puppet[:confdir] }
|
10
10
|
let(:cmdline_args) { ['--confdir', confdir, '--vardir', Puppet[:vardir], '--hiera_config', Puppet[:hiera_config]] }
|
11
11
|
|
12
|
+
before(:each) do
|
13
|
+
FileUtils.mkdir_p(confdir)
|
14
|
+
end
|
15
|
+
|
12
16
|
shared_examples_for "a setting that does not interpolate $environment" do
|
13
17
|
|
14
18
|
before(:each) do
|
@@ -151,16 +151,4 @@ describe Puppet::HTTP::Client, unless: Puppet::Util::Platform.jruby? do
|
|
151
151
|
end
|
152
152
|
end
|
153
153
|
end
|
154
|
-
|
155
|
-
context 'ciphersuites' do
|
156
|
-
it "does not connect when using an SSLv3 ciphersuite", :if => Puppet::Util::Package.versioncmp(OpenSSL::OPENSSL_LIBRARY_VERSION.split[1], '1.1.1e') > 0 do
|
157
|
-
Puppet[:ciphers] = "DES-CBC3-SHA"
|
158
|
-
|
159
|
-
https_server.start_server do |port|
|
160
|
-
expect {
|
161
|
-
client.get(URI("https://127.0.0.1:#{port}"), options: {ssl_context: root_context})
|
162
|
-
}.to raise_error(Puppet::HTTP::ConnectionError, /no cipher match|sslv3 alert handshake failure/)
|
163
|
-
end
|
164
|
-
end
|
165
|
-
end
|
166
154
|
end
|
@@ -1,4 +1,5 @@
|
|
1
1
|
require 'spec_helper'
|
2
|
+
require 'matchers/include'
|
2
3
|
|
3
4
|
require 'puppet/indirector/file_content/file'
|
4
5
|
require 'puppet/indirector/file_metadata/file'
|
@@ -29,6 +30,7 @@ end
|
|
29
30
|
|
30
31
|
describe Puppet::Indirector::DirectFileServer, " when interacting with FileServing::Fileset and the model" do
|
31
32
|
include PuppetSpec::Files
|
33
|
+
include Matchers::Include
|
32
34
|
|
33
35
|
matcher :file_with_content do |name, content|
|
34
36
|
match do |actual|
|
@@ -50,7 +52,7 @@ describe Puppet::Indirector::DirectFileServer, " when interacting with FileServi
|
|
50
52
|
terminus = Puppet::Indirector::FileContent::File.new
|
51
53
|
request = terminus.indirection.request(:search, Puppet::Util.path_to_uri(path).to_s, nil, :recurse => true)
|
52
54
|
|
53
|
-
expect(terminus.search(request)).to
|
55
|
+
expect(terminus.search(request)).to include_in_any_order(
|
54
56
|
file_with_content(File.join(path, "one"), "one content"),
|
55
57
|
file_with_content(File.join(path, "two"), "two content"),
|
56
58
|
directory_named(path))
|
@@ -6,7 +6,6 @@ require 'puppet/indirector/facts/facter'
|
|
6
6
|
describe Puppet::Node::Facts::Facter do
|
7
7
|
include PuppetSpec::Files
|
8
8
|
include PuppetSpec::Compiler
|
9
|
-
include PuppetSpec::Settings
|
10
9
|
|
11
10
|
before :each do
|
12
11
|
Puppet::Node::Facts.indirection.terminus_class = :facter
|
@@ -67,102 +66,49 @@ describe Puppet::Node::Facts::Facter do
|
|
67
66
|
end
|
68
67
|
end
|
69
68
|
|
70
|
-
|
71
|
-
|
72
|
-
allow(Facter).to receive(:reset)
|
73
|
-
|
74
|
-
cat = compile_to_catalog('notify { $::puppetversion: }',
|
75
|
-
Puppet::Node.indirection.find('foo'))
|
76
|
-
expect(cat.resource("Notify[#{Puppet.version.to_s}]")).to be
|
77
|
-
end
|
78
|
-
|
79
|
-
context "when adding the agent_specified_environment fact" do
|
80
|
-
it "does not add the fact if the agent environment is not set" do
|
81
|
-
expect do
|
82
|
-
compile_to_catalog('notify { $::agent_specified_environment: }',
|
83
|
-
Puppet::Node.indirection.find('foo'))
|
84
|
-
end.to raise_error(Puppet::PreformattedError)
|
85
|
-
end
|
86
|
-
|
87
|
-
it "does not add the fact if the agent environment is set in sections other than agent or main" do
|
88
|
-
set_puppet_conf(Puppet[:confdir], <<~CONF)
|
89
|
-
[user]
|
90
|
-
environment=bar
|
91
|
-
CONF
|
69
|
+
it "adds the puppetversion fact" do
|
70
|
+
allow(Facter).to receive(:reset)
|
92
71
|
|
93
|
-
|
94
|
-
expect do
|
95
|
-
compile_to_catalog('notify { $::agent_specified_environment: }',
|
72
|
+
cat = compile_to_catalog('notify { $::puppetversion: }',
|
96
73
|
Puppet::Node.indirection.find('foo'))
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
it "adds the agent_specified_environment fact when set in the agent section in puppet.conf" do
|
101
|
-
set_puppet_conf(Puppet[:confdir], <<~CONF)
|
102
|
-
[agent]
|
103
|
-
environment=bar
|
104
|
-
CONF
|
105
|
-
|
106
|
-
Puppet.initialize_settings
|
107
|
-
cat = compile_to_catalog('notify { $::agent_specified_environment: }',
|
108
|
-
Puppet::Node.indirection.find('foo'))
|
109
|
-
expect(cat.resource("Notify[bar]")).to be
|
110
|
-
end
|
111
|
-
|
112
|
-
it "prefers agent_specified_environment from main if set in section other than agent" do
|
113
|
-
set_puppet_conf(Puppet[:confdir], <<~CONF)
|
114
|
-
[main]
|
115
|
-
environment=baz
|
116
|
-
|
117
|
-
[user]
|
118
|
-
environment=bar
|
119
|
-
CONF
|
120
|
-
|
121
|
-
Puppet.initialize_settings
|
122
|
-
cat = compile_to_catalog('notify { $::agent_specified_environment: }',
|
123
|
-
Puppet::Node.indirection.find('foo'))
|
124
|
-
expect(cat.resource("Notify[baz]")).to be
|
125
|
-
end
|
126
|
-
|
127
|
-
it "prefers agent_specified_environment from agent if set in multiple sections" do
|
128
|
-
set_puppet_conf(Puppet[:confdir], <<~CONF)
|
129
|
-
[main]
|
130
|
-
environment=baz
|
131
|
-
|
132
|
-
[agent]
|
133
|
-
environment=bar
|
134
|
-
CONF
|
135
|
-
|
136
|
-
Puppet.initialize_settings
|
137
|
-
cat = compile_to_catalog('notify { $::agent_specified_environment: }',
|
138
|
-
Puppet::Node.indirection.find('foo'))
|
139
|
-
expect(cat.resource("Notify[bar]")).to be
|
140
|
-
end
|
74
|
+
expect(cat.resource("Notify[#{Puppet.version.to_s}]")).to be
|
75
|
+
end
|
141
76
|
|
142
|
-
|
143
|
-
|
77
|
+
it "the agent_specified_environment fact is nil when not set" do
|
78
|
+
expect do
|
79
|
+
compile_to_catalog('notify { $::agent_specified_environment: }',
|
80
|
+
Puppet::Node.indirection.find('foo'))
|
81
|
+
end.to raise_error(Puppet::PreformattedError)
|
82
|
+
end
|
144
83
|
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
84
|
+
it "adds the agent_specified_environment fact when set in puppet.conf" do
|
85
|
+
FileUtils.mkdir_p(Puppet[:confdir])
|
86
|
+
File.open(File.join(Puppet[:confdir], 'puppet.conf'), 'w') do |f|
|
87
|
+
f.puts("environment=bar")
|
88
|
+
end
|
150
89
|
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
end
|
90
|
+
Puppet.initialize_settings
|
91
|
+
cat = compile_to_catalog('notify { $::agent_specified_environment: }',
|
92
|
+
Puppet::Node.indirection.find('foo'))
|
93
|
+
expect(cat.resource("Notify[bar]")).to be
|
94
|
+
end
|
157
95
|
|
158
|
-
|
159
|
-
|
96
|
+
it "adds the agent_specified_environment fact when set via command-line" do
|
97
|
+
Puppet.initialize_settings(['--environment', 'bar'])
|
98
|
+
cat = compile_to_catalog('notify { $::agent_specified_environment: }',
|
99
|
+
Puppet::Node.indirection.find('foo'))
|
100
|
+
expect(cat.resource("Notify[bar]")).to be
|
101
|
+
end
|
160
102
|
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
end
|
103
|
+
it "adds the agent_specified_environment fact, preferring cli, when set in puppet.conf and via command-line" do
|
104
|
+
FileUtils.mkdir_p(Puppet[:confdir])
|
105
|
+
File.open(File.join(Puppet[:confdir], 'puppet.conf'), 'w') do |f|
|
106
|
+
f.puts("environment=bar")
|
166
107
|
end
|
108
|
+
|
109
|
+
Puppet.initialize_settings(['--environment', 'baz'])
|
110
|
+
cat = compile_to_catalog('notify { $::agent_specified_environment: }',
|
111
|
+
Puppet::Node.indirection.find('foo'))
|
112
|
+
expect(cat.resource("Notify[baz]")).to be
|
167
113
|
end
|
168
114
|
end
|
@@ -81,16 +81,6 @@ describe Puppet::Network::HttpPool, unless: Puppet::Util::Platform.jruby? do
|
|
81
81
|
end
|
82
82
|
end
|
83
83
|
|
84
|
-
it "doesn't generate a Puppet::SSL::Host deprecation warning" do
|
85
|
-
server.start_server do |port|
|
86
|
-
http = connection(hostname, port)
|
87
|
-
res = http.get('/')
|
88
|
-
expect(res.code).to eq('200')
|
89
|
-
end
|
90
|
-
|
91
|
-
expect(@logs).to eq([])
|
92
|
-
end
|
93
|
-
|
94
84
|
it "detects when the server has closed the connection and reconnects" do
|
95
85
|
server.start_server do |port|
|
96
86
|
http = connection(hostname, port)
|
@@ -101,17 +91,13 @@ describe Puppet::Network::HttpPool, unless: Puppet::Util::Platform.jruby? do
|
|
101
91
|
end
|
102
92
|
end
|
103
93
|
|
104
|
-
context "when using single use HTTPS connections" do
|
105
|
-
include_examples 'HTTPS client'
|
106
|
-
end
|
107
|
-
|
108
94
|
context "when using persistent HTTPS connections" do
|
109
95
|
around :each do |example|
|
110
|
-
|
111
|
-
Puppet.override(:http_pool => pool) do
|
96
|
+
begin
|
112
97
|
example.run
|
98
|
+
ensure
|
99
|
+
Puppet.runtime[:http].close
|
113
100
|
end
|
114
|
-
pool.close
|
115
101
|
end
|
116
102
|
|
117
103
|
include_examples 'HTTPS client'
|
@@ -183,10 +169,6 @@ describe Puppet::Network::HttpPool, unless: Puppet::Util::Platform.jruby? do
|
|
183
169
|
end
|
184
170
|
|
185
171
|
describe Puppet::Network::HTTP::Connection do
|
186
|
-
it_behaves_like "an HttpPool connection", described_class, true
|
187
|
-
end
|
188
|
-
|
189
|
-
describe Puppet::Network::HTTP::ConnectionAdapter do
|
190
172
|
it_behaves_like "an HttpPool connection", described_class, false
|
191
173
|
end
|
192
174
|
end
|
@@ -48,44 +48,6 @@ describe "A catalog" do
|
|
48
48
|
expect(resources_in(agent_catalog)).
|
49
49
|
to include_in_order(*resources_in_declaration_order)
|
50
50
|
end
|
51
|
-
|
52
|
-
it "does not contain unrealized, virtual resources" do
|
53
|
-
virtual_resources = ["Unrealized[unreal]", "Class[Unreal]"]
|
54
|
-
|
55
|
-
master_catalog, agent_catalog = master_and_agent_catalogs_for(<<-EOM)
|
56
|
-
class unreal { }
|
57
|
-
define unrealized() { }
|
58
|
-
|
59
|
-
class real {
|
60
|
-
@unrealized { "unreal": }
|
61
|
-
@class { "unreal": }
|
62
|
-
}
|
63
|
-
|
64
|
-
include real
|
65
|
-
EOM
|
66
|
-
|
67
|
-
expect(resources_in(master_catalog)).to_not include(*virtual_resources)
|
68
|
-
expect(resources_in(agent_catalog)).to_not include(*virtual_resources)
|
69
|
-
end
|
70
|
-
|
71
|
-
it "does not contain unrealized, exported resources" do
|
72
|
-
exported_resources = ["Unrealized[unreal]", "Class[Unreal]"]
|
73
|
-
|
74
|
-
master_catalog, agent_catalog = master_and_agent_catalogs_for(<<-EOM)
|
75
|
-
class unreal { }
|
76
|
-
define unrealized() { }
|
77
|
-
|
78
|
-
class real {
|
79
|
-
@@unrealized { "unreal": }
|
80
|
-
@@class { "unreal": }
|
81
|
-
}
|
82
|
-
|
83
|
-
include real
|
84
|
-
EOM
|
85
|
-
|
86
|
-
expect(resources_in(master_catalog)).to_not include(*exported_resources)
|
87
|
-
expect(resources_in(agent_catalog)).to_not include(*exported_resources)
|
88
|
-
end
|
89
51
|
end
|
90
52
|
end
|
91
53
|
|
@@ -117,15 +117,6 @@ describe 'node statements' do
|
|
117
117
|
expect(catalog).to have_resource('Notify[matched]')
|
118
118
|
end
|
119
119
|
|
120
|
-
it 'selects a node that is a prefix of the agent name' do
|
121
|
-
Puppet[:strict_hostname_checking] = false
|
122
|
-
catalog = compile_to_catalog(<<-MANIFEST, Puppet::Node.new("node.name.com"))
|
123
|
-
node 'node.name' { notify { matched: } }
|
124
|
-
MANIFEST
|
125
|
-
|
126
|
-
expect(catalog).to have_resource('Notify[matched]')
|
127
|
-
end
|
128
|
-
|
129
120
|
it 'does not treat regex symbols as a regex inside a string literal' do
|
130
121
|
catalog = compile_to_catalog(<<-MANIFEST, Puppet::Node.new("nodexname"))
|
131
122
|
node 'node.name' { notify { 'not matched': } }
|
@@ -68,16 +68,6 @@ describe 'when pcore described resources types are in use' do
|
|
68
68
|
end
|
69
69
|
end
|
70
70
|
RUBY
|
71
|
-
'cap.rb' => <<-EOF
|
72
|
-
module Puppet
|
73
|
-
Type.newtype(:cap, :is_capability => true) do
|
74
|
-
@doc = "Docs for capability"
|
75
|
-
@isomorphic = false
|
76
|
-
newproperty(:message) do
|
77
|
-
desc "Docs for 'message' property"
|
78
|
-
end
|
79
|
-
end;end
|
80
|
-
EOF
|
81
71
|
} } },
|
82
72
|
}
|
83
73
|
}}})
|
@@ -126,14 +116,10 @@ describe 'when pcore described resources types are in use' do
|
|
126
116
|
test3 { 'x/y':
|
127
117
|
message => 'x/y works'
|
128
118
|
}
|
129
|
-
cap { 'c':
|
130
|
-
message => 'c works'
|
131
|
-
}
|
132
119
|
MANIFEST
|
133
120
|
expect(catalog.resource(:test1, "a")['message']).to eq('a works')
|
134
121
|
expect(catalog.resource(:test2, "b")['message']).to eq('b works')
|
135
122
|
expect(catalog.resource(:test3, "x/y")['message']).to eq('x/y works')
|
136
|
-
expect(catalog.resource(:cap, "c")['message']).to eq('c works')
|
137
123
|
end
|
138
124
|
|
139
125
|
it 'the validity of attribute names are checked' do
|
@@ -158,20 +144,6 @@ describe 'when pcore described resources types are in use' do
|
|
158
144
|
expect(catalog.resource(:test1, "a")['noop']).to eq(true)
|
159
145
|
end
|
160
146
|
|
161
|
-
it 'capability is propagated to the catalog' do
|
162
|
-
genface.types
|
163
|
-
catalog = compile_to_catalog(<<-MANIFEST)
|
164
|
-
test2 { 'r':
|
165
|
-
message => 'a resource'
|
166
|
-
}
|
167
|
-
cap { 'c':
|
168
|
-
message => 'a cap'
|
169
|
-
}
|
170
|
-
MANIFEST
|
171
|
-
expect(catalog.resource(:test2, "r").is_capability?).to eq(false)
|
172
|
-
expect(catalog.resource(:cap, "c").is_capability?).to eq(true)
|
173
|
-
end
|
174
|
-
|
175
147
|
it 'a generated type describes if it is isomorphic' do
|
176
148
|
generate_and_in_a_compilers_context do |compiler|
|
177
149
|
t1 = find_resource_type(compiler.topscope, 'test1')
|
@@ -181,15 +153,6 @@ describe 'when pcore described resources types are in use' do
|
|
181
153
|
end
|
182
154
|
end
|
183
155
|
|
184
|
-
it 'a generated type describes if it is a capability' do
|
185
|
-
generate_and_in_a_compilers_context do |compiler|
|
186
|
-
t1 = find_resource_type(compiler.topscope, 'test1')
|
187
|
-
expect(t1.is_capability?).to be(false)
|
188
|
-
t2 = find_resource_type(compiler.topscope, 'cap')
|
189
|
-
expect(t2.is_capability?).to be(true)
|
190
|
-
end
|
191
|
-
end
|
192
|
-
|
193
156
|
it 'a generated type returns parameters defined in pcore' do
|
194
157
|
generate_and_in_a_compilers_context do |compiler|
|
195
158
|
t1 = find_resource_type(compiler.topscope, 'test1')
|