gitgreen 0.1.1 → 1.0.1

package/dist/init.js

@@ -10,6 +10,7 @@ const path_1 = __importDefault(require("path"));
 const axios_1 = __importDefault(require("axios"));
 const prompts_1 = __importDefault(require("prompts"));
 const kleur_1 = require("kleur");
+const power_profile_repository_1 = require("./lib/carbon/power-profile-repository");
 const hasGlab = () => {
     try {
         (0, child_process_1.execSync)('glab --version', { stdio: 'ignore' });
@@ -80,12 +81,19 @@ const setVariable = async (auth, project, key, value, masked = false) => {
         return setVariableApi(auth.baseUrl, auth.pat, project, key, value, masked);
     }
 };
-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
+const generateCiJob = (opts) => {
+    const { provider, runnerTag, carbonBudget, failOnBudget } = opts;
+    let inputs = `      provider: ${provider}
       machine_type: $MACHINE_TYPE`;
+    if (provider === 'gcp') {
+        inputs += `\n      gcp_project_id: $GCP_PROJECT_ID\n      gcp_instance_id: $GCP_INSTANCE_ID\n      gcp_zone: $GCP_ZONE`;
+    }
+    else {
+        inputs += `\n      aws_region: $AWS_REGION\n      aws_instance_id: $AWS_INSTANCE_ID`;
+        if (opts.aws?.periodSeconds) {
+            inputs += `\n      aws_period_seconds: "${opts.aws.periodSeconds}"`;
+        }
+    }
     if (carbonBudget) {
         inputs += `\n      carbon_budget_grams: "${carbonBudget}"`;
     }
@@ -95,7 +103,7 @@ const generateCiJob = (opts = {}) => {
     const tagsSection = runnerTag ? `\n  tags:\n    - ${runnerTag}` : '';
     return `# GitGreen carbon analysis (generated by gitgreen init)
 include:
-  - component: gitlab.com/youneslaaroussi/gitgreen/gitgreen-cli-component@0.1.0
+  - component: gitlab.com/youneslaaroussi/gitgreen/gitgreen-cli-component@main
     inputs:
 ${inputs}
 
@@ -103,6 +111,565 @@ carbon_analysis:
   extends: .gitgreen-carbon-analysis${tagsSection}
 `;
 };
+const applyCiJobSnippet = async (ciJob) => {
+    const { addCiJob } = await (0, prompts_1.default)({
+        type: 'confirm',
+        name: 'addCiJob',
+        message: 'Add job to .gitlab-ci.yml?',
+        initial: true
+    });
+    const ciPath = path_1.default.join(process.cwd(), '.gitlab-ci.yml');
+    if (addCiJob) {
+        if (fs_1.default.existsSync(ciPath)) {
+            const backupPath = `/tmp/gitlab-ci-backup-${Date.now()}.yml`;
+            const existing = fs_1.default.readFileSync(ciPath, 'utf8');
+            fs_1.default.writeFileSync(backupPath, existing);
+            console.log((0, kleur_1.gray)(`Backup saved to: ${backupPath}`));
+            fs_1.default.writeFileSync(ciPath, existing + '\n' + ciJob);
+        }
+        else {
+            fs_1.default.writeFileSync(ciPath, 'stages:\n  - test\n\n' + ciJob);
+        }
+        console.log((0, kleur_1.green)('Updated .gitlab-ci.yml'));
+    }
+    else {
+        console.log('\nCI job snippet:\n');
+        console.log(ciJob);
+    }
+};
+const getAwsMachineTypes = (() => {
+    let cached = null;
+    return () => {
+        if (cached)
+            return cached;
+        try {
+            const repo = new power_profile_repository_1.PowerProfileRepository(path_1.default.join(__dirname, '..', 'data'));
+            cached = repo.listMachines('aws');
+            return cached;
+        }
+        catch {
+            cached = [];
+            return cached;
+        }
+    };
+})();
+const promptMachineType = async (message, initial) => {
+    const machines = getAwsMachineTypes();
+    if (!machines.length) {
+        const { manualMachine } = await (0, prompts_1.default)({
+            type: 'text',
+            name: 'manualMachine',
+            message,
+            initial
+        });
+        return manualMachine || initial;
+    }
+    const choices = [
+        ...machines.map(m => ({ title: m, value: m })),
+        { title: 'Enter manually', value: '_manual_' }
+    ];
+    const { selectedType } = await (0, prompts_1.default)({
+        type: 'select',
+        name: 'selectedType',
+        message,
+        choices,
+        initial: Math.max(0, machines.indexOf(initial))
+    });
+    if (selectedType === '_manual_') {
+        const { manualMachine } = await (0, prompts_1.default)({
+            type: 'text',
+            name: 'manualMachine',
+            message,
+            initial
+        });
+        return manualMachine || initial;
+    }
+    return selectedType;
+};
+const listAwsInstances = (region, env) => {
+    try {
+        const query = "Reservations[].Instances[].{InstanceId:InstanceId,Type:InstanceType,State:State.Name,Name:Tags[?Key==\\`Name\\`]|[0].Value}";
+        const raw = (0, child_process_1.execSync)(`aws ec2 describe-instances --region ${region} --query "${query}" --output json`, { encoding: 'utf8', env });
+        const parsed = JSON.parse(raw);
+        return parsed
+            .filter(item => Boolean(item.InstanceId))
+            .map(item => ({
+            instanceId: String(item.InstanceId),
+            type: item.Type,
+            state: item.State,
+            name: item.Name
+        }));
+    }
+    catch {
+        return [];
+    }
+};
+const ensureAwsCli = () => {
+    try {
+        (0, child_process_1.execSync)('aws --version', { stdio: 'ignore' });
+    }
+    catch {
+        console.log((0, kleur_1.red)('aws CLI not found. Install from https://aws.amazon.com/cli/'));
+        process.exit(1);
+    }
+};
+const resolveAmazonLinuxAmi = (region, env) => {
+    try {
+        const ami = (0, child_process_1.execSync)(`aws ssm get-parameter --name /aws/service/ami-amazon-linux-latest/al2023-ami-kernel-6.1-x86_64 --query 'Parameter.Value' --output text --region ${region}`, { encoding: 'utf8', env }).trim();
+        if (ami)
+            return ami;
+    }
+    catch { }
+    return '';
+};
+const createRunnerToken = (auth, projectPath, description, runnerTag) => {
+    if (auth.type !== 'glab')
+        return '';
+    try {
+        const projectEncoded = encodeURIComponent(projectPath);
+        const projectInfoJson = (0, child_process_1.execSync)(`glab api "projects/${projectEncoded}"`, { encoding: 'utf8' });
+        const projectInfo = JSON.parse(projectInfoJson);
+        const projectId = projectInfo.id;
+        const createResult = (0, child_process_1.execSync)(`glab api --method POST "user/runners" -f runner_type=project_type -f project_id=${projectId} -f description="${description}" -f tag_list="${runnerTag}" -f run_untagged=true`, { encoding: 'utf8' });
+        const runnerData = JSON.parse(createResult);
+        console.log((0, kleur_1.green)(`Runner token created (ID: ${runnerData.id})`));
+        return runnerData.token;
+    }
+    catch (err) {
+        console.log((0, kleur_1.gray)('Could not create token via API, falling back to manual...'));
+        return '';
+    }
+};
+const buildAwsUserData = (params) => {
+    const { region, runnerToken, runnerName, runnerTag, machineType, periodSeconds } = params;
+    const lines = [
+        '#!/usr/bin/env bash',
+        'set -euo pipefail',
+        `REGION=${region}`,
+        `RUNNER_TOKEN="${runnerToken}"`,
+        `RUNNER_NAME="${runnerName}"`,
+        `RUNNER_TAGS="${runnerTag}"`,
+        `MACHINE_TYPE="${machineType}"`,
+        `PERIOD=${periodSeconds}`,
+        '',
+        'dnf update -y',
+        'dnf install -y amazon-cloudwatch-agent jq tar',
+        'dnf install -y curl --allowerasing',
+        'curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.rpm.sh | bash',
+        'dnf install -y gitlab-runner',
+        'curl -fsSL https://rpm.nodesource.com/setup_20.x | bash -',
+        'dnf install -y nodejs',
+        '',
+        'INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id)',
+        '',
+        "cat > /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json <<'EOF'",
+        '{',
+        '  "metrics": {',
+        '    "append_dimensions": {',
+        '      "InstanceId": "${aws:InstanceId}"',
+        '    },',
+        '    "metrics_collected": {',
+        '      "mem": {',
+        '        "measurement": ["mem_used", "mem_total", "mem_used_percent"],',
+        `        "metrics_collection_interval": ${periodSeconds}`,
+        '      },',
+        '      "cpu": {',
+        '        "measurement": ["cpu_usage_active"],',
+        `        "metrics_collection_interval": ${periodSeconds}`,
+        '      }',
+        '    }',
+        '  }',
+        '}',
+        'EOF',
+        '',
+        '/opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -c file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json -s',
+        '',
+        'gitlab-runner register --non-interactive --url https://gitlab.com/ --token "$RUNNER_TOKEN" --executor shell --description "$RUNNER_NAME"',
+        'RUNNER_ID=$(gitlab-runner list | grep -Eo \'[^ ]+ \\(ID: [0-9]+\\)\' | grep "$RUNNER_NAME" | sed -E \'s/.*ID: ([0-9]+).*/\\1/\')',
+        'if [ -n "$RUNNER_ID" ]; then',
+        '  gitlab-runner verify --run-untagged --add --name "$RUNNER_NAME" || true',
+        '  gitlab-runner verify --tag-list "$RUNNER_TAGS" --add --name "$RUNNER_NAME" || true',
+        'fi',
+        'echo "$INSTANCE_ID" > /opt/gitlab-runner-instance-id.txt',
+        'systemctl enable amazon-cloudwatch-agent',
+        'systemctl enable gitlab-runner',
+        'systemctl start amazon-cloudwatch-agent',
+        'systemctl start gitlab-runner'
+    ];
+    return lines.join('\n');
+};
+const provisionAwsRunnerInstance = (awsEnv, params) => {
+    const userData = buildAwsUserData({
+        region: params.region,
+        runnerToken: params.runnerToken,
+        runnerName: params.runnerName,
+        runnerTag: params.runnerTag,
+        machineType: params.machineType,
+        periodSeconds: params.periodSeconds
+    });
+    const tmpFile = `/tmp/gitgreen-aws-userdata-${Date.now()}.sh`;
+    fs_1.default.writeFileSync(tmpFile, userData);
+    const tagSpec = `ResourceType=instance,Tags=[{Key=Name,Value=${params.runnerName}},{Key=gitlab-runner,Value=gitgreen}]`;
+    const subnetFlag = params.subnetId ? `--subnet-id ${params.subnetId}` : '';
+    const sgFlag = params.securityGroupId ? `--security-group-ids ${params.securityGroupId}` : '';
+    const keyFlag = params.keyName ? `--key-name ${params.keyName}` : '';
+    const iamFlag = params.iamInstanceProfile ? `--iam-instance-profile Name=${params.iamInstanceProfile}` : '';
+    try {
+        const resultJson = (0, child_process_1.execSync)(`aws ec2 run-instances --image-id ${params.amiId} --count 1 --instance-type ${params.machineType} ${subnetFlag} ${sgFlag} ${keyFlag} ${iamFlag} --user-data file://${tmpFile} --tag-specifications '${tagSpec}' --region ${params.region} --output json`, { encoding: 'utf8', env: awsEnv, stdio: ['pipe', 'pipe', 'pipe'] });
+        const parsed = JSON.parse(resultJson);
+        return parsed?.Instances?.[0]?.InstanceId || '';
+    }
+    finally {
+        fs_1.default.unlinkSync(tmpFile);
+    }
+};
+const runAwsInit = async (auth, projectPath) => {
+    console.log((0, kleur_1.gray)('\nStep 4: AWS Runner'));
+    console.log((0, kleur_1.gray)('─'.repeat(40)));
+    console.log((0, kleur_1.gray)('Provide the details for your existing GitLab runner on AWS.'));
+    console.log((0, kleur_1.gray)('Ensure CloudWatch Agent publishes mem_used and mem_total for RAM data.'));
+    const { awsRegion } = await (0, prompts_1.default)({
+        type: 'text',
+        name: 'awsRegion',
+        message: 'AWS region (e.g., us-east-1)',
+        initial: 'us-east-1'
+    });
+    if (!awsRegion) {
+        console.log((0, kleur_1.red)('AWS region required'));
+        process.exit(1);
+    }
+    const { runnerSetup } = await (0, prompts_1.default)({
+        type: 'select',
+        name: 'runnerSetup',
+        message: 'Runner setup',
+        choices: [
+            { title: 'Use existing runner', value: 'existing' },
+            { title: 'Provision new AWS runner', value: 'provision' }
+        ]
+    });
+    let instanceId = '';
+    let machineType = '';
+    let periodSeconds = 60;
+    let runnerTag = 'aws';
+    let pendingInstanceSelection = false;
+    if (runnerSetup === 'existing') {
+        const existingAnswers = await (0, prompts_1.default)([
+            {
+                type: 'text',
+                name: 'runnerTag',
+                message: 'Runner tag (for routing CI jobs)',
+                initial: 'aws'
+            },
+            {
+                type: 'number',
+                name: 'periodSeconds',
+                message: 'CloudWatch metrics period (seconds)',
+                initial: 60
+            }
+        ]);
+        runnerTag = existingAnswers.runnerTag || 'aws';
+        periodSeconds = existingAnswers.periodSeconds || 60;
+        machineType = await promptMachineType('Instance type', 'm5.large');
+        pendingInstanceSelection = true;
+    }
+    else {
+        ensureAwsCli();
+        const selectedMachineType = await promptMachineType('Instance type', 'm5.large');
+        const provisionAnswers = await (0, prompts_1.default)([
+            {
+                type: 'text',
+                name: 'runnerName',
+                message: 'Runner name/description',
+                initial: 'aws-carbon-runner'
+            },
+            {
+                type: 'text',
+                name: 'runnerTag',
+                message: 'Runner tag (for routing CI jobs)',
+                initial: 'aws'
+            },
+            {
+                type: 'number',
+                name: 'periodSeconds',
+                message: 'CloudWatch metrics period (seconds)',
+                initial: 60
+            },
+            {
+                type: 'text',
+                name: 'subnetId',
+                message: 'Subnet ID (optional, leave empty for default VPC)',
+                initial: ''
+            },
+            {
+                type: 'text',
+                name: 'securityGroupId',
+                message: 'Security Group ID (optional)',
+                initial: ''
+            },
+            {
+                type: 'text',
+                name: 'keyName',
+                message: 'EC2 key pair name (optional)',
+                initial: ''
+            },
+            {
+                type: 'text',
+                name: 'iamInstanceProfile',
+                message: 'IAM instance profile name (recommended for CloudWatch Agent, optional)',
+                initial: ''
+            }
+        ]);
+        machineType = selectedMachineType;
+        periodSeconds = provisionAnswers.periodSeconds || 60;
+        runnerTag = provisionAnswers.runnerTag || 'aws';
+        const runnerName = provisionAnswers.runnerName || 'aws-carbon-runner';
+        const subnetId = provisionAnswers.subnetId || '';
+        const securityGroupId = provisionAnswers.securityGroupId || '';
+        const keyName = provisionAnswers.keyName || '';
+        const iamInstanceProfile = provisionAnswers.iamInstanceProfile || '';
+        let runnerToken = createRunnerToken(auth, projectPath, runnerName, runnerTag);
+        if (!runnerToken) {
+            const { manualToken } = await (0, prompts_1.default)({
+                type: 'password',
+                name: 'manualToken',
+                message: 'GitLab runner token (glrt-...)'
+            });
+            runnerToken = manualToken;
+        }
+        if (!runnerToken) {
+            console.log((0, kleur_1.red)('Runner token required to provision.'));
+            process.exit(1);
+        }
+        // Credentials will be collected below (Step 5) before provisioning
+        const provisionConfig = {
+            runnerName,
+            runnerToken,
+            subnetId,
+            securityGroupId,
+            keyName,
+            iamInstanceProfile
+        };
+        runAwsInit._provisionConfig = provisionConfig;
+    }
+    console.log((0, kleur_1.gray)('\nStep 5: AWS Credentials'));
+    console.log((0, kleur_1.gray)('─'.repeat(40)));
+    console.log((0, kleur_1.gray)('Use an access key with CloudWatch read permissions for the runner instance.'));
+    const { accessKeyId } = await (0, prompts_1.default)({
+        type: 'password',
+        name: 'accessKeyId',
+        message: 'AWS Access Key ID',
+        initial: process.env.AWS_ACCESS_KEY_ID || ''
+    });
+    if (!accessKeyId) {
+        console.log((0, kleur_1.red)('AWS Access Key ID required'));
+        process.exit(1);
+    }
+    const { secretAccessKey } = await (0, prompts_1.default)({
+        type: 'password',
+        name: 'secretAccessKey',
+        message: 'AWS Secret Access Key',
+        initial: process.env.AWS_SECRET_ACCESS_KEY || ''
+    });
+    if (!secretAccessKey) {
+        console.log((0, kleur_1.red)('AWS Secret Access Key required'));
+        process.exit(1);
+    }
+    const { sessionToken } = await (0, prompts_1.default)({
+        type: 'password',
+        name: 'sessionToken',
+        message: 'AWS Session Token (optional)',
+        initial: process.env.AWS_SESSION_TOKEN || ''
+    });
+    const awsEnv = {
+        ...process.env,
+        AWS_REGION: awsRegion,
+        AWS_DEFAULT_REGION: awsRegion,
+        AWS_ACCESS_KEY_ID: accessKeyId,
+        AWS_SECRET_ACCESS_KEY: secretAccessKey,
+        ...(sessionToken ? { AWS_SESSION_TOKEN: sessionToken } : {})
+    };
+    if (runAwsInit._provisionConfig) {
+        ensureAwsCli();
+        const cfg = runAwsInit._provisionConfig;
+        console.log((0, kleur_1.gray)('\nProvisioning AWS runner EC2 instance...'));
+        console.log((0, kleur_1.gray)('─'.repeat(40)));
+        let amiId = resolveAmazonLinuxAmi(awsRegion, awsEnv);
+        if (!amiId) {
+            const { manualAmi } = await (0, prompts_1.default)({
+                type: 'text',
+                name: 'manualAmi',
+                message: 'AMI ID (Amazon Linux 2023)',
+                initial: ''
+            });
+            amiId = manualAmi;
+        }
+        if (!amiId) {
+            console.log((0, kleur_1.red)('AMI ID required'));
+            process.exit(1);
+        }
+        let newInstanceId = '';
+        try {
+            newInstanceId = provisionAwsRunnerInstance(awsEnv, {
+                region: awsRegion,
+                amiId,
+                machineType,
+                runnerName: cfg.runnerName,
+                runnerTag,
+                runnerToken: cfg.runnerToken,
+                periodSeconds,
+                subnetId: cfg.subnetId || undefined,
+                securityGroupId: cfg.securityGroupId || undefined,
+                keyName: cfg.keyName || undefined,
+                iamInstanceProfile: cfg.iamInstanceProfile || undefined
+            });
+        }
+        catch (err) {
+            console.log((0, kleur_1.red)('Failed to create EC2 instance: ' + (err?.message || err)));
+            process.exit(1);
+        }
+        if (!newInstanceId) {
+            console.log((0, kleur_1.red)('Could not determine instance ID from run-instances output.'));
+            process.exit(1);
+        }
+        instanceId = newInstanceId;
+        console.log((0, kleur_1.green)(`Provisioned instance ${instanceId}. Runner will register shortly.`));
+    }
+    if (pendingInstanceSelection && !instanceId) {
+        ensureAwsCli();
+        const instances = listAwsInstances(awsRegion, awsEnv);
+        let chosenInstance = '_manual_';
+        if (instances.length > 0) {
+            const choices = [
+                ...instances.map(inst => ({
+                    title: `${inst.instanceId}${inst.type ? ` (${inst.type})` : ''}${inst.name ? ` - ${inst.name}` : ''}${inst.state ? ` [${inst.state}]` : ''}`,
+                    value: inst
+                })),
+                { title: 'Enter manually', value: '_manual_' }
+            ];
+            const { selectedInstance } = await (0, prompts_1.default)({
+                type: 'select',
+                name: 'selectedInstance',
+                message: 'Select EC2 runner instance',
+                choices
+            });
+            chosenInstance = selectedInstance;
+        }
+        else {
+            console.log((0, kleur_1.gray)('No EC2 instances found via AWS CLI. Please enter details manually.'));
+        }
+        if (chosenInstance === '_manual_') {
+            const { manualInstanceId } = await (0, prompts_1.default)({
+                type: 'text',
+                name: 'manualInstanceId',
+                message: 'EC2 instance ID (i-xxxxxxxx)',
+                initial: process.env.AWS_INSTANCE_ID || ''
+            });
+            instanceId = manualInstanceId;
+            machineType = await promptMachineType('Instance type', machineType || 'm5.large');
+        }
+        else {
+            instanceId = chosenInstance.instanceId;
+            machineType = chosenInstance.type || '';
+            if (!machineType) {
+                machineType = await promptMachineType('Instance type', 'm5.large');
+            }
+            else {
+                console.log((0, kleur_1.gray)(`Detected instance type: ${machineType}`));
+            }
+        }
+        if (!instanceId) {
+            console.log((0, kleur_1.red)('Instance ID required'));
+            process.exit(1);
+        }
+    }
+    console.log((0, kleur_1.gray)('\nStep 6: Electricity Maps API'));
+    console.log((0, kleur_1.gray)('─'.repeat(40)));
+    console.log((0, kleur_1.gray)('Get free key: https://api-portal.electricitymaps.com'));
+    const { electricityMapsKey } = await (0, prompts_1.default)({
+        type: 'password',
+        name: 'electricityMapsKey',
+        message: 'Electricity Maps API Key'
+    });
+    if (!electricityMapsKey) {
+        console.log((0, kleur_1.red)('API key required'));
+        process.exit(1);
+    }
+    console.log((0, kleur_1.gray)('\nStep 7: Optional Settings'));
+    console.log((0, kleur_1.gray)('─'.repeat(40)));
+    console.log((0, kleur_1.gray)('Set a carbon budget to track emissions against a limit.'));
+    console.log((0, kleur_1.gray)('Example: 10 grams CO2e per job. Leave empty to skip.\n'));
+    const { carbonBudget } = await (0, prompts_1.default)({
+        type: 'number',
+        name: 'carbonBudget',
+        message: 'Carbon budget (grams CO2e)',
+        initial: undefined
+    });
+    let failOnBudget = false;
+    if (carbonBudget) {
+        const { shouldFail } = await (0, prompts_1.default)({
+            type: 'confirm',
+            name: 'shouldFail',
+            message: 'Fail CI job if over budget?',
+            initial: false
+        });
+        failOnBudget = shouldFail;
+    }
+    console.log((0, kleur_1.gray)('\nStep 8: Setting CI/CD Variables'));
+    console.log((0, kleur_1.gray)('─'.repeat(40)));
+    const variables = [
+        { key: 'AWS_ACCESS_KEY_ID', value: accessKeyId, masked: true },
+        { key: 'AWS_SECRET_ACCESS_KEY', value: secretAccessKey, masked: true },
+        { key: 'AWS_REGION', value: awsRegion, masked: false },
+        { key: 'AWS_INSTANCE_ID', value: instanceId, masked: false },
+        { key: 'MACHINE_TYPE', value: machineType, masked: false },
+        { key: 'AWS_PERIOD_SECONDS', value: String(periodSeconds || 60), masked: false },
+        { key: 'ELECTRICITY_MAPS_API_KEY', value: electricityMapsKey, masked: true }
+    ];
+    if (sessionToken) {
+        variables.push({ key: 'AWS_SESSION_TOKEN', value: sessionToken, masked: true });
+    }
+    if (carbonBudget) {
+        variables.push({ key: 'CARBON_BUDGET_GRAMS', value: String(carbonBudget), masked: false });
+    }
+    if (failOnBudget) {
+        variables.push({ key: 'FAIL_ON_BUDGET', value: 'true', masked: false });
+    }
+    for (const v of variables) {
+        const ok = await setVariable(auth, projectPath, v.key, v.value, v.masked);
+        if (ok) {
+            console.log((0, kleur_1.green)('  Set ' + v.key));
+        }
+        else {
+            console.log((0, kleur_1.red)('  Failed: ' + v.key));
+        }
+    }
+    console.log((0, kleur_1.gray)('\nStep 9: CI Configuration'));
+    console.log((0, kleur_1.gray)('─'.repeat(40)));
+    let runnerTagForCi = runnerTag;
+    if (!runnerTagForCi) {
+        const { runnerTag: promptRunnerTag } = await (0, prompts_1.default)({
+            type: 'text',
+            name: 'runnerTag',
+            message: 'Runner tag (leave empty for any runner)',
+            initial: 'aws'
+        });
+        runnerTagForCi = promptRunnerTag || '';
+    }
+    else {
+        console.log((0, kleur_1.gray)(`Using runner tag: ${runnerTagForCi}`));
+    }
+    const ciJob = generateCiJob({
+        provider: 'aws',
+        machineType,
+        runnerTag: runnerTagForCi || undefined,
+        carbonBudget: carbonBudget || undefined,
+        failOnBudget,
+        aws: { region: awsRegion, instanceId, periodSeconds: periodSeconds || 60 }
+    });
+    await applyCiJobSnippet(ciJob);
+    console.log((0, kleur_1.bold)('\nDone'));
+    console.log('Commit and push to trigger the pipeline.\n');
+};
 const runInit = async (opts = {}) => {
     console.log((0, kleur_1.bold)('\nGitGreen Setup\n'));
     // Step 1: GitLab Authentication
@@ -167,11 +734,12 @@ const runInit = async (opts = {}) => {
         ]
     });
     if (provider === 'aws') {
-        console.log((0, kleur_1.red)('\nAWS support coming soon.'));
-        process.exit(1);
+        await runAwsInit(auth, projectPath);
+        return;
     }
     if (provider === 'manual') {
         console.log((0, kleur_1.red)('\nManual configuration coming soon.'));
+        console.log((0, kleur_1.gray)('Docs: https://gitlab.com/youneslaaroussi/gitgreen (README covers manual metrics/power profile ingestion)'));
         process.exit(1);
     }
     // Check if gcloud is available
@@ -236,14 +804,9 @@ const runInit = async (opts = {}) => {
         message: 'GitLab Runner',
         choices: [
             { title: 'Use existing runner', value: 'existing' },
-            { title: 'Provision new GCP runner VM', value: 'provision-gcp' },
-            { title: 'Provision new AWS runner (coming soon)', value: 'provision-aws' }
+            { title: 'Provision new GCP runner VM', value: 'provision-gcp' }
         ]
     });
