gitgreen 1.0.1 → 1.0.3

package/dist/cli.js

@@ -9,6 +9,7 @@ const commander_1 = require("commander");
 const kleur_1 = require("kleur");
 const asciichart_1 = __importDefault(require("asciichart"));
 const config_1 = require("./config");
+const package_json_1 = require("../package.json");
 const index_1 = require("./index");
 const init_1 = require("./init");
 const cloudwatch_1 = require("./lib/aws/cloudwatch");
@@ -279,6 +280,7 @@ const runCalculate = async (opts) => {
 };
 program
     .name('gitgreen')
+    .version(package_json_1.version)
     .description('GitGreen carbon calculator using real timeseries metrics')
     .option('-p, --provider <provider>', 'Cloud provider (gcp|aws)', config_1.config.defaultProvider)
     .option('-m, --machine <type>', 'Machine type (e.g., e2-standard-4)')

package/dist/init.js

@@ -889,11 +889,11 @@ const runInit = async (opts = {}) => {
             (0, child_process_1.execSync)(`gcloud projects add-iam-policy-binding ${gcpProjectId} --member="serviceAccount:${saEmail}" --role="roles/monitoring.viewer" --quiet 2>/dev/null`, { stdio: 'pipe' });
         }
         catch { }
-        // Check if VM exists
+        // Check if VM exists and is running
         let vmExists = false;
         try {
-            (0, child_process_1.execSync)(`gcloud compute instances describe ${vmName} --project=${gcpProjectId} --zone=${gcpZone} 2>/dev/null`, { stdio: 'pipe' });
-            vmExists = true;
+            const status = (0, child_process_1.execSync)(`gcloud compute instances describe ${vmName} --project=${gcpProjectId} --zone=${gcpZone} --format="value(status)" 2>/dev/null`, { encoding: 'utf8' }).trim();
+            vmExists = status === 'RUNNING';
         }
         catch { }
         const startupScript = `#!/usr/bin/env bash
@@ -944,20 +944,12 @@ systemctl start gitlab-runner
             try {
                 (0, child_process_1.execSync)(`gcloud compute instances create ${vmName} --project=${gcpProjectId} --zone=${gcpZone} --machine-type=${vmMachineType} --service-account=${saEmail} --scopes=https://www.googleapis.com/auth/cloud-platform --metadata=runner-token="${runnerToken}" --metadata-from-file=startup-script=${tmpFile} --image-family=debian-12 --image-project=debian-cloud`, { stdio: 'inherit' });
                 console.log((0, kleur_1.green)(`VM ${vmName} created. Runner will register in 2-3 minutes.`));
-                console.log((0, kleur_1.gray)('Waiting for runner to register...'));
-                // Wait for instance ID file
-                for (let i = 0; i < 30; i++) {
-                    await new Promise(r => setTimeout(r, 10000));
-                    try {
-                        gcpInstanceId = (0, child_process_1.execSync)(`gcloud compute ssh ${vmName} --project=${gcpProjectId} --zone=${gcpZone} --command="cat /opt/gitlab-runner-instance-id.txt 2>/dev/null"`, { encoding: 'utf8' }).trim();
-                        if (gcpInstanceId) {
-                            console.log((0, kleur_1.green)(`Runner registered. Instance ID: ${gcpInstanceId}`));
-                            break;
-                        }
-                    }
-                    catch { }
-                    console.log((0, kleur_1.gray)(`Waiting... (${i + 1}/30)`));
+                // Get the instance ID of the newly created VM
+                try {
+                    const instanceInfo = (0, child_process_1.execSync)(`gcloud compute instances describe ${vmName} --project=${gcpProjectId} --zone=${gcpZone} --format="value(id)"`, { encoding: 'utf8' });
+                    gcpInstanceId = instanceInfo.trim();
                 }
+                catch { }
             }
             catch (err) {
                 console.log((0, kleur_1.red)('Failed to create VM: ' + err.message));
@@ -1158,7 +1150,17 @@ systemctl start gitlab-runner
         // Create key
         console.log((0, kleur_1.gray)('Creating key...'));
         const tmpKeyPath = `/tmp/gitgreen-sa-key-${Date.now()}.json`;
-        (0, child_process_1.execSync)(`gcloud iam service-accounts keys create ${tmpKeyPath} --iam-account=${saEmail}`, { stdio: 'inherit' });
+        try {
+            (0, child_process_1.execSync)(`gcloud iam service-accounts keys create ${tmpKeyPath} --iam-account=${saEmail}`, { stdio: 'inherit' });
+        }
+        catch {
+            console.log((0, kleur_1.red)('\nFailed to create service account key.'));
+            console.log((0, kleur_1.gray)('This usually means the service account has too many keys (limit: 10).'));
+            console.log((0, kleur_1.gray)('\nTo fix, delete old keys:'));
+            console.log((0, kleur_1.green)(`  gcloud iam service-accounts keys list --iam-account=${saEmail}`));
+            console.log((0, kleur_1.green)(`  gcloud iam service-accounts keys delete KEY_ID --iam-account=${saEmail}`));
+            process.exit(1);
+        }
         saKeyBase64 = fs_1.default.readFileSync(tmpKeyPath).toString('base64');
         fs_1.default.unlinkSync(tmpKeyPath);
         console.log((0, kleur_1.green)('Service account key created'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitgreen",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "GitGreen CLI for carbon reporting in GitLab pipelines (GCP/AWS)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",