puppet 6.18.0-x64-mingw32 → 6.21.1-x64-mingw32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CODEOWNERS +2 -16
- data/Gemfile +2 -0
- data/Gemfile.lock +37 -34
- data/README.md +1 -2
- data/Rakefile +4 -12
- data/lib/puppet/agent/locker.rb +0 -7
- data/lib/puppet/application.rb +10 -6
- data/lib/puppet/application/agent.rb +9 -3
- data/lib/puppet/application/apply.rb +3 -2
- data/lib/puppet/application/device.rb +1 -0
- data/lib/puppet/application/doc.rb +1 -1
- data/lib/puppet/application/filebucket.rb +2 -2
- data/lib/puppet/application/lookup.rb +5 -5
- data/lib/puppet/application/script.rb +1 -0
- data/lib/puppet/application_support.rb +7 -0
- data/lib/puppet/configurer.rb +50 -8
- data/lib/puppet/defaults.rb +67 -35
- data/lib/puppet/environments.rb +84 -59
- data/lib/puppet/face/catalog.rb +1 -1
- data/lib/puppet/face/config.rb +56 -16
- data/lib/puppet/face/epp.rb +12 -2
- data/lib/puppet/face/facts.rb +60 -0
- data/lib/puppet/face/node.rb +3 -3
- data/lib/puppet/face/node/clean.rb +2 -2
- data/lib/puppet/face/status.rb +1 -1
- data/lib/puppet/ffi/posix.rb +10 -0
- data/lib/puppet/ffi/posix/constants.rb +14 -0
- data/lib/puppet/ffi/posix/functions.rb +24 -0
- data/lib/puppet/file_bucket/dipper.rb +1 -1
- data/lib/puppet/functions/epp.rb +1 -0
- data/lib/puppet/functions/inline_epp.rb +1 -0
- data/lib/puppet/functions/new.rb +8 -3
- data/lib/puppet/http.rb +1 -0
- data/lib/puppet/http/client.rb +1 -1
- data/lib/puppet/http/resolver.rb +5 -8
- data/lib/puppet/http/resolver/server_list.rb +18 -36
- data/lib/puppet/http/resolver/settings.rb +4 -4
- data/lib/puppet/http/resolver/srv.rb +5 -5
- data/lib/puppet/http/service.rb +3 -1
- data/lib/puppet/http/service/compiler.rb +1 -1
- data/lib/puppet/http/service/file_server.rb +1 -1
- data/lib/puppet/http/service/puppetserver.rb +39 -0
- data/lib/puppet/http/session.rb +5 -4
- data/lib/puppet/indirector/catalog/compiler.rb +1 -1
- data/lib/puppet/indirector/fact_search.rb +60 -0
- data/lib/puppet/indirector/facts/json.rb +27 -0
- data/lib/puppet/indirector/facts/yaml.rb +4 -59
- data/lib/puppet/indirector/json.rb +5 -1
- data/lib/puppet/indirector/msgpack.rb +1 -1
- data/lib/puppet/indirector/node/json.rb +8 -0
- data/lib/puppet/indirector/report/json.rb +34 -0
- data/lib/puppet/indirector/request.rb +4 -4
- data/lib/puppet/indirector/yaml.rb +1 -1
- data/lib/puppet/module_tool/applications/installer.rb +48 -2
- data/lib/puppet/module_tool/errors/shared.rb +17 -2
- data/lib/puppet/network/formats.rb +2 -1
- data/lib/puppet/network/http/api/master/v3/environments.rb +0 -1
- data/lib/puppet/node/facts.rb +17 -0
- data/lib/puppet/pal/pal_impl.rb +70 -17
- data/lib/puppet/parser/ast/leaf.rb +3 -2
- data/lib/puppet/parser/templatewrapper.rb +1 -1
- data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +1 -3
- data/lib/puppet/pops/evaluator/deferred_resolver.rb +5 -3
- data/lib/puppet/pops/evaluator/evaluator_impl.rb +22 -3
- data/lib/puppet/pops/evaluator/runtime3_converter.rb +2 -2
- data/lib/puppet/pops/model/ast_transformer.rb +1 -1
- 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/property/list.rb +1 -1
- data/lib/puppet/provider/group/groupadd.rb +13 -8
- data/lib/puppet/provider/package/apt.rb +34 -2
- data/lib/puppet/provider/package/aptitude.rb +6 -0
- data/lib/puppet/provider/package/dpkg.rb +1 -1
- data/lib/puppet/provider/package/pip2.rb +17 -0
- data/lib/puppet/provider/package/puppetserver_gem.rb +180 -0
- data/lib/puppet/provider/package/yum.rb +1 -0
- data/lib/puppet/provider/service/debian.rb +2 -0
- data/lib/puppet/provider/user/aix.rb +2 -2
- data/lib/puppet/provider/user/useradd.rb +62 -8
- data/lib/puppet/reference/configuration.rb +6 -5
- data/lib/puppet/resource/type.rb +2 -1
- data/lib/puppet/rest/route.rb +2 -2
- data/lib/puppet/settings.rb +62 -20
- data/lib/puppet/settings/alias_setting.rb +37 -0
- data/lib/puppet/settings/base_setting.rb +26 -2
- data/lib/puppet/transaction/report.rb +11 -7
- data/lib/puppet/type/file/source.rb +1 -1
- data/lib/puppet/type/filebucket.rb +1 -1
- data/lib/puppet/type/package.rb +3 -3
- data/lib/puppet/util/autoload.rb +1 -8
- data/lib/puppet/util/connection.rb +8 -8
- data/lib/puppet/util/fact_dif.rb +62 -0
- data/lib/puppet/util/posix.rb +54 -5
- data/lib/puppet/util/rubygems.rb +5 -1
- data/lib/puppet/util/run_mode.rb +5 -1
- data/lib/puppet/util/windows/service.rb +1 -1
- data/lib/puppet/version.rb +1 -1
- data/locales/puppet.pot +289 -268
- data/man/man5/puppet.conf.5 +33 -17
- data/man/man8/puppet-agent.8 +7 -4
- data/man/man8/puppet-apply.8 +2 -2
- 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 +2 -2
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +32 -1
- data/man/man8/puppet-filebucket.8 +3 -3
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-key.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-man.8 +1 -1
- data/man/man8/puppet-module.8 +1 -1
- data/man/man8/puppet-node.8 +7 -4
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +4 -1
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +2 -2
- 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/agent/cached_deferred_catalog.json +91 -0
- data/spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages +30 -0
- data/spec/fixtures/unit/provider/user/aix/aix_passwd_file.out +4 -0
- data/spec/integration/application/agent_spec.rb +183 -22
- data/spec/integration/application/apply_spec.rb +19 -0
- data/spec/integration/application/filebucket_spec.rb +7 -7
- data/spec/integration/application/plugin_spec.rb +3 -3
- data/spec/integration/configurer_spec.rb +14 -0
- data/spec/integration/defaults_spec.rb +19 -1
- data/spec/integration/environments/setting_hooks_spec.rb +1 -1
- data/spec/integration/resource/type_collection_spec.rb +2 -6
- data/spec/integration/transaction_spec.rb +4 -9
- data/spec/integration/util/windows/adsi_spec.rb +5 -3
- data/spec/integration/util/windows/registry_spec.rb +0 -10
- data/spec/lib/puppet_spec/settings.rb +6 -1
- data/spec/shared_contexts/types_setup.rb +2 -0
- data/spec/spec_helper.rb +1 -4
- data/spec/unit/agent_spec.rb +8 -6
- data/spec/unit/application/agent_spec.rb +0 -1
- data/spec/unit/application/config_spec.rb +224 -4
- data/spec/unit/application/doc_spec.rb +2 -2
- data/spec/unit/application/facts_spec.rb +3 -1
- data/spec/unit/application/filebucket_spec.rb +0 -2
- data/spec/unit/application_spec.rb +60 -13
- data/spec/unit/configurer_spec.rb +39 -6
- data/spec/unit/confine/feature_spec.rb +1 -1
- data/spec/unit/confine_spec.rb +8 -2
- data/spec/unit/defaults_spec.rb +20 -1
- data/spec/unit/environments_spec.rb +176 -32
- data/spec/unit/face/config_spec.rb +62 -11
- data/spec/unit/face/node_spec.rb +2 -13
- data/spec/unit/file_serving/configuration/parser_spec.rb +0 -1
- data/spec/unit/file_serving/metadata_spec.rb +3 -3
- data/spec/unit/file_serving/terminus_helper_spec.rb +11 -4
- data/spec/unit/file_system_spec.rb +1 -2
- data/spec/unit/forge/module_release_spec.rb +2 -7
- data/spec/unit/functions/inline_epp_spec.rb +26 -1
- data/spec/unit/http/resolver_spec.rb +24 -4
- data/spec/unit/http/service/ca_spec.rb +2 -2
- data/spec/unit/http/service/compiler_spec.rb +51 -2
- data/spec/unit/http/service/file_server_spec.rb +2 -2
- data/spec/unit/http/service/puppetserver_spec.rb +82 -0
- data/spec/unit/http/service/report_spec.rb +2 -2
- data/spec/unit/http/service_spec.rb +1 -1
- data/spec/unit/http/session_spec.rb +8 -20
- data/spec/unit/indirector/catalog/json_spec.rb +1 -1
- data/spec/unit/indirector/catalog/rest_spec.rb +1 -1
- data/spec/unit/indirector/face_spec.rb +0 -1
- data/spec/unit/indirector/facts/facter_spec.rb +0 -1
- data/spec/unit/indirector/facts/json_spec.rb +255 -0
- data/spec/unit/indirector/facts/rest_spec.rb +1 -1
- data/spec/unit/indirector/file_bucket_file/selector_spec.rb +26 -8
- data/spec/unit/indirector/indirection_spec.rb +8 -12
- data/spec/unit/indirector/json_spec.rb +8 -8
- data/spec/unit/indirector/key/file_spec.rb +0 -1
- data/spec/unit/indirector/msgpack_spec.rb +8 -8
- data/spec/unit/indirector/node/json_spec.rb +33 -0
- data/spec/unit/indirector/node/rest_spec.rb +1 -1
- data/spec/{integration/indirector/report/yaml.rb → unit/indirector/report/json_spec.rb} +13 -24
- data/spec/unit/indirector/report/yaml_spec.rb +72 -8
- data/spec/unit/indirector/request_spec.rb +4 -4
- data/spec/unit/indirector/rest_spec.rb +1 -1
- data/spec/unit/indirector/status/rest_spec.rb +1 -1
- data/spec/unit/indirector/yaml_spec.rb +7 -7
- data/spec/unit/indirector_spec.rb +2 -2
- data/spec/unit/module_tool/applications/installer_spec.rb +66 -0
- data/spec/unit/network/authconfig_spec.rb +0 -3
- data/spec/unit/network/http/api/indirected_routes_spec.rb +0 -9
- data/spec/unit/network/http/api/master/v3/environments_spec.rb +12 -23
- data/spec/unit/network/http/handler_spec.rb +0 -5
- data/spec/unit/parser/compiler_spec.rb +3 -19
- data/spec/unit/parser/resource_spec.rb +14 -8
- data/spec/unit/parser/templatewrapper_spec.rb +4 -3
- data/spec/unit/pops/evaluator/deferred_resolver_spec.rb +20 -0
- data/spec/unit/property_spec.rb +1 -0
- data/spec/unit/provider/exec_spec.rb +4 -3
- data/spec/unit/provider/group/groupadd_spec.rb +5 -2
- data/spec/unit/provider/nameservice_spec.rb +66 -65
- data/spec/unit/provider/package/apt_spec.rb +28 -23
- data/spec/unit/provider/package/aptitude_spec.rb +1 -1
- data/spec/unit/provider/package/base_spec.rb +6 -5
- data/spec/unit/provider/package/dpkg_spec.rb +22 -7
- data/spec/unit/provider/package/openbsd_spec.rb +2 -0
- data/spec/unit/provider/package/pacman_spec.rb +18 -12
- data/spec/unit/provider/package/pip2_spec.rb +36 -0
- data/spec/unit/provider/package/pip_spec.rb +6 -11
- data/spec/unit/provider/package/pkgdmg_spec.rb +0 -4
- data/spec/unit/provider/package/puppetserver_gem_spec.rb +137 -0
- data/spec/unit/provider/package/yum_spec.rb +31 -0
- data/spec/unit/provider/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 +4 -5
- data/spec/unit/provider/service/launchd_spec.rb +5 -6
- data/spec/unit/provider/service/openrc_spec.rb +4 -5
- data/spec/unit/provider/service/openwrt_spec.rb +1 -1
- data/spec/unit/provider/service/redhat_spec.rb +1 -1
- data/spec/unit/provider/service/runit_spec.rb +2 -1
- data/spec/unit/provider/service/smf_spec.rb +1 -1
- data/spec/unit/provider/service/src_spec.rb +3 -5
- data/spec/unit/provider/service/systemd_spec.rb +3 -1
- data/spec/unit/provider/service/upstart_spec.rb +4 -5
- data/spec/unit/provider/user/aix_spec.rb +5 -0
- data/spec/unit/provider/user/hpux_spec.rb +1 -1
- data/spec/unit/provider/user/pw_spec.rb +2 -0
- data/spec/unit/provider/user/useradd_spec.rb +56 -3
- data/spec/unit/provider_spec.rb +8 -10
- data/spec/unit/puppet_pal_catalog_spec.rb +45 -0
- data/spec/unit/resource/capability_finder_spec.rb +6 -1
- data/spec/unit/resource/type_spec.rb +1 -1
- data/spec/unit/resource_spec.rb +11 -10
- data/spec/unit/rest/route_spec.rb +4 -4
- data/spec/unit/settings_spec.rb +576 -239
- data/spec/unit/ssl/base_spec.rb +0 -1
- data/spec/unit/ssl/host_spec.rb +0 -5
- data/spec/unit/ssl/ssl_provider_spec.rb +14 -8
- data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -7
- data/spec/unit/transaction/event_manager_spec.rb +14 -11
- data/spec/unit/transaction/report_spec.rb +2 -0
- data/spec/unit/transaction_spec.rb +13 -4
- data/spec/unit/type/file/content_spec.rb +0 -1
- data/spec/unit/type/file/selinux_spec.rb +0 -2
- data/spec/unit/type/file/source_spec.rb +1 -1
- data/spec/unit/type/file_spec.rb +0 -6
- data/spec/unit/type/filebucket_spec.rb +1 -1
- data/spec/unit/type/group_spec.rb +13 -6
- data/spec/unit/type/resources_spec.rb +7 -7
- data/spec/unit/type/service_spec.rb +1 -1
- data/spec/unit/type/tidy_spec.rb +0 -1
- data/spec/unit/type_spec.rb +2 -2
- data/spec/unit/util/at_fork_spec.rb +2 -2
- data/spec/unit/util/autoload_spec.rb +5 -1
- data/spec/unit/util/backups_spec.rb +1 -2
- data/spec/unit/util/execution_spec.rb +15 -11
- data/spec/unit/util/inifile_spec.rb +6 -14
- data/spec/unit/util/log_spec.rb +8 -7
- data/spec/unit/util/logging_spec.rb +3 -3
- data/spec/unit/util/posix_spec.rb +363 -15
- data/spec/unit/util/rubygems_spec.rb +2 -2
- data/spec/unit/util/run_mode_spec.rb +6 -6
- data/spec/unit/util/selinux_spec.rb +76 -52
- data/spec/unit/util/storage_spec.rb +3 -1
- data/spec/unit/util/suidmanager_spec.rb +44 -41
- data/spec/unit/util_spec.rb +13 -6
- metadata +32 -10
- data/spec/integration/application/config_spec.rb +0 -74
- data/spec/unit/face/catalog_spec.rb +0 -6
- data/spec/unit/face/module_spec.rb +0 -3
    
        metadata
    CHANGED
    
    | @@ -1,14 +1,14 @@ | |
