Remove support for macOS < 10.12 in the service resource

There's no reason to perform this check anymore since we only product packages for macOS 10.13 and later.

Signed-off-by: Tim Smith <tsmith@chef.io>

2 files changed, 8 insertions, 15 deletions

diff --git a/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb
index 746581df73..2c74cb2629 100644
--- a/lib/chef/provider/service/macosx.rb
+++ b/lib/chef/provider/service/macosx.rb
@@ -1,6 +1,7 @@
 #
 # Author:: Igor Afonov <afonov@gmail.com>
 # Copyright:: Copyright 2011-2016, Igor Afonov
+# Copyright:: Copyright 2020, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,10 +43,6 @@ class Chef
 
         PLIST_DIRS = gather_plist_dirs
 
-        def this_version_or_newer?(this_version)
-          Gem::Version.new(node["platform_version"]) >= Gem::Version.new(this_version)
-        end
-
         def load_current_resource
           @current_resource = Chef::Resource::MacosxService.new(@new_resource.name)
           @current_resource.service_name(@new_resource.service_name)
@@ -59,10 +56,8 @@ class Chef
           if @console_user
             @console_user = Etc.getpwuid(::File.stat("/dev/console").uid).name
             logger.trace("#{new_resource} console_user: '#{@console_user}'")
-            cmd = "su "
-            param = this_version_or_newer?("10.10") ? "" : "-l "
-            param = "-l " if this_version_or_newer?("10.12")
-            @base_user_cmd = cmd + param + "#{@console_user} -c"
+            cmd = "su -l"
+            @base_user_cmd = cmd + "#{@console_user} -c"
             # Default LaunchAgent session should be Aqua
             @session_type = "Aqua" if @session_type.nil?
           end
@@ -140,10 +135,10 @@ class Chef
           end
         end
 
-        # On OS/X, enabling a service has the side-effect of starting it,
+        # On macOS, enabling a service has the side-effect of starting it,
         # and disabling a service has the side-effect of stopping it.
         #
-        # This makes some sense on OS/X since launchctl is an "init"-style
+        # This makes some sense on macOS since launchctl is an "init"-style
         # supervisor that will restart daemons that are crashing, etc.
         def enable_service
           if @current_resource.enabled
diff --git a/spec/unit/provider/service/macosx_spec.rb b/spec/unit/provider/service/macosx_spec.rb
index 420fd329f6..ef8220b6be 100644
--- a/spec/unit/provider/service/macosx_spec.rb
+++ b/spec/unit/provider/service/macosx_spec.rb
@@ -1,6 +1,7 @@
 #
 # Author:: Igor Afonov <afonov@gmail.com>
 # Copyright:: Copyright 2011-2016, Igor Afonov
+# Copyright:: Copyright 2020, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -61,16 +62,13 @@ describe Chef::Provider::Service::Macosx do
 
     %w{Daemon Agent}.each do |service_type|
       ["redis-server", "io.redis.redis-server"].each do |service_name|
-        ["10.9", "10.10", "10.11"].each do |platform_version|
+        ["10.10", "10.11"].each do |platform_version|
           let(:plist) { "/Library/LaunchDaemons/io.redis.redis-server.plist" }
           let(:session) { StringIO.new }
           if service_type == "Agent"
             let(:plist) { "/Library/LaunchAgents/io.redis.redis-server.plist" }
             let(:session) { "-S Aqua " }
             let(:su_cmd) { "su -l igor -c" }
-            if platform_version == "10.9"
-              let(:su_cmd) { "su igor -c" }
-            end
           end
           let(:service_label) { "io.redis.redis-server" }
           before do
@@ -92,7 +90,7 @@ describe Chef::Provider::Service::Macosx do
               .and_return(double("Status", stdout: plutil_stdout))
           end
 
-          context "#{service_name} that is a #{service_type} running Osx #{platform_version}" do
+          context "#{service_name} that is a #{service_type} running macOS #{platform_version}" do
             let(:new_resource) { Chef::Resource::MacosxService.new(service_name) }
             let!(:current_resource) { Chef::Resource::MacosxService.new(service_name) }