diff options
author | Tim Smith <tsmith@chef.io> | 2019-06-03 15:11:57 -0700 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2019-06-03 15:11:57 -0700 |
commit | 93c3b6d1604c47117968c9de26dfaff59e76074c (patch) | |
tree | 97c9be5d51c0cb66a7e0d148759752f73d639ff2 /lib | |
parent | 8ab574c75ada5112b89149cc63b3a4f007664974 (diff) | |
download | chef-93c3b6d1604c47117968c9de26dfaff59e76074c.tar.gz |
Avoid constant warningsconstant_warnings
Chef has gotten quite loud with warnings. This quiets things back down a
bit.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/chef/knife/bootstrap.rb | 4 | ||||
-rw-r--r-- | lib/chef/knife/bootstrap/train_connector.rb | 6 | ||||
-rw-r--r-- | lib/chef/knife/core/gem_glob_loader.rb | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index 0826a0f38c..8122c55b7c 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -28,8 +28,8 @@ class Chef include DataBagSecretOptions include LicenseAcceptance::CLIFlags::MixlibCLI - SUPPORTED_CONNECTION_PROTOCOLS = %w{ssh winrm}.freeze - WINRM_AUTH_PROTOCOL_LIST = %w{plaintext kerberos ssl negotiate}.freeze + SUPPORTED_CONNECTION_PROTOCOLS ||= %w{ssh winrm}.freeze + WINRM_AUTH_PROTOCOL_LIST ||= %w{plaintext kerberos ssl negotiate}.freeze # Common connectivity options option :connection_user, diff --git a/lib/chef/knife/bootstrap/train_connector.rb b/lib/chef/knife/bootstrap/train_connector.rb index af09a8c366..2a1432a8c4 100644 --- a/lib/chef/knife/bootstrap/train_connector.rb +++ b/lib/chef/knife/bootstrap/train_connector.rb @@ -23,16 +23,16 @@ class Chef class Knife class Bootstrap < Knife class TrainConnector - SSH_CONFIG_OVERRIDE_KEYS = [:user, :port, :proxy].freeze + SSH_CONFIG_OVERRIDE_KEYS ||= [:user, :port, :proxy].freeze - MKTEMP_WIN_COMMAND = <<~EOM.freeze + MKTEMP_WIN_COMMAND ||= <<~EOM.freeze $parent = [System.IO.Path]::GetTempPath(); [string] $name = [System.Guid]::NewGuid(); $tmp = New-Item -ItemType Directory -Path (Join-Path $parent $name); $tmp.FullName EOM - MKTEMP_NIX_COMMAND = "bash -c 'd=$(mktemp -d ${TMPDIR:-/tmp}/chef_XXXXXX); echo $d'".freeze + MKTEMP_NIX_COMMAND ||= "bash -c 'd=$(mktemp -d ${TMPDIR:-/tmp}/chef_XXXXXX); echo $d'".freeze def initialize(host_url, default_protocol, opts) @host_url = host_url diff --git a/lib/chef/knife/core/gem_glob_loader.rb b/lib/chef/knife/core/gem_glob_loader.rb index 41d85b83a4..15707dee2e 100644 --- a/lib/chef/knife/core/gem_glob_loader.rb +++ b/lib/chef/knife/core/gem_glob_loader.rb @@ -22,8 +22,8 @@ class Chef class Knife class SubcommandLoader class GemGlobLoader < Chef::Knife::SubcommandLoader - MATCHES_CHEF_GEM = %r{/chef-[\d]+\.[\d]+\.[\d]+}.freeze - MATCHES_THIS_CHEF_GEM = %r{/chef-#{Chef::VERSION}(-\w+)?(-\w+)?/}.freeze + MATCHES_CHEF_GEM ||= %r{/chef-[\d]+\.[\d]+\.[\d]+}.freeze + MATCHES_THIS_CHEF_GEM ||= %r{/chef-#{Chef::VERSION}(-\w+)?(-\w+)?/}.freeze def subcommand_files @subcommand_files ||= (gem_and_builtin_subcommands.values + site_subcommands).flatten.uniq |