@leverege/build-tools 2.51.3 → 2.51.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.51.3",
+  "version": "2.51.5",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -64,7 +64,7 @@
     "execa": "^9.4.0",
     "glob": "^11.0.0",
     "handlebars": "^4.7.8",
-    "inquirer": "^11.0.1",
+    "inquirer": "^11.0.2",
     "js-yaml": "^4.1.0",
     "ms": "^2.1.3",
     "npm-registry-fetch": "^17.1.0",
@@ -73,7 +73,7 @@
     "read-pkg": "^9.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.6.3",
-    "simple-git": "^3.26.0",
+    "simple-git": "^3.27.0",
     "zx": "^8.1.7"
   },
   "devDependencies": {

package/src/firebaseDeploy.mjs

@@ -213,7 +213,6 @@ try {
   const hostingPrefix = CHANNEL ? '' : 'hosting:'
 
   await $( { ac } )`npm run clean && DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`
-    .pipe( process.stdout )
 } catch ( err ) {
   console.error( err )
 }

package/src/firebaseServe.mjs

@@ -130,8 +130,9 @@ const ac = new AbortController()
 
 EXIT_EVENTS
   .forEach( ( event ) => {
-    process.on( event, () => {
+    process.on( event, ( d ) => {
       if ( !exited ) {
+        console.error( d )
         exited = true
         fs.removeSync( path.join( process.cwd(), '.env.temp' ) )
         ac.abort()
@@ -142,7 +143,7 @@ EXIT_EVENTS
 await fs.writeFile( path.join( process.cwd(), '.env.temp' ), envFileContent )
 
 try {
-  await $( { ac } )`DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} npm run serve --colors`.pipe( process.stdout )
+  await $( { ac } )`DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} npm run serve --colors`
 } catch ( err ) {
   console.error( err )
 }

package/src/helm-charts/cnpg-db-psql-stack/helmup.plugin

@@ -1,3 +1,6 @@
 #!/bin/bash
 
+# ensures the PG_PASSWORD secret exists and correct
+ensureCnpgSecret PG_PASSWORD $SERVICE-postgres-pw
+
 kubectl apply -f cnpg-db-psql-stack/cluster.yaml $K8S_WHAT

package/src/helm-charts/cnpg-db-tsdb-basic/helmup.plugin

@@ -1,3 +1,6 @@
 #!/bin/bash
-#
+
+# ensures the TSDB_PASSWORD secret exists and correct
+ensureCnpgSecret TSDB_PASSWORD $SERVICE-postgres-pw
+
 kubectl apply -f cnpg-db-tsdb-basic/cluster.yaml $K8S_WHAT

package/src/helm-charts/cnpg-db-tsdb-dense/helmup.plugin

@@ -1,3 +1,6 @@
 #!/bin/bash
-#
+
+# ensures the TSDB_DENSE_PASSWORD secret exists and correct
+ensureCnpgSecret TSDB_DENSE_PASSWORD $SERVICE-postgres-pw
+
 kubectl apply -f cnpg-db-tsdb-dense/cluster.yaml $K8S_WHAT

package/src/helmup.sh

@@ -671,6 +671,23 @@ EOSNAPSC
   sleep 2 # hold up processing for a moment to allow IAM mods to propagate
 }
 
+function ensureCnpgSecret() {
+  local mgrSecret=$1
+  local k8sSecret=$2
+
+  service-man --from-helmup --sync-secrets ${mgrSecret}=${k8sSecret}
+
+  if [ $? -ne 0 ];
+  then
+    cat<<BAD_SECRETS
+  `color r "There appears to be a problem with one, or both of the secrets. Please
+  rectify the situation and try again."`
+
+BAD_SECRETS
+    exit 1
+  fi
+}
+
 function installVeleroEnvironment() {
   # Follows instructions => https://github.com/vmware-tanzu/velero-plugin-for-gcp
   showInstalling "Velero Backup Management"