chef 16.2.73-universal-mingw32 → 16.4.41-universal-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +4 -4
- data/Rakefile +1 -1
- data/chef-universal-mingw32.gemspec +2 -3
- data/chef.gemspec +2 -1
- data/lib/chef/action_collection.rb +4 -0
- data/lib/chef/api_client/registration.rb +2 -2
- data/lib/chef/application.rb +13 -1
- data/lib/chef/application/apply.rb +5 -5
- data/lib/chef/application/windows_service.rb +27 -27
- data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
- data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
- data/lib/chef/chef_class.rb +0 -1
- data/lib/chef/chef_fs/chef_fs_data_store.rb +54 -54
- data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
- data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +10 -10
- data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
- data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
- data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
- data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
- data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
- data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
- data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
- data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
- data/lib/chef/client.rb +14 -14
- data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
- data/lib/chef/cookbook/syntax_check.rb +1 -2
- data/lib/chef/cookbook_loader.rb +15 -29
- data/lib/chef/data_bag.rb +1 -2
- data/lib/chef/data_collector/run_end_message.rb +11 -1
- data/lib/chef/deprecated.rb +8 -0
- data/lib/chef/dsl/platform_introspection.rb +9 -7
- data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
- data/lib/chef/environment.rb +3 -4
- data/lib/chef/exceptions.rb +4 -1
- data/lib/chef/file_content_management/tempfile.rb +9 -9
- data/lib/chef/handler.rb +2 -0
- data/lib/chef/http.rb +11 -11
- data/lib/chef/http/authenticator.rb +3 -1
- data/lib/chef/json_compat.rb +1 -1
- data/lib/chef/knife.rb +4 -4
- data/lib/chef/knife/bootstrap.rb +6 -12
- data/lib/chef/knife/bootstrap/train_connector.rb +1 -0
- data/lib/chef/knife/config_get.rb +1 -0
- data/lib/chef/knife/config_list_profiles.rb +4 -1
- data/lib/chef/knife/configure.rb +3 -1
- data/lib/chef/knife/cookbook_download.rb +1 -1
- data/lib/chef/knife/cookbook_metadata.rb +1 -1
- data/lib/chef/knife/cookbook_upload.rb +28 -33
- data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
- data/lib/chef/knife/core/generic_presenter.rb +1 -1
- data/lib/chef/knife/core/hashed_command_loader.rb +3 -2
- data/lib/chef/knife/core/subcommand_loader.rb +20 -1
- data/lib/chef/knife/core/ui.rb +8 -2
- data/lib/chef/knife/core/windows_bootstrap_context.rb +32 -25
- data/lib/chef/knife/delete.rb +15 -15
- data/lib/chef/knife/exec.rb +2 -2
- data/lib/chef/knife/rehash.rb +3 -21
- data/lib/chef/knife/ssh.rb +11 -7
- data/lib/chef/knife/xargs.rb +19 -19
- data/lib/chef/knife/yaml_convert.rb +1 -1
- data/lib/chef/log.rb +7 -2
- data/lib/chef/mixin/checksum.rb +0 -1
- data/lib/chef/mixin/chef_utils_wiring.rb +40 -0
- data/lib/chef/mixin/deep_merge.rb +35 -6
- data/{spec/unit/log_spec.rb → lib/chef/mixin/default_paths.rb} +13 -5
- data/lib/chef/mixin/openssl_helper.rb +30 -6
- data/lib/chef/mixin/path_sanity.rb +5 -4
- data/lib/chef/mixin/shell_out.rb +4 -188
- data/lib/chef/mixin/template.rb +1 -0
- data/lib/chef/mixin/which.rb +6 -3
- data/lib/chef/mixins.rb +1 -0
- data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
- data/lib/chef/node.rb +36 -12
- data/lib/chef/node/attribute.rb +2 -4
- data/lib/chef/node_map.rb +21 -18
- data/lib/chef/platform/service_helpers.rb +31 -28
- data/lib/chef/property.rb +1 -1
- data/lib/chef/provider/cron/unix.rb +0 -2
- data/lib/chef/provider/git.rb +17 -9
- data/lib/chef/provider/group.rb +0 -2
- data/lib/chef/provider/group/suse.rb +5 -5
- data/lib/chef/provider/ifconfig.rb +1 -4
- data/lib/chef/provider/mount.rb +0 -2
- data/lib/chef/provider/mount/solaris.rb +0 -1
- data/lib/chef/provider/package.rb +0 -2
- data/lib/chef/provider/package/rubygems.rb +1 -1
- data/lib/chef/provider/package/snap.rb +3 -4
- data/lib/chef/provider/package/windows.rb +9 -4
- data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +9 -9
- data/lib/chef/provider/package/zypper.rb +0 -1
- data/lib/chef/provider/powershell_script.rb +21 -5
- data/lib/chef/provider/route.rb +1 -1
- data/lib/chef/provider/service.rb +2 -2
- data/lib/chef/provider/service/arch.rb +1 -1
- data/lib/chef/provider/service/debian.rb +1 -1
- data/lib/chef/provider/service/gentoo.rb +2 -2
- data/lib/chef/provider/service/macosx.rb +2 -2
- data/lib/chef/provider/service/openbsd.rb +1 -4
- data/lib/chef/provider/service/redhat.rb +2 -2
- data/lib/chef/provider/service/upstart.rb +1 -1
- data/lib/chef/provider/service/windows.rb +10 -10
- data/lib/chef/provider/systemd_unit.rb +0 -2
- data/lib/chef/provider/template/content.rb +1 -0
- data/lib/chef/provider/user/dscl.rb +2 -2
- data/lib/chef/provider/user/mac.rb +9 -9
- data/lib/chef/provider/windows_task.rb +0 -3
- data/lib/chef/provider/yum_repository.rb +1 -1
- data/lib/chef/provider/zypper_repository.rb +1 -2
- data/lib/chef/providers.rb +0 -1
- data/lib/chef/recipe.rb +1 -1
- data/lib/chef/resource.rb +8 -10
- data/lib/chef/resource/apt_repository.rb +1 -10
- data/lib/chef/resource/build_essential.rb +2 -2
- data/lib/chef/resource/chef_client_scheduled_task.rb +1 -1
- data/lib/chef/resource/chef_client_systemd_timer.rb +2 -2
- data/lib/chef/resource/chef_vault_secret.rb +13 -13
- data/lib/chef/resource/chocolatey_feature.rb +1 -2
- data/lib/chef/resource/cron/cron_d.rb +1 -1
- data/lib/chef/resource/cron_access.rb +2 -2
- data/lib/chef/resource/execute.rb +4 -5
- data/lib/chef/resource/homebrew_update.rb +2 -2
- data/lib/chef/resource/hostname.rb +18 -18
- data/lib/chef/resource/lwrp_base.rb +1 -0
- data/lib/chef/resource/macos_userdefaults.rb +176 -61
- data/lib/chef/resource/openssl_dhparam.rb +2 -0
- data/lib/chef/resource/openssl_ec_private_key.rb +2 -0
- data/lib/chef/resource/openssl_ec_public_key.rb +2 -0
- data/lib/chef/resource/openssl_rsa_private_key.rb +2 -0
- data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
- data/lib/chef/resource/openssl_x509_certificate.rb +35 -35
- data/lib/chef/resource/openssl_x509_crl.rb +3 -2
- data/lib/chef/resource/openssl_x509_request.rb +23 -20
- data/lib/chef/resource/osx_profile.rb +227 -5
- data/lib/chef/resource/powershell_package_source.rb +1 -1
- data/lib/chef/resource/powershell_script.rb +24 -30
- data/lib/chef/resource/service.rb +2 -2
- data/lib/chef/resource/ssh_known_hosts_entry.rb +1 -1
- data/lib/chef/resource/sudo.rb +2 -2
- data/lib/chef/resource/sysctl.rb +5 -5
- data/lib/chef/resource/timezone.rb +112 -73
- data/lib/chef/resource/user_ulimit.rb +1 -1
- data/lib/chef/resource/windows_ad_join.rb +2 -0
- data/lib/chef/resource/windows_audit_policy.rb +3 -0
- data/lib/chef/resource/windows_auto_run.rb +2 -0
- data/lib/chef/resource/windows_certificate.rb +2 -0
- data/lib/chef/resource/windows_dfs_folder.rb +2 -0
- data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
- data/lib/chef/resource/windows_dfs_server.rb +2 -0
- data/lib/chef/resource/windows_dns_record.rb +25 -5
- data/lib/chef/resource/windows_dns_zone.rb +12 -7
- data/lib/chef/resource/windows_feature.rb +2 -0
- data/lib/chef/resource/windows_feature_dism.rb +10 -0
- data/lib/chef/resource/windows_feature_powershell.rb +14 -2
- data/lib/chef/resource/windows_firewall_profile.rb +199 -0
- data/lib/chef/resource/windows_firewall_rule.rb +5 -3
- data/lib/chef/resource/windows_font.rb +3 -1
- data/lib/chef/resource/windows_pagefile.rb +4 -0
- data/lib/chef/resource/windows_printer.rb +17 -18
- data/lib/chef/resource/windows_printer_port.rb +14 -13
- data/lib/chef/resource/windows_security_policy.rb +51 -20
- data/lib/chef/resource/windows_share.rb +5 -3
- data/lib/chef/resource/windows_shortcut.rb +2 -0
- data/lib/chef/resource/windows_uac.rb +2 -0
- data/lib/chef/resource/windows_user_privilege.rb +2 -0
- data/lib/chef/resource/windows_workgroup.rb +2 -3
- data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
- data/lib/chef/resource_inspector.rb +7 -1
- data/lib/chef/resources.rb +1 -0
- data/lib/chef/role.rb +3 -4
- data/lib/chef/run_context/cookbook_compiler.rb +20 -20
- data/lib/chef/run_status.rb +2 -6
- data/lib/chef/server_api_versions.rb +4 -0
- data/lib/chef/shell.rb +1 -1
- data/lib/chef/shell/shell_session.rb +2 -0
- data/lib/chef/util/backup.rb +1 -1
- data/lib/chef/util/diff.rb +11 -12
- data/lib/chef/util/powershell/cmdlet.rb +1 -1
- data/lib/chef/version.rb +2 -2
- data/lib/chef/win32/file.rb +2 -2
- data/lib/chef/win32/file/version_info.rb +5 -5
- data/lib/chef/win32/registry.rb +1 -2
- data/spec/data/ssl/chef-rspec.cert +15 -15
- data/spec/functional/knife/ssh_spec.rb +5 -16
- data/spec/functional/resource/aix_service_spec.rb +0 -2
- data/spec/functional/resource/aixinit_service_spec.rb +7 -8
- data/spec/functional/resource/apt_package_spec.rb +0 -1
- data/spec/functional/resource/bff_spec.rb +2 -2
- data/spec/functional/resource/cookbook_file_spec.rb +1 -1
- data/spec/functional/resource/cron_spec.rb +0 -1
- data/spec/functional/resource/dsc_resource_spec.rb +1 -1
- data/spec/functional/resource/dsc_script_spec.rb +0 -1
- data/spec/functional/resource/git_spec.rb +23 -1
- data/spec/functional/resource/group_spec.rb +12 -8
- data/spec/functional/resource/insserv_spec.rb +4 -5
- data/spec/functional/resource/link_spec.rb +20 -20
- data/spec/functional/resource/powershell_script_spec.rb +4 -4
- data/spec/functional/resource/remote_file_spec.rb +1 -7
- data/spec/functional/resource/rpm_spec.rb +2 -2
- data/spec/functional/resource/windows_certificate_spec.rb +3 -3
- data/spec/functional/resource/windows_font_spec.rb +49 -0
- data/spec/functional/resource/windows_security_policy_spec.rb +0 -3
- data/spec/functional/resource/windows_user_privilege_spec.rb +1 -1
- data/spec/functional/run_lock_spec.rb +26 -25
- data/spec/functional/shell_spec.rb +5 -5
- data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
- data/spec/functional/version_spec.rb +1 -1
- data/spec/functional/win32/registry_spec.rb +8 -8
- data/spec/functional/win32/service_manager_spec.rb +1 -1
- data/spec/integration/knife/common_options_spec.rb +12 -12
- data/spec/integration/knife/config_get_profile_spec.rb +69 -68
- data/spec/integration/knife/config_get_spec.rb +126 -125
- data/spec/integration/knife/config_list_profiles_spec.rb +181 -152
- data/spec/integration/knife/config_use_profile_spec.rb +110 -109
- data/spec/integration/knife/cookbook_upload_spec.rb +27 -0
- data/spec/integration/knife/diff_spec.rb +3 -1
- data/spec/integration/knife/download_spec.rb +3 -1
- data/spec/integration/knife/serve_spec.rb +5 -5
- data/spec/integration/knife/upload_spec.rb +3 -1
- data/spec/integration/recipes/accumulator_spec.rb +1 -1
- data/spec/integration/recipes/lwrp_inline_resources_spec.rb +2 -2
- data/spec/integration/recipes/lwrp_spec.rb +1 -1
- data/spec/integration/recipes/notifies_spec.rb +1 -1
- data/spec/integration/recipes/notifying_block_spec.rb +1 -1
- data/spec/integration/recipes/recipe_dsl_spec.rb +1 -1
- data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
- data/spec/integration/recipes/resource_load_spec.rb +2 -0
- data/spec/integration/recipes/unified_mode_spec.rb +1 -1
- data/spec/integration/recipes/use_partial_spec.rb +1 -1
- data/spec/scripts/ssl-serve.rb +1 -1
- data/spec/spec_helper.rb +16 -10
- data/spec/support/chef_helpers.rb +1 -20
- data/spec/support/platform_helpers.rb +9 -11
- data/spec/support/platforms/win32/spec_service.rb +1 -1
- data/spec/support/shared/functional/directory_resource.rb +1 -1
- data/spec/support/shared/functional/execute_resource.rb +1 -1
- data/spec/support/shared/functional/file_resource.rb +20 -21
- data/spec/support/shared/functional/win32_service.rb +1 -1
- data/spec/support/shared/functional/windows_script.rb +3 -3
- data/spec/support/shared/integration/integration_helper.rb +22 -52
- data/spec/support/shared/integration/knife_support.rb +2 -9
- data/spec/support/shared/unit/application_dot_d.rb +0 -1
- data/spec/support/shared/unit/script_resource.rb +6 -20
- data/spec/support/shared/unit/windows_script_resource.rb +15 -28
- data/spec/unit/application_spec.rb +4 -2
- data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
- data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +1 -1
- data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
- data/spec/unit/data_collector_spec.rb +29 -1
- data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
- data/spec/unit/environment_spec.rb +7 -7
- data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
- data/spec/unit/http/api_versions_spec.rb +19 -1
- data/spec/unit/json_compat_spec.rb +1 -1
- data/spec/unit/knife/bootstrap_spec.rb +16 -20
- data/spec/unit/knife/cookbook_download_spec.rb +4 -4
- data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
- data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
- data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
- data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +21 -12
- data/spec/unit/knife/supermarket_share_spec.rb +1 -1
- data/spec/unit/log/syslog_spec.rb +6 -10
- data/spec/unit/log/winevt_spec.rb +21 -13
- data/spec/unit/lwrp_spec.rb +4 -4
- data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
- data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
- data/spec/unit/mixin/securable_spec.rb +0 -1
- data/spec/unit/mixin/shell_out_spec.rb +25 -26
- data/spec/unit/mixin/template_spec.rb +30 -30
- data/spec/unit/mixin/which.rb +8 -0
- data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
- data/spec/unit/node/immutable_collections_spec.rb +6 -2
- data/spec/unit/node_spec.rb +103 -16
- data/spec/unit/property_spec.rb +5 -5
- data/spec/unit/provider/execute_spec.rb +0 -7
- data/spec/unit/provider/ifconfig_spec.rb +0 -1
- data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
- data/spec/unit/provider/package/rubygems_spec.rb +5 -10
- data/spec/unit/provider/package/smartos_spec.rb +1 -1
- data/spec/unit/provider/package/windows_spec.rb +30 -53
- data/spec/unit/provider/powershell_script_spec.rb +11 -4
- data/spec/unit/provider/remote_directory_spec.rb +9 -9
- data/spec/unit/provider/service/arch_service_spec.rb +3 -2
- data/spec/unit/provider/service/debian_service_spec.rb +1 -1
- data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
- data/spec/unit/provider/service/macosx_spec.rb +3 -3
- data/spec/unit/provider/service/redhat_spec.rb +3 -3
- data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
- data/spec/unit/provider/service/windows_spec.rb +2 -6
- data/spec/unit/provider/systemd_unit_spec.rb +28 -24
- data/spec/unit/provider_resolver_spec.rb +6 -6
- data/spec/unit/provider_spec.rb +1 -0
- data/spec/unit/resource/batch_spec.rb +6 -6
- data/spec/unit/resource/execute_spec.rb +123 -118
- data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
- data/spec/unit/resource/osx_profile_spec.rb +233 -0
- data/spec/unit/resource/powershell_script_spec.rb +11 -29
- data/spec/unit/resource/script_spec.rb +6 -1
- data/spec/unit/resource/timezone_spec.rb +63 -0
- data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
- data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
- data/spec/unit/resource/windows_package_spec.rb +1 -0
- data/spec/unit/resource_reporter_spec.rb +1 -1
- data/spec/unit/role_spec.rb +11 -11
- data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
- data/spec/unit/run_lock_spec.rb +1 -1
- data/spec/unit/scan_access_control_spec.rb +1 -1
- data/spec/unit/server_api_spec.rb +43 -16
- data/spec/unit/util/diff_spec.rb +1 -15
- data/spec/unit/win32/security_spec.rb +4 -3
- data/tasks/rspec.rb +1 -1
- metadata +39 -31
- data/lib/chef/provider/osx_profile.rb +0 -255
- data/spec/unit/provider/osx_profile_spec.rb +0 -255
@@ -22,169 +22,198 @@ describe "knife config list-profiles", :workstation do
|
|
22
22
|
include KnifeSupport
|
23
23
|
|
24
24
|
include_context "default config options"
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
25
|
+
|
26
|
+
when_the_repository("has a custom env") do
|
27
|
+
let(:cmd_args) { [] }
|
28
|
+
let(:knife_list_profiles) do
|
29
|
+
knife("config", "list-profiles", *cmd_args, instance_filter: lambda { |instance|
|
30
|
+
# Fake the failsafe check because this command doesn't actually process knife.rb.
|
31
|
+
$__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
|
32
|
+
allow(File).to receive(:file?).and_call_original
|
33
|
+
})
|
34
|
+
end
|
35
|
+
subject { knife_list_profiles.stdout }
|
36
|
+
|
37
|
+
around do |ex|
|
38
|
+
# Store and reset the value of some env vars.
|
39
|
+
old_home = ENV["HOME"]
|
40
|
+
old_wd = Dir.pwd
|
41
|
+
# Clear these out because they are cached permanently.
|
42
|
+
ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
|
43
|
+
Chef::Knife::ConfigListProfiles.reset_config_loader!
|
44
|
+
begin
|
45
|
+
ex.run
|
46
|
+
ensure
|
47
|
+
ENV["HOME"] = old_home
|
48
|
+
Dir.chdir(old_wd)
|
49
|
+
ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
53
|
+
before do
|
54
|
+
# Always run from the temp folder. This can't be in the `around` block above
|
55
|
+
# because it has to run after the before set in the "with a chef repo" shared context.
|
56
|
+
directory("repo")
|
57
|
+
Dir.chdir(path_to("repo"))
|
48
58
|
ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
|
59
|
+
ENV["HOME"] = path_to(".")
|
49
60
|
end
|
50
|
-
end
|
51
61
|
|
52
|
-
|
53
|
-
#
|
54
|
-
#
|
55
|
-
directory("repo")
|
56
|
-
Dir.chdir(path_to("repo"))
|
57
|
-
ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
|
58
|
-
ENV["HOME"] = path_to(".")
|
59
|
-
end
|
62
|
+
# NOTE: The funky formatting with # at the end of the line of some of the
|
63
|
+
# output examples are because of how the format strings are built, there is
|
64
|
+
# substantial trailing whitespace in most cases which many editors "helpfully" remove.
|
60
65
|
|
61
|
-
|
62
|
-
|
63
|
-
|
66
|
+
context "with no credentials file" do
|
67
|
+
subject { knife_list_profiles.stderr }
|
68
|
+
it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
|
69
|
+
end
|
64
70
|
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
71
|
+
context "with an empty credentials file" do
|
72
|
+
before { file(".chef/credentials", "") }
|
73
|
+
subject { knife_list_profiles.stderr }
|
74
|
+
it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
|
75
|
+
end
|
69
76
|
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
77
|
+
context "with a simple default profile" do
|
78
|
+
before { file(".chef/credentials", <<~EOH) }
|
79
|
+
[default]
|
80
|
+
client_name = "testuser"
|
81
|
+
client_key = "testkey.pem"
|
82
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
83
|
+
EOH
|
84
|
+
it { is_expected.to eq <<~EOH.delete("#") }
|
85
|
+
Profile Client Key Server #
|
86
|
+
----------------------------------------------------------------------------------#
|
87
|
+
*default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
|
88
|
+
EOH
|
89
|
+
end
|
75
90
|
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
91
|
+
context "with multiple profiles" do
|
92
|
+
before { file(".chef/credentials", <<~EOH) }
|
93
|
+
[default]
|
94
|
+
client_name = "testuser"
|
95
|
+
client_key = "testkey.pem"
|
96
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
97
|
+
|
98
|
+
[prod]
|
99
|
+
client_name = "testuser"
|
100
|
+
client_key = "testkey.pem"
|
101
|
+
chef_server_url = "https://example.com/organizations/prod"
|
102
|
+
|
103
|
+
[qa]
|
104
|
+
client_name = "qauser"
|
105
|
+
client_key = "~/src/qauser.pem"
|
106
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
107
|
+
EOH
|
108
|
+
it { is_expected.to eq <<~EOH.delete("#") }
|
109
|
+
Profile Client Key Server #
|
110
|
+
----------------------------------------------------------------------------------#
|
111
|
+
*default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
|
112
|
+
prod testuser ~/.chef/testkey.pem https://example.com/organizations/prod #
|
113
|
+
qa qauser ~/src/qauser.pem https://example.com/organizations/testorg#
|
114
|
+
EOH
|
115
|
+
end
|
89
116
|
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
117
|
+
context "with a non-default active profile" do
|
118
|
+
let(:cmd_args) { %w{--profile prod} }
|
119
|
+
before { file(".chef/credentials", <<~EOH) }
|
120
|
+
[default]
|
121
|
+
client_name = "testuser"
|
122
|
+
client_key = "testkey.pem"
|
123
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
124
|
+
|
125
|
+
[prod]
|
126
|
+
client_name = "testuser"
|
127
|
+
client_key = "testkey.pem"
|
128
|
+
chef_server_url = "https://example.com/organizations/prod"
|
129
|
+
|
130
|
+
[qa]
|
131
|
+
client_name = "qauser"
|
132
|
+
client_key = "~/src/qauser.pem"
|
133
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
134
|
+
EOH
|
135
|
+
it { is_expected.to eq <<~EOH.delete("#") }
|
136
|
+
Profile Client Key Server #
|
137
|
+
----------------------------------------------------------------------------------#
|
138
|
+
default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
|
139
|
+
*prod testuser ~/.chef/testkey.pem https://example.com/organizations/prod #
|
140
|
+
qa qauser ~/src/qauser.pem https://example.com/organizations/testorg#
|
141
|
+
EOH
|
142
|
+
end
|
115
143
|
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
144
|
+
context "with a bad profile as an active profile" do
|
145
|
+
let(:cmd_args) { %w{--profile production} }
|
146
|
+
before { file(".chef/credentials", <<~EOH) }
|
147
|
+
[default]
|
148
|
+
client_name = "testuser"
|
149
|
+
client_key = "testkey.pem"
|
150
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
151
|
+
|
152
|
+
[prod]
|
153
|
+
client_name = "testuser"
|
154
|
+
client_key = "testkey.pem"
|
155
|
+
chef_server_url = "https://example.com/organizations/prod"
|
156
|
+
|
157
|
+
[qa]
|
158
|
+
client_name = "qauser"
|
159
|
+
client_key = "~/src/qauser.pem"
|
160
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
161
|
+
EOH
|
162
|
+
it { is_expected.to eq <<~EOH.delete("#") }
|
163
|
+
Profile Client Key Server #
|
164
|
+
---------------------------------------------------------------------------------#
|
165
|
+
default testuser ~/.chef/testkey.pem https://example.com/organizations/testorg#
|
166
|
+
prod testuser ~/.chef/testkey.pem https://example.com/organizations/prod #
|
167
|
+
qa qauser ~/src/qauser.pem https://example.com/organizations/testorg#
|
168
|
+
EOH
|
169
|
+
end
|
142
170
|
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
171
|
+
context "with a minimal profile" do
|
172
|
+
before { file(".chef/credentials", <<~EOH) }
|
173
|
+
[default]
|
174
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
175
|
+
EOH
|
176
|
+
it { is_expected.to match %r{^*default .*? https://example.com/organizations/testorg$} }
|
177
|
+
end
|
150
178
|
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
179
|
+
context "with -i" do
|
180
|
+
let(:cmd_args) { %w{-i} }
|
181
|
+
before { file(".chef/credentials", <<~EOH) }
|
182
|
+
[default]
|
183
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
184
|
+
EOH
|
185
|
+
it { is_expected.to eq <<~EOH.delete("#") }
|
186
|
+
Profile Client Key Server #
|
187
|
+
----------------------------------------------------------------#
|
188
|
+
*default https://example.com/organizations/testorg#
|
189
|
+
EOH
|
190
|
+
end
|
163
191
|
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
192
|
+
context "with --format=json" do
|
193
|
+
let(:cmd_args) { %w{--format=json node_name} }
|
194
|
+
before { file(".chef/credentials", <<~EOH) }
|
195
|
+
[default]
|
196
|
+
client_name = "testuser"
|
197
|
+
client_key = "testkey.pem"
|
198
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
199
|
+
|
200
|
+
[prod]
|
201
|
+
client_name = "testuser"
|
202
|
+
client_key = "testkey.pem"
|
203
|
+
chef_server_url = "https://example.com/organizations/prod"
|
204
|
+
|
205
|
+
[qa]
|
206
|
+
client_name = "qauser"
|
207
|
+
client_key = "~/src/qauser.pem"
|
208
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
209
|
+
EOH
|
210
|
+
it {
|
211
|
+
expect(JSON.parse(subject)).to eq [
|
212
|
+
{ "profile" => "default", "active" => true, "client_name" => "testuser", "client_key" => path_to(".chef/testkey.pem"), "server_url" => "https://example.com/organizations/testorg" },
|
213
|
+
{ "profile" => "prod", "active" => false, "client_name" => "testuser", "client_key" => path_to(".chef/testkey.pem"), "server_url" => "https://example.com/organizations/prod" },
|
214
|
+
{ "profile" => "qa", "active" => false, "client_name" => "qauser", "client_key" => path_to("src/qauser.pem"), "server_url" => "https://example.com/organizations/testorg" },
|
215
|
+
]
|
216
|
+
}
|
217
|
+
end
|
189
218
|
end
|
190
219
|
end
|
@@ -22,133 +22,134 @@ describe "knife config use-profile", :workstation do
|
|
22
22
|
include KnifeSupport
|
23
23
|
|
24
24
|
include_context "default config options"
|
25
|
-
include_context "with a chef repo"
|
26
25
|
|
27
26
|
let(:cmd_args) { [] }
|
28
27
|
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
subject { knife_use_profile.stdout }
|
38
|
-
|
39
|
-
around do |ex|
|
40
|
-
# Store and reset the value of some env vars.
|
41
|
-
old_chef_home = ENV["CHEF_HOME"]
|
42
|
-
old_knife_home = ENV["KNIFE_HOME"]
|
43
|
-
old_home = ENV["HOME"]
|
44
|
-
old_wd = Dir.pwd
|
45
|
-
ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
|
46
|
-
# Clear these out because they are cached permanently.
|
47
|
-
ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
|
48
|
-
Chef::Knife::ConfigUseProfile.reset_config_loader!
|
49
|
-
begin
|
50
|
-
ex.run
|
51
|
-
ensure
|
52
|
-
ENV["CHEF_HOME"] = old_chef_home
|
53
|
-
ENV["KNIFE_HOME"] = old_knife_home
|
54
|
-
ENV["HOME"] = old_home
|
55
|
-
Dir.chdir(old_wd)
|
56
|
-
ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
|
57
|
-
ChefConfig::PathHelper.per_tool_home_environment = nil
|
28
|
+
when_the_repository("has a custom env") do
|
29
|
+
let(:knife_use_profile) do
|
30
|
+
knife("config", "use-profile", *cmd_args, instance_filter: lambda { |instance|
|
31
|
+
# Fake the failsafe check because this command doesn't actually process knife.rb.
|
32
|
+
$__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
|
33
|
+
allow(File).to receive(:file?).and_call_original
|
34
|
+
})
|
58
35
|
end
|
59
|
-
end
|
60
|
-
|
61
|
-
before do
|
62
|
-
# Always run from the temp folder. This can't be in the `around` block above
|
63
|
-
# because it has to run after the before set in the "with a chef repo" shared context.
|
64
|
-
directory("repo")
|
65
|
-
Dir.chdir(path_to("repo"))
|
66
|
-
ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
|
67
|
-
ENV["HOME"] = path_to(".")
|
68
|
-
end
|
69
36
|
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
37
|
+
subject { knife_use_profile.stdout }
|
38
|
+
|
39
|
+
around do |ex|
|
40
|
+
# Store and reset the value of some env vars.
|
41
|
+
old_chef_home = ENV["CHEF_HOME"]
|
42
|
+
old_knife_home = ENV["KNIFE_HOME"]
|
43
|
+
old_home = ENV["HOME"]
|
44
|
+
old_wd = Dir.pwd
|
45
|
+
ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
|
46
|
+
# Clear these out because they are cached permanently.
|
47
|
+
ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
|
48
|
+
Chef::Knife::ConfigUseProfile.reset_config_loader!
|
49
|
+
begin
|
50
|
+
ex.run
|
51
|
+
ensure
|
52
|
+
ENV["CHEF_HOME"] = old_chef_home
|
53
|
+
ENV["KNIFE_HOME"] = old_knife_home
|
54
|
+
ENV["HOME"] = old_home
|
55
|
+
Dir.chdir(old_wd)
|
56
|
+
ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
|
57
|
+
ChefConfig::PathHelper.per_tool_home_environment = nil
|
58
|
+
end
|
86
59
|
end
|
87
|
-
end
|
88
60
|
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
before { file(".chef/credentials", "") }
|
98
|
-
subject { knife_use_profile.stderr }
|
99
|
-
it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
|
100
|
-
end
|
61
|
+
before do
|
62
|
+
# Always run from the temp folder. This can't be in the `around` block above
|
63
|
+
# because it has to run after the before set in the "with a chef repo" shared context.
|
64
|
+
directory("repo")
|
65
|
+
Dir.chdir(path_to("repo"))
|
66
|
+
ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
|
67
|
+
ENV["HOME"] = path_to(".")
|
68
|
+
end
|
101
69
|
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
client_name = "testuser"
|
107
|
-
client_key = "testkey.pem"
|
108
|
-
chef_server_url = "https://example.com/organizations/testorg"
|
109
|
-
EOH
|
110
|
-
subject { knife_use_profile }
|
111
|
-
it { expect { subject }.to raise_error ChefConfig::ConfigurationError, "Profile staging doesn't exist. Please add it to #{path_to(".chef/credentials")} and if it is profile with DNS name check that you are not missing single quotes around it as per docs https://docs.chef.io/workstation/knife_setup/#knife-profiles." }
|
112
|
-
end
|
70
|
+
context "with no argument" do
|
71
|
+
subject { knife_use_profile.stderr }
|
72
|
+
it { is_expected.to eq "FATAL: You must specify a profile\n" }
|
73
|
+
end
|
113
74
|
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
client_key = "testkey.pem"
|
122
|
-
chef_server_url = "https://example.com/organizations/testorg"
|
75
|
+
context "with an argument" do
|
76
|
+
let(:cmd_args) { %w{production} }
|
77
|
+
before { file(".chef/credentials", <<~EOH) }
|
78
|
+
[production]
|
79
|
+
client_name = "testuser"
|
80
|
+
client_key = "testkey.pem"
|
81
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
123
82
|
EOH
|
124
|
-
|
83
|
+
it do
|
84
|
+
is_expected.to eq "Set default profile to production\n"
|
85
|
+
expect(File.read(path_to(".chef/context"))).to eq "production\n"
|
86
|
+
end
|
125
87
|
end
|
126
88
|
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
89
|
+
context "with no credentials file" do
|
90
|
+
let(:cmd_args) { %w{production} }
|
91
|
+
subject { knife_use_profile.stderr }
|
92
|
+
it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
|
131
93
|
end
|
132
|
-
end
|
133
94
|
|
134
|
-
|
135
|
-
|
95
|
+
context "with an empty credentials file" do
|
96
|
+
let(:cmd_args) { %w{production} }
|
97
|
+
before { file(".chef/credentials", "") }
|
98
|
+
subject { knife_use_profile.stderr }
|
99
|
+
it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
|
100
|
+
end
|
136
101
|
|
137
|
-
|
138
|
-
|
139
|
-
file("
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
102
|
+
context "with an wrong argument" do
|
103
|
+
let(:cmd_args) { %w{staging} }
|
104
|
+
before { file(".chef/credentials", <<~EOH) }
|
105
|
+
[production]
|
106
|
+
client_name = "testuser"
|
107
|
+
client_key = "testkey.pem"
|
108
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
144
109
|
EOH
|
145
|
-
|
110
|
+
subject { knife_use_profile }
|
111
|
+
it { expect { subject }.to raise_error ChefConfig::ConfigurationError, "Profile staging doesn't exist. Please add it to #{path_to(".chef/credentials")} and if it is profile with DNS name check that you are not missing single quotes around it as per docs https://docs.chef.io/workstation/knife_setup/#knife-profiles." }
|
112
|
+
end
|
113
|
+
|
114
|
+
context "with $CHEF_HOME" do
|
115
|
+
let(:cmd_args) { %w{staging} }
|
116
|
+
before do
|
117
|
+
ENV["CHEF_HOME"] = path_to("chefhome"); file("chefhome/tmp", "")
|
118
|
+
file("chefhome/.chef/credentials", <<~EOH
|
119
|
+
[staging]
|
120
|
+
client_name = "testuser"
|
121
|
+
client_key = "testkey.pem"
|
122
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
123
|
+
EOH
|
124
|
+
)
|
125
|
+
end
|
126
|
+
|
127
|
+
it do
|
128
|
+
is_expected.to eq "Set default profile to staging\n"
|
129
|
+
expect(File.read(path_to("chefhome/.chef/context"))).to eq "staging\n"
|
130
|
+
expect(File.exist?(path_to(".chef/context"))).to be_falsey
|
131
|
+
end
|
146
132
|
end
|
147
133
|
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
134
|
+
context "with $KNIFE_HOME" do
|
135
|
+
let(:cmd_args) { %w{development} }
|
136
|
+
|
137
|
+
before do
|
138
|
+
ENV["KNIFE_HOME"] = path_to("knifehome"); file("knifehome/tmp", "")
|
139
|
+
file("knifehome/.chef/credentials", <<~EOH
|
140
|
+
[development]
|
141
|
+
client_name = "testuser"
|
142
|
+
client_key = "testkey.pem"
|
143
|
+
chef_server_url = "https://example.com/organizations/testorg"
|
144
|
+
EOH
|
145
|
+
)
|
146
|
+
end
|
147
|
+
|
148
|
+
it do
|
149
|
+
is_expected.to eq "Set default profile to development\n"
|
150
|
+
expect(File.read(path_to("knifehome/.chef/context"))).to eq "development\n"
|
151
|
+
expect(File.exist?(path_to(".chef/context"))).to be_falsey
|
152
|
+
end
|
152
153
|
end
|
153
154
|
end
|
154
155
|
end
|