From 785c0ef6f307a17c9a123454d8929afc1b2de20c Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Mon, 1 Feb 2021 15:29:08 -0500
Subject: [PATCH 1/2] chore: Attach osx sign to packager config correctly

---
 ui/desktop/electron-app/config/forge.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/desktop/electron-app/config/forge.config.js b/ui/desktop/electron-app/config/forge.config.js
index 23d9ba10a..e82ab964b 100644
--- a/ui/desktop/electron-app/config/forge.config.js
+++ b/ui/desktop/electron-app/config/forge.config.js
@@ -4,7 +4,7 @@ module.exports = {
   hooks: {
     preMake: (forgeConfig) => {
       if (process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY) {
-        forgeConfig.osxSign = {
+        forgeConfig.packagerConfig.osxSign = {
           identity: process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY,
           hardenedRuntime: true,
           "gatekeeper-assess": false,

From b28fed1f34ea8fac4a2d42569627ff7ca1dbe4c8 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Tue, 2 Feb 2021 10:04:28 -0500
Subject: [PATCH 2/2] chore: Use basic electronforge config to view signing
 errors

---
 .../electron-app/config/forge.config.js       | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/ui/desktop/electron-app/config/forge.config.js b/ui/desktop/electron-app/config/forge.config.js
index e82ab964b..10fd470ba 100644
--- a/ui/desktop/electron-app/config/forge.config.js
+++ b/ui/desktop/electron-app/config/forge.config.js
@@ -2,18 +2,9 @@ const process = require('process');
 
 module.exports = {
   hooks: {
-    preMake: (forgeConfig) => {
-      if (process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY) {
-        forgeConfig.packagerConfig.osxSign = {
-          identity: process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY,
-          hardenedRuntime: true,
-          "gatekeeper-assess": false,
-          entitlements: "config/macos/entitlements.plist",
-          "entitlements-inherit": "config/macos/entitlements.plist",
-          "signature-flags": "library"
-        }
-      } else {
-        console.warn('Could not find signing identity. Skipping signing.');
+    prePackage: () => {
+      if (!process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY) {
+        console.warn('\nWARNING: Could not find signing identity.');
       }
     }
   },
@@ -25,7 +16,14 @@ module.exports = {
     name: "Boundary Desktop",
     appBundleId: "com.electron.boundary",
     appVersion: "0.0.1",
-    appCopyright: "Copyright © 2021 HashiCorp, Inc."
+    appCopyright: "Copyright © 2021 HashiCorp, Inc.",
+    osxSign: {
+      identity: process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY,
+      "hardened-runtime": true,
+      entitlements: "./config/macos/entitlements.plist",
+      "entitlements-inherit": "./config/macos/entitlements.plist",
+      "signature-flags": "library"
+    }
   },
   makers: [
     {