gitgreen 0.1.0 → 0.1.1

package/dist/init.js

@@ -80,80 +80,27 @@ const setVariable = async (auth, project, key, value, masked = false) => {
         return setVariableApi(auth.baseUrl, auth.pat, project, key, value, masked);
     }
 };
-const generateCiJob = (runnerTag) => {
+const generateCiJob = (opts = {}) => {
+    const { runnerTag, carbonBudget, failOnBudget } = opts;
+    let inputs = `      gcp_project_id: $GCP_PROJECT_ID
+      gcp_instance_id: $GCP_INSTANCE_ID
+      gcp_zone: $GCP_ZONE
+      machine_type: $MACHINE_TYPE`;
+    if (carbonBudget) {
+        inputs += `\n      carbon_budget_grams: "${carbonBudget}"`;
+    }
+    if (failOnBudget) {
+        inputs += `\n      fail_on_budget: true`;
+    }
     const tagsSection = runnerTag ? `\n  tags:\n    - ${runnerTag}` : '';
     return `# GitGreen carbon analysis (generated by gitgreen init)
-# Fetches real CPU and RAM metrics from GCP Monitoring API
+include:
+  - component: gitlab.com/youneslaaroussi/gitgreen/gitgreen-cli-component@0.1.0
+    inputs:
+${inputs}
 
 carbon_analysis:
-  stage: test${tagsSection}
-  before_script:
-    - echo "$GCP_SA_KEY_BASE64" | base64 -d > /tmp/gcp-key.json
-    - gcloud auth activate-service-account --key-file=/tmp/gcp-key.json
-    - npm install ./gitgreen-cli-0.1.0.tgz
-  script:
-    - |
-      TOKEN=$(gcloud auth print-access-token)
-      START_TIME=$(date -u -d "$CI_PIPELINE_CREATED_AT" +%Y-%m-%dT%H:%M:%SZ)
-      END_TIME=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-
-      CPU_FILTER="resource.type=\\"gce_instance\\" AND resource.labels.instance_id=\\"$GCP_INSTANCE_ID\\" AND resource.labels.zone=\\"$GCP_ZONE\\" AND metric.type=\\"compute.googleapis.com/instance/cpu/utilization\\""
-      CPU_ENCODED=$(python3 -c "import urllib.parse; print(urllib.parse.quote('''$CPU_FILTER'''))")
-
-      RAM_USED_FILTER="resource.type=\\"gce_instance\\" AND resource.labels.instance_id=\\"$GCP_INSTANCE_ID\\" AND metric.type=\\"compute.googleapis.com/instance/memory/balloon/ram_used\\""
-      RAM_USED_ENCODED=$(python3 -c "import urllib.parse; print(urllib.parse.quote('''$RAM_USED_FILTER'''))")
-
-      RAM_SIZE_FILTER="resource.type=\\"gce_instance\\" AND resource.labels.instance_id=\\"$GCP_INSTANCE_ID\\" AND metric.type=\\"compute.googleapis.com/instance/memory/balloon/ram_size\\""
-      RAM_SIZE_ENCODED=$(python3 -c "import urllib.parse; print(urllib.parse.quote('''$RAM_SIZE_FILTER'''))")
-
-      # Calculate expected data points (GCP reports every 60s)
-      START_SEC=$(date -d "$START_TIME" +%s)
-      NOW_SEC=$(date +%s)
-      DURATION_SEC=$((NOW_SEC - START_SEC))
-      EXPECTED_POINTS=$((DURATION_SEC / 60))
-      [ "$EXPECTED_POINTS" -lt 1 ] && EXPECTED_POINTS=1
-
-      echo "Pipeline duration: \${DURATION_SEC}s, expecting ~\$EXPECTED_POINTS data points"
-      echo "Waiting for metrics data (GCP has ~3 min lag)..."
-
-      for i in $(seq 1 30); do
-        END_TIME=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-        CPU_DATA=$(curl -s -H "Authorization: Bearer $TOKEN" \\
-          "https://monitoring.googleapis.com/v3/projects/$GCP_PROJECT_ID/timeSeries?filter=$CPU_ENCODED&interval.startTime=$START_TIME&interval.endTime=$END_TIME")
-
-        POINTS=$(echo "$CPU_DATA" | python3 -c "import sys,json; d=json.load(sys.stdin); print(sum(len(ts.get('points',[])) for ts in d.get('timeSeries',[])))" 2>/dev/null || echo "0")
-
-        if [ "$POINTS" -ge "$EXPECTED_POINTS" ]; then
-          echo "Got $POINTS CPU data points (expected $EXPECTED_POINTS)"
-          break
-        fi
-        echo "Waiting for data... got $POINTS/$EXPECTED_POINTS (attempt $i/30)"
-        sleep 10
-      done
-
-      # Fetch RAM data
-      RAM_USED_DATA=$(curl -s -H "Authorization: Bearer $TOKEN" \\
-        "https://monitoring.googleapis.com/v3/projects/$GCP_PROJECT_ID/timeSeries?filter=$RAM_USED_ENCODED&interval.startTime=$START_TIME&interval.endTime=$END_TIME")
-
-      RAM_SIZE_DATA=$(curl -s -H "Authorization: Bearer $TOKEN" \\
-        "https://monitoring.googleapis.com/v3/projects/$GCP_PROJECT_ID/timeSeries?filter=$RAM_SIZE_ENCODED&interval.startTime=$START_TIME&interval.endTime=$END_TIME")
-
-      # Save timeseries to files
-      echo "$CPU_DATA" > /tmp/cpu_timeseries.json
-      echo "$RAM_USED_DATA" > /tmp/ram_used_timeseries.json
-      echo "$RAM_SIZE_DATA" > /tmp/ram_size_timeseries.json
-
-      CMD="./node_modules/.bin/gitgreen --provider gcp --machine $MACHINE_TYPE --region $GCP_ZONE --cpu-timeseries /tmp/cpu_timeseries.json --ram-used-timeseries /tmp/ram_used_timeseries.json --ram-size-timeseries /tmp/ram_size_timeseries.json --out-md carbon-report.md --out-json carbon-report.json --no-gitlab"
-      [ -n "\${CARBON_BUDGET_GRAMS:-}" ] && CMD="$CMD --budget $CARBON_BUDGET_GRAMS"
-      [ "\${FAIL_ON_BUDGET:-}" = "true" ] && CMD="$CMD --fail-on-budget"
-
-      eval "$CMD"
-      cat carbon-report.md
-  artifacts:
-    paths:
-      - carbon-report.md
-      - carbon-report.json
-    expire_in: 30 days
+  extends: .gitgreen-carbon-analysis${tagsSection}
 `;
 };
 const runInit = async (opts = {}) => {
@@ -747,7 +694,11 @@ systemctl start gitlab-runner
         message: 'Add job to .gitlab-ci.yml?',
         initial: true
     });
-    const ciJob = generateCiJob(runnerTag || undefined);
+    const ciJob = generateCiJob({
+        runnerTag: runnerTag || undefined,
+        carbonBudget: carbonBudget || undefined,
+        failOnBudget
+    });
     if (addCiJob) {
         const ciPath = path_1.default.join(process.cwd(), '.gitlab-ci.yml');
         if (fs_1.default.existsSync(ciPath)) {

package/package.json

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