| 1 1 | 
             
            --- !ruby/object:Gem::Specification
         | 
| 2 2 | 
             
            name: puppet
         | 
| 3 3 | 
             
            version: !ruby/object:Gem::Version
         | 
| 4 | 
            -
              version: 6. | 
| 4 | 
            +
              version: 6.21.1
         | 
| 5 5 | 
             
            platform: x64-mingw32
         | 
| 6 6 | 
             
            authors:
         | 
| 7 7 | 
             
            - Puppet Labs
         | 
| 8 8 | 
             
            autorequire: 
         | 
| 9 9 | 
             
            bindir: bin
         | 
| 10 10 | 
             
            cert_chain: []
         | 
| 11 | 
            -
            date:  | 
| 11 | 
            +
            date: 2021-02-11 00:00:00.000000000 Z
         | 
| 12 12 | 
             
            dependencies:
         | 
| 13 13 | 
             
            - !ruby/object:Gem::Dependency
         | 
| 14 14 | 
             
              name: facter
         | 
| @@ -512,6 +512,9 @@ files: | |
| 512 512 | 
             
            - lib/puppet/feature/ssh.rb
         | 
| 513 513 | 
             
            - lib/puppet/feature/telnet.rb
         | 
| 514 514 | 
             
            - lib/puppet/feature/zlib.rb
         | 
