chef 16.18.30 → 17.0.242
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +9 -22
- data/README.md +1 -1
- data/Rakefile +2 -2
- data/chef-universal-mingw32.gemspec +1 -2
- data/chef.gemspec +7 -10
- data/lib/chef/action_collection.rb +1 -1
- data/lib/chef/application/base.rb +1 -1
- data/lib/chef/application.rb +1 -1
- data/lib/chef/applications.rb +0 -1
- data/lib/chef/chef_fs/command_line.rb +5 -2
- data/lib/chef/chef_fs/file_system.rb +9 -10
- data/lib/chef/client.rb +5 -5
- data/lib/chef/compliance/default_attributes.rb +4 -3
- data/lib/chef/compliance/fetcher/automate.rb +0 -7
- data/lib/chef/compliance/reporter/automate.rb +17 -7
- data/lib/chef/compliance/reporter/chef_server_automate.rb +11 -6
- data/lib/chef/compliance/reporter/cli.rb +77 -0
- data/lib/chef/compliance/reporter/compliance_enforcer.rb +4 -0
- data/lib/chef/compliance/reporter/json_file.rb +8 -1
- data/lib/chef/compliance/runner.rb +65 -27
- data/lib/chef/cookbook/gem_installer.rb +1 -5
- data/lib/chef/cookbook/synchronizer.rb +3 -5
- data/lib/chef/cookbook_loader.rb +2 -4
- data/lib/chef/cookbook_uploader.rb +0 -1
- data/lib/chef/cookbook_version.rb +4 -26
- data/lib/chef/data_bag_item.rb +11 -2
- data/lib/chef/data_collector/run_end_message.rb +2 -2
- data/lib/chef/delayed_evaluator.rb +4 -0
- data/lib/chef/deprecated.rb +6 -12
- data/lib/chef/dsl/chef_vault.rb +6 -6
- data/lib/chef/dsl/reboot_pending.rb +1 -2
- data/lib/chef/exceptions.rb +0 -3
- data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +20 -22
- data/lib/chef/formatters/error_mapper.rb +2 -2
- data/lib/chef/group.rb +75 -0
- data/lib/chef/http.rb +5 -5
- data/lib/chef/mixin/checksum.rb +0 -6
- data/lib/chef/mixin/get_source_from_package.rb +1 -1
- data/lib/chef/mixin/powershell_exec.rb +26 -7
- data/lib/chef/node/attribute.rb +9 -24
- data/lib/chef/node/immutable_collections.rb +13 -0
- data/lib/chef/node/mixin/deep_merge_cache.rb +14 -10
- data/lib/chef/node.rb +19 -20
- data/lib/chef/org.rb +3 -2
- data/lib/chef/platform/query_helpers.rb +2 -2
- data/lib/chef/policy_builder/policyfile.rb +0 -5
- data/lib/chef/property.rb +18 -0
- data/lib/chef/provider/cron.rb +2 -6
- data/lib/chef/provider/execute.rb +2 -1
- data/lib/chef/provider/file.rb +3 -3
- data/lib/chef/provider/git.rb +5 -7
- data/lib/chef/provider/group/dscl.rb +1 -1
- data/lib/chef/provider/group/groupadd.rb +3 -3
- data/lib/chef/provider/group/groupmod.rb +3 -3
- data/lib/chef/provider/group/pw.rb +3 -3
- data/lib/chef/provider/ifconfig.rb +2 -2
- data/lib/chef/provider/link.rb +2 -2
- data/lib/chef/provider/mount/aix.rb +3 -3
- data/lib/chef/provider/mount/mount.rb +5 -5
- data/lib/chef/provider/mount/windows.rb +1 -1
- data/lib/chef/provider/mount.rb +5 -5
- data/lib/chef/provider/package/apt.rb +27 -1
- data/lib/chef/provider/package/deb.rb +3 -3
- data/lib/chef/provider/package/dnf/dnf_helper.py +1 -1
- data/lib/chef/provider/package/portage.rb +2 -2
- data/lib/chef/provider/package/powershell.rb +0 -5
- data/lib/chef/provider/package/rubygems.rb +9 -15
- data/lib/chef/provider/package/windows.rb +3 -5
- data/lib/chef/provider/package/yum/yum_helper.py +11 -1
- data/lib/chef/provider/package.rb +17 -21
- data/lib/chef/provider/route.rb +2 -2
- data/lib/chef/provider/service/aixinit.rb +1 -1
- data/lib/chef/provider/service/debian.rb +1 -1
- data/lib/chef/provider/service/freebsd.rb +15 -21
- data/lib/chef/provider/service/macosx.rb +4 -4
- data/lib/chef/provider/service/systemd.rb +43 -14
- data/lib/chef/provider/service/upstart.rb +2 -13
- data/lib/chef/provider/service/windows.rb +12 -12
- data/lib/chef/provider/service.rb +6 -6
- data/lib/chef/provider/subversion.rb +10 -12
- data/lib/chef/provider/systemd_unit.rb +36 -10
- data/lib/chef/provider/template/content.rb +3 -7
- data/lib/chef/provider/user/dscl.rb +1 -1
- data/lib/chef/provider/user/mac.rb +17 -20
- data/lib/chef/provider/user/pw.rb +1 -1
- data/lib/chef/provider/user/windows.rb +1 -1
- data/lib/chef/provider/user.rb +2 -2
- data/lib/chef/provider/zypper_repository.rb +2 -2
- data/lib/chef/provider.rb +1 -1
- data/lib/chef/providers.rb +0 -1
- data/lib/chef/resource/alternatives.rb +6 -6
- data/lib/chef/resource/apt_package.rb +1 -1
- data/lib/chef/resource/apt_preference.rb +2 -2
- data/lib/chef/resource/apt_repository.rb +6 -6
- data/lib/chef/resource/apt_update.rb +3 -2
- data/lib/chef/resource/archive_file.rb +8 -9
- data/lib/chef/resource/breakpoint.rb +1 -1
- data/lib/chef/resource/build_essential.rb +2 -6
- data/lib/chef/resource/chef_client_config.rb +2 -2
- data/lib/chef/resource/chef_client_cron.rb +4 -4
- data/lib/chef/resource/chef_client_launchd.rb +3 -3
- 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_client_trusted_certificate.rb +0 -1
- data/lib/chef/resource/chef_handler.rb +3 -7
- data/lib/chef/resource/chef_sleep.rb +1 -1
- data/lib/chef/resource/chef_vault_secret.rb +3 -8
- data/lib/chef/resource/chocolatey_config.rb +2 -6
- data/lib/chef/resource/chocolatey_feature.rb +2 -6
- data/lib/chef/resource/chocolatey_source.rb +4 -10
- data/lib/chef/resource/cron/_cron_shared.rb +2 -2
- data/lib/chef/resource/cron_access.rb +2 -4
- data/lib/chef/resource/dmg_package.rb +6 -10
- data/lib/chef/resource/dpkg_package.rb +1 -1
- data/lib/chef/resource/execute.rb +6 -1
- data/lib/chef/resource/file.rb +1 -1
- data/lib/chef/resource/group.rb +2 -2
- data/lib/chef/resource/homebrew_cask.rb +5 -15
- data/lib/chef/resource/homebrew_tap.rb +2 -6
- data/lib/chef/resource/hostname.rb +21 -17
- data/lib/chef/resource/http_request.rb +1 -1
- data/lib/chef/resource/kernel_module.rb +6 -17
- data/lib/chef/resource/locale.rb +3 -4
- data/lib/chef/resource/lwrp_base.rb +4 -0
- data/lib/chef/resource/macos_userdefaults.rb +10 -14
- data/lib/chef/resource/mdadm.rb +53 -7
- data/lib/chef/resource/mount.rb +3 -2
- data/lib/chef/resource/openssl_ec_private_key.rb +2 -2
- data/lib/chef/resource/openssl_rsa_private_key.rb +1 -1
- data/lib/chef/resource/openssl_x509_certificate.rb +2 -2
- data/lib/chef/resource/plist.rb +7 -7
- data/lib/chef/resource/powershell_script.rb +1 -1
- data/lib/chef/resource/remote_file.rb +1 -1
- data/lib/chef/resource/rhsm_errata.rb +16 -1
- data/lib/chef/resource/rhsm_errata_level.rb +10 -1
- data/lib/chef/resource/rhsm_register.rb +12 -23
- data/lib/chef/resource/rhsm_repo.rb +2 -6
- data/lib/chef/resource/rhsm_subscription.rb +7 -11
- data/lib/chef/resource/scm/git.rb +1 -1
- data/lib/chef/resource/sudo.rb +6 -6
- data/lib/chef/resource/support/client.erb +2 -6
- data/lib/chef/resource/sysctl.rb +2 -6
- data/lib/chef/resource/systemd_unit.rb +3 -3
- data/lib/chef/resource/template.rb +1 -1
- data/lib/chef/resource/timezone.rb +1 -3
- data/lib/chef/resource/user/mac_user.rb +1 -1
- data/lib/chef/resource/user_ulimit.rb +2 -3
- data/lib/chef/resource/windows_ad_join.rb +2 -6
- data/lib/chef/resource/windows_audit_policy.rb +1 -1
- data/lib/chef/resource/windows_auto_run.rb +2 -5
- data/lib/chef/resource/windows_certificate.rb +207 -73
- data/lib/chef/resource/windows_dfs_folder.rb +2 -6
- data/lib/chef/resource/windows_dfs_namespace.rb +2 -6
- data/lib/chef/resource/windows_dfs_server.rb +1 -3
- data/lib/chef/resource/windows_dns_record.rb +2 -6
- data/lib/chef/resource/windows_dns_zone.rb +2 -6
- data/lib/chef/resource/windows_env.rb +5 -4
- data/lib/chef/resource/windows_feature.rb +3 -9
- data/lib/chef/resource/windows_feature_dism.rb +2 -6
- data/lib/chef/resource/windows_feature_powershell.rb +3 -3
- data/lib/chef/resource/windows_firewall_profile.rb +4 -4
- data/lib/chef/resource/windows_firewall_rule.rb +2 -5
- data/lib/chef/resource/windows_font.rb +2 -4
- data/lib/chef/resource/windows_pagefile.rb +2 -6
- data/lib/chef/resource/windows_path.rb +2 -2
- data/lib/chef/resource/windows_printer.rb +4 -4
- data/lib/chef/resource/windows_printer_port.rb +6 -6
- data/lib/chef/resource/windows_security_policy.rb +9 -12
- data/lib/chef/resource/windows_share.rb +14 -21
- data/lib/chef/resource/windows_shortcut.rb +4 -6
- data/lib/chef/resource/windows_task.rb +17 -5
- data/lib/chef/resource/windows_uac.rb +2 -4
- data/lib/chef/resource/windows_user_privilege.rb +26 -36
- data/lib/chef/resource/windows_workgroup.rb +1 -2
- data/lib/chef/resource.rb +1 -1
- data/lib/chef/resource_reporter.rb +1 -1
- data/lib/chef/resources.rb +0 -1
- data/lib/chef/shell/ext.rb +3 -3
- data/lib/chef/user.rb +0 -1
- data/lib/chef/user_v1.rb +3 -4
- data/lib/chef/util/dsc/configuration_generator.rb +1 -0
- data/lib/chef/util/dsc/local_configuration_manager.rb +1 -1
- data/lib/chef/version.rb +1 -1
- data/lib/chef/win32/api.rb +2 -9
- data/lib/chef/win32/registry.rb +4 -2
- data/lib/chef/win32/version.rb +2 -4
- data/spec/data/cookbooks/openldap/libraries/openldap.rb +1 -1
- data/spec/data/lwrp/resources/bar.rb +2 -0
- data/spec/data/lwrp/resources/buck_passer.rb +1 -0
- data/spec/data/lwrp/resources/buck_passer_2.rb +1 -0
- data/spec/data/lwrp/resources/embedded_resource_accesses_providers_scope.rb +1 -0
- data/spec/data/lwrp/resources/foo.rb +2 -0
- data/spec/data/lwrp/resources/inline_compiler.rb +1 -0
- data/spec/data/lwrp/resources/monkey_name_printer.rb +1 -0
- data/spec/data/lwrp/resources/paint_drying_watcher.rb +1 -0
- data/spec/data/lwrp/resources/thumb_twiddler.rb +1 -0
- data/spec/data/lwrp/resources_with_default_attributes/nodeattr.rb +2 -0
- data/spec/data/lwrp_const_scoping/resources/conflict.rb +1 -0
- data/spec/data/lwrp_override/resources/foo.rb +1 -0
- data/spec/data/rubygems.org/nonexistent_gem-info +1 -0
- data/spec/data/rubygems.org/sexp_processor-info +49 -0
- data/spec/data/run_context/cookbooks/circular-dep1/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/circular-dep2/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency1/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/dependency2/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/no-default-attr/resources/resource.rb +1 -0
- data/spec/data/run_context/cookbooks/test/resources/resource.rb +2 -0
- data/spec/data/run_context/cookbooks/test-with-circular-deps/resources/resource.rb +2 -0
- data/spec/data/run_context/cookbooks/test-with-deps/resources/resource.rb +1 -0
- data/spec/functional/assets/yumrepo/repodata/4632d67cb92636e7575d911c24f0e04d3505a944e97c483abe0c3e73a7c62d33-filelists.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/74599b793e54d877323837d2d81a1c3c594c44e4335f9528234bb490f7b9b439-other.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/a845d418f919d2115ab95a56b2c76f6825ad0d0bede49181a55c04f58995d057-primary.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/af9b7cf9ef23bd7b43068d74a460f3b5d06753d638e58e4a0c9edc35bfb9cdc4-other.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo/repodata/bdb4f5f1492a3b9532f22c43110a81500dd744f23da0aec5c33b2a41317c737d-filelists.xml.gz +0 -0
- data/spec/functional/assets/yumrepo/repodata/c10d1d34ce99e02f12ec96ef68360543ab1bb7c3cb81a4a2bf78df7d8597e9df-primary.xml.gz +0 -0
- data/spec/functional/dsl/registry_helper_spec.rb +1 -1
- data/spec/functional/resource/aixinit_service_spec.rb +7 -7
- data/spec/functional/resource/apt_package_spec.rb +1 -1
- data/spec/functional/resource/chocolatey_package_spec.rb +9 -0
- data/spec/functional/resource/dnf_package_spec.rb +4 -1
- data/spec/functional/resource/dsc_script_spec.rb +1 -1
- data/spec/functional/resource/group_spec.rb +1 -5
- data/spec/functional/resource/link_spec.rb +0 -8
- data/spec/functional/resource/registry_spec.rb +8 -8
- data/spec/functional/resource/user/mac_user_spec.rb +2 -2
- data/spec/functional/resource/windows_certificate_spec.rb +92 -35
- data/spec/functional/resource/windows_font_spec.rb +1 -2
- data/spec/functional/resource/yum_package_spec.rb +0 -12
- data/spec/functional/shell_spec.rb +0 -5
- data/spec/functional/version_spec.rb +1 -1
- data/spec/functional/win32/registry_spec.rb +1 -1
- data/spec/integration/client/client_spec.rb +5 -2
- data/spec/integration/client/exit_code_spec.rb +1 -1
- data/spec/integration/client/ipv6_spec.rb +1 -1
- data/spec/integration/compliance/compliance_spec.rb +1 -1
- data/spec/integration/ohai/ohai_spec.rb +7 -6
- data/spec/integration/recipes/accumulator_spec.rb +13 -1
- data/spec/integration/recipes/lwrp_inline_resources_spec.rb +5 -1
- data/spec/integration/recipes/lwrp_spec.rb +3 -1
- data/spec/integration/recipes/notifies_spec.rb +15 -1
- data/spec/integration/recipes/notifying_block_spec.rb +2 -1
- data/spec/integration/recipes/recipe_dsl_spec.rb +9 -9
- data/spec/integration/recipes/unified_mode_spec.rb +1 -1
- data/spec/integration/recipes/use_partial_spec.rb +4 -1
- data/spec/spec_helper.rb +10 -17
- data/spec/support/chef_helpers.rb +0 -16
- data/spec/support/lib/chef/resource/with_state.rb +0 -1
- data/spec/support/lib/chef/resource/zen_follower.rb +0 -1
- data/spec/support/lib/chef/resource/zen_master.rb +0 -1
- data/spec/support/matchers/leak.rb +7 -9
- data/spec/support/platform_helpers.rb +1 -12
- data/spec/support/shared/integration/integration_helper.rb +0 -1
- data/spec/support/shared/unit/script_resource.rb +2 -2
- data/spec/unit/application/solo_spec.rb +2 -2
- data/spec/unit/chef_fs/diff_spec.rb +1 -1
- data/spec/unit/chef_fs/file_system_spec.rb +1 -1
- data/spec/unit/client_spec.rb +4 -4
- data/spec/unit/compliance/fetcher/automate_spec.rb +0 -16
- data/spec/unit/compliance/reporter/automate_spec.rb +26 -2
- data/spec/unit/compliance/reporter/chef_server_automate_spec.rb +20 -0
- data/spec/unit/compliance/reporter/compliance_enforcer_spec.rb +1 -0
- data/spec/unit/compliance/runner_spec.rb +30 -4
- data/spec/unit/cookbook_version_spec.rb +0 -52
- data/spec/unit/daemon_spec.rb +5 -1
- data/spec/unit/data_bag_item_spec.rb +1 -6
- data/spec/unit/data_collector_spec.rb +2 -71
- data/spec/unit/dsl/reboot_pending_spec.rb +2 -2
- data/spec/unit/dsl/registry_helper_spec.rb +1 -1
- data/spec/unit/lwrp_spec.rb +1 -1
- data/spec/unit/mixin/checksum_spec.rb +0 -28
- data/spec/unit/mixin/params_validate_spec.rb +4 -3
- data/spec/unit/mixin/powershell_exec_spec.rb +9 -9
- data/spec/unit/mixin/powershell_out_spec.rb +2 -2
- data/spec/unit/node/attribute_spec.rb +1 -1
- data/spec/unit/node_spec.rb +78 -0
- data/spec/unit/org_group_spec.rb +45 -0
- data/spec/unit/platform/query_helpers_spec.rb +5 -5
- data/spec/unit/policy_builder/policyfile_spec.rb +1 -11
- data/spec/unit/property_spec.rb +23 -22
- data/spec/unit/provider/cron_spec.rb +1 -35
- data/spec/unit/provider/group/gpasswd_spec.rb +2 -2
- data/spec/unit/provider/group/groupmod_spec.rb +2 -2
- data/spec/unit/provider/group/pw_spec.rb +2 -2
- data/spec/unit/provider/group_spec.rb +1 -1
- data/spec/unit/provider/package/apt_spec.rb +84 -18
- data/spec/unit/provider/package/deb_spec.rb +3 -3
- data/spec/unit/provider/package/powershell_spec.rb +12 -74
- data/spec/unit/provider/package/rubygems_spec.rb +18 -30
- data/spec/unit/provider/service/arch_service_spec.rb +1 -0
- data/spec/unit/provider/service/debian_service_spec.rb +1 -0
- data/spec/unit/provider/service/macosx_spec.rb +2 -2
- data/spec/unit/provider/service/systemd_service_spec.rb +138 -23
- data/spec/unit/provider/service/upstart_service_spec.rb +0 -29
- data/spec/unit/provider/service/windows_spec.rb +2 -2
- data/spec/unit/provider/subversion_spec.rb +2 -2
- data/spec/unit/provider/systemd_unit_spec.rb +79 -60
- data/spec/unit/provider/zypper_repository_spec.rb +2 -2
- data/spec/unit/provider_spec.rb +0 -8
- data/spec/unit/resource/archive_file_spec.rb +1 -13
- data/spec/unit/resource/chef_client_trusted_certificate_spec.rb +0 -14
- data/spec/unit/resource/homebrew_cask_spec.rb +11 -29
- data/spec/unit/resource/mount_spec.rb +0 -10
- data/spec/unit/resource/powershell_script_spec.rb +2 -2
- data/spec/unit/resource/rhsm_subscription_spec.rb +3 -50
- data/spec/unit/resource/systemd_unit_spec.rb +1 -1
- data/spec/unit/resource/user_ulimit_spec.rb +1 -14
- data/spec/unit/resource/windows_task_spec.rb +1 -1
- data/spec/unit/resource_spec.rb +2 -7
- data/spec/unit/user_spec.rb +1 -1
- data/spec/unit/user_v1_spec.rb +6 -4
- data/spec/unit/util/dsc/local_configuration_manager_spec.rb +2 -2
- data/tasks/rspec.rb +15 -7
- metadata +43 -388
- data/bin/knife +0 -24
- data/lib/chef/application/knife.rb +0 -234
- data/lib/chef/application/windows_service.rb +0 -338
- data/lib/chef/application/windows_service_manager.rb +0 -205
- data/lib/chef/chef_fs/knife.rb +0 -160
- data/lib/chef/chef_fs/parallelizer/flatten_enumerable.rb +0 -35
- data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +0 -278
- data/lib/chef/chef_fs/parallelizer.rb +0 -102
- data/lib/chef/cookbook_site_streaming_uploader.rb +0 -244
- data/lib/chef/knife/acl_add.rb +0 -57
- data/lib/chef/knife/acl_base.rb +0 -183
- data/lib/chef/knife/acl_bulk_add.rb +0 -78
- data/lib/chef/knife/acl_bulk_remove.rb +0 -83
- data/lib/chef/knife/acl_remove.rb +0 -62
- data/lib/chef/knife/acl_show.rb +0 -56
- data/lib/chef/knife/bootstrap/chef_vault_handler.rb +0 -162
- data/lib/chef/knife/bootstrap/client_builder.rb +0 -212
- data/lib/chef/knife/bootstrap/templates/README.md +0 -11
- data/lib/chef/knife/bootstrap/templates/chef-full.erb +0 -242
- data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +0 -278
- data/lib/chef/knife/bootstrap/train_connector.rb +0 -336
- data/lib/chef/knife/bootstrap.rb +0 -1192
- data/lib/chef/knife/client_bulk_delete.rb +0 -104
- data/lib/chef/knife/client_create.rb +0 -101
- data/lib/chef/knife/client_delete.rb +0 -62
- data/lib/chef/knife/client_edit.rb +0 -52
- data/lib/chef/knife/client_key_create.rb +0 -73
- data/lib/chef/knife/client_key_delete.rb +0 -80
- data/lib/chef/knife/client_key_edit.rb +0 -83
- data/lib/chef/knife/client_key_list.rb +0 -73
- data/lib/chef/knife/client_key_show.rb +0 -80
- data/lib/chef/knife/client_list.rb +0 -41
- data/lib/chef/knife/client_reregister.rb +0 -58
- data/lib/chef/knife/client_show.rb +0 -48
- data/lib/chef/knife/config_get.rb +0 -39
- data/lib/chef/knife/config_get_profile.rb +0 -37
- data/lib/chef/knife/config_list.rb +0 -139
- data/lib/chef/knife/config_list_profiles.rb +0 -37
- data/lib/chef/knife/config_show.rb +0 -127
- data/lib/chef/knife/config_use.rb +0 -61
- data/lib/chef/knife/config_use_profile.rb +0 -47
- data/lib/chef/knife/configure.rb +0 -150
- data/lib/chef/knife/configure_client.rb +0 -48
- data/lib/chef/knife/cookbook_bulk_delete.rb +0 -71
- data/lib/chef/knife/cookbook_delete.rb +0 -151
- data/lib/chef/knife/cookbook_download.rb +0 -142
- data/lib/chef/knife/cookbook_list.rb +0 -47
- data/lib/chef/knife/cookbook_metadata.rb +0 -106
- data/lib/chef/knife/cookbook_metadata_from_file.rb +0 -49
- data/lib/chef/knife/cookbook_show.rb +0 -98
- data/lib/chef/knife/cookbook_upload.rb +0 -292
- data/lib/chef/knife/core/bootstrap_context.rb +0 -264
- data/lib/chef/knife/core/cookbook_scm_repo.rb +0 -159
- data/lib/chef/knife/core/formatting_options.rb +0 -49
- data/lib/chef/knife/core/gem_glob_loader.rb +0 -138
- data/lib/chef/knife/core/generic_presenter.rb +0 -232
- data/lib/chef/knife/core/hashed_command_loader.rb +0 -100
- data/lib/chef/knife/core/node_editor.rb +0 -130
- data/lib/chef/knife/core/node_presenter.rb +0 -133
- data/lib/chef/knife/core/object_loader.rb +0 -115
- data/lib/chef/knife/core/status_presenter.rb +0 -147
- data/lib/chef/knife/core/subcommand_loader.rb +0 -203
- data/lib/chef/knife/core/text_formatter.rb +0 -85
- data/lib/chef/knife/core/ui.rb +0 -338
- data/lib/chef/knife/core/windows_bootstrap_context.rb +0 -405
- data/lib/chef/knife/data_bag_create.rb +0 -81
- data/lib/chef/knife/data_bag_delete.rb +0 -49
- data/lib/chef/knife/data_bag_edit.rb +0 -74
- data/lib/chef/knife/data_bag_from_file.rb +0 -113
- data/lib/chef/knife/data_bag_list.rb +0 -42
- data/lib/chef/knife/data_bag_secret_options.rb +0 -122
- data/lib/chef/knife/data_bag_show.rb +0 -69
- data/lib/chef/knife/delete.rb +0 -125
- data/lib/chef/knife/deps.rb +0 -156
- data/lib/chef/knife/diff.rb +0 -83
- data/lib/chef/knife/download.rb +0 -84
- data/lib/chef/knife/edit.rb +0 -88
- data/lib/chef/knife/environment_compare.rb +0 -128
- data/lib/chef/knife/environment_create.rb +0 -52
- data/lib/chef/knife/environment_delete.rb +0 -44
- data/lib/chef/knife/environment_edit.rb +0 -44
- data/lib/chef/knife/environment_from_file.rb +0 -84
- data/lib/chef/knife/environment_list.rb +0 -41
- data/lib/chef/knife/environment_show.rb +0 -47
- data/lib/chef/knife/exec.rb +0 -99
- data/lib/chef/knife/group_add.rb +0 -55
- data/lib/chef/knife/group_create.rb +0 -49
- data/lib/chef/knife/group_destroy.rb +0 -53
- data/lib/chef/knife/group_list.rb +0 -43
- data/lib/chef/knife/group_remove.rb +0 -56
- data/lib/chef/knife/group_show.rb +0 -49
- data/lib/chef/knife/key_create.rb +0 -112
- data/lib/chef/knife/key_create_base.rb +0 -50
- data/lib/chef/knife/key_delete.rb +0 -55
- data/lib/chef/knife/key_edit.rb +0 -118
- data/lib/chef/knife/key_edit_base.rb +0 -55
- data/lib/chef/knife/key_list.rb +0 -90
- data/lib/chef/knife/key_list_base.rb +0 -45
- data/lib/chef/knife/key_show.rb +0 -53
- data/lib/chef/knife/list.rb +0 -177
- data/lib/chef/knife/node_bulk_delete.rb +0 -75
- data/lib/chef/knife/node_create.rb +0 -47
- data/lib/chef/knife/node_delete.rb +0 -46
- data/lib/chef/knife/node_edit.rb +0 -70
- data/lib/chef/knife/node_environment_set.rb +0 -53
- data/lib/chef/knife/node_from_file.rb +0 -51
- data/lib/chef/knife/node_list.rb +0 -44
- data/lib/chef/knife/node_policy_set.rb +0 -79
- data/lib/chef/knife/node_run_list_add.rb +0 -104
- data/lib/chef/knife/node_run_list_remove.rb +0 -67
- data/lib/chef/knife/node_run_list_set.rb +0 -66
- data/lib/chef/knife/node_show.rb +0 -63
- data/lib/chef/knife/null.rb +0 -12
- data/lib/chef/knife/raw.rb +0 -123
- data/lib/chef/knife/recipe_list.rb +0 -32
- data/lib/chef/knife/rehash.rb +0 -50
- data/lib/chef/knife/role_bulk_delete.rb +0 -66
- data/lib/chef/knife/role_create.rb +0 -53
- data/lib/chef/knife/role_delete.rb +0 -46
- data/lib/chef/knife/role_edit.rb +0 -45
- data/lib/chef/knife/role_env_run_list_add.rb +0 -87
- data/lib/chef/knife/role_env_run_list_clear.rb +0 -55
- data/lib/chef/knife/role_env_run_list_remove.rb +0 -57
- data/lib/chef/knife/role_env_run_list_replace.rb +0 -60
- data/lib/chef/knife/role_env_run_list_set.rb +0 -70
- data/lib/chef/knife/role_from_file.rb +0 -51
- data/lib/chef/knife/role_list.rb +0 -42
- data/lib/chef/knife/role_run_list_add.rb +0 -87
- data/lib/chef/knife/role_run_list_clear.rb +0 -55
- data/lib/chef/knife/role_run_list_remove.rb +0 -56
- data/lib/chef/knife/role_run_list_replace.rb +0 -60
- data/lib/chef/knife/role_run_list_set.rb +0 -69
- data/lib/chef/knife/role_show.rb +0 -48
- data/lib/chef/knife/search.rb +0 -194
- data/lib/chef/knife/serve.rb +0 -65
- data/lib/chef/knife/show.rb +0 -72
- data/lib/chef/knife/ssh.rb +0 -645
- data/lib/chef/knife/ssl_check.rb +0 -284
- data/lib/chef/knife/ssl_fetch.rb +0 -161
- data/lib/chef/knife/status.rb +0 -95
- data/lib/chef/knife/supermarket_download.rb +0 -121
- data/lib/chef/knife/supermarket_install.rb +0 -192
- data/lib/chef/knife/supermarket_list.rb +0 -76
- data/lib/chef/knife/supermarket_search.rb +0 -53
- data/lib/chef/knife/supermarket_share.rb +0 -166
- data/lib/chef/knife/supermarket_show.rb +0 -66
- data/lib/chef/knife/supermarket_unshare.rb +0 -61
- data/lib/chef/knife/tag_create.rb +0 -52
- data/lib/chef/knife/tag_delete.rb +0 -60
- data/lib/chef/knife/tag_list.rb +0 -47
- data/lib/chef/knife/upload.rb +0 -86
- data/lib/chef/knife/user_create.rb +0 -107
- data/lib/chef/knife/user_delete.rb +0 -44
- data/lib/chef/knife/user_dissociate.rb +0 -42
- data/lib/chef/knife/user_edit.rb +0 -52
- data/lib/chef/knife/user_invite_add.rb +0 -43
- data/lib/chef/knife/user_invite_list.rb +0 -34
- data/lib/chef/knife/user_invite_rescind.rb +0 -63
- data/lib/chef/knife/user_key_create.rb +0 -73
- data/lib/chef/knife/user_key_delete.rb +0 -80
- data/lib/chef/knife/user_key_edit.rb +0 -83
- data/lib/chef/knife/user_key_list.rb +0 -73
- data/lib/chef/knife/user_key_show.rb +0 -80
- data/lib/chef/knife/user_list.rb +0 -42
- data/lib/chef/knife/user_reregister.rb +0 -59
- data/lib/chef/knife/user_show.rb +0 -48
- data/lib/chef/knife/xargs.rb +0 -282
- data/lib/chef/knife/yaml_convert.rb +0 -91
- data/lib/chef/knife.rb +0 -665
- data/lib/chef/resource/user/dscl_user.rb +0 -35
- data/spec/data/knife-home/.chef/plugins/knife/example_home_subcommand.rb +0 -0
- data/spec/data/knife-site-subcommands/plugins/knife/example_subcommand.rb +0 -0
- data/spec/data/knife_subcommand/test_explicit_category.rb +0 -7
- data/spec/data/knife_subcommand/test_name_mapping.rb +0 -4
- data/spec/data/knife_subcommand/test_yourself.rb +0 -21
- data/spec/functional/assets/yumrepo-empty/repodata/01a3b-filelists.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/401dc-filelists.xml.gz +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/5dc1e-primary.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/6bf96-other.xml.gz +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/7c365-other.sqlite.bz2 +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/dabe2-primary.xml.gz +0 -0
- data/spec/functional/assets/yumrepo-empty/repodata/repomd.xml +0 -55
- data/spec/functional/knife/configure_spec.rb +0 -33
- data/spec/functional/knife/cookbook_delete_spec.rb +0 -156
- data/spec/functional/knife/exec_spec.rb +0 -55
- data/spec/functional/knife/rehash_spec.rb +0 -39
- data/spec/functional/knife/smoke_test.rb +0 -42
- data/spec/functional/knife/ssh_spec.rb +0 -352
- data/spec/functional/resource/user/dscl_spec.rb +0 -188
- data/spec/functional/resource/windows_service_spec.rb +0 -105
- data/spec/functional/win32/service_manager_spec.rb +0 -220
- data/spec/integration/client/fips_spec.rb +0 -21
- data/spec/integration/knife/chef_fs_data_store_spec.rb +0 -557
- data/spec/integration/knife/chef_repo_path_spec.rb +0 -962
- data/spec/integration/knife/chef_repository_file_system_spec.rb +0 -200
- data/spec/integration/knife/chefignore_spec.rb +0 -301
- data/spec/integration/knife/client_bulk_delete_spec.rb +0 -131
- data/spec/integration/knife/client_create_spec.rb +0 -70
- data/spec/integration/knife/client_delete_spec.rb +0 -64
- data/spec/integration/knife/client_key_create_spec.rb +0 -66
- data/spec/integration/knife/client_key_delete_spec.rb +0 -43
- data/spec/integration/knife/client_key_list_spec.rb +0 -61
- data/spec/integration/knife/client_key_show_spec.rb +0 -45
- data/spec/integration/knife/client_list_spec.rb +0 -49
- data/spec/integration/knife/client_show_spec.rb +0 -37
- data/spec/integration/knife/common_options_spec.rb +0 -174
- data/spec/integration/knife/config_list_spec.rb +0 -220
- data/spec/integration/knife/config_show_spec.rb +0 -192
- data/spec/integration/knife/config_use_spec.rb +0 -198
- data/spec/integration/knife/cookbook_api_ipv6_spec.rb +0 -113
- data/spec/integration/knife/cookbook_bulk_delete_spec.rb +0 -65
- data/spec/integration/knife/cookbook_download_spec.rb +0 -72
- data/spec/integration/knife/cookbook_list_spec.rb +0 -55
- data/spec/integration/knife/cookbook_show_spec.rb +0 -149
- data/spec/integration/knife/cookbook_upload_spec.rb +0 -128
- data/spec/integration/knife/data_bag_create_spec.rb +0 -125
- data/spec/integration/knife/data_bag_delete_spec.rb +0 -59
- data/spec/integration/knife/data_bag_edit_spec.rb +0 -105
- data/spec/integration/knife/data_bag_from_file_spec.rb +0 -116
- data/spec/integration/knife/data_bag_list_spec.rb +0 -44
- data/spec/integration/knife/data_bag_show_spec.rb +0 -95
- data/spec/integration/knife/delete_spec.rb +0 -1018
- data/spec/integration/knife/deps_spec.rb +0 -703
- data/spec/integration/knife/diff_spec.rb +0 -605
- data/spec/integration/knife/download_spec.rb +0 -1336
- data/spec/integration/knife/environment_compare_spec.rb +0 -75
- data/spec/integration/knife/environment_create_spec.rb +0 -41
- data/spec/integration/knife/environment_delete_spec.rb +0 -37
- data/spec/integration/knife/environment_from_file_spec.rb +0 -116
- data/spec/integration/knife/environment_list_spec.rb +0 -42
- data/spec/integration/knife/environment_show_spec.rb +0 -77
- data/spec/integration/knife/list_spec.rb +0 -1060
- data/spec/integration/knife/node_bulk_delete_spec.rb +0 -52
- data/spec/integration/knife/node_create_spec.rb +0 -47
- data/spec/integration/knife/node_delete_spec.rb +0 -48
- data/spec/integration/knife/node_environment_set_spec.rb +0 -46
- data/spec/integration/knife/node_from_file_spec.rb +0 -59
- data/spec/integration/knife/node_list_spec.rb +0 -45
- data/spec/integration/knife/node_run_list_add_spec.rb +0 -54
- data/spec/integration/knife/node_run_list_remove_spec.rb +0 -36
- data/spec/integration/knife/node_run_list_set_spec.rb +0 -41
- data/spec/integration/knife/node_show_spec.rb +0 -36
- data/spec/integration/knife/raw_spec.rb +0 -297
- data/spec/integration/knife/redirection_spec.rb +0 -64
- data/spec/integration/knife/role_bulk_delete_spec.rb +0 -52
- data/spec/integration/knife/role_create_spec.rb +0 -41
- data/spec/integration/knife/role_delete_spec.rb +0 -48
- data/spec/integration/knife/role_from_file_spec.rb +0 -96
- data/spec/integration/knife/role_list_spec.rb +0 -45
- data/spec/integration/knife/role_show_spec.rb +0 -51
- data/spec/integration/knife/search_node_spec.rb +0 -40
- data/spec/integration/knife/serve_spec.rb +0 -92
- data/spec/integration/knife/show_spec.rb +0 -197
- data/spec/integration/knife/upload_spec.rb +0 -1616
- data/spec/support/shared/functional/knife.rb +0 -37
- data/spec/support/shared/functional/win32_service.rb +0 -57
- data/spec/support/shared/integration/knife_support.rb +0 -192
- data/spec/support/shared/unit/knife_shared.rb +0 -39
- data/spec/unit/application/knife_spec.rb +0 -241
- data/spec/unit/chef_fs/parallelizer_spec.rb +0 -479
- data/spec/unit/cookbook_site_streaming_uploader_spec.rb +0 -198
- data/spec/unit/knife/bootstrap/chef_vault_handler_spec.rb +0 -152
- data/spec/unit/knife/bootstrap/client_builder_spec.rb +0 -207
- data/spec/unit/knife/bootstrap/train_connector_spec.rb +0 -244
- data/spec/unit/knife/bootstrap_spec.rb +0 -2220
- data/spec/unit/knife/client_bulk_delete_spec.rb +0 -166
- data/spec/unit/knife/client_create_spec.rb +0 -169
- data/spec/unit/knife/client_delete_spec.rb +0 -99
- data/spec/unit/knife/client_edit_spec.rb +0 -53
- data/spec/unit/knife/client_list_spec.rb +0 -34
- data/spec/unit/knife/client_reregister_spec.rb +0 -62
- data/spec/unit/knife/client_show_spec.rb +0 -52
- data/spec/unit/knife/configure_client_spec.rb +0 -81
- data/spec/unit/knife/configure_spec.rb +0 -190
- data/spec/unit/knife/cookbook_bulk_delete_spec.rb +0 -87
- data/spec/unit/knife/cookbook_delete_spec.rb +0 -239
- data/spec/unit/knife/cookbook_download_spec.rb +0 -255
- data/spec/unit/knife/cookbook_list_spec.rb +0 -88
- data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +0 -72
- data/spec/unit/knife/cookbook_metadata_spec.rb +0 -182
- data/spec/unit/knife/cookbook_show_spec.rb +0 -253
- data/spec/unit/knife/cookbook_upload_spec.rb +0 -364
- data/spec/unit/knife/core/bootstrap_context_spec.rb +0 -287
- data/spec/unit/knife/core/cookbook_scm_repo_spec.rb +0 -187
- data/spec/unit/knife/core/gem_glob_loader_spec.rb +0 -209
- data/spec/unit/knife/core/hashed_command_loader_spec.rb +0 -112
- data/spec/unit/knife/core/node_editor_spec.rb +0 -211
- data/spec/unit/knife/core/object_loader_spec.rb +0 -81
- data/spec/unit/knife/core/status_presenter_spec.rb +0 -54
- data/spec/unit/knife/core/subcommand_loader_spec.rb +0 -64
- data/spec/unit/knife/core/ui_spec.rb +0 -656
- data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +0 -238
- data/spec/unit/knife/data_bag_create_spec.rb +0 -175
- data/spec/unit/knife/data_bag_edit_spec.rb +0 -126
- data/spec/unit/knife/data_bag_from_file_spec.rb +0 -174
- data/spec/unit/knife/data_bag_secret_options_spec.rb +0 -173
- data/spec/unit/knife/data_bag_show_spec.rb +0 -139
- data/spec/unit/knife/environment_compare_spec.rb +0 -112
- data/spec/unit/knife/environment_create_spec.rb +0 -91
- data/spec/unit/knife/environment_delete_spec.rb +0 -71
- data/spec/unit/knife/environment_edit_spec.rb +0 -79
- data/spec/unit/knife/environment_from_file_spec.rb +0 -90
- data/spec/unit/knife/environment_list_spec.rb +0 -54
- data/spec/unit/knife/environment_show_spec.rb +0 -52
- data/spec/unit/knife/key_create_spec.rb +0 -223
- data/spec/unit/knife/key_delete_spec.rb +0 -133
- data/spec/unit/knife/key_edit_spec.rb +0 -264
- data/spec/unit/knife/key_helper.rb +0 -74
- data/spec/unit/knife/key_list_spec.rb +0 -216
- data/spec/unit/knife/key_show_spec.rb +0 -126
- data/spec/unit/knife/node_bulk_delete_spec.rb +0 -94
- data/spec/unit/knife/node_delete_spec.rb +0 -77
- data/spec/unit/knife/node_edit_spec.rb +0 -116
- data/spec/unit/knife/node_environment_set_spec.rb +0 -61
- data/spec/unit/knife/node_from_file_spec.rb +0 -59
- data/spec/unit/knife/node_list_spec.rb +0 -62
- data/spec/unit/knife/node_policy_set_spec.rb +0 -122
- data/spec/unit/knife/node_run_list_add_spec.rb +0 -145
- data/spec/unit/knife/node_run_list_remove_spec.rb +0 -106
- data/spec/unit/knife/node_run_list_set_spec.rb +0 -115
- data/spec/unit/knife/node_show_spec.rb +0 -65
- data/spec/unit/knife/raw_spec.rb +0 -43
- data/spec/unit/knife/role_bulk_delete_spec.rb +0 -80
- data/spec/unit/knife/role_create_spec.rb +0 -80
- data/spec/unit/knife/role_delete_spec.rb +0 -67
- data/spec/unit/knife/role_edit_spec.rb +0 -77
- data/spec/unit/knife/role_env_run_list_add_spec.rb +0 -217
- data/spec/unit/knife/role_env_run_list_clear_spec.rb +0 -94
- data/spec/unit/knife/role_env_run_list_remove_spec.rb +0 -102
- data/spec/unit/knife/role_env_run_list_replace_spec.rb +0 -105
- data/spec/unit/knife/role_env_run_list_set_spec.rb +0 -99
- data/spec/unit/knife/role_from_file_spec.rb +0 -69
- data/spec/unit/knife/role_list_spec.rb +0 -54
- data/spec/unit/knife/role_run_list_add_spec.rb +0 -179
- data/spec/unit/knife/role_run_list_clear_spec.rb +0 -84
- data/spec/unit/knife/role_run_list_remove_spec.rb +0 -92
- data/spec/unit/knife/role_run_list_replace_spec.rb +0 -98
- data/spec/unit/knife/role_run_list_set_spec.rb +0 -89
- data/spec/unit/knife/role_show_spec.rb +0 -59
- data/spec/unit/knife/ssh_spec.rb +0 -403
- data/spec/unit/knife/ssl_check_spec.rb +0 -256
- data/spec/unit/knife/ssl_fetch_spec.rb +0 -222
- data/spec/unit/knife/status_spec.rb +0 -112
- data/spec/unit/knife/supermarket_download_spec.rb +0 -152
- data/spec/unit/knife/supermarket_install_spec.rb +0 -202
- data/spec/unit/knife/supermarket_list_spec.rb +0 -70
- data/spec/unit/knife/supermarket_search_spec.rb +0 -85
- data/spec/unit/knife/supermarket_share_spec.rb +0 -208
- data/spec/unit/knife/supermarket_unshare_spec.rb +0 -78
- data/spec/unit/knife/tag_create_spec.rb +0 -23
- data/spec/unit/knife/tag_delete_spec.rb +0 -25
- data/spec/unit/knife/tag_list_spec.rb +0 -23
- data/spec/unit/knife/user_create_spec.rb +0 -184
- data/spec/unit/knife/user_delete_spec.rb +0 -46
- data/spec/unit/knife/user_edit_spec.rb +0 -48
- data/spec/unit/knife/user_list_spec.rb +0 -36
- data/spec/unit/knife/user_reregister_spec.rb +0 -56
- data/spec/unit/knife/user_show_spec.rb +0 -46
- data/spec/unit/knife_spec.rb +0 -634
- data/spec/unit/provider/user/dscl_spec.rb +0 -699
- data/spec/unit/windows_service_spec.rb +0 -118
@@ -1,102 +0,0 @@
|
|
1
|
-
require_relative "parallelizer/parallel_enumerable"
|
2
|
-
|
3
|
-
class Chef
|
4
|
-
module ChefFS
|
5
|
-
# Tries to balance several guarantees, in order of priority:
|
6
|
-
# - don't get deadlocked
|
7
|
-
# - provide results in desired order
|
8
|
-
# - provide results as soon as they are available
|
9
|
-
# - process input as soon as possible
|
10
|
-
class Parallelizer
|
11
|
-
@@parallelizer = nil
|
12
|
-
@@threads = 0
|
13
|
-
|
14
|
-
def self.threads=(value)
|
15
|
-
@@threads = value
|
16
|
-
@@parallelizer.resize(value) if @@parallelizer
|
17
|
-
end
|
18
|
-
|
19
|
-
def self.parallelizer
|
20
|
-
@@parallelizer ||= Parallelizer.new(@@threads)
|
21
|
-
end
|
22
|
-
|
23
|
-
def self.parallelize(enumerable, options = {}, &block)
|
24
|
-
parallelizer.parallelize(enumerable, options, &block)
|
25
|
-
end
|
26
|
-
|
27
|
-
def self.parallel_do(enumerable, options = {}, &block)
|
28
|
-
parallelizer.parallel_do(enumerable, options, &block)
|
29
|
-
end
|
30
|
-
|
31
|
-
def initialize(num_threads)
|
32
|
-
@tasks = Queue.new
|
33
|
-
@threads = []
|
34
|
-
@stop_thread = {}
|
35
|
-
resize(num_threads)
|
36
|
-
end
|
37
|
-
|
38
|
-
def num_threads
|
39
|
-
@threads.size
|
40
|
-
end
|
41
|
-
|
42
|
-
def parallelize(enumerable, options = {}, &block)
|
43
|
-
ParallelEnumerable.new(@tasks, enumerable, options, &block)
|
44
|
-
end
|
45
|
-
|
46
|
-
def parallel_do(enumerable, options = {}, &block)
|
47
|
-
ParallelEnumerable.new(@tasks, enumerable, options.merge(ordered: false), &block).wait
|
48
|
-
end
|
49
|
-
|
50
|
-
def stop(wait = true, timeout = nil)
|
51
|
-
resize(0, wait, timeout)
|
52
|
-
end
|
53
|
-
|
54
|
-
def resize(to_threads, wait = true, timeout = nil)
|
55
|
-
if to_threads < num_threads
|
56
|
-
threads_to_stop = @threads[to_threads..num_threads - 1]
|
57
|
-
@threads = @threads.slice(0, to_threads)
|
58
|
-
threads_to_stop.each do |thread|
|
59
|
-
@stop_thread[thread] = true
|
60
|
-
end
|
61
|
-
|
62
|
-
if wait
|
63
|
-
start_time = Time.now
|
64
|
-
threads_to_stop.each do |thread|
|
65
|
-
thread_timeout = timeout ? timeout - (Time.now - start_time) : nil
|
66
|
-
thread.join(thread_timeout)
|
67
|
-
end
|
68
|
-
end
|
69
|
-
|
70
|
-
else
|
71
|
-
num_threads.upto(to_threads - 1) do |i|
|
72
|
-
@threads[i] = Thread.new(&method(:worker_loop))
|
73
|
-
end
|
74
|
-
end
|
75
|
-
end
|
76
|
-
|
77
|
-
def kill
|
78
|
-
@threads.each do |thread|
|
79
|
-
Thread.kill(thread)
|
80
|
-
@stop_thread.delete(thread)
|
81
|
-
end
|
82
|
-
@threads = []
|
83
|
-
end
|
84
|
-
|
85
|
-
private
|
86
|
-
|
87
|
-
def worker_loop
|
88
|
-
until @stop_thread[Thread.current]
|
89
|
-
begin
|
90
|
-
task = @tasks.pop
|
91
|
-
task.call
|
92
|
-
rescue
|
93
|
-
puts "ERROR #{$!}"
|
94
|
-
puts $!.backtrace
|
95
|
-
end
|
96
|
-
end
|
97
|
-
ensure
|
98
|
-
@stop_thread.delete(Thread.current)
|
99
|
-
end
|
100
|
-
end
|
101
|
-
end
|
102
|
-
end
|
@@ -1,244 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Stanislav Vitvitskiy
|
3
|
-
# Author:: Nuo Yan (nuo@chef.io)
|
4
|
-
# Author:: Christopher Walters (<cw@chef.io>)
|
5
|
-
# Copyright:: Copyright (c) Chef Software Inc.
|
6
|
-
# License:: Apache License, Version 2.0
|
7
|
-
#
|
8
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
9
|
-
# you may not use this file except in compliance with the License.
|
10
|
-
# You may obtain a copy of the License at
|
11
|
-
#
|
12
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
13
|
-
#
|
14
|
-
# Unless required by applicable law or agreed to in writing, software
|
15
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
16
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
17
|
-
# See the License for the specific language governing permissions and
|
18
|
-
# limitations under the License.
|
19
|
-
#
|
20
|
-
|
21
|
-
autoload :URI, "uri"
|
22
|
-
module Net
|
23
|
-
autoload :HTTP, "net/http"
|
24
|
-
end
|
25
|
-
autoload :OpenSSL, "openssl"
|
26
|
-
module Mixlib
|
27
|
-
module Authentication
|
28
|
-
autoload :SignedHeaderAuth, "mixlib/authentication/signedheaderauth"
|
29
|
-
end
|
30
|
-
end
|
31
|
-
require "chef-utils/dist" unless defined?(ChefUtils::Dist)
|
32
|
-
|
33
|
-
class Chef
|
34
|
-
# == Chef::CookbookSiteStreamingUploader
|
35
|
-
# A streaming multipart HTTP upload implementation. Used to upload cookbooks
|
36
|
-
# (in tarball form) to https://supermarket.chef.io
|
37
|
-
#
|
38
|
-
# inspired by http://stanislavvitvitskiy.blogspot.com/2008/12/multipart-post-in-ruby.html
|
39
|
-
class CookbookSiteStreamingUploader
|
40
|
-
|
41
|
-
DefaultHeaders = { "accept" => "application/json", "x-chef-version" => ::Chef::VERSION }.freeze # rubocop:disable Naming/ConstantName
|
42
|
-
|
43
|
-
class << self
|
44
|
-
|
45
|
-
def create_build_dir(cookbook)
|
46
|
-
tmp_cookbook_path = Tempfile.new("#{ChefUtils::Dist::Infra::SHORT}-#{cookbook.name}-build")
|
47
|
-
tmp_cookbook_path.close
|
48
|
-
tmp_cookbook_dir = tmp_cookbook_path.path
|
49
|
-
File.unlink(tmp_cookbook_dir)
|
50
|
-
FileUtils.mkdir_p(tmp_cookbook_dir)
|
51
|
-
Chef::Log.trace("Staging at #{tmp_cookbook_dir}")
|
52
|
-
checksums_to_on_disk_paths = cookbook.checksums
|
53
|
-
cookbook.each_file do |manifest_record|
|
54
|
-
path_in_cookbook = manifest_record[:path]
|
55
|
-
on_disk_path = checksums_to_on_disk_paths[manifest_record[:checksum]]
|
56
|
-
dest = File.join(tmp_cookbook_dir, cookbook.name.to_s, path_in_cookbook)
|
57
|
-
FileUtils.mkdir_p(File.dirname(dest))
|
58
|
-
Chef::Log.trace("Staging #{on_disk_path} to #{dest}")
|
59
|
-
FileUtils.cp(on_disk_path, dest)
|
60
|
-
end
|
61
|
-
|
62
|
-
# First, generate metadata
|
63
|
-
Chef::Log.trace("Generating metadata")
|
64
|
-
kcm = Chef::Knife::CookbookMetadata.new
|
65
|
-
kcm.config[:cookbook_path] = [ tmp_cookbook_dir ]
|
66
|
-
kcm.name_args = [ cookbook.name.to_s ]
|
67
|
-
kcm.run
|
68
|
-
|
69
|
-
tmp_cookbook_dir
|
70
|
-
end
|
71
|
-
|
72
|
-
def post(to_url, user_id, secret_key_filename, params = {}, headers = {})
|
73
|
-
make_request(:post, to_url, user_id, secret_key_filename, params, headers)
|
74
|
-
end
|
75
|
-
|
76
|
-
def put(to_url, user_id, secret_key_filename, params = {}, headers = {})
|
77
|
-
make_request(:put, to_url, user_id, secret_key_filename, params, headers)
|
78
|
-
end
|
79
|
-
|
80
|
-
def make_request(http_verb, to_url, user_id, secret_key_filename, params = {}, headers = {})
|
81
|
-
boundary = "----RubyMultipartClient" + rand(1000000).to_s + "ZZZZZ"
|
82
|
-
parts = []
|
83
|
-
content_file = nil
|
84
|
-
|
85
|
-
secret_key = OpenSSL::PKey::RSA.new(File.read(secret_key_filename))
|
86
|
-
|
87
|
-
unless params.nil? || params.empty?
|
88
|
-
params.each do |key, value|
|
89
|
-
if value.is_a?(File)
|
90
|
-
content_file = value
|
91
|
-
filepath = value.path
|
92
|
-
filename = File.basename(filepath)
|
93
|
-
parts << StringPart.new( "--" + boundary + "\r\n" +
|
94
|
-
"Content-Disposition: form-data; name=\"" + key.to_s + "\"; filename=\"" + filename + "\"\r\n" +
|
95
|
-
"Content-Type: application/octet-stream\r\n\r\n")
|
96
|
-
parts << StreamPart.new(value, File.size(filepath))
|
97
|
-
parts << StringPart.new("\r\n")
|
98
|
-
else
|
99
|
-
parts << StringPart.new( "--" + boundary + "\r\n" +
|
100
|
-
"Content-Disposition: form-data; name=\"" + key.to_s + "\"\r\n\r\n")
|
101
|
-
parts << StringPart.new(value.to_s + "\r\n")
|
102
|
-
end
|
103
|
-
end
|
104
|
-
parts << StringPart.new("--" + boundary + "--\r\n")
|
105
|
-
end
|
106
|
-
|
107
|
-
body_stream = MultipartStream.new(parts)
|
108
|
-
|
109
|
-
timestamp = Time.now.utc.iso8601
|
110
|
-
|
111
|
-
url = URI.parse(to_url)
|
112
|
-
|
113
|
-
Chef::Log.logger.debug("Signing: method: #{http_verb}, url: #{url}, file: #{content_file}, User-id: #{user_id}, Timestamp: #{timestamp}")
|
114
|
-
|
115
|
-
# We use the body for signing the request if the file parameter
|
116
|
-
# wasn't a valid file or wasn't included. Extract the body (with
|
117
|
-
# multi-part delimiters intact) to sign the request.
|
118
|
-
# TODO: tim: 2009-12-28: It'd be nice to remove this special case, and
|
119
|
-
# always hash the entire request body. In the file case it would just be
|
120
|
-
# expanded multipart text - the entire body of the POST.
|
121
|
-
content_body = parts.inject("") { |result, part| result + part.read(0, part.size) }
|
122
|
-
content_file.rewind if content_file # we consumed the file for the above operation, so rewind it.
|
123
|
-
|
124
|
-
signing_options = {
|
125
|
-
http_method: http_verb,
|
126
|
-
path: url.path,
|
127
|
-
user_id: user_id,
|
128
|
-
timestamp: timestamp }
|
129
|
-
(content_file && signing_options[:file] = content_file) || (signing_options[:body] = (content_body || ""))
|
130
|
-
|
131
|
-
headers.merge!(Mixlib::Authentication::SignedHeaderAuth.signing_object(signing_options).sign(secret_key))
|
132
|
-
|
133
|
-
content_file.rewind if content_file
|
134
|
-
|
135
|
-
# net/http doesn't like symbols for header keys, so we'll to_s each one just in case
|
136
|
-
headers = DefaultHeaders.merge(Hash[*headers.map { |k, v| [k.to_s, v] }.flatten])
|
137
|
-
|
138
|
-
req = case http_verb
|
139
|
-
when :put
|
140
|
-
Net::HTTP::Put.new(url.path, headers)
|
141
|
-
when :post
|
142
|
-
Net::HTTP::Post.new(url.path, headers)
|
143
|
-
end
|
144
|
-
req.content_length = body_stream.size
|
145
|
-
req.content_type = "multipart/form-data; boundary=" + boundary unless parts.empty?
|
146
|
-
req.body_stream = body_stream
|
147
|
-
|
148
|
-
http = Chef::HTTP::BasicClient.new(url).http_client
|
149
|
-
res = http.request(req)
|
150
|
-
|
151
|
-
# alias status to code and to_s to body for test purposes
|
152
|
-
# TODO: stop the following madness!
|
153
|
-
class << res
|
154
|
-
alias :to_s :body
|
155
|
-
|
156
|
-
# BUG this makes the response compatible with what response_steps expects to test headers (response.headers[] -> response[])
|
157
|
-
def headers # rubocop:disable Lint/NestedMethodDefinition
|
158
|
-
self
|
159
|
-
end
|
160
|
-
|
161
|
-
def status # rubocop:disable Lint/NestedMethodDefinition
|
162
|
-
code.to_i
|
163
|
-
end
|
164
|
-
end
|
165
|
-
res
|
166
|
-
end
|
167
|
-
|
168
|
-
end
|
169
|
-
|
170
|
-
class StreamPart
|
171
|
-
def initialize(stream, size)
|
172
|
-
@stream, @size = stream, size
|
173
|
-
end
|
174
|
-
|
175
|
-
def size
|
176
|
-
@size
|
177
|
-
end
|
178
|
-
|
179
|
-
# read the specified amount from the stream
|
180
|
-
def read(offset, how_much)
|
181
|
-
@stream.read(how_much)
|
182
|
-
end
|
183
|
-
end
|
184
|
-
|
185
|
-
class StringPart
|
186
|
-
def initialize(str)
|
187
|
-
@str = str
|
188
|
-
end
|
189
|
-
|
190
|
-
def size
|
191
|
-
@str.length
|
192
|
-
end
|
193
|
-
|
194
|
-
# read the specified amount from the string starting at the offset
|
195
|
-
def read(offset, how_much)
|
196
|
-
@str[offset, how_much]
|
197
|
-
end
|
198
|
-
end
|
199
|
-
|
200
|
-
class MultipartStream
|
201
|
-
def initialize(parts)
|
202
|
-
@parts = parts
|
203
|
-
@part_no = 0
|
204
|
-
@part_offset = 0
|
205
|
-
end
|
206
|
-
|
207
|
-
def size
|
208
|
-
@parts.inject(0) { |size, part| size + part.size }
|
209
|
-
end
|
210
|
-
|
211
|
-
def read(how_much, dst_buf = nil)
|
212
|
-
if @part_no >= @parts.size
|
213
|
-
dst_buf.replace("") if dst_buf
|
214
|
-
return dst_buf
|
215
|
-
end
|
216
|
-
|
217
|
-
how_much_current_part = @parts[@part_no].size - @part_offset
|
218
|
-
|
219
|
-
how_much_current_part = if how_much_current_part > how_much
|
220
|
-
how_much
|
221
|
-
else
|
222
|
-
how_much_current_part
|
223
|
-
end
|
224
|
-
|
225
|
-
how_much_next_part = how_much - how_much_current_part
|
226
|
-
|
227
|
-
current_part = @parts[@part_no].read(@part_offset, how_much_current_part)
|
228
|
-
|
229
|
-
# recurse into the next part if the current one was not large enough
|
230
|
-
if how_much_next_part > 0
|
231
|
-
@part_no += 1
|
232
|
-
@part_offset = 0
|
233
|
-
next_part = read(how_much_next_part)
|
234
|
-
result = current_part + (next_part || "")
|
235
|
-
else
|
236
|
-
@part_offset += how_much_current_part
|
237
|
-
result = current_part
|
238
|
-
end
|
239
|
-
dst_buf ? dst_buf.replace(result || "") : result
|
240
|
-
end
|
241
|
-
end
|
242
|
-
|
243
|
-
end
|
244
|
-
end
|
data/lib/chef/knife/acl_add.rb
DELETED
@@ -1,57 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Steven Danna (steve@chef.io)
|
3
|
-
# Author:: Jeremiah Snapp (jeremiah@chef.io)
|
4
|
-
# Copyright:: Copyright (c) Chef Software Inc.
|
5
|
-
# License:: Apache License, Version 2.0
|
6
|
-
#
|
7
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
# you may not use this file except in compliance with the License.
|
9
|
-
# You may obtain a copy of the License at
|
10
|
-
#
|
11
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
#
|
13
|
-
# Unless required by applicable law or agreed to in writing, software
|
14
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
# See the License for the specific language governing permissions and
|
17
|
-
# limitations under the License.
|
18
|
-
#
|
19
|
-
|
20
|
-
require_relative "../knife"
|
21
|
-
|
22
|
-
class Chef
|
23
|
-
class Knife
|
24
|
-
class AclAdd < Chef::Knife
|
25
|
-
category "acl"
|
26
|
-
banner "knife acl add MEMBER_TYPE MEMBER_NAME OBJECT_TYPE OBJECT_NAME PERMS"
|
27
|
-
|
28
|
-
deps do
|
29
|
-
require_relative "acl_base"
|
30
|
-
include Chef::Knife::AclBase
|
31
|
-
end
|
32
|
-
|
33
|
-
def run
|
34
|
-
member_type, member_name, object_type, object_name, perms = name_args
|
35
|
-
|
36
|
-
if name_args.length != 5
|
37
|
-
show_usage
|
38
|
-
ui.fatal "You must specify the member type [client|group], member name, object type, object name and perms"
|
39
|
-
exit 1
|
40
|
-
end
|
41
|
-
|
42
|
-
unless %w{client group}.include?(member_type)
|
43
|
-
ui.fatal "ERROR: To enforce best practice, knife-acl can only add a client or a group to an ACL."
|
44
|
-
ui.fatal " See the knife-acl README for more information."
|
45
|
-
exit 1
|
46
|
-
end
|
47
|
-
validate_perm_type!(perms)
|
48
|
-
validate_member_name!(member_name)
|
49
|
-
validate_object_name!(object_name)
|
50
|
-
validate_object_type!(object_type)
|
51
|
-
validate_member_exists!(member_type, member_name)
|
52
|
-
|
53
|
-
add_to_acl!(member_type, member_name, object_type, object_name, perms)
|
54
|
-
end
|
55
|
-
end
|
56
|
-
end
|
57
|
-
end
|
data/lib/chef/knife/acl_base.rb
DELETED
@@ -1,183 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Steven Danna (steve@chef.io)
|
3
|
-
# Author:: Jeremiah Snapp (<jeremiah@chef.io>)
|
4
|
-
# Copyright:: Copyright (c) Chef Software Inc.
|
5
|
-
# License:: Apache License, Version 2.0
|
6
|
-
#
|
7
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
-
# you may not use this file except in compliance with the License.
|
9
|
-
# You may obtain a copy of the License at
|
10
|
-
#
|
11
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
12
|
-
#
|
13
|
-
# Unless required by applicable law or agreed to in writing, software
|
14
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
-
# See the License for the specific language governing permissions and
|
17
|
-
# limitations under the License.
|
18
|
-
#
|
19
|
-
|
20
|
-
require_relative "../knife"
|
21
|
-
|
22
|
-
class Chef
|
23
|
-
class Knife
|
24
|
-
module AclBase
|
25
|
-
|
26
|
-
PERM_TYPES = %w{create read update delete grant}.freeze unless defined? PERM_TYPES
|
27
|
-
MEMBER_TYPES = %w{client group user}.freeze unless defined? MEMBER_TYPES
|
28
|
-
OBJECT_TYPES = %w{clients containers cookbooks data environments groups nodes roles policies policy_groups}.freeze unless defined? OBJECT_TYPES
|
29
|
-
OBJECT_NAME_SPEC = /^[\-[:alnum:]_\.]+$/.freeze unless defined? OBJECT_NAME_SPEC
|
30
|
-
|
31
|
-
def validate_object_type!(type)
|
32
|
-
unless OBJECT_TYPES.include?(type)
|
33
|
-
ui.fatal "Unknown object type \"#{type}\". The following types are permitted: #{OBJECT_TYPES.join(", ")}"
|
34
|
-
exit 1
|
35
|
-
end
|
36
|
-
end
|
37
|
-
|
38
|
-
def validate_object_name!(name)
|
39
|
-
unless OBJECT_NAME_SPEC.match(name)
|
40
|
-
ui.fatal "Invalid name: #{name}"
|
41
|
-
exit 1
|
42
|
-
end
|
43
|
-
end
|
44
|
-
|
45
|
-
def validate_member_type!(type)
|
46
|
-
unless MEMBER_TYPES.include?(type)
|
47
|
-
ui.fatal "Unknown member type \"#{type}\". The following types are permitted: #{MEMBER_TYPES.join(", ")}"
|
48
|
-
exit 1
|
49
|
-
end
|
50
|
-
end
|
51
|
-
|
52
|
-
def validate_member_name!(name)
|
53
|
-
# Same rules apply to objects and members
|
54
|
-
validate_object_name!(name)
|
55
|
-
end
|
56
|
-
|
57
|
-
def validate_perm_type!(perms)
|
58
|
-
perms.split(",").each do |perm|
|
59
|
-
unless PERM_TYPES.include?(perm)
|
60
|
-
ui.fatal "Invalid permission \"#{perm}\". The following permissions are permitted: #{PERM_TYPES.join(",")}"
|
61
|
-
exit 1
|
62
|
-
end
|
63
|
-
end
|
64
|
-
end
|
65
|
-
|
66
|
-
def validate_member_exists!(member_type, member_name)
|
67
|
-
true if rest.get_rest("#{member_type}s/#{member_name}")
|
68
|
-
rescue NameError
|
69
|
-
# ignore "NameError: uninitialized constant Chef::ApiClient" when finding a client
|
70
|
-
true
|
71
|
-
rescue
|
72
|
-
ui.fatal "#{member_type} '#{member_name}' does not exist"
|
73
|
-
exit 1
|
74
|
-
end
|
75
|
-
|
76
|
-
def is_usag?(gname)
|
77
|
-
gname.length == 32 && gname =~ /^[0-9a-f]+$/
|
78
|
-
end
|
79
|
-
|
80
|
-
def get_acl(object_type, object_name)
|
81
|
-
rest.get_rest("#{object_type}/#{object_name}/_acl?detail=granular")
|
82
|
-
end
|
83
|
-
|
84
|
-
def get_ace(object_type, object_name, perm)
|
85
|
-
get_acl(object_type, object_name)[perm]
|
86
|
-
end
|
87
|
-
|
88
|
-
def add_to_acl!(member_type, member_name, object_type, object_name, perms)
|
89
|
-
acl = get_acl(object_type, object_name)
|
90
|
-
perms.split(",").each do |perm|
|
91
|
-
ui.msg "Adding '#{member_name}' to '#{perm}' ACE of '#{object_name}'"
|
92
|
-
ace = acl[perm]
|
93
|
-
|
94
|
-
case member_type
|
95
|
-
when "client", "user"
|
96
|
-
# Our PUT body depends on the type of reply we get from _acl?detail=granular
|
97
|
-
# When the server replies with json attributes 'users' and 'clients',
|
98
|
-
# we'll want to modify entries under the same keys they arrived.- their presence
|
99
|
-
# in the body tells us that CS will accept them in a PUT.
|
100
|
-
# Older version of chef-server will continue to use 'actors' for a combined list
|
101
|
-
# and expect the same in the body.
|
102
|
-
key = "#{member_type}s"
|
103
|
-
key = "actors" unless ace.key? key
|
104
|
-
next if ace[key].include?(member_name)
|
105
|
-
|
106
|
-
ace[key] << member_name
|
107
|
-
when "group"
|
108
|
-
next if ace["groups"].include?(member_name)
|
109
|
-
|
110
|
-
ace["groups"] << member_name
|
111
|
-
end
|
112
|
-
|
113
|
-
update_ace!(object_type, object_name, perm, ace)
|
114
|
-
end
|
115
|
-
end
|
116
|
-
|
117
|
-
def remove_from_acl!(member_type, member_name, object_type, object_name, perms)
|
118
|
-
acl = get_acl(object_type, object_name)
|
119
|
-
perms.split(",").each do |perm|
|
120
|
-
ui.msg "Removing '#{member_name}' from '#{perm}' ACE of '#{object_name}'"
|
121
|
-
ace = acl[perm]
|
122
|
-
|
123
|
-
case member_type
|
124
|
-
when "client", "user"
|
125
|
-
key = "#{member_type}s"
|
126
|
-
key = "actors" unless ace.key? key
|
127
|
-
next unless ace[key].include?(member_name)
|
128
|
-
|
129
|
-
ace[key].delete(member_name)
|
130
|
-
when "group"
|
131
|
-
next unless ace["groups"].include?(member_name)
|
132
|
-
|
133
|
-
ace["groups"].delete(member_name)
|
134
|
-
end
|
135
|
-
|
136
|
-
update_ace!(object_type, object_name, perm, ace)
|
137
|
-
end
|
138
|
-
end
|
139
|
-
|
140
|
-
def update_ace!(object_type, object_name, ace_type, ace)
|
141
|
-
rest.put_rest("#{object_type}/#{object_name}/_acl/#{ace_type}", ace_type => ace)
|
142
|
-
end
|
143
|
-
|
144
|
-
def add_to_group!(member_type, member_name, group_name)
|
145
|
-
validate_member_exists!(member_type, member_name)
|
146
|
-
existing_group = rest.get_rest("groups/#{group_name}")
|
147
|
-
ui.msg "Adding '#{member_name}' to '#{group_name}' group"
|
148
|
-
unless existing_group["#{member_type}s"].include?(member_name)
|
149
|
-
existing_group["#{member_type}s"] << member_name
|
150
|
-
new_group = {
|
151
|
-
"groupname" => existing_group["groupname"],
|
152
|
-
"orgname" => existing_group["orgname"],
|
153
|
-
"actors" => {
|
154
|
-
"users" => existing_group["users"],
|
155
|
-
"clients" => existing_group["clients"],
|
156
|
-
"groups" => existing_group["groups"],
|
157
|
-
},
|
158
|
-
}
|
159
|
-
rest.put_rest("groups/#{group_name}", new_group)
|
160
|
-
end
|
161
|
-
end
|
162
|
-
|
163
|
-
def remove_from_group!(member_type, member_name, group_name)
|
164
|
-
validate_member_exists!(member_type, member_name)
|
165
|
-
existing_group = rest.get_rest("groups/#{group_name}")
|
166
|
-
ui.msg "Removing '#{member_name}' from '#{group_name}' group"
|
167
|
-
if existing_group["#{member_type}s"].include?(member_name)
|
168
|
-
existing_group["#{member_type}s"].delete(member_name)
|
169
|
-
new_group = {
|
170
|
-
"groupname" => existing_group["groupname"],
|
171
|
-
"orgname" => existing_group["orgname"],
|
172
|
-
"actors" => {
|
173
|
-
"users" => existing_group["users"],
|
174
|
-
"clients" => existing_group["clients"],
|
175
|
-
"groups" => existing_group["groups"],
|
176
|
-
},
|
177
|
-
}
|
178
|
-
rest.put_rest("groups/#{group_name}", new_group)
|
179
|
-
end
|
180
|
-
end
|
181
|
-
end
|
182
|
-
end
|
183
|
-
end
|
@@ -1,78 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# Author:: Jeremiah Snapp (jeremiah@chef.io)
|
3
|
-
# Copyright:: Copyright (c) Chef Software Inc.
|
4
|
-
# License:: Apache License, Version 2.0
|
5
|
-
#
|
6
|
-
# Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
-
# you may not use this file except in compliance with the License.
|
8
|
-
# You may obtain a copy of the License at
|
9
|
-
#
|
10
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
-
#
|
12
|
-
# Unless required by applicable law or agreed to in writing, software
|
13
|
-
# distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
-
# See the License for the specific language governing permissions and
|
16
|
-
# limitations under the License.
|
17
|
-
#
|
18
|
-
|
19
|
-
require_relative "../knife"
|
20
|
-
|
21
|
-
class Chef
|
22
|
-
class Knife
|
23
|
-
class AclBulkAdd < Chef::Knife
|
24
|
-
category "acl"
|
25
|
-
banner "knife acl bulk add MEMBER_TYPE MEMBER_NAME OBJECT_TYPE REGEX PERMS"
|
26
|
-
|
27
|
-
deps do
|
28
|
-
require_relative "acl_base"
|
29
|
-
include Chef::Knife::AclBase
|
30
|
-
end
|
31
|
-
|
32
|
-
def run
|
33
|
-
member_type, member_name, object_type, regex, perms = name_args
|
34
|
-
object_name_matcher = /#{regex}/
|
35
|
-
|
36
|
-
if name_args.length != 5
|
37
|
-
show_usage
|
38
|
-
ui.fatal "You must specify the member type [client|group], member name, object type, object name REGEX and perms"
|
39
|
-
exit 1
|
40
|
-
end
|
41
|
-
|
42
|
-
unless %w{client group}.include?(member_type)
|
43
|
-
ui.fatal "ERROR: To enforce best practice, knife-acl can only add a client or a group to an ACL."
|
44
|
-
ui.fatal " See the knife-acl README for more information."
|
45
|
-
exit 1
|
46
|
-
end
|
47
|
-
validate_perm_type!(perms)
|
48
|
-
validate_member_name!(member_name)
|
49
|
-
validate_object_type!(object_type)
|
50
|
-
validate_member_exists!(member_type, member_name)
|
51
|
-
|
52
|
-
if %w{containers groups}.include?(object_type)
|
53
|
-
ui.fatal "bulk modifying the ACL of #{object_type} is not permitted"
|
54
|
-
exit 1
|
55
|
-
end
|
56
|
-
|
57
|
-
objects_to_modify = []
|
58
|
-
all_objects = rest.get_rest(object_type)
|
59
|
-
objects_to_modify = all_objects.keys.select { |object_name| object_name =~ object_name_matcher }
|
60
|
-
|
61
|
-
if objects_to_modify.empty?
|
62
|
-
ui.info "No #{object_type} match the expression /#{regex}/"
|
63
|
-
exit 0
|
64
|
-
end
|
65
|
-
|
66
|
-
ui.msg("The ACL of the following #{object_type} will be modified:")
|
67
|
-
ui.msg("")
|
68
|
-
ui.msg(ui.list(objects_to_modify.sort, :columns_down))
|
69
|
-
ui.msg("")
|
70
|
-
ui.confirm("Are you sure you want to modify the ACL of these #{object_type}?")
|
71
|
-
|
72
|
-
objects_to_modify.each do |object_name|
|
73
|
-
add_to_acl!(member_type, member_name, object_type, object_name, perms)
|
74
|
-
end
|
75
|
-
end
|
76
|
-
end
|
77
|
-
end
|
78
|
-
end
|