@leverege/build-tools 2.21.9-nick.1 → 2.21.9-nick.2

package/.env.temp

@@ -0,0 +1,18 @@
+THEFT_RECOVERY_URL='theft.recovermycar.com'
+MAPBOX_APIKEY=pk.eyJ1IjoibGV2ZXJlZ2UiLCJhIjoiY2p1Y3E0cWpkMG15azQzbnFzaDY2dmhiMSJ9.7N25h5jsjO2Aq_YmiLrAJw
+APPEARANCE_PROJECT_ID=7b2GTbmsZj3f5VdFpjGM8O
+INTERCOM_APP_ID='ec0qbuwi'
+LOCATOR_ALIAS_KEY='serialNumber'
+RECOVR_BILLING_MODULE='recovrBilling'
+IMAGINE_HOST=https://leverege-sandbox-imagine-api.leverege.com
+RECOVR_HOST=https://dev-recovr-notify.leverege.com
+# RECOVR_HOST=http://localhost:8296
+SYSTEM_ID=0UTmPFvRHXYLMlT4Kl2z1K
+PROJECT_ID=08HBeHEYGxu5Bg4TCCnAAV
+VEHICLE_NETWORK_ID='dev-dealership-vehicles'
+CONSUMER_VEHICLE_NETWORK_ID='dev-customer-vehicles'
+LOCATOR_NETWORK_ID='dev-recovr-tracker'
+BEACON_NETWORK_ID='dev-dealership-beacons'
+SALE_LOCATION_PARENT_PATH=sales
+CONSUMER_LOCATION_ID=1KceIcZlVWrOBvCzsEXYud
+IS_DEV=true

package/.firebaserc

