diff options
| author | Tim Smith <tsmith@chef.io> | 2019-06-06 10:05:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 10:05:50 -0700 |
| commit | 375edcb6881a7e143f3d381df7b17b8538888eea (patch) | |
| tree | 9c5b653ff1e8eaa1949e0a1772f24bfcec9e145a | |
| parent | c9dcc0d64d53d85eac22e0c490f18c89f0d7f326 (diff) | |
| parent | 93c3b6d1604c47117968c9de26dfaff59e76074c (diff) | |
| download | chef-375edcb6881a7e143f3d381df7b17b8538888eea.tar.gz | |
Merge pull request #8633 from chef/constant_warnings
Avoid constant warnings
| -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 f5e67dcfaf..f60928375e 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 a29581a51d..59de880cbd 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 |