@leverege/build-tools 2.21.3 → 2.21.5

package/lib/server/firebaseServe.js

@@ -64,17 +64,24 @@ const targets = Object.entries(firebasercContent.targets).reduce((prev, [project
 }, defaultTargets);
 
 if (!TARGET) {
-  const {
-    targetEnv
-  } = await prompt({
-    type: 'autocomplete',
-    name: 'targetEnv',
-    message: 'Which environment would you like to serve?',
-    choices: Object.keys(targets).map(t => ({
-      name: t,
-      value: t
-    }))
-  });
+  const choices = Object.keys(targets).map(t => ({
+    name: t,
+    value: t
+  }));
+  let targetEnv;
+
+  if (choices.length > 1) {
+    const res = await prompt({
+      type: 'autocomplete',
+      name: 'targetEnv',
+      message: 'Which environment would you like to serve?',
+      choices
+    });
+    targetEnv = res.targetEnv;
+  } else {
+    targetEnv = choices[0].value;
+  }
+
   TARGET = targets[targetEnv];
 } else {
   TARGET = targets[TARGET];

package/lib/web/firebaseServe.js

@@ -64,17 +64,24 @@ const targets = Object.entries(firebasercContent.targets).reduce((prev, [project
 }, defaultTargets);
 
 if (!TARGET) {
-  const {
-    targetEnv
-  } = await prompt({
-    type: 'autocomplete',
-    name: 'targetEnv',
-    message: 'Which environment would you like to serve?',
-    choices: Object.keys(targets).map(t => ({
-      name: t,
-      value: t
-    }))
-  });
+  const choices = Object.keys(targets).map(t => ({
+    name: t,
+    value: t
+  }));
+  let targetEnv;
+
+  if (choices.length > 1) {
+    const res = await prompt({
+      type: 'autocomplete',
+      name: 'targetEnv',
+      message: 'Which environment would you like to serve?',
+      choices
+    });
+    targetEnv = res.targetEnv;
+  } else {
+    targetEnv = choices[0].value;
+  }
+
   TARGET = targets[targetEnv];
 } else {
   TARGET = targets[TARGET];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.21.3",
+  "version": "2.21.5",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -53,7 +53,7 @@
     "command-line-args": "^5.2.1",
     "command-line-usage": "^6.1.3",
     "deepmerge": "^4.2.2",
-    "dotenv": "^16.0.1",
+    "dotenv": "^16.0.2",
     "enquirer": "^2.3.6",
     "execa": "^5.1.1",
     "glob": "^8.0.3",
@@ -62,14 +62,14 @@
     "parse-gitignore": "^2.0.0",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.7",
-    "simple-git": "^3.13.0",
+    "simple-git": "^3.14.0",
     "zx": "^7.0.8"
   },
   "devDependencies": {
     "@babel/cli": "^7.18.10",
-    "@babel/core": "^7.18.13",
+    "@babel/core": "^7.19.1",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^8.18.0"
+    "npm": "^8.19.2"
   }
 }

package/src/firebaseServe.mjs

@@ -72,12 +72,22 @@ const targets = Object
   }, defaultTargets )
 
 if ( !TARGET ) {
-  const { targetEnv } = await prompt( {
-    type : 'autocomplete',
-    name : 'targetEnv',
-    message : 'Which environment would you like to serve?',
-    choices : Object.keys( targets ).map( t => ( { name : t, value : t } ) )
-  } )
+  const choices = Object.keys( targets ).map( t => ( { name : t, value : t } ) )
+
+  let targetEnv
+  
+  if ( choices.length > 1 ) {
+    const res = await prompt( {
+      type : 'autocomplete',
+      name : 'targetEnv',
+      message : 'Which environment would you like to serve?',
+      choices
+    } )
+
+    targetEnv = res.targetEnv
+  } else { 
+    targetEnv = choices[0].value
+  }
 
   TARGET = targets[targetEnv]
 } else {

package/src/helmup

@@ -307,8 +307,15 @@ SA_EXISTS
   ## Installing ES exporter
   helm upgrade --install elasticsearch-exporter prometheus-community/prometheus-elasticsearch-exporter \
     --namespace monitoring \
-    --values elasticsearch-exporter/values-es-exporter.yaml \
-    --version 4.13
+    --version 4.13 \
+    -f - <<ELASTIC_EXPORTER_CHART_MOD
+service:
+  annotations:
+    prometheus.io/port: "9108"
+    prometheus.io/scrape: "true"
+es:
+  uri: http://elasticsearch-master.default.svc.cluster.local:9200
+ELASTIC_EXPORTER_CHART_MOD
 
   ## Install Grafana  
   installGrafana
@@ -430,7 +437,7 @@ function installCronZombieKiller() {
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: cronjob-sa
+  name: cron-zombie-sa
   namespace: default
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -450,7 +457,7 @@ metadata:
   namespace: default
 subjects:
 - kind: ServiceAccount
-  name: cronjob-sa
+  name: cron-zombie-sa
   namespace: default
 roleRef:
   kind: Role
@@ -464,7 +471,7 @@ metadata:
   name: cron-zombie-killer
 spec:
   schedule: "*/4 * * * *"
-  successfulJobsHistoryLimit: 0
+  successfulJobsHistoryLimit: 1
   jobTemplate:
     spec:
       template:
@@ -472,7 +479,7 @@ spec:
           name: cron-zombie-killer
           namespace: default
         spec:
-          serviceAccountName: cronjob-sa
+          serviceAccountName: cron-zombie-sa
           restartPolicy: Never
           containers:
           - name: cron-zombie-killer
@@ -873,7 +880,7 @@ function doInstall() {
         checkSSDStorageClass
         addHelmRepo elastic https://helm.elastic.co
         helm upgrade --install elasticsearch elastic/elasticsearch \
-          --version 7 \
+          --version 7.16 \
           --values $LOCAL_ES_VALUES \
           --set volumeClaimTemplate.storageClassName="ssd"
         removeHelmRepo elastic