Removing the WS-GUI-app (#3277)

* removing ws-app Signed-off-by: nikhil2611 <[email protected]> * removing ws-app from bundleing Signed-off-by: nikhil2611 <[email protected]> * updated the signing key Signed-off-by: nikhil2611 <[email protected]> * removed the ws-app Signed-off-by: nikhil2611 <[email protected]> * updatd the docs pages to remove ws-app Signed-off-by: nikhil2611 <[email protected]> * updated postinst to remove plist and ws-app Signed-off-by: nikhil2611 <[email protected]> * removing the app launcher Signed-off-by: nikhil2611 <[email protected]> --------- Signed-off-by: nikhil2611 <[email protected]>
chef · Oct 25, 2024 · efc81ac · efc81ac
1 parent 9d713ad
commit efc81ac
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 290 deletions.
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
@@ -83,9 +83,6 @@ subscriptions:
   - workload: habitat-sh/habitat:main_completed:project_promoted:habitat-sh/habitat:main:current:*
     actions:
       - bash:.expeditor/update_habitat.sh
-  - workload: buildkite_build_passed:chef/chef-workstation-app:main:release:*
-    actions:
-      - bash:.expeditor/update_chef-workstation-app_to_latest.sh
   - workload: chef/chef-analyze:main_completed:pull_request_merged:chef/chef-analyze:main:*
     actions:
       - bash:.expeditor/update_chef-analyze_to_latest.sh

diff --git a/.expeditor/update_chef-workstation-app_to_latest.sh b/.expeditor/update_chef-workstation-app_to_latest.sh
diff --git a/README.md b/README.md
@@ -9,7 +9,6 @@
 
 Chef Workstation installs everything you need to get started using Chef products on Windows, Mac and Linux. It includes:
 
-* Chef Workstation App
 * Chef Infra Client
 * Chef InSpec
 * Chef Habitat

diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
@@ -22,7 +22,6 @@ Examine the [open PRs](https://github.com/chef/chef-workstation/pulls) on the Ch
 
 Dependabot and Expeditor are configured to create PRs when dependent packages are updated. Those processes can sometimes fail or there may be a pending PR in a dependent package that should be merged. Check the following repos and ensure they have the desired PRs merged, released, and updated in Chef Workstation:
 
-* [Chef Workstation App](https://github.com/chef/chef-workstation-app)
 * [Chef CLI](https://github.com/chef/chef-cli)
 * [Chef Analyze](https://github.com/chef/chef-analyze/)
 * [Chef Infra Client](https://github.com/chef/chef/)

diff --git a/docs-chef-io/content/workstation/chef-workstation-app.md b/docs-chef-io/content/workstation/chef-workstation-app.md
diff --git a/docs-chef-io/content/workstation/install_workstation.md b/docs-chef-io/content/workstation/install_workstation.md
@@ -41,10 +41,6 @@ Minimum system requirements:
 - Disk: 8GB
 - Additional memory and storage space may be necessary to take advantage of Chef Workstation tools such as Test Kitchen which creates and manages virtualized test environments.
 
-Additional Chef Workstation App Requirements:
-
-- On Linux, you must have a graphical window manager running with support for system tray icons. For some distributions you may also need to install additional libraries. After you install the Chef Workstation package from the terminal, the post-install message will tell you which, if any, additional libraries are required to run the Chef Workstation App.
-
 ## Installation
 
 The Chef Workstation installer must run as a privileged user.

diff --git a/omnibus/config/projects/chef-workstation.rb b/omnibus/config/projects/chef-workstation.rb
@@ -89,7 +89,6 @@
   dependency "ruby-windows-system-libraries"
 end
 
-dependency "chef-workstation-app"
 dependency "uninstall-scripts"
 dependency "ruby-env-script"
 dependency "ruby-cleanup"
@@ -131,7 +130,7 @@
   fast_msi true
   upgrade_code "9870C512-DF2C-43D9-8C28-7ACD60ABBE27"
   wix_light_extension "WixUtilExtension"
-  signing_identity "769E6AF679126F184850AAC7C5C823A80DB3ADAA", machine_store: false, keypair_alias: "key_495941360"
+  signing_identity "7D16AE73AB249D473362E9332D029089DBBB89B2", machine_store: false, keypair_alias: "key_875762014"
 end
 
 # We don't support appx builds, and they eat a lot of time.

diff --git a/omnibus/config/software/chef-workstation-app.rb b/omnibus/config/software/chef-workstation-app.rb
diff --git a/omnibus/files/uninstall-scripts/uninstall_chef_workstation b/omnibus/files/uninstall-scripts/uninstall_chef_workstation
@@ -21,11 +21,8 @@ if is_darwin; then
   echo "This uninstaller will remove Chef Workstation."
   sudo /bin/sh -s <<'EOF'
 echo "Uninstalling Chef Workstation..."
-echo "  -> Removing Chef Workstation App..."
-/opt/chef-workstation/bin/chef_workstation_app_launcher remove
 echo "  -> Removing files..."
 sudo rm -rf '/opt/chef-workstation'
-sudo rm -rf '/Applications/Chef Workstation App.app'
 echo "  -> Removing .plist for server"
 sudo rm -rf '~/Library/LaunchAgents/io.chef.chef-workstation.plist'
 echo "  -> Removing binary links in /usr/local/bin..."

diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh
@@ -47,11 +47,5 @@ fi
 # echo "--- Ensure that 'chef-automate-collect' cli is available"
 # chef exec chef-automate-collect -h
 
-# Verify that the chef-workstation-app was installed (MacOS only)
-if is_darwin; then
-  echo "--- Verifying that chef-workstation-app exist in /Applications directory"
-  test -d "/Applications/Chef Workstation App.app"
-fi
-
 echo "--- Run Workstation verification suite"
 /opt/chef-workstation/embedded/bin/ruby omnibus/verification/run.rb
diff --git a/omnibus/package-scripts/chef-workstation/postinst b/omnibus/package-scripts/chef-workstation/postinst
@@ -82,67 +82,16 @@ done
 
 if is_darwin; then
 
-  # this will be removed when we bring back the workstation-gui changes back 
-  FILE="$HOME/Library/LaunchAgents/io.chef.chef-workstation.plist"
+  FILE="$HOME/Library/LaunchAgents/io.chef.chef-workstation.app.plist"
+
   if [ -f "$FILE" ]; then
-    sudo -u $USER launchctl unload $HOME/Library/LaunchAgents/io.chef.chef-workstation.plist
-    sudo rm -rf $HOME/Library/LaunchAgents/io.chef.chef-workstation.plist
-    sudo rm -rf $INSTALLER_DIR/service.txt
-    sudo rm -rf $INSTALLER_DIR/embedded/service
+    sudo -u $USER launchctl unload $HOME/Library/LaunchAgents/io.chef.chef-workstation.app.plist
+    sudo rm -rf $HOME/Library/LaunchAgents/io.chef.chef-workstation.app.plist
   fi
-
-  # the app launcher comes from the chef-workstation-app repo, here we are just using
-  # it to start the app as a service on MacOS systems, it will start at boot
+  sudo rm -rf '/Applications/Chef Workstation App.app'
   app_launcher=chef_workstation_app_launcher
+  su "$USER" $INSTALLER_DIR/bin/$app_launcher remove
 
-  # Close the app if it is running.
-  if [ $(osascript -e 'application "Chef Workstation App" is running') = 'true' ]; then
-    echo "Closing Chef Workstation App..."
-    osascript -e 'quit app "Chef Workstation App"' > /dev/null 2>&1;
-  fi
-  # chef-workstation-app is configured to build Mac as a zip file instead
-  # of a directory. Otherwise, the mac pkgbuild command will find the Chef Workstation App
-  # within the larger Chef Workstation package, and will not include it in the Chef Workstation
-  # package directly.
-  echo "Moving Chef Workstation App to the Applications folder"
-  pushd "$INSTALLER_DIR/components/chef-workstation-app"
-  # https://github.com/electron-userland/electron-builder/issues/3779
-  # https://github.com/electron-userland/electron-builder/issues/4299#issuecomment-544997415
-  ditto -x -k -V chef-workstation-app-mac.zip ./
-  sudo rm -rf "/Applications/Chef Workstation App.app"
-  sudo mv "Chef Workstation App.app" /Applications/
-  cp "/Applications/Chef Workstation App.app/Contents/Resources/assets/scripts/$app_launcher" $INSTALLER_DIR/bin/. || error_exit "Cannot copy $app_launcher to $INSTALLER_DIR/bin"
-  rm -rf "$INSTALLER_DIR/components"
-  popd
-
-  ln -sf $INSTALLER_DIR/bin/uninstall_chef_workstation $PREFIX/bin || error_exit "Cannot link uninstall_chef_workstation to $PREFIX/bin"
-
-  echo "Setting Chef Workstation App to run at boot..."
-  su "$USER" $INSTALLER_DIR/bin/$app_launcher load
-
-  echo "Launching Chef Workstation App..."
-  osascript -e 'open app "Chef Workstation App"' > /dev/null 2>&1;
-else # linux - postinst does not run for windows.
-  cwa_app_path="$INSTALLER_DIR/components/chef-workstation-app/chef-workstation-app"
-  ldd "$cwa_app_path" | grep "not found" >/dev/null 2>&1
-  # 0 rc means grep found 'not found' text - and we have missing deps.
-  if [ $? -eq 0 ]; then
-    echo ""
-    echo "Chef Workstation ships with a toolbar application, the Chef Workstation App."
-    echo "To run this application some additional dependencies must be installed."
-    echo "Using your platform's package manager to install the 'electron' package is "
-    echo "the easiest way to meet the dependency requirements."
-    echo ""
-    echo "You can then launch the App by running 'chef-workstation-app'."
-    echo "The App will then be available in the system tray."
-  else
-    echo ""
-    echo "The Chef Workstation App is available."
-    echo ""
-    echo "Launch the App by running 'chef-workstation-app'."
-    echo "The App will then be available in the system tray."
-  fi
-  ln -sf $cwa_app_path $PREFIX/bin
 fi
 
 echo ""

diff --git a/omnibus/package-scripts/chef-workstation/postrm b/omnibus/package-scripts/chef-workstation/postrm
@@ -13,7 +13,7 @@ cleanup_symlinks() {
   # Keep removed symlinks in this list, so that removal of upgraded packages still cleans up
   # leftovers from older versions. We keep the push jobs values here to cleanup old releases
   workstation_binaries="berks chef chef-cli chef-apply chef-shell chef-solo chef-vault cookstyle dco delivery foodcritic inspec kitchen knife ohai push-apply pushy-client pushy-service-manager chef-client mixlib-install chef-zero fauxhai"
-  binaries="chef-run chef-workstation-app $workstation_binaries chef-analyze hab"
+  binaries="chef-run $workstation_binaries chef-analyze hab"
 
   for binary in $binaries; do
     rm -f "$PREFIX/bin/$binary"