| 515 | 
            +
            - lib/puppet/ffi/posix.rb
         | 
| 516 | 
            +
            - lib/puppet/ffi/posix/constants.rb
         | 
| 517 | 
            +
            - lib/puppet/ffi/posix/functions.rb
         | 
| 515 518 | 
             
            - lib/puppet/file_bucket.rb
         | 
| 516 519 | 
             
            - lib/puppet/file_bucket/dipper.rb
         | 
| 517 520 | 
             
            - lib/puppet/file_bucket/file.rb
         | 
| @@ -663,6 +666,7 @@ files: | |
| 663 666 | 
             
            - lib/puppet/http/service/ca.rb
         | 
| 664 667 | 
             
            - lib/puppet/http/service/compiler.rb
         | 
| 665 668 | 
             
            - lib/puppet/http/service/file_server.rb
         | 
| 669 | 
            +
            - lib/puppet/http/service/puppetserver.rb
         | 
| 666 670 | 
             
            - lib/puppet/http/service/report.rb
         | 
| 667 671 | 
             
            - lib/puppet/http/session.rb
         | 
| 668 672 | 
             
            - lib/puppet/indirector.rb
         | 
| @@ -685,7 +689,9 @@ files: | |
| 685 689 | 
             
            - lib/puppet/indirector/errors.rb
         | 
