From c99449d8e53175067caea351f311b7b4fcf80e42 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Mon, 24 May 2021 15:20:02 -0400
Subject: [PATCH] refactor: Rename forge config generator to electron.js

---
 .../config/{forge.js => electron.js}          | 25 ++++++++++---------
 ui/desktop/electron-app/package.json          |  2 +-
 ui/desktop/electron-app/src/config/menu.js    |  8 +++---
 3 files changed, 18 insertions(+), 17 deletions(-)
 rename ui/desktop/electron-app/config/{forge.js => electron.js} (80%)

diff --git a/ui/desktop/electron-app/config/forge.js b/ui/desktop/electron-app/config/electron.js
similarity index 80%
rename from ui/desktop/electron-app/config/forge.js
rename to ui/desktop/electron-app/config/electron.js
index 1b6aab69f..b5520f2ba 100644
--- a/ui/desktop/electron-app/config/forge.js
+++ b/ui/desktop/electron-app/config/electron.js
@@ -8,26 +8,27 @@ const DEFAULT_CONFIG = {
     name: 'Boundary',
     version: '0.0.0',
     appBundleId: 'com.electron.boundary',
-    appCopyright: 'Copyright © 2021 HashiCorp, Inc.',
+    appCopyright: `Copyright © ${new Date().getFullYear()} HashiCorp, Inc.`,
   },
   makers: [
     {
       name: '@electron-forge/maker-zip',
     },
   ],
-}
+};
 
 // Create forge config based on platform
 const createConfig = () => {
-  const config = { ...DEFAULT_CONFIG };
+  const config = {
+    releaseVersion: process.env.RELEASE_VERSION,
+    releaseCommit: process.env.RELEASE_COMMIT,
+    ...DEFAULT_CONFIG,
+  };
 
-  // Store env vars in config
-  ['RELEASE_COMMIT', 'RELEASE_VERSION'].forEach((envVar) => {
-    if (process.env[envVar]) {
-      config[envVar] = process.env[envVar];
-      console.log(`[forge-config] ${envVar} ${config[envVar]}`);
-    }
-  });
+  console.log(`[forge-config]
+    release version: ${config.releaseVersion}
+    release commit: ${config.releaseVersion}
+  `);
 
   if (os.platform().match(/(darwin)/i)) {
     config.packagerConfig.icon = './config/macos/icon.icns';
@@ -39,8 +40,8 @@ const createConfig = () => {
     };
 
     // Version
-    if (config.RELEASE_VERSION)
-      config.packagerConfig.version = config.RELEASE_VERSION;
+    if (config.releaseVersion)
+      config.packagerConfig.version = config.releaseVersion;
 
     // Signing identity
     const signingIdentity = process.env.BOUNDARY_DESKTOP_SIGNING_IDENTITY;
diff --git a/ui/desktop/electron-app/package.json b/ui/desktop/electron-app/package.json
index 14502cdfc..3e2fc020b 100644
--- a/ui/desktop/electron-app/package.json
+++ b/ui/desktop/electron-app/package.json
@@ -9,7 +9,7 @@
   "main": "src/index.js",
   "scripts": {
     "build:cli": "node -e 'require(\"./config/cli.js\").setup()'",
-    "build:config": "node -e 'require(\"./config/forge.js\").setup()'",
+    "build:config": "node -e 'require(\"./config/electron.js\").setup()'",
     "start": "electron-forge start",
     "package": "electron-forge package",
     "premake": "yarn build:cli && yarn build:config",
diff --git a/ui/desktop/electron-app/src/config/menu.js b/ui/desktop/electron-app/src/config/menu.js
index d2a0b12c4..2054c8240 100644
--- a/ui/desktop/electron-app/src/config/menu.js
+++ b/ui/desktop/electron-app/src/config/menu.js
@@ -1,6 +1,6 @@
 const { app, shell, dialog } = require('electron');
 const appUpdater = require('../helpers/app-updater.js');
-const forgeConfig = require('../../config/forge.config.js');
+const electronConfig = require('../../config/forge.config.js');
 const { version } = require('../cli/index.js');
 
 const generateMenuTemplate = () => {
@@ -13,10 +13,10 @@ const generateMenuTemplate = () => {
         {
           label: `About ${app.getName()}`,
           click: () => {
-            const appVersion = `Version:  ${forgeConfig.RELEASE_VERSION}`;
-            const appCommit = `Commit: ${forgeConfig.RELEASE_COMMIT}`;
+            const appVersion = `Version:  ${electronConfig.releaseVersion}`;
+            const appCommit = `Commit: ${electronConfig.releaseCommit}`;
             const cliVersion = version().formatted;
-            const copyright = forgeConfig.packagerConfig.appCopyright;
+            const copyright = electronConfig.packagerConfig.appCopyright;
 
             const dialogOpts = {
               type: 'none',