duoops 0.2.4 → 0.2.6

package/dist/commands/init.js

@@ -24,10 +24,13 @@ const hasBinary = (command) => {
 const detectGlabToken = (host = 'gitlab.com') => {
     try {
         const token = execSync(`glab config get token --host ${host}`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
-        if (token)
+        if (!token)
+            return;
+        const status = execSync(`curl -sf -o /dev/null -w "%{http_code}" -H "Authorization: Bearer ${token}" "https://${host}/api/v4/user"`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'], timeout: 5000 }).trim();
+        if (status === '200')
             return { source: 'glab CLI', token };
     }
-    catch { /* glab not installed or not authenticated */ }
+    catch { /* glab not installed, not authenticated, or token expired */ }
 };
 const detectGitRemotePath = () => {
     try {
@@ -559,7 +562,7 @@ export default class Init extends Command {
         if (!hasBinary('gcloud')) {
             this.error('gcloud CLI is required to provision a runner. Install it from https://cloud.google.com/sdk');
         }
-        const vmName = await input({
+        let vmName = await input({
             default: 'duoops-runner',
             message: 'Runner VM name',
         });
@@ -592,6 +595,54 @@ export default class Init extends Command {
         if (!runnerToken) {
             this.error('Runner token required to register the VM.');
         }
+        let vmExists = false;
+        try {
+            execSync(`gcloud compute instances describe ${vmName} --project=${gcpProjectId} --zone=${gcpZone} --format="value(name)"`, { stdio: ['pipe', 'pipe', 'pipe'] });
+            vmExists = true;
+        }
+        catch { /* does not exist */ }
+        if (vmExists) {
+            const vmAction = await select({
+                choices: [
+                    { name: 'Use existing VM', value: 'use' },
+                    { name: 'Delete and recreate', value: 'recreate' },
+                    { name: 'Use a different name', value: 'rename' },
+                ],
+                message: `VM "${vmName}" already exists in ${gcpZone}. What would you like to do?`,
+            });
+            if (vmAction === 'use') {
+                this.log(green(`Using existing VM "${vmName}".`));
+                let gcpInstanceId = '';
+                try {
+                    gcpInstanceId = execSync(`gcloud compute instances describe ${vmName} --project=${gcpProjectId} --zone=${gcpZone} --format="value(id)"`, { encoding: 'utf8' }).trim();
+                }
+                catch {
+                    this.warn('Unable to read instance ID automatically.');
+                }
+                return {
+                    gcpInstanceId,
+                    gcpZone,
+                    instanceName: vmName,
+                    machineType,
+                    runnerTag,
+                };
+            }
+            if (vmAction === 'recreate') {
+                this.log(gray(`Deleting VM "${vmName}"...`));
+                try {
+                    execSync(`gcloud compute instances delete ${vmName} --project=${gcpProjectId} --zone=${gcpZone} --quiet`, { stdio: 'inherit' });
+                    this.log(green(`Deleted "${vmName}".`));
+                }
+                catch {
+                    this.error(`Failed to delete VM "${vmName}". Delete it manually and retry.`);
+                }
+            }
+            if (vmAction === 'rename') {
+                vmName = await input({
+                    message: 'New VM name',
+                });
+            }
+        }
         const startupScript = buildStartupScript({
             gitlabUrl: normalizeGitLabUrl(auth.baseUrl),
             runnerTag,

package/oclif.manifest.json

@@ -669,5 +669,5 @@
       ]
     }
   },
-  "version": "0.2.4"
+  "version": "0.2.6"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duoops",
   "description": "Toolset for Explainable and Sustainable CI on Gitlab.",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "author": "Younes Laaroussi",
   "bin": {
     "duoops": "./bin/run.js"