| 686 690 | 
             
            - lib/puppet/indirector/exec.rb
         | 
| 687 691 | 
             
            - lib/puppet/indirector/face.rb
         | 
| 692 | 
            +
            - lib/puppet/indirector/fact_search.rb
         | 
| 688 693 | 
             
            - lib/puppet/indirector/facts/facter.rb
         | 
| 694 | 
            +
            - lib/puppet/indirector/facts/json.rb
         | 
| 689 695 | 
             
            - lib/puppet/indirector/facts/memory.rb
         | 
| 690 696 | 
             
            - lib/puppet/indirector/facts/network_device.rb
         | 
| 691 697 | 
             
            - lib/puppet/indirector/facts/rest.rb
         | 
| @@ -716,6 +722,7 @@ files: | |
| 716 722 | 
             
            - lib/puppet/indirector/memory.rb
         | 
| 717 723 | 
             
            - lib/puppet/indirector/msgpack.rb
         | 
| 718 724 | 
             
            - lib/puppet/indirector/node/exec.rb
         | 
| 725 | 
            +
            - lib/puppet/indirector/node/json.rb
         | 
| 719 726 | 
             
            - lib/puppet/indirector/node/memory.rb
         | 
| 720 727 | 
             
            - lib/puppet/indirector/node/msgpack.rb
         | 
| 721 728 | 
             
            - lib/puppet/indirector/node/plain.rb
         | 
| @@ -724,6 +731,7 @@ files: | |
| 724 731 | 
             
            - lib/puppet/indirector/node/yaml.rb
         | 
| 725 732 | 
             
            - lib/puppet/indirector/none.rb
         | 
| 726 733 | 
             
            - lib/puppet/indirector/plain.rb
         | 
| 734 | 
            +
            - lib/puppet/indirector/report/json.rb
         | 
| 727 735 | 
             
            - lib/puppet/indirector/report/msgpack.rb
         | 
| 728 736 | 
             
            - lib/puppet/indirector/report/processor.rb
         | 
| 729 737 | 
             
            - lib/puppet/indirector/report/rest.rb
         | 
| @@ -1143,6 +1151,7 @@ files: | |
| 1143 1151 | 
             
            - lib/puppet/provider/package/opkg.rb
         | 
| 1144 1152 | 
             
            - lib/puppet/provider/package/pacman.rb
         | 
| 1145 1153 | 
             
            - lib/puppet/provider/package/pip.rb
         | 
| 1154 | 
            +
            - lib/puppet/provider/package/pip2.rb
         | 
| 1146 1155 | 
             
            - lib/puppet/provider/package/pip3.rb
         | 
| 1147 1156 | 
             
            - lib/puppet/provider/package/pkg.rb
         | 
| 1148 1157 | 
             
            - lib/puppet/provider/package/pkgdmg.rb
         | 
| @@ -1153,6 +1162,7 @@ files: | |
| 1153 1162 | 
             
            - lib/puppet/provider/package/ports.rb
         | 
| 1154 1163 | 
             
            - lib/puppet/provider/package/portupgrade.rb
         | 
| 1155 1164 | 
             
            - lib/puppet/provider/package/puppet_gem.rb
         | 
| 1165 | 
            +
            - lib/puppet/provider/package/puppetserver_gem.rb
         | 
| 1156 1166 | 
             
            - lib/puppet/provider/package/rpm.rb
         | 
| 1157 1167 | 
             
            - lib/puppet/provider/package/rug.rb
         | 
| 1158 1168 | 
             
            - lib/puppet/provider/package/sun.rb
         | 
| @@ -1226,6 +1236,7 @@ files: | |
| 1226 1236 | 
             
            - lib/puppet/scheduler/splay_job.rb
         | 
| 1227 1237 | 
             
            - lib/puppet/scheduler/timer.rb
         | 
| 1228 1238 | 
             
            - lib/puppet/settings.rb
         | 
| 1239 | 
            +
            - lib/puppet/settings/alias_setting.rb
         | 
| 1229 1240 | 
             
            - lib/puppet/settings/array_setting.rb
         | 
| 1230 1241 | 
             
            - lib/puppet/settings/autosign_setting.rb
         | 
| 1231 1242 | 
             
            - lib/puppet/settings/base_setting.rb
         | 
| @@ -1334,6 +1345,7 @@ files: | |
| 1334 1345 | 
             
            - lib/puppet/util/errors.rb
         | 
| 1335 1346 | 
             
            - lib/puppet/util/execution.rb
         | 
| 1336 1347 | 
             
            - lib/puppet/util/execution_stub.rb
         | 
| 1348 | 
            +
            - lib/puppet/util/fact_dif.rb
         | 
| 1337 1349 | 
             
            - lib/puppet/util/feature.rb
         | 
| 1338 1350 | 
             
            - lib/puppet/util/file_watcher.rb
         | 
| 1339 1351 | 
             
            - lib/puppet/util/fileparsing.rb
         | 
| @@ -1488,6 +1500,7 @@ files: | |
| 1488 1500 | 
             
            - man/man8/puppet.8
         | 
| 1489 1501 | 
             
            - spec/fixtures/faulty_face/puppet/face/syntax.rb
         | 
| 1490 1502 | 
             
            - spec/fixtures/hiera.yaml
         | 
