@rulebricks/cli 2.0.5 → 2.1.0

package/dist/lib/terraform.js

@@ -2,11 +2,39 @@ import { execa } from 'execa';
 import { promises as fs } from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import { isSupportedDnsProvider } from '../types/index.js';
 import { getTerraformDir } from './config.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 // Path to embedded terraform templates
 const TERRAFORM_TEMPLATES_DIR = path.resolve(__dirname, '../../terraform');
+/**
+ * Detects if an error is a GCP authentication error
+ */
+function isGcpAuthError(output) {
+    const lowerOutput = output.toLowerCase();
+    return (lowerOutput.includes('oauth2') ||
+        lowerOutput.includes('invalid_grant') ||
+        lowerOutput.includes('reauth') ||
+        lowerOutput.includes('invalid_rapt') ||
+        lowerOutput.includes('authentication') && lowerOutput.includes('google') ||
+        lowerOutput.includes('unable to find default credentials') ||
+        lowerOutput.includes('application default credentials'));
+}
+/**
+ * Enhances GCP authentication errors with helpful guidance
+ */
+function enhanceGcpAuthError(output) {
+    return ('GCP Authentication Error\n\n' +
+        'Terraform requires Application Default Credentials (ADC) to authenticate with Google Cloud.\n\n' +
+        'To fix this:\n' +
+        '  • Run: gcloud auth login\n' +
+        '  • Run: gcloud auth application-default login\n' +
+        '  • Verify: gcloud auth application-default print-access-token\n\n' +
+        'For more information: https://cloud.google.com/docs/authentication/application-default-credentials\n\n' +
+        'Original error:\n' +
+        (output.length > 500 ? '...' + output.slice(-500) : output));
+}
 /**
  * Extracts meaningful error message from execa error
  */
