Merge pull request #459 from hashicorp/chore-about-version

Chore about version

ui/desktop/electron-app/config/forge.config.js

@@ -3,6 +3,15 @@ const { version } = require('../src/boundary-cli.js');
 
 const formattedCLIVersion = version().formatted;
 
+const appVersion = process.env.VERSION
+  ? `Version:  ${process.env.VERSION}\n`
+  : '';
+const appCommit = process.env.COMMIT
+  ? `Commit:  ${process.env.COMMIT}\n`
+  : '';
+
+const formattedAppVersion = `${appVersion}${appCommit}`;
+
 module.exports = {
   hooks: {
     prePackage: () => {
@@ -19,7 +28,7 @@ module.exports = {
     name: "Boundary Desktop",
     appBundleId: "com.electron.boundary",
     // TODO: where should the client version number come from?
-    appVersion: `1.0.0 ${formattedCLIVersion}`,
+    appVersion: `${formattedAppVersion}${formattedCLIVersion}\n`,
     appCopyright: "Copyright © 2021 HashiCorp, Inc.",
     icon: "./config/macos/icon.icns",
     osxSign: {

ui/desktop/electron-app/src/boundary-cli.js

@@ -49,8 +49,8 @@ module.exports = {
     if (gitRevision) gitRevision = gitRevision.groups.rev;
     if (versionNumber) versionNumber = versionNumber.groups.ver;
     const formatted = versionNumber
-      ? `CLI Version ${versionNumber}; CLI Git Rev ${gitRevision}`
-      : `CLI Git Rev ${gitRevision}`;
+      ? `CLI Version:  ${versionNumber}\nCLI Commit:  ${gitRevision}`
+      : `CLI Commit:  ${gitRevision}`;
     return { gitRevision, versionNumber, formatted };
     return rawOutput;
   }