| 1503 | 
            +
            - spec/fixtures/integration/application/agent/cached_deferred_catalog.json
         | 
| 1491 1504 | 
             
            - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
         | 
| 1492 1505 | 
             
            - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
         | 
| 1493 1506 | 
             
            - spec/fixtures/integration/node/environment/sitedir/00_a.pp
         | 
| @@ -1840,6 +1853,7 @@ files: | |
| 1840 1853 | 
             
            - spec/fixtures/unit/provider/package/pkgng/pkg.query
         | 
| 1841 1854 | 
             
            - spec/fixtures/unit/provider/package/pkgng/pkg.query.zsh
         | 
| 1842 1855 | 
             
            - spec/fixtures/unit/provider/package/pkgng/pkg.version
         | 
| 1856 | 
            +
            - spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages
         | 
| 1843 1857 | 
             
            - spec/fixtures/unit/provider/package/sun/dummy.server
         | 
| 1844 1858 | 
             
            - spec/fixtures/unit/provider/package/sun/simple
         | 
| 1845 1859 | 
             
            - spec/fixtures/unit/provider/package/yum/yum-check-update-broken-notices.txt
         | 
| @@ -1886,7 +1900,6 @@ files: | |
| 1886 1900 | 
             
            - spec/integration/agent/logging_spec.rb
         | 
| 1887 1901 | 
             
            - spec/integration/application/agent_spec.rb
         | 
| 1888 1902 | 
             
            - spec/integration/application/apply_spec.rb
         | 
| 1889 | 
            -
            - spec/integration/application/config_spec.rb
         | 
| 1890 1903 | 
             
            - spec/integration/application/doc_spec.rb
         | 
| 1891 1904 | 
             
            - spec/integration/application/filebucket_spec.rb
         | 
| 1892 1905 | 
             
            - spec/integration/application/help_spec.rb
         | 
| @@ -1907,7 +1920,6 @@ files: | |
| 1907 1920 | 
             
            - spec/integration/indirector/facts/facter_spec.rb
         | 
| 1908 1921 | 
             
            - spec/integration/indirector/file_content/file_server_spec.rb
         | 
| 1909 1922 | 
             
            - spec/integration/indirector/file_metadata/file_server_spec.rb
         | 
| 1910 | 
            -
            - spec/integration/indirector/report/yaml.rb
         | 
| 1911 1923 | 
             
            - spec/integration/network/authconfig_spec.rb
         | 
| 1912 1924 | 
             
            - spec/integration/network/formats_spec.rb
         | 
| 1913 1925 | 
             
            - spec/integration/network/http/api/indirected_routes_spec.rb
         | 
| @@ -2053,7 +2065,6 @@ files: | |
| 2053 2065 | 
             
            - spec/unit/environments_spec.rb
         | 
| 2054 2066 | 
             
            - spec/unit/etc_spec.rb
         | 
| 2055 2067 | 
             
            - spec/unit/external/pson_spec.rb
         | 
| 2056 | 
            -
            - spec/unit/face/catalog_spec.rb
         | 
| 2057 2068 | 
             
            - spec/unit/face/config_spec.rb
         | 
| 2058 2069 | 
             
            - spec/unit/face/epp_face_spec.rb
         | 
| 2059 2070 | 
             
            - spec/unit/face/facts_spec.rb
         | 
| @@ -2065,7 +2076,6 @@ files: | |
| 2065 2076 | 
             
            - spec/unit/face/module/search_spec.rb
         | 
| 2066 2077 | 
             
            - spec/unit/face/module/uninstall_spec.rb
         | 
| 2067 2078 | 
             
            - spec/unit/face/module/upgrade_spec.rb
         | 
| 2068 | 
            -
            - spec/unit/face/module_spec.rb
         | 
| 2069 2079 | 
             
            - spec/unit/face/node_spec.rb
         | 
| 2070 2080 | 
             
            - spec/unit/face/parser_spec.rb
         | 
| 2071 2081 | 
             
            - spec/unit/face/plugin_spec.rb
         | 
| @@ -2189,6 +2199,7 @@ files: | |
| 2189 2199 | 
             
            - spec/unit/http/service/ca_spec.rb
         | 
| 2190 2200 | 
             
            - spec/unit/http/service/compiler_spec.rb
         | 
| 2191 2201 | 
             
            - spec/unit/http/service/file_server_spec.rb
         | 
| 2202 | 
            +
            - spec/unit/http/service/puppetserver_spec.rb
         | 
| 2192 2203 | 
             
            - spec/unit/http/service/report_spec.rb
         | 
| 2193 2204 | 
             
            - spec/unit/http/service_spec.rb
         | 
| 2194 2205 | 
             
            - spec/unit/http/session_spec.rb
         | 
| @@ -2209,6 +2220,7 @@ files: | |
| 2209 2220 | 
             
            - spec/unit/indirector/exec_spec.rb
         | 
| 2210 2221 | 
             
            - spec/unit/indirector/face_spec.rb
         | 
| 2211 2222 | 
             
            - spec/unit/indirector/facts/facter_spec.rb
         | 
| 2223 | 
            +
            - spec/unit/indirector/facts/json_spec.rb
         | 
| 2212 2224 | 
             
            - spec/unit/indirector/facts/network_device_spec.rb
         | 
| 2213 2225 | 
             
            - spec/unit/indirector/facts/rest_spec.rb
         | 
| 2214 2226 | 
             
            - spec/unit/indirector/facts/store_configs_spec.rb
         | 
| @@ -2233,6 +2245,7 @@ files: | |
| 2233 2245 | 
             
            - spec/unit/indirector/memory_spec.rb
         | 
| 2234 2246 | 
             
            - spec/unit/indirector/msgpack_spec.rb
         | 
| 2235 2247 | 
             
            - spec/unit/indirector/node/exec_spec.rb
         | 
| 2248 | 
            +
            - spec/unit/indirector/node/json_spec.rb
         | 
| 2236 2249 | 
             
            - spec/unit/indirector/node/memory_spec.rb
         | 
| 2237 2250 | 
             
            - spec/unit/indirector/node/msgpack_spec.rb
         | 
