duoops 0.2.3 → 0.2.5

package/dist/commands/init.js

@@ -11,6 +11,7 @@ import { fileURLToPath } from 'node:url';
 import { configManager } from '../lib/config.js';
 import { detectGcpProject, enableApis, validateProjectAccess } from '../lib/gcloud.js';
 import McpDeploy from './mcp/deploy.js';
+const gitlabAuthHeaders = (token) => token.startsWith('glpat-') ? { 'PRIVATE-TOKEN': token } : { Authorization: `Bearer ${token}` };
 const hasBinary = (command) => {
     try {
         execSync(`${command} --version`, { stdio: 'ignore' });
@@ -50,7 +51,7 @@ const setGitlabVariable = async (auth, projectPath, variable) => {
     const apiUrl = `${base}/api/v4/projects/${project}/variables`;
     await axios
         .delete(`${apiUrl}/${variable.key}`, {
-        headers: { 'PRIVATE-TOKEN': auth.token },
+        headers: gitlabAuthHeaders(auth.token),
     })
         .catch(() => { });
     await axios.post(apiUrl, {
@@ -58,7 +59,7 @@ const setGitlabVariable = async (auth, projectPath, variable) => {
         masked: Boolean(variable.masked),
         protected: false,
         value: variable.value,
-    }, { headers: { 'PRIVATE-TOKEN': auth.token } });
+    }, { headers: gitlabAuthHeaders(auth.token) });
 };
 const ensureServiceAccount = (projectId, serviceAccount) => {
     try {
@@ -558,7 +559,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',
         });
@@ -591,6 +592,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.3"
+  "version": "0.2.5"
 }

package/package.json

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