@@ -15,6 +43,10 @@ function getErrorMessage(error, fallback) {
     // Try stderr first, then stdout (terraform sometimes writes errors to stdout)
     const output = execaError.stderr || execaError.stdout || '';
     if (output) {
+        // Check if this is a GCP authentication error
+        if (isGcpAuthError(output)) {
+            return enhanceGcpAuthError(output);
+        }
         // Get last 500 chars of output for the error message
         const truncated = output.length > 500 ? '...' + output.slice(-500) : output;
         return truncated;
@@ -137,11 +169,27 @@ export async function terraformApply(deploymentName) {
     }
 }
 /**
- * Destroys Terraform infrastructure
+ * Destroys Terraform infrastructure.
+ * Runs init first to ensure .terraform folder exists (handles partial deployments).
  */
 export async function terraformDestroy(deploymentName) {
     const workDir = getTerraformDir(deploymentName);
     try {
+        // Run init first to ensure terraform is ready (handles partial deployments
+        // where .terraform folder might be missing or corrupted)
+        try {
+            await execa('terraform', ['init', '-upgrade'], {
+                cwd: workDir
+            });
+        }
+        catch (initError) {
+            // If init fails, still try destroy - it might work if state exists
+            const execaInitError = initError;
+            if (execaInitError.stdout || execaInitError.stderr) {
+                await saveLogFile(workDir, 'destroy-init', execaInitError.stdout || '', execaInitError.stderr || '');
+            }
+            // Don't throw - continue to try destroy anyway
+        }
         await execa('terraform', ['destroy', '-auto-approve'], {
             cwd: workDir
         });
@@ -175,19 +223,98 @@ export async function getTerraformOutputs(deploymentName) {
     }
 }
 /**
- * Checks if Terraform state exists for a deployment
+ * Checks if Terraform files/state exist for a deployment.
+ * Returns true if the terraform directory contains any terraform files,
+ * not just the state file. This allows destroy to work on partial infrastructure.
  */
 export async function hasTerraformState(deploymentName) {
     const workDir = getTerraformDir(deploymentName);
-    const statePath = path.join(workDir, 'terraform.tfstate');
     try {
-        await fs.access(statePath);
-        return true;
+        // Check if terraform directory exists
+        await fs.access(workDir);
+        // Check for any of: state file, .terraform folder, or .tf files
+        const entries = await fs.readdir(workDir);
+        const hasTerraformFiles = entries.some((e) => e === 'terraform.tfstate' ||
+            e === '.terraform' ||
+            e.endsWith('.tf'));
+        return hasTerraformFiles;
     }
     catch {
         return false;
     }
 }
+/**
+ * Generates Terraform variables from deployment configuration
+ */
+export function generateTerraformVars(config) {
+    const provider = config.infrastructure.provider;
+    if (!provider) {
+        throw new Error('Cloud provider is required for infrastructure provisioning');
+    }
+    const region = config.infrastructure.region || (provider === 'gcp' ? 'us-central1' : provider === 'aws' ? 'us-east-1' : 'eastus');
+    const clusterName = config.infrastructure.clusterName || `${config.name}-cluster`;
+    const tier = config.tier || 'small';
+    const kubernetesVersion = '1.34';
+    // Determine if external DNS should be enabled
+    const enableExternalDns = config.dns.autoManage && isSupportedDnsProvider(config.dns.provider);
+    // Determine logging configuration
+    const loggingSink = config.features.logging.sink;
+    const loggingBucket = config.features.logging.bucket || '';
+    switch (provider) {
+        case 'gcp': {
+            if (!config.infrastructure.gcpProjectId) {
+                throw new Error('GCP project ID is required for GCP infrastructure provisioning');
+            }
+            const vars = {
+                project_id: config.infrastructure.gcpProjectId,
+                region,
+                cluster_name: clusterName,
+                tier,
+                kubernetes_version: kubernetesVersion,
+                enable_external_dns: enableExternalDns,
+                enable_gcs_logging: loggingSink === 'gcs',
+                logging_gcs_bucket: loggingSink === 'gcs' ? loggingBucket : '',
+            };
+            return vars;
+        }
+        case 'aws': {
+            // Extract domain suffix for external DNS domain filter
+            const domainSuffix = enableExternalDns && config.domain ? config.domain.split('.').slice(1).join('.') : '';
+            const vars = {
+                region,
+                cluster_name: clusterName,
+                tier,
+                kubernetes_version: kubernetesVersion,
+                enable_external_dns: enableExternalDns,
+                external_dns_domain: enableExternalDns ? domainSuffix : '',
+                enable_s3_logging: loggingSink === 's3',
+                logging_s3_bucket: loggingSink === 's3' ? loggingBucket : '',
+            };
+            return vars;
+        }
+        case 'azure': {
+            const resourceGroupName = config.infrastructure.azureResourceGroup || `${config.name}-rg`;
+            // For Azure DNS, we need the DNS zone resource group
+            // This is typically the same as the resource group, but can be different
+            const dnsZoneResourceGroup = enableExternalDns ? resourceGroupName : '';
+            const vars = {
+                resource_group_name: resourceGroupName,
+                location: region,
+                cluster_name: clusterName,
+                tier,
+                kubernetes_version: kubernetesVersion,
+                enable_external_dns: enableExternalDns,
+                dns_zone_resource_group: dnsZoneResourceGroup,
+                enable_blob_logging: loggingSink === 'azure-blob',
+                logging_storage_account: loggingSink === 'azure-blob' ? loggingBucket : '',
+                logging_container_name: loggingSink === 'azure-blob' ? 'logs' : '',
+            };
+            return vars;
+        }
+        default:
+            throw new Error(`Unsupported cloud provider: ${provider}`);
+    }
+}
 /**
  * Updates kubeconfig for the provisioned cluster
  */

package/dist/types/index.js

@@ -21,51 +21,120 @@ export const LOGGING_SINK_CATEGORIES = {
 // Region mappings
 export const CLOUD_REGIONS = {
     aws: [
+        // US regions (c8g Graviton4 available)
         "us-east-1",
         "us-east-2",
         "us-west-1",
         "us-west-2",
+        // Canada
+        "ca-central-1",
+        "ca-west-1",
+        // Europe (c8g available)
         "eu-west-1",
         "eu-west-2",
         "eu-west-3",
         "eu-central-1",
-        "ap-south-1",
-        "ap-southeast-1",
-        "ap-southeast-2",
+        "eu-central-2",
+        "eu-north-1",
+        "eu-south-1",
+        "eu-south-2",
+        // Asia Pacific (c8g available)
         "ap-northeast-1",
         "ap-northeast-2",
-        "ca-central-1",
+        "ap-northeast-3",
+        "ap-southeast-1",
+        "ap-southeast-2",
+        "ap-southeast-3",
+        "ap-southeast-4",
+        "ap-southeast-5",
+        "ap-southeast-7",
+        "ap-south-1",
+        "ap-south-2",
+        "ap-east-1",
+        // South America
         "sa-east-1",
+        // Middle East & Africa
+        "me-south-1",
+        "me-central-1",
+        "af-south-1",
+        "il-central-1",
     ],
     gcp: [
-        "us-central1",
-        "us-east1",
-        "us-west1",
-        "us-west2",
-        "europe-west1",
-        "europe-west2",
-        "europe-west3",
-        "asia-east1",
-        "asia-northeast1",
-        "asia-southeast1",
-        "australia-southeast1",
-        "southamerica-east1",
+        // Tier 1: Full C4A (Google Axion ARM64) availability - 3+ zones confirmed
+        // US regions
+        "us-central1", // C4A in zones a, b, c, f (best availability)
+        "us-east1", // C4A in zones b, c, d
+        "us-east4", // C4A in zones a, b, c
+        "us-west1", // C4A in zones a, b, c
+        "us-west4", // C4A in zones a, b, c
+        // North America
+        "northamerica-south1", // C4A in zones a, b, c (Mexico)
+        // Europe
+        "europe-west1", // C4A in zones b, c, d
+        "europe-west2", // C4A in zones a, b, c
+        "europe-west3", // C4A in zones a, b, c
+        "europe-west4", // C4A in zones a, b, c
+        "europe-north1", // C4A in zones a, b
+        // Asia Pacific
+        "asia-east1", // C4A in zones a, b, c
+        "asia-northeast1", // C4A in zones b, c
+        "asia-south1", // C4A in zones a, b, c
+        "asia-southeast1", // C4A in zones a, b, c
+        // Australia
+        "australia-southeast2", // C4A in zones a, b, c
     ],
     azure: [
+        // US regions (Dpsv5 ARM64 available)
         "eastus",
         "eastus2",
         "westus",
         "westus2",
+        "westus3",
         "centralus",
+        "northcentralus",
+        "southcentralus",
+        "westcentralus",
+        // Canada
+        "canadacentral",
+        "canadaeast",
+        // South America
+        "brazilsouth",
+        // Europe (Dpsv5 available)
         "northeurope",
         "westeurope",
         "uksouth",
+        "ukwest",
+        "francecentral",
+        "francesouth",
+        "germanywestcentral",
+        "germanynorth",
+        "switzerlandnorth",
+        "switzerlandwest",
+        "norwayeast",
+        "norwaywest",
+        "swedencentral",
+        "polandcentral",
+        // Asia Pacific
         "eastasia",
         "southeastasia",
         "japaneast",
+        "japanwest",
+        "koreacentral",
+        "koreasouth",
+        // Australia
         "australiaeast",
-        "canadacentral",
-        "brazilsouth",
+        "australiasoutheast",
+        "australiacentral",
+        // India
+        "centralindia",
+        "southindia",
+        "westindia",
+        // Middle East & Africa
+        "uaenorth",
+        "uaecentral",
+        "southafricanorth",
+        "qatarcentral",
+        "israelcentral",
     ],
 };
 // Performance tier configurations

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulebricks/cli",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "description": "CLI for deploying and managing private Rulebricks instances",
   "type": "module",
   "bin": {

package/terraform/aws/main.tf

@@ -38,7 +38,7 @@ variable "tier" {
 variable "kubernetes_version" {
   description = "Kubernetes version"
   type        = string
-  default     = "1.29"
+  default     = "1.34"
 }
 
 variable "enable_external_dns" {
@@ -74,21 +74,21 @@ locals {
       instance_type  = "c8g.large"  # 2 vCPU, 4GB (Graviton4 ARM64)
       min_nodes      = 4
       max_nodes      = 4
-      disk_size      = 50
+      disk_size      = 20
     }
     medium = {
       node_count     = 4
       instance_type  = "c8g.xlarge"  # 4 vCPU, 8GB (Graviton4 ARM64)
       min_nodes      = 4
       max_nodes      = 8
-      disk_size      = 100
+      disk_size      = 30
     }
     large = {
       node_count     = 5
       instance_type  = "c8g.2xlarge"  # 8 vCPU, 16GB (Graviton4 ARM64)
       min_nodes      = 5
       max_nodes      = 16
-      disk_size      = 200
+      disk_size      = 50
     }
   }
 
@@ -150,7 +150,7 @@ module "eks" {
     rulebricks = {
       name           = "rulebricks-nodes"
       instance_types = [local.config.instance_type]
-      ami_type       = "AL2_ARM_64"  # ARM AMI for Graviton instances
+      ami_type       = "AL2023_ARM_64"  # ARM AMI for Graviton instances
 
       min_size     = local.config.min_nodes
       max_size     = local.config.max_nodes

package/terraform/azure/main.tf

@@ -44,7 +44,7 @@ variable "tier" {
 variable "kubernetes_version" {
   description = "Kubernetes version"
   type        = string
-  default     = "1.29"
+  default     = "1.34"
 }
 
 variable "enable_external_dns" {
@@ -86,21 +86,21 @@ locals {
       vm_size      = "Standard_D2ps_v5"  # 2 vCPU, 8GB (Ampere ARM64)
       min_nodes    = 4
       max_nodes    = 4
-      disk_size    = 50
+      disk_size    = 20
     }
     medium = {
       node_count   = 4
       vm_size      = "Standard_D4ps_v5"  # 4 vCPU, 16GB (Ampere ARM64)
       min_nodes    = 4
       max_nodes    = 8
-      disk_size    = 100
+      disk_size    = 30
     }
     large = {
       node_count   = 5
       vm_size      = "Standard_D8ps_v5"  # 8 vCPU, 32GB (Ampere ARM64)
       min_nodes    = 5
       max_nodes    = 16
-      disk_size    = 200
+      disk_size    = 50
     }
   }
 

package/terraform/gcp/main.tf

@@ -53,7 +53,7 @@ variable "tier" {
 variable "kubernetes_version" {
   description = "Kubernetes version"
   type        = string
-  default     = "1.29"
+  default     = "1.34"
 }
 
 variable "enable_external_dns" {
@@ -75,7 +75,8 @@ variable "logging_gcs_bucket" {
 }
 
 # Tier configurations
-# Using Axion C4A (ARM64) instances for compatibility with arm64 container images
+# Using C4A (Google Axion ARM64) instances for best ARM64 performance
+# C4A requires Hyperdisk (does not support Persistent Disk)
 locals {
   tier_configs = {
     small = {
@@ -83,21 +84,21 @@ locals {
       machine_type  = "c4a-standard-2"  # 2 vCPU, 8GB (Google Axion ARM64)
       min_nodes     = 4
       max_nodes     = 4
-      disk_size     = 50
+      disk_size     = 20
     }
     medium = {
       node_count    = 4
       machine_type  = "c4a-standard-4"  # 4 vCPU, 16GB (Google Axion ARM64)
       min_nodes     = 4
       max_nodes     = 8
-      disk_size     = 100
+      disk_size     = 30
     }
     large = {
       node_count    = 5
       machine_type  = "c4a-standard-8"  # 8 vCPU, 32GB (Google Axion ARM64)
       min_nodes     = 5
       max_nodes     = 16
-      disk_size     = 200
+      disk_size     = 50
     }
   }
 
@@ -211,6 +212,9 @@ resource "google_container_cluster" "cluster" {
   remove_default_node_pool = true
   initial_node_count       = 1
 
+  # Allow terraform destroy to delete the cluster
+  deletion_protection = false
+
   # Cluster configuration
   min_master_version = var.kubernetes_version
 
@@ -286,7 +290,7 @@ resource "google_container_node_pool" "primary" {
     preemptible  = false
     machine_type = local.config.machine_type
     disk_size_gb = local.config.disk_size
-    disk_type    = "pd-ssd"
+    disk_type    = "hyperdisk-balanced"
 
     oauth_scopes = [
       "https://www.googleapis.com/auth/cloud-platform"