| 2238 2251 | 
             
            - spec/unit/indirector/node/plain_spec.rb
         | 
| @@ -2241,6 +2254,7 @@ files: | |
| 2241 2254 | 
             
            - spec/unit/indirector/node/yaml_spec.rb
         | 
| 2242 2255 | 
             
            - spec/unit/indirector/none_spec.rb
         | 
| 2243 2256 | 
             
            - spec/unit/indirector/plain_spec.rb
         | 
| 2257 | 
            +
            - spec/unit/indirector/report/json_spec.rb
         | 
| 2244 2258 | 
             
            - spec/unit/indirector/report/msgpack_spec.rb
         | 
| 2245 2259 | 
             
            - spec/unit/indirector/report/processor_spec.rb
         | 
| 2246 2260 | 
             
            - spec/unit/indirector/report/rest_spec.rb
         | 
| @@ -2365,6 +2379,7 @@ files: | |
| 2365 2379 | 
             
            - spec/unit/pops/evaluator/collections_ops_spec.rb
         | 
| 2366 2380 | 
             
            - spec/unit/pops/evaluator/comparison_ops_spec.rb
         | 
| 2367 2381 | 
             
            - spec/unit/pops/evaluator/conditionals_spec.rb
         | 
| 2382 | 
            +
            - spec/unit/pops/evaluator/deferred_resolver_spec.rb
         | 
| 2368 2383 | 
             
            - spec/unit/pops/evaluator/evaluating_parser_spec.rb
         | 
| 2369 2384 | 
             
            - spec/unit/pops/evaluator/evaluator_rspec_helper.rb
         | 
| 2370 2385 | 
             
            - spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb
         | 
| @@ -2491,6 +2506,7 @@ files: | |
| 2491 2506 | 
             
            - spec/unit/provider/package/openbsd_spec.rb
         | 
| 2492 2507 | 
             
            - spec/unit/provider/package/opkg_spec.rb
         | 
| 2493 2508 | 
             
            - spec/unit/provider/package/pacman_spec.rb
         | 
| 2509 | 
            +
            - spec/unit/provider/package/pip2_spec.rb
         | 
| 2494 2510 | 
             
            - spec/unit/provider/package/pip3_spec.rb
         | 
| 2495 2511 | 
             
            - spec/unit/provider/package/pip_spec.rb
         | 
| 2496 2512 | 
             
            - spec/unit/provider/package/pkg_spec.rb
         | 
| @@ -2500,6 +2516,7 @@ files: | |
| 2500 2516 | 
             
            - spec/unit/provider/package/pkgutil_spec.rb
         | 
| 2501 2517 | 
             
            - spec/unit/provider/package/portage_spec.rb
         | 
| 2502 2518 | 
             
            - spec/unit/provider/package/puppet_gem_spec.rb
         | 
| 2519 | 
            +
            - spec/unit/provider/package/puppetserver_gem_spec.rb
         | 
| 2503 2520 | 
             
            - spec/unit/provider/package/rpm_spec.rb
         | 
| 2504 2521 | 
             
            - spec/unit/provider/package/sun_spec.rb
         | 
| 2505 2522 | 
             
            - spec/unit/provider/package/tdnf_spec.rb
         | 
| @@ -2753,6 +2770,7 @@ summary: Puppet, an automated configuration management tool | |
| 2753 2770 | 
             
            test_files:
         | 
| 2754 2771 | 
             
            - spec/fixtures/faulty_face/puppet/face/syntax.rb
         | 
| 2755 2772 | 
             
            - spec/fixtures/hiera.yaml
         | 
| 2773 | 
            +
            - spec/fixtures/integration/application/agent/cached_deferred_catalog.json
         | 
| 2756 2774 | 
             
            - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
         | 
| 2757 2775 | 
             
            - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
         | 
| 2758 2776 | 
             
            - spec/fixtures/integration/node/environment/sitedir/00_a.pp
         | 
| @@ -3105,6 +3123,7 @@ test_files: | |
| 3105 3123 | 
             
            - spec/fixtures/unit/provider/package/pkgng/pkg.query
         | 
| 3106 3124 | 
             
            - spec/fixtures/unit/provider/package/pkgng/pkg.query.zsh
         | 
| 3107 3125 | 
             
            - spec/fixtures/unit/provider/package/pkgng/pkg.version
         | 
| 3126 | 
            +
            - spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages
         | 
| 3108 3127 | 
             
            - spec/fixtures/unit/provider/package/sun/dummy.server
         | 
| 3109 3128 | 
             
            - spec/fixtures/unit/provider/package/sun/simple
         | 
| 3110 3129 | 
             
            - spec/fixtures/unit/provider/package/yum/yum-check-update-broken-notices.txt
         | 
| @@ -3151,7 +3170,6 @@ test_files: | |
| 3151 3170 | 
             
            - spec/integration/agent/logging_spec.rb
         | 
| 3152 3171 | 
             
            - spec/integration/application/agent_spec.rb
         | 
| 3153 3172 | 
             
            - spec/integration/application/apply_spec.rb
         | 
| 3154 | 
            -
            - spec/integration/application/config_spec.rb
         | 
| 3155 3173 | 
             
            - spec/integration/application/doc_spec.rb
         | 
| 3156 3174 | 
             
            - spec/integration/application/filebucket_spec.rb
         | 
| 3157 3175 | 
             
            - spec/integration/application/help_spec.rb
         | 
| @@ -3172,7 +3190,6 @@ test_files: | |
| 3172 3190 | 
             
            - spec/integration/indirector/facts/facter_spec.rb
         | 
| 3173 3191 | 
             
            - spec/integration/indirector/file_content/file_server_spec.rb
         | 
| 3174 3192 | 
             
            - spec/integration/indirector/file_metadata/file_server_spec.rb
         | 
| 3175 | 
            -
            - spec/integration/indirector/report/yaml.rb
         | 
| 3176 3193 | 
             
            - spec/integration/network/authconfig_spec.rb
         | 
