change "internal" to "default_env"

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

6 files changed, 13 insertions, 13 deletions

diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb
index cb6e02bd7e..236ef844b1 100644
--- a/lib/chef/mixin/shell_out.rb
+++ b/lib/chef/mixin/shell_out.rb
@@ -104,9 +104,9 @@ class Chef
       # generally must support UTF-8 unicode.
       def shell_out(*args, **options)
         options = options.dup
-        internal = options.delete(:internal)
-        internal = true if internal.nil?
-        if internal
+        default_env = options.delete(:default_env)
+        default_env = true if default_env.nil?
+        if default_env
           env_key = options.key?(:env) ? :env : :environment
           options[env_key] = {
             "LC_ALL" => Chef::Config[:internal_locale],
@@ -126,11 +126,11 @@ class Chef
       end
 
       def shell_out_with_systems_locale(*args, **options) # FIXME: deprecate
-        shell_out(*args, internal: false, **options)
+        shell_out(*args, default_env: false, **options)
       end
 
       def shell_out_with_systems_locale!(*args, **options) # FIXME: deprecate
-        shell_out!(*args, internal: false, **options)
+        shell_out!(*args, default_env: false, **options)
       end
 
       # Helper for subclasses to convert an array of string args into a string.  It
diff --git a/lib/chef/provider/execute.rb b/lib/chef/provider/execute.rb
index 265932db06..3d3255260f 100644
--- a/lib/chef/provider/execute.rb
+++ b/lib/chef/provider/execute.rb
@@ -27,7 +27,7 @@ class Chef
 
       provides :execute
 
-      def_delegators :new_resource, :command, :returns, :environment, :user, :domain, :password, :group, :cwd, :umask, :creates, :elevated, :internal
+      def_delegators :new_resource, :command, :returns, :environment, :user, :domain, :password, :group, :cwd, :umask, :creates, :elevated, :default_env
 
       def load_current_resource
         current_resource = Chef::Resource::Execute.new(new_resource.name)
@@ -97,7 +97,7 @@ class Chef
         opts[:group]       = group if group
         opts[:cwd]         = cwd if cwd
         opts[:umask]       = umask if umask
-        opts[:internal]    = internal
+        opts[:default_env] = default_env
         opts[:log_level]   = :info
         opts[:log_tag]     = new_resource.to_s
         if (logger.info? || live_stream?) && !sensitive?
diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb
index f9165ee487..7003b546fe 100644
--- a/lib/chef/resource/execute.rb
+++ b/lib/chef/resource/execute.rb
@@ -64,8 +64,8 @@ class Chef
 
       property :group, [ String, Integer ]
       property :live_stream, [ TrueClass, FalseClass ], default: false
-      # internal defaults to `false` so that the command execution more exactly matches what the user gets on the command line without magic
-      property :internal, [ TrueClass, FalseClass ], desired_state: false, default: false,
+      # default_env defaults to `false` so that the command execution more exactly matches what the user gets on the command line without magic
+      property :default_env, [ TrueClass, FalseClass ], desired_state: false, default: false,
         description: "When true this enables ENV magic to add path_sanity to the PATH and force the locale to English+UTF-8 for parsing output"
       property :returns, [ Integer, Array ], default: 0
       property :timeout, [ Integer, Float ]
diff --git a/lib/chef/resource/sysctl.rb b/lib/chef/resource/sysctl.rb
index 6cc525e062..496eb05cb8 100644
--- a/lib/chef/resource/sysctl.rb
+++ b/lib/chef/resource/sysctl.rb
@@ -84,7 +84,7 @@ class Chef
 
           execute "Load sysctl values" do
             command "sysctl #{'-e ' if new_resource.ignore_error}-p"
-            internal true
+            default_env true
             action :run
           end
         end
@@ -99,7 +99,7 @@ class Chef
             end
 
             execute "Load sysctl values" do
-              internal true
+              default_env true
               command "sysctl -p"
               action :run
             end
diff --git a/spec/unit/provider/execute_spec.rb b/spec/unit/provider/execute_spec.rb
index 97e4f3d112..78534bfb57 100644
--- a/spec/unit/provider/execute_spec.rb
+++ b/spec/unit/provider/execute_spec.rb
@@ -33,7 +33,7 @@ describe Chef::Provider::Execute do
       timeout:      3600,
       returns:      0,
       log_level:    :info,
-      internal:     false,
+      default_env:  false,
       log_tag:      new_resource.to_s,
     }
   end
diff --git a/spec/unit/provider/script_spec.rb b/spec/unit/provider/script_spec.rb
index 42a1186cc0..651e5130e0 100644
--- a/spec/unit/provider/script_spec.rb
+++ b/spec/unit/provider/script_spec.rb
@@ -131,7 +131,7 @@ describe Chef::Provider::Script, "action_run" do
 
     describe "when running the script" do
       let (:default_opts) do
-        { timeout: 3600, returns: 0, internal: false, log_level: :info, log_tag: "script[run some perl code]" }
+        { timeout: 3600, returns: 0, default_env: false, log_level: :info, log_tag: "script[run some perl code]" }
       end
 
       before do