@autofleet/cli 1.0.10 → 1.0.12

package/bin/index.js

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { connectAndGetPrefix, terminalCommand } from './utils/index.js';
+import path from 'path';
+import { connectAndGetPrefix, parseIps, terminalCommand } from './utils/index.js';
 
 yargs(hideBin(process.argv))
   .command({
@@ -22,16 +23,14 @@ yargs(hideBin(process.argv))
     command: 'getIps',
     describe: '--service=driver-ms --variationId=${yourVariationUuid} --cluster=dev1/e2eManager',
     async handler(argv) {
-      const { cluster, variationId, service } = argv;
+      const { cluster, variationId } = argv;
       const prefix = await connectAndGetPrefix({
         clusterName: cluster,
         variationId,
       });
       await terminalCommand(`kubectl ${prefix} get services > ips`);
-      const CAT_IPS = 'cat ips';
-      const getServicesCommand = service ? `${CAT_IPS} | grep ${service}` : CAT_IPS;
-      const serviceLine = await terminalCommand(getServicesCommand);
-      console.log(serviceLine);
+      const ips = parseIps(`${path.resolve()}/ips`);
+      ips.forEach((ip) => console.log(ip));
     },
   })
   .command({

package/bin/utils/index.js

@@ -1,9 +1,12 @@
 #!/usr/bin/env node
 import { promisify } from 'util';
 import { exec } from 'child_process';
+import fs from 'fs';
 
 const asyncExec = promisify(exec);
-
+const SERVICE_NAME_INDEX = 0;
+const EXTERNAL_IP_INDEX = 6;
+const IP_LINE_SUFFIX = 'SERVICE_HOST';
 const CLUSTER_TO_CMD_MAP = {
   dev1: 'gcloud container clusters get-credentials dev-cluster-2 --region europe-west1 --project dev1-experiment-manager',
   e2eManager: 'gcloud container clusters get-credentials e2e-cluster-1 --region europe-west1 --project e2e-manager',
@@ -20,3 +23,17 @@ export const connectAndGetPrefix = async ({ clusterName, variationId }) => {
   await connectToCluster(clusterName);
   return `--namespace=${variationId}`;
 };
+export const parseIps = (ipsFilePath) => {
+  const ipLines = fs.readFileSync(ipsFilePath, 'utf-8').split('\n');
+  ipLines.shift();
+
+  let formattedIps = ipLines.map((ipLine) => {
+    const splittedLine = ipLine.split(/(\s+)/);
+    const serviceName = splittedLine[SERVICE_NAME_INDEX].replace(/-/g, '_').toUpperCase();
+    const loadBalancerIp = splittedLine[EXTERNAL_IP_INDEX];
+    const formattedLine = `${serviceName}_${IP_LINE_SUFFIX}=${loadBalancerIp}`;
+    return formattedLine;
+  });
+  formattedIps = formattedIps.filter((formattedIp) => !formattedIp.includes('none') && !formattedIp.includes('undefined'));
+  return formattedIps;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/cli",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "",
   "main": "dist/index.js",
   "scripts": {