| 3177 3194 | 
             
            - spec/integration/network/formats_spec.rb
         | 
| 3178 3195 | 
             
            - spec/integration/network/http/api/indirected_routes_spec.rb
         | 
| @@ -3318,7 +3335,6 @@ test_files: | |
| 3318 3335 | 
             
            - spec/unit/environments_spec.rb
         | 
| 3319 3336 | 
             
            - spec/unit/etc_spec.rb
         | 
| 3320 3337 | 
             
            - spec/unit/external/pson_spec.rb
         | 
| 3321 | 
            -
            - spec/unit/face/catalog_spec.rb
         | 
| 3322 3338 | 
             
            - spec/unit/face/config_spec.rb
         | 
| 3323 3339 | 
             
            - spec/unit/face/epp_face_spec.rb
         | 
| 3324 3340 | 
             
            - spec/unit/face/facts_spec.rb
         | 
| @@ -3330,7 +3346,6 @@ test_files: | |
| 3330 3346 | 
             
            - spec/unit/face/module/search_spec.rb
         | 
| 3331 3347 | 
             
            - spec/unit/face/module/uninstall_spec.rb
         | 
| 3332 3348 | 
             
            - spec/unit/face/module/upgrade_spec.rb
         | 
| 3333 | 
            -
            - spec/unit/face/module_spec.rb
         | 
| 3334 3349 | 
             
            - spec/unit/face/node_spec.rb
         | 
| 3335 3350 | 
             
            - spec/unit/face/parser_spec.rb
         | 
| 3336 3351 | 
             
            - spec/unit/face/plugin_spec.rb
         | 
| @@ -3454,6 +3469,7 @@ test_files: | |
| 3454 3469 | 
             
            - spec/unit/http/service/ca_spec.rb
         | 
| 3455 3470 | 
             
            - spec/unit/http/service/compiler_spec.rb
         | 
| 3456 3471 | 
             
            - spec/unit/http/service/file_server_spec.rb
         | 
| 3472 | 
            +
            - spec/unit/http/service/puppetserver_spec.rb
         | 
| 3457 3473 | 
             
            - spec/unit/http/service/report_spec.rb
         | 
| 3458 3474 | 
             
            - spec/unit/http/service_spec.rb
         | 
| 3459 3475 | 
             
            - spec/unit/http/session_spec.rb
         | 
| @@ -3474,6 +3490,7 @@ test_files: | |
| 3474 3490 | 
             
            - spec/unit/indirector/exec_spec.rb
         | 
| 3475 3491 | 
             
            - spec/unit/indirector/face_spec.rb
         | 
| 3476 3492 | 
             
            - spec/unit/indirector/facts/facter_spec.rb
         | 
| 3493 | 
            +
            - spec/unit/indirector/facts/json_spec.rb
         | 
| 3477 3494 | 
             
            - spec/unit/indirector/facts/network_device_spec.rb
         | 
| 3478 3495 | 
             
            - spec/unit/indirector/facts/rest_spec.rb
         | 
| 3479 3496 | 
             
            - spec/unit/indirector/facts/store_configs_spec.rb
         | 
| @@ -3498,6 +3515,7 @@ test_files: | |
| 3498 3515 | 
             
            - spec/unit/indirector/memory_spec.rb
         | 
| 3499 3516 | 
             
            - spec/unit/indirector/msgpack_spec.rb
         | 
| 3500 3517 | 
             
            - spec/unit/indirector/node/exec_spec.rb
         | 
| 3518 | 
            +
            - spec/unit/indirector/node/json_spec.rb
         | 
| 3501 3519 | 
             
            - spec/unit/indirector/node/memory_spec.rb
         | 
| 3502 3520 | 
             
            - spec/unit/indirector/node/msgpack_spec.rb
         | 
| 3503 3521 | 
             
            - spec/unit/indirector/node/plain_spec.rb
         | 
| @@ -3506,6 +3524,7 @@ test_files: | |
| 3506 3524 | 
             
            - spec/unit/indirector/node/yaml_spec.rb
         | 
| 3507 3525 | 
             
            - spec/unit/indirector/none_spec.rb
         | 
| 3508 3526 | 
             
            - spec/unit/indirector/plain_spec.rb
         | 
| 3527 | 
            +
            - spec/unit/indirector/report/json_spec.rb
         | 
| 3509 3528 | 
             
            - spec/unit/indirector/report/msgpack_spec.rb
         | 
| 3510 3529 | 
             
            - spec/unit/indirector/report/processor_spec.rb
         | 
| 3511 3530 | 
             
            - spec/unit/indirector/report/rest_spec.rb
         | 
| @@ -3630,6 +3649,7 @@ test_files: | |
| 3630 3649 | 
             
            - spec/unit/pops/evaluator/collections_ops_spec.rb
         | 
| 3631 3650 | 
             
            - spec/unit/pops/evaluator/comparison_ops_spec.rb
         | 
| 3632 3651 | 
             
            - spec/unit/pops/evaluator/conditionals_spec.rb
         | 
| 3652 | 
            +
            - spec/unit/pops/evaluator/deferred_resolver_spec.rb
         | 
| 3633 3653 | 
             
            - spec/unit/pops/evaluator/evaluating_parser_spec.rb
         | 
| 3634 3654 | 
             
            - spec/unit/pops/evaluator/evaluator_rspec_helper.rb
         | 
| 3635 3655 | 
             
            - spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb
         | 
| @@ -3756,6 +3776,7 @@ test_files: | |
| 3756 3776 | 
             
            - spec/unit/provider/package/openbsd_spec.rb
         | 
| 3757 3777 | 
             
            - spec/unit/provider/package/opkg_spec.rb
         | 
| 3758 3778 | 
             
            - spec/unit/provider/package/pacman_spec.rb
         | 
| 3779 | 
            +
            - spec/unit/provider/package/pip2_spec.rb
         | 
| 3759 3780 | 
             
            - spec/unit/provider/package/pip3_spec.rb
         | 
| 3760 3781 | 
             
            - spec/unit/provider/package/pip_spec.rb
         | 
