From 37f833ca278cc48d02bca4239a1653799922159c Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Mon, 24 May 2021 19:40:14 -0700
Subject: [PATCH] Update nodejs to 14.17

also update all the macos checks in omnibus to macos?

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 omnibus/config/software/chef-workstation-app.rb |  2 +-
 omnibus/config/software/gems.rb                 |  2 +-
 omnibus/config/software/nodejs-binary.rb        | 14 +++++++-------
 omnibus/config/software/uninstall-scripts.rb    |  2 +-
 omnibus_overrides.rb                            |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/omnibus/config/software/chef-workstation-app.rb b/omnibus/config/software/chef-workstation-app.rb
index 7ad43573a..5bff70073 100644
--- a/omnibus/config/software/chef-workstation-app.rb
+++ b/omnibus/config/software/chef-workstation-app.rb
@@ -50,7 +50,7 @@
     separator = File::PATH_SEPARATOR || ":"
     env["PATH"] = "#{env["PATH"]}#{separator}#{node_bin_path}"
 
-    platform_name, artifact_name = if mac_os_x?
+    platform_name, artifact_name = if macos?
                                      ["mac", "Chef Workstation App-#{app_version}-mac.zip"]
                                    elsif linux?
                                      %w{linux linux-unpacked}
diff --git a/omnibus/config/software/gems.rb b/omnibus/config/software/gems.rb
index f6545fb6b..fa65e01ea 100644
--- a/omnibus/config/software/gems.rb
+++ b/omnibus/config/software/gems.rb
@@ -42,7 +42,7 @@
 # This is a transative dep but we need to build from source so binaries are built on current sdk.
 # Only matters on mac.
 # @todo https://github.com/guard/rb-fsevent/issues/83
-dependency "rb-fsevent-gem" if mac_os_x?
+dependency "rb-fsevent-gem" if macos?
 
 build do
   env = with_standard_compiler_flags(with_embedded_path)
diff --git a/omnibus/config/software/nodejs-binary.rb b/omnibus/config/software/nodejs-binary.rb
index 58c4b44d8..58598218d 100644
--- a/omnibus/config/software/nodejs-binary.rb
+++ b/omnibus/config/software/nodejs-binary.rb
@@ -47,26 +47,26 @@
 # ```
 
 name "nodejs-binary"
-default_version "14.15.4"
+default_version "14.17.0"
 
 license "MIT"
 license_file "LICENSE"
 skip_transitive_dependency_licensing true
 
-version "14.15.4" do
-  source_hash = if mac_os_x?
-                  "6b0e19e5c2601ef97510f7eb4f52cc8ee261ba14cb05f31eb1a41a5043b0304e"
+version "14.17.0" do
+  source_hash = if macos?
+                  "7b210652e11d1ee25650c164cf32381895e1dcb3e0ff1d0841d8abc1f47ac73e"
                 elsif linux?
-                  "b51c033d40246cd26e52978125a3687df5cd02ee532e8614feff0ba6c13a774f"
+                  "3d06eabc73ec8626337bff370474306eac1c3c21122f677720d154c556ceafaf"
                 elsif windows?
-                  "b2a0765240f8fbd3ba90a050b8c87069d81db36c9f3745aff7516e833e4d2ed6"
+                  "6582a7259c433e9f667dcc4ed3e5d68bc514caba2eed40e4626c8b4c7e5ecd5c"
                 else
                   raise "nodejs-binary does not have configuration for this build platform"
                 end
   source sha256: source_hash
 end
 
-platform_name, platform_ext = if mac_os_x?
+platform_name, platform_ext = if macos?
                                 %w{darwin tar.gz}
                               elsif linux?
                                 %w{linux tar.gz}
diff --git a/omnibus/config/software/uninstall-scripts.rb b/omnibus/config/software/uninstall-scripts.rb
index 5d8cb206c..0c0a5f59d 100644
--- a/omnibus/config/software/uninstall-scripts.rb
+++ b/omnibus/config/software/uninstall-scripts.rb
@@ -23,7 +23,7 @@
 license :project_license
 
 build do
-  if mac_os_x?
+  if macos?
     copy "#{project_dir}/uninstall_chef_workstation", "#{install_dir}/bin/uninstall_chef_workstation", { preserve: true }
   end
 end
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index e08afc091..7371662ee 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -18,7 +18,7 @@
 override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
-override "openssl", version: mac_os_x? ? "1.1.1k" : "1.0.2y"
+override "openssl", version: macos? ? "1.1.1k" : "1.0.2y"
 override "pkg-config-lite", version: "0.28-1"
 override "ruby", version: "2.7.3"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"