-    if (runnerSetup === 'provision-aws') {
-        console.log((0, kleur_1.red)('\nAWS runner provisioning coming soon.'));
-        process.exit(1);
-    }
     let gcpZone = '';
     let gcpInstanceId = '';
     let machineType = '';
@@ -688,36 +1251,15 @@ systemctl start gitlab-runner
     else {
         console.log((0, kleur_1.gray)(`Using runner tag: ${runnerTag}`));
     }
-    const { addCiJob } = await (0, prompts_1.default)({
-        type: 'confirm',
-        name: 'addCiJob',
-        message: 'Add job to .gitlab-ci.yml?',
-        initial: true
-    });
     const ciJob = generateCiJob({
+        provider: 'gcp',
+        machineType,
         runnerTag: runnerTag || undefined,
         carbonBudget: carbonBudget || undefined,
-        failOnBudget
+        failOnBudget,
+        gcp: { projectId: gcpProjectId, zone: gcpZone, instanceId: gcpInstanceId }
     });
-    if (addCiJob) {
-        const ciPath = path_1.default.join(process.cwd(), '.gitlab-ci.yml');
-        if (fs_1.default.existsSync(ciPath)) {
-            // Backup existing file before modifying
-            const backupPath = `/tmp/gitlab-ci-backup-${Date.now()}.yml`;
-            const existing = fs_1.default.readFileSync(ciPath, 'utf8');
-            fs_1.default.writeFileSync(backupPath, existing);
-            console.log((0, kleur_1.gray)(`Backup saved to: ${backupPath}`));
-            fs_1.default.writeFileSync(ciPath, existing + '\n' + ciJob);
-        }
-        else {
-            fs_1.default.writeFileSync(ciPath, 'stages:\n  - test\n\n' + ciJob);
-        }
-        console.log((0, kleur_1.green)('Updated .gitlab-ci.yml'));
-    }
-    else {
-        console.log('\nCI job snippet:\n');
-        console.log(ciJob);
-    }
+    await applyCiJobSnippet(ciJob);
     console.log((0, kleur_1.bold)('\nDone'));
     console.log('Commit and push to trigger the pipeline.\n');
 };