| 3761 3782 | 
             
            - spec/unit/provider/package/pkg_spec.rb
         | 
| @@ -3765,6 +3786,7 @@ test_files: | |
| 3765 3786 | 
             
            - spec/unit/provider/package/pkgutil_spec.rb
         | 
| 3766 3787 | 
             
            - spec/unit/provider/package/portage_spec.rb
         | 
| 3767 3788 | 
             
            - spec/unit/provider/package/puppet_gem_spec.rb
         | 
| 3789 | 
            +
            - spec/unit/provider/package/puppetserver_gem_spec.rb
         | 
| 3768 3790 | 
             
            - spec/unit/provider/package/rpm_spec.rb
         | 
| 3769 3791 | 
             
            - spec/unit/provider/package/sun_spec.rb
         | 
| 3770 3792 | 
             
            - spec/unit/provider/package/tdnf_spec.rb
         | 
| @@ -1,74 +0,0 @@ | |
| 1 | 
            -
            # coding: utf-8
         | 
| 2 | 
            -
            require 'spec_helper'
         | 
| 3 | 
            -
            require 'puppet/application/config'
         | 
| 4 | 
            -
             | 
| 5 | 
            -
            #describe "puppet config" do
         | 
| 6 | 
            -
            describe Puppet::Face[:config, '0.0.1'] do
         | 
| 7 | 
            -
              include PuppetSpec::Files
         | 
| 8 | 
            -
             | 
| 9 | 
            -
              # different UTF-8 widths
         | 
| 10 | 
            -
              # 1-byte A
         | 
| 11 | 
            -
              # 2-byte ۿ - http://www.fileformat.info/info/unicode/char/06ff/index.htm - 0xDB 0xBF / 219 191
         | 
| 12 | 
            -
              # 3-byte ᚠ - http://www.fileformat.info/info/unicode/char/16A0/index.htm - 0xE1 0x9A 0xA0 / 225 154 160
         | 
| 13 | 
            -
              # 4-byte 𠜎 - http://www.fileformat.info/info/unicode/char/2070E/index.htm - 0xF0 0xA0 0x9C 0x8E / 240 160 156 142
         | 
| 14 | 
            -
              MIXED_UTF8 = "A\u06FF\u16A0\u{2070E}" # Aۿᚠ𠜎
         | 
| 15 | 
            -
             | 
| 16 | 
            -
              let(:tmp_config) { tmpfile('puppet.conf') }
         | 
| 17 | 
            -
              let(:config) { Puppet::Application[:config] }
         | 
| 18 | 
            -
             | 
| 19 | 
            -
              def read_utf8(path)
         | 
| 20 | 
            -
                File.read(tmp_config, :encoding => 'UTF-8')
         | 
| 21 | 
            -
              end
         | 
| 22 | 
            -
             | 
| 23 | 
            -
              def write_utf8(path, content)
         | 
| 24 | 
            -
                File.write(tmp_config, content, 0, :encoding => 'UTF-8')
         | 
| 25 | 
            -
              end
         | 
| 26 | 
            -
             | 
| 27 | 
            -
              it "reads a UTF-8 value" do
         | 
| 28 | 
            -
                write_utf8(tmp_config, <<~EOF)
         | 
| 29 | 
            -
                  [main]
         | 
| 30 | 
            -
                  tags=#{MIXED_UTF8}
         | 
| 31 | 
            -
                EOF
         | 
| 32 | 
            -
             | 
| 33 | 
            -
                Puppet.initialize_settings(['--config', tmp_config])
         | 
| 34 | 
            -
                config.command_line.args = ['print', 'tags' ]
         | 
| 35 | 
            -
             | 
| 36 | 
            -
                expect {
         | 
| 37 | 
            -
                  config.run
         | 
| 38 | 
            -
                }.to exit_with(0)
         | 
| 39 | 
            -
                 .and output("#{MIXED_UTF8}\n").to_stdout
         | 
| 40 | 
            -
              end
         | 
| 41 | 
            -
             | 
| 42 | 
            -
              it "sets a UTF-8 value" do
         | 
| 43 | 
            -
                Puppet.initialize_settings(['--config', tmp_config])
         | 
| 44 | 
            -
                config.command_line.args = ['set', 'tags', MIXED_UTF8 ]
         | 
| 45 | 
            -
             | 
| 46 | 
            -
                expect {
         | 
| 47 | 
            -
                  config.run
         | 
| 48 | 
            -
                }.to exit_with(0)
         | 
| 49 | 
            -
             | 
| 50 | 
            -
                expect(read_utf8(tmp_config)).to eq(<<~EOF)
         | 
| 51 | 
            -
                  [main]
         | 
| 52 | 
            -
                  tags = #{MIXED_UTF8}
         | 
| 53 | 
            -
                EOF
         | 
| 54 | 
            -
              end
         | 
| 55 | 
            -
             | 
| 56 | 
            -
              it "deletes a key" do
         | 
| 57 | 
            -
                write_utf8(tmp_config, <<~EOF)
         | 
| 58 | 
            -
                  [main]
         | 
| 59 | 
            -
                  tags=#{MIXED_UTF8}
         | 
| 60 | 
            -
                EOF
         | 
| 61 | 
            -
             | 
| 62 | 
            -
                Puppet.initialize_settings(['--config', tmp_config])
         | 
| 63 | 
            -
                config.command_line.args = ['delete', 'tags']
         | 
| 64 | 
            -
             | 
| 65 | 
            -
                expect {
         | 
| 66 | 
            -
                  config.run
         | 
| 67 | 
            -
                }.to exit_with(0)
         | 
| 68 | 
            -
                 .and output(/Deleted setting from 'main': 'tags=#{MIXED_UTF8}'/).to_stdout
         | 
| 69 | 
            -
             | 
| 70 | 
            -
                expect(read_utf8(tmp_config)).to eq(<<~EOF)
         | 
| 71 | 
            -
                  [main]
         | 
| 72 | 
            -
                EOF
         | 
| 73 | 
            -
              end
         | 
| 74 | 
            -
            end
         |