@@ -1,47 +1,40 @@
 {
   "projects": {
     "default": "leverege-sandbox",
-    "dev-keys": "leverege-dev-nick",
-    "prd-indoor-zoning" : "prd-indoor-zoning"
+    "stg-recovr-auto": "stg-recovr-auto",
+    "prd-recovr-auto":"prd-recovr-auto"
   },
   "targets": {
     "leverege-sandbox": {
       "hosting": {
-        "dev-izg": [
-          "dev-izg"
+        "recovr": [
+          "dev"
         ],
-        "dev-olive-indoor-zoning": [
-          "dev-olive-indoor-zoning"
+        "dev-obd-recovr": [
+          "dev-obd"
         ]
       }
     },
-    "leverege-dev-nick": {
+    "stg-recovr-auto": {
       "hosting": {
-        "dev-keys": [
-          "dev-keys"
+        "stg-recovr": [
+          "stg"
+        ],
+        "stg-obd-recovr": [
+          "stg-obd"
         ]
       }
     },
-    "prd-indoor-zoning": {
+    "prd-recovr-auto": {
       "hosting": {
-        "prd-indoor-zoning-ui": [
-          "prd-indoor-zoning-ui"
-        ],
-        "prd-olive-indoor-zoning-ui": [
-          "prd-olive-indoor-zoning-ui"
+        "recovr-auto": [
+          "prd"
         ],
-        "prd-keys": [
-          "prd-keys"
+        "prd-obd-recovr":[
+          "prd-obd"
         ]
       },
       "production": true
-    },
-    "stg-indoor-zoning-pen-test": {
-      "hosting": {
-        "stg-indoor-zoning-ui": [
-          "stg-indoor-zoning-ui"
-        ]
-      }
     }
   }
 }

package/.firebasercizg

@@ -0,0 +1,47 @@
+{
+  "projects": {
+    "default": "leverege-sandbox",
+    "dev-keys": "leverege-dev-nick",
+    "prd-indoor-zoning" : "prd-indoor-zoning"
+  },
+  "targets": {
+    "leverege-sandbox": {
+      "hosting": {
+        "dev-izg": [
+          "dev-izg"
+        ],
+        "dev-olive-indoor-zoning": [
+          "dev-olive-indoor-zoning"
+        ]
+      }
+    },
+    "leverege-dev-nick": {
+      "hosting": {
+        "dev-keys": [
+          "dev-keys"
+        ]
+      }
+    },
+    "prd-indoor-zoning": {
+      "hosting": {
+        "prd-indoor-zoning-ui222": [
+          "prd-indoor-zoning-ui"
+        ],
+        "prd-olive-indoor-zoning-ui222": [
+          "prd-olive-indoor-zoning-ui"
+        ],
+        "prd-keys222": [
+          "prd-keys"
+        ]
+      },
+      "production": true
+    },
+    "stg-indoor-zoning-pen-test": {
+      "hosting": {
+        "stg-indoor-zoning-ui": [
+          "stg-indoor-zoning-ui"
+        ]
+      }
+    }
+  }
+}

package/lib/server/firebaseDeploy.js

@@ -31,6 +31,7 @@ if (_zx.argv._.length === 1) {
     CHANNEL.expiration = _zx.argv.channelExpiration ?? '7d';
   }
 }
+const INTERACTIVE_MODE = !TARGET;
 let exited = false;
 const SECRETS_DIR = 'secrets';
 const EXIT_EVENTS = ['SIGINT', 'exit', 'uncaughException', 'unhandledRejection'];
@@ -72,7 +73,7 @@ const targets = Object.entries(firebasercContent.targets).reduce((prev, [project
   });
   return prev;
 }, {});
-if (!TARGET) {
+if (INTERACTIVE_MODE) {
   const {
     targetEnv
   } = await prompt([{
@@ -83,7 +84,7 @@ if (!TARGET) {
       const productionLabel = t.production ? _ansiColors.default.bold.red('--PRODUCTION--') : '';
       return {
         message: `${_ansiColors.default.bold.cyan('Site: ')}${t.siteId.padEnd(maxPadding)} ${_ansiColors.default.bold.green('Project: ')}${t.projectId} ${productionLabel}`,
-        value: t.siteId
+        value: t.alias
       };
     })
   }]);
@@ -94,7 +95,7 @@ if (!TARGET) {
     } = await prompt([{
       type: 'confirm',
       name: 'confirmProductionDeploy',
-      message: `${_ansiColors.default.bold.red('WARNING: ')} This is a ${_ansiColors.default.bold.yellow('PRODUCTION')} deployment target. Are you sure you want to proceed?`
+      message: `${_ansiColors.default.bold.red('WARNING: ')} This is a ${_ansiColors.default.bold.yellow('PRODUCTION')} environment. Are you sure you want to deploy here?`
     }]);
     if (!confirmProductionDeploy) {
       console.log('Cancelling deployment...');
@@ -155,6 +156,26 @@ if (aliasFileExists) {
     encoding: 'utf-8'
   }));
 }
+if (INTERACTIVE_MODE) {
+  console.log(`\n\n\n${_ansiColors.default.bold.green('====== Deployment Summary ======')}`);
+  console.log(`${_ansiColors.default.blue('Firebase project:')} ${TARGET.projectId} ${TARGET.production ? _ansiColors.default.yellow('--PRODUCTION--') : ''}`);
+  console.log(`${_ansiColors.default.blue('Site ID:')} ${TARGET.siteId}`);
+  console.log(`${_ansiColors.default.blue('Channel Name:')} ${CHANNEL?.name ?? _ansiColors.default.italic.gray('(none)')}`);
+  console.log(`${_ansiColors.default.blue('Channel Expiration date:')} ${CHANNEL?.name ? CHANNEL.expiration ?? _ansiColors.default.italic.gray('(none)') : _ansiColors.default.italic.gray('(n/a)')}`);
+  console.log(`${_ansiColors.default.blue('Shared .env file:')} ${sharedFileExists ? `${SECRETS_DIR}/shared.env` : _ansiColors.default.italic.gray('(none)')}`);
+  console.log(`${_ansiColors.default.blue('Additional .env overrides:')} ${aliasFileExists ? `${SECRETS_DIR}/${TARGET.alias}.env` : `${SECRETS_DIR}/${TARGET.siteId}.env`}`);
+  const {
+    confirmSelections
+  } = await prompt([{
+    type: 'confirm',
+    name: 'confirmSelections',
+    message: 'Proceed with this deployment?'
+  }]);
+  if (!confirmSelections) {
+    console.log('Cancelling deployment...');
+    process.exit();
+  }
+}
 const envFileContent = (await Promise.all(exec)).join('\n');
 EXIT_EVENTS.forEach(event => {
   process.on(event, () => {
@@ -166,7 +187,7 @@ EXIT_EVENTS.forEach(event => {
 });
 await _zx.fs.writeFile(_zx.path.join(process.cwd(), '.env.temp'), envFileContent);
 try {
-  const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} --expires ${CHANNEL.expiration}` : 'deploy';
+  const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} ${CHANNEL.expiration ? `--expires ${CHANNEL.expiration}` : ''}` : 'deploy';
   await (0, _zx.$)`npm run clean && DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only hosting:${TARGET.siteId}`;
 } catch (err) {
   console.error(err);

package/lib/web/firebaseDeploy.js

@@ -31,6 +31,7 @@ if (_zx.argv._.length === 1) {
     CHANNEL.expiration = _zx.argv.channelExpiration ?? '7d';
   }
 }
+const INTERACTIVE_MODE = !TARGET;
 let exited = false;
 const SECRETS_DIR = 'secrets';
 const EXIT_EVENTS = ['SIGINT', 'exit', 'uncaughException', 'unhandledRejection'];
@@ -72,7 +73,7 @@ const targets = Object.entries(firebasercContent.targets).reduce((prev, [project
   });
   return prev;
 }, {});
-if (!TARGET) {
+if (INTERACTIVE_MODE) {
   const {
     targetEnv
   } = await prompt([{
@@ -83,7 +84,7 @@ if (!TARGET) {
       const productionLabel = t.production ? _ansiColors.default.bold.red('--PRODUCTION--') : '';
       return {
         message: `${_ansiColors.default.bold.cyan('Site: ')}${t.siteId.padEnd(maxPadding)} ${_ansiColors.default.bold.green('Project: ')}${t.projectId} ${productionLabel}`,
-        value: t.siteId
+        value: t.alias
       };
     })
   }]);
@@ -94,7 +95,7 @@ if (!TARGET) {
     } = await prompt([{
       type: 'confirm',
       name: 'confirmProductionDeploy',
-      message: `${_ansiColors.default.bold.red('WARNING: ')} This is a ${_ansiColors.default.bold.yellow('PRODUCTION')} deployment target. Are you sure you want to proceed?`
+      message: `${_ansiColors.default.bold.red('WARNING: ')} This is a ${_ansiColors.default.bold.yellow('PRODUCTION')} environment. Are you sure you want to deploy here?`
     }]);
     if (!confirmProductionDeploy) {
       console.log('Cancelling deployment...');
@@ -155,6 +156,26 @@ if (aliasFileExists) {
     encoding: 'utf-8'
   }));
 }
+if (INTERACTIVE_MODE) {
+  console.log(`\n\n\n${_ansiColors.default.bold.green('====== Deployment Summary ======')}`);
+  console.log(`${_ansiColors.default.blue('Firebase project:')} ${TARGET.projectId} ${TARGET.production ? _ansiColors.default.yellow('--PRODUCTION--') : ''}`);
+  console.log(`${_ansiColors.default.blue('Site ID:')} ${TARGET.siteId}`);
+  console.log(`${_ansiColors.default.blue('Channel Name:')} ${CHANNEL?.name ?? _ansiColors.default.italic.gray('(none)')}`);
+  console.log(`${_ansiColors.default.blue('Channel Expiration date:')} ${CHANNEL?.name ? CHANNEL.expiration ?? _ansiColors.default.italic.gray('(none)') : _ansiColors.default.italic.gray('(n/a)')}`);
+  console.log(`${_ansiColors.default.blue('Shared .env file:')} ${sharedFileExists ? `${SECRETS_DIR}/shared.env` : _ansiColors.default.italic.gray('(none)')}`);
+  console.log(`${_ansiColors.default.blue('Additional .env overrides:')} ${aliasFileExists ? `${SECRETS_DIR}/${TARGET.alias}.env` : `${SECRETS_DIR}/${TARGET.siteId}.env`}`);
+  const {
+    confirmSelections
+  } = await prompt([{
+    type: 'confirm',
+    name: 'confirmSelections',
+    message: 'Proceed with this deployment?'
+  }]);
+  if (!confirmSelections) {
+    console.log('Cancelling deployment...');
+    process.exit();
+  }
+}
 const envFileContent = (await Promise.all(exec)).join('\n');
 EXIT_EVENTS.forEach(event => {
   process.on(event, () => {
@@ -166,7 +187,7 @@ EXIT_EVENTS.forEach(event => {
 });
 await _zx.fs.writeFile(_zx.path.join(process.cwd(), '.env.temp'), envFileContent);
 try {
-  const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} --expires ${CHANNEL.expiration}` : 'deploy';
+  const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} ${CHANNEL.expiration ? `--expires ${CHANNEL.expiration}` : ''}` : 'deploy';
   await (0, _zx.$)`npm run clean && DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only hosting:${TARGET.siteId}`;
 } catch (err) {
   console.error(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.21.9-nick.1",
+  "version": "2.21.9-nick.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/secrets/dev-obd.env

@@ -0,0 +1,13 @@
+IMAGINE_HOST=https://leverege-sandbox-imagine-api.leverege.com
+RECOVR_HOST=https://dev-recovr-notify.leverege.com
+# RECOVR_HOST=http://localhost:8296
+SYSTEM_ID=0UTmPFvRHXYLMlT4Kl2z1K
+PROJECT_ID=08HBeHEYGxu5Bg4TCCnAAV
+VEHICLE_NETWORK_ID='dev-dealership-vehicles'
+CONSUMER_VEHICLE_NETWORK_ID='dev-customer-vehicles'
+LOCATOR_NETWORK_ID='dev-recovr-tracker'
+BEACON_NETWORK_ID='dev-dealership-beacons'
+SALE_LOCATION_PARENT_PATH=sales
+CONSUMER_LOCATION_ID=1KceIcZlVWrOBvCzsEXYud
+userManagementUiName='obd'
+IS_DEV=true

package/secrets/dev.env

@@ -0,0 +1,12 @@
+IMAGINE_HOST=https://leverege-sandbox-imagine-api.leverege.com
+RECOVR_HOST=https://dev-recovr-notify.leverege.com
+# RECOVR_HOST=http://localhost:8296
+SYSTEM_ID=0UTmPFvRHXYLMlT4Kl2z1K
+PROJECT_ID=08HBeHEYGxu5Bg4TCCnAAV
+VEHICLE_NETWORK_ID='dev-dealership-vehicles'
+CONSUMER_VEHICLE_NETWORK_ID='dev-customer-vehicles'
+LOCATOR_NETWORK_ID='dev-recovr-tracker'
+BEACON_NETWORK_ID='dev-dealership-beacons'
+SALE_LOCATION_PARENT_PATH=sales
+CONSUMER_LOCATION_ID=1KceIcZlVWrOBvCzsEXYud
+IS_DEV=true

package/secrets/prd-obd.env

@@ -0,0 +1,12 @@
+IMAGINE_HOST=https://prd-recovr-auto-imagine-api.leverege.com
+RECOVR_HOST=https://recovr-auto-notify.leverege.com
+SYSTEM_ID=2ExK7rl76meCVCCctjOJEY
+PROJECT_ID=1Je8Y7dNlfthv7ixV8oEfZ
+VEHICLE_NETWORK_ID='prd-auto-vehicles'
+CONSUMER_VEHICLE_NETWORK_ID='prd-customer-vehicles'
+BEACON_NETWORK_ID='prd-auto-beacons'
+GOOGLE_ANALYTICS_TRACKER_ID='G-LBTT0JT9V6'
+SALE_LOCATION_PARENT_PATH=location
+CONSUMER_LOCATION_ID=26OsDlsRqBTIOxMjyHg9S5
+userManagementUiName='obd'
+IS_DEV=true

package/secrets/prd.env

@@ -0,0 +1,10 @@
+IMAGINE_HOST=https://prd-recovr-auto-imagine-api.leverege.com
+RECOVR_HOST=https://recovr-auto-notify.leverege.com
+SYSTEM_ID=2ExK7rl76meCVCCctjOJEY
+PROJECT_ID=1Je8Y7dNlfthv7ixV8oEfZ
+VEHICLE_NETWORK_ID='prd-auto-vehicles'
+CONSUMER_VEHICLE_NETWORK_ID='prd-customer-vehicles'
+BEACON_NETWORK_ID='prd-auto-beacons'
+GOOGLE_ANALYTICS_TRACKER_ID='G-LBTT0JT9V6'
+SALE_LOCATION_PARENT_PATH=location
+CONSUMER_LOCATION_ID=26OsDlsRqBTIOxMjyHg9S5

package/secrets/shared.env

@@ -0,0 +1,6 @@
+THEFT_RECOVERY_URL='theft.recovermycar.com'
+MAPBOX_APIKEY=pk.eyJ1IjoibGV2ZXJlZ2UiLCJhIjoiY2p1Y3E0cWpkMG15azQzbnFzaDY2dmhiMSJ9.7N25h5jsjO2Aq_YmiLrAJw
+APPEARANCE_PROJECT_ID=7b2GTbmsZj3f5VdFpjGM8O
+INTERCOM_APP_ID='ec0qbuwi'
+LOCATOR_ALIAS_KEY='serialNumber'
+RECOVR_BILLING_MODULE='recovrBilling'

package/secrets/stg-obd.env

@@ -0,0 +1,10 @@
+IMAGINE_HOST=https://stg-recovr-auto-imagine-api.leverege.com
+# RECOVR_HOST=http://localhost:8296
+SYSTEM_ID=6CxONnaSOnbGFBS5gLnZWl
+PROJECT_ID=3vo2u8m9GEXPaQgMnJ45rh
+VEHICLE_NETWORK_ID='stg-auto-vehicles'
+CONSUMER_VEHICLE_NETWORK_ID='stg-customer-vehicles'
+BEACON_NETWORK_ID='stg-auto-beacons'
+CONSUMER_LOCATION_ID=1SRDkIuPWDpiAy4dsuy0JT
+userManagementUiName='obd'
+IS_DEV=false

package/secrets/stg.env

@@ -0,0 +1,9 @@
+IMAGINE_HOST=https://stg-recovr-auto-imagine-api.leverege.com
+# RECOVR_HOST=http://localhost:8296
+SYSTEM_ID=6CxONnaSOnbGFBS5gLnZWl
+PROJECT_ID=3vo2u8m9GEXPaQgMnJ45rh
+VEHICLE_NETWORK_ID='stg-auto-vehicles'
+CONSUMER_VEHICLE_NETWORK_ID='stg-customer-vehicles'
+BEACON_NETWORK_ID='stg-auto-beacons'
+CONSUMER_LOCATION_ID=1SRDkIuPWDpiAy4dsuy0JT
+IS_DEV=false

package/src/firebaseDeploy.mjs

@@ -22,7 +22,7 @@ if ( argv._.length === 1 ) {
   TARGET = argv._[0]
 } else {
   TARGET = argv.target
-
+  
   if ( argv.channelName ) {
     CHANNEL = {}
     CHANNEL.name = argv.channelName
@@ -30,6 +30,8 @@ if ( argv._.length === 1 ) {
   }
 }
 
+const INTERACTIVE_MODE = !TARGET
+
 let exited = false
 
 const SECRETS_DIR = 'secrets'
@@ -89,14 +91,14 @@ const targets = Object
     return prev
   }, {} )
 
-if ( !TARGET ) {
+if ( INTERACTIVE_MODE ) {
   const { targetEnv } = await prompt( [ {
     type : 'select',
     name : 'targetEnv',
     message : 'To which environment would you like to deploy?',
     choices : Object.values( targets ).map( ( t ) => { 
       const productionLabel = t.production ? colors.bold.red( '--PRODUCTION--' ) : ''
-      return { message : `${colors.bold.cyan( 'Site: ' )}${t.siteId.padEnd( maxPadding )} ${colors.bold.green( 'Project: ' )}${t.projectId} ${productionLabel}`, value : t.siteId } 
+      return { message : `${colors.bold.cyan( 'Site: ' )}${t.siteId.padEnd( maxPadding )} ${colors.bold.green( 'Project: ' )}${t.projectId} ${productionLabel}`, value : t.alias } 
     } )
   } ] )
 
@@ -106,7 +108,7 @@ if ( !TARGET ) {
     const { confirmProductionDeploy } = await prompt( [ {
       type : 'confirm',
       name : 'confirmProductionDeploy',
-      message : `${colors.bold.red( 'WARNING: ' )} This is a ${colors.bold.yellow( 'PRODUCTION' )} deployment target. Are you sure you want to proceed?`
+      message : `${colors.bold.red( 'WARNING: ' )} This is a ${colors.bold.yellow( 'PRODUCTION' )} environment. Are you sure you want to deploy here?`
     } ] )
     if ( !confirmProductionDeploy ) {
       console.log( 'Cancelling deployment...' )
@@ -135,7 +137,7 @@ if ( !TARGET ) {
 
     CHANNEL = { name : channelName, expiration : channelExpiration }
   }
-
+  
 } else {
   TARGET = targets[TARGET]
 }
@@ -168,6 +170,26 @@ if ( aliasFileExists ) {
   exec.push( fs.readFile( path.join( process.cwd(), SECRETS_DIR, `${TARGET.siteId}.env` ), { encoding : 'utf-8' } ) )
 }
 
+if ( INTERACTIVE_MODE ) {
+  console.log( `\n\n\n${colors.bold.green( '====== Deployment Summary ======' )}` )
+  console.log( `${colors.blue( 'Firebase project:' )} ${TARGET.projectId} ${TARGET.production ? colors.yellow( '--PRODUCTION--' ) : ''}` )
+  console.log( `${colors.blue( 'Site ID:' )} ${TARGET.siteId}` )
+  console.log( `${colors.blue( 'Channel Name:' )} ${CHANNEL?.name ?? colors.italic.gray( '(none)' )}` )
+  console.log( `${colors.blue( 'Channel Expiration date:' )} ${CHANNEL?.name ? CHANNEL.expiration ?? colors.italic.gray( '(none)' ) : colors.italic.gray( '(n/a)' )}` ) 
+  console.log( `${colors.blue( 'Shared .env file:' )} ${sharedFileExists ? `${SECRETS_DIR}/shared.env` : colors.italic.gray( '(none)' )}` )
+  console.log( `${colors.blue( 'Additional .env overrides:' )} ${aliasFileExists ? `${SECRETS_DIR}/${TARGET.alias}.env` : `${SECRETS_DIR}/${TARGET.siteId}.env`}` )
+
+  const { confirmSelections } = await prompt( [ {
+    type : 'confirm',
+    name : 'confirmSelections',
+    message : 'Proceed with this deployment?'
+  } ] )
+
+  if ( !confirmSelections ) {
+    console.log( 'Cancelling deployment...' )
+    process.exit()
+  }
+}
 const envFileContent = ( await Promise.all( exec ) ).join( '\n' )
 
 EXIT_EVENTS
@@ -183,7 +205,7 @@ EXIT_EVENTS
 await fs.writeFile( path.join( process.cwd(), '.env.temp' ), envFileContent )
 
 try {
-  const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} --expires ${CHANNEL.expiration}` : 'deploy'
+  const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} ${CHANNEL.expiration ? `--expires ${CHANNEL.expiration}` : ''}` : 'deploy'
   await $`npm run clean && DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only hosting:${TARGET.siteId}`
 } catch ( err ) {
   console.error( err )