Merge branch 'main' into feature-oidc-authenticate

README.md

@@ -120,7 +120,7 @@ To provide a signing identify for macOS build, use `BOUNDARY_DESKTOP_SIGNING_IDE
 environment variable to set signing certificate name (e.g Developer ID Application: * (*)).
 
 Assets are saved to `ui/desktop/electron-app/out/make/`.
-DMG packaged desktop UI is available at asset location as `Boundary Desktop.dmg`.
+DMG packaged desktop UI is available at asset location as `boundary.dmg`.
 
 ### Committing
 

ui/desktop/CHANGELOG.md

@@ -11,6 +11,7 @@ Canonical reference for changes, improvements, and bugfixes for Boundary Desktop
 
 ### Changes/Deprecations
 
+- Boundary Desktop is now simply "Boundary".  This change affects macOS asset filenames, as well as the title used within the application.  Documentation will continue to refer to "Boundary Desktop" to avoid confusion with the core binary.  ([PR](https://github.com/hashicorp/boundary-ui/pull/481))
 - Boundary origin validation now occurs via Electron's built-in net request module, ensuring the validation request is made via chromium's networking library rather than Node's.  ([PR](https://github.com/hashicorp/boundary-ui/pull/480))
 
 ## v1.0.0-alpha (2021.02.16)

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

@@ -10,7 +10,7 @@ const artifactDestination = path.resolve(__dirname, '..', 'cli');
 const downloadArtifact = version => {
   const url = `https://releases.hashicorp.com/boundary/${version}/boundary_${version}_darwin_amd64.zip`;
   return new Promise((resolve, reject) => {
-    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'boundary-desktop-artifact-'))
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'boundary-artifact-'))
     console.log('Create tmp artifact directory: ', tmpDir);
 
     const artifactFileName = url.split('/').pop();

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

@@ -25,7 +25,7 @@ module.exports = {
       "/ember-test(/|$)",
       "/tests(/|$)"
     ],
-    name: "Boundary Desktop",
+    name: "Boundary",
     appBundleId: "com.electron.boundary",
     // TODO: where should the client version number come from?
     appVersion: `${formattedAppVersion}${formattedCLIVersion}\n`,
@@ -44,7 +44,7 @@ module.exports = {
       name: "@electron-forge/maker-dmg",
       config: {
         title: "Boundary",
-        name: "boundary-desktop",
+        name: "boundary",
         icon: "./config/macos/disk.icns",
         background: "./config/macos/background.png"
       }

ui/desktop/electron-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "desktop",
-  "productName": "Boundary Desktop",
+  "productName": "Boundary",
   "version": "0.0.0",
   "private": true,
   "description": "Electron UI for client for Boundary.",

ui/desktop/electron-app/src/menu.js

@@ -4,7 +4,7 @@ const generateMenuTemplate = () => {
   return [
     // { role: 'appMenu' }
     {
-      label: 'Boundary Desktop',
+      label: 'Boundary',
       submenu: [
         { role: 'about' },
         { type: 'separator' },
@@ -86,4 +86,4 @@ const generateMenuTemplate = () => {
 
 module.exports = {
   generateMenuTemplate: generateMenuTemplate
-};
+};