@rulebricks/cli 2.0.5 → 2.0.6

package/dist/commands/deploy.js

@@ -4,8 +4,9 @@ import { Box, Text, useApp, useInput } from "ink";
 import { platform } from "os";
 import { BorderBox, Spinner, StatusLine, ThemeProvider, useTheme, Logo, } from "../components/common/index.js";
 import { DNSWaitScreen } from "../components/DNSWaitScreen.js";
-import { loadDeploymentConfig, loadDeploymentState, saveDeploymentState, updateDeploymentStatus, } from "../lib/config.js";
-import { setupTerraformWorkspace, terraformInit, terraformPlan, terraformApply, terraformDestroy, updateKubeconfig, hasTerraformState, isTerraformInstalled, } from "../lib/terraform.js";
+import { loadDeploymentConfig, loadDeploymentState, saveDeploymentState, updateDeploymentStatus, saveTerraformVars, } from "../lib/config.js";
+import { setupTerraformWorkspace, terraformInit, terraformPlan, terraformApply, terraformDestroy, updateKubeconfig, hasTerraformState, isTerraformInstalled, generateTerraformVars, } from "../lib/terraform.js";
+import { checkGcpApplicationDefaultCredentials, checkAzureResourceProviders, checkAzureVmQuota, AZURE_TIER_CORES, } from "../lib/cloudCli.js";
 import { installOrUpgradeChart, upgradeChart, isHelmInstalled, } from "../lib/helm.js";
 import { isKubectlInstalled, checkClusterAccessible, } from "../lib/kubernetes.js";
 import { generateHelmValues, updateHelmValuesForTLS, } from "../lib/helmValues.js";
@@ -158,6 +159,10 @@ function DeployCommandInner({ name, skipInfra, skipDns, version, }) {
                     setStep("infra-setup");
                     await setupTerraformWorkspace(name, cfg.infrastructure.provider);
                 }
+                // Generate and save terraform variables (always do this before plan,
+                // even if state exists, in case config changed)
+                const terraformVars = generateTerraformVars(cfg);
+                await saveTerraformVars(name, terraformVars);
                 setStep("infra-init");
                 await terraformInit(name);
                 setStep("infra-plan");
@@ -287,6 +292,49 @@ function DeployCommandInner({ name, skipInfra, skipDns, version, }) {
         if (cfg.infrastructure.mode === "provision" && !terraform) {
             throw new Error("Terraform is not installed. Required for infrastructure provisioning.");
         }
+        // Check GCP Application Default Credentials if provisioning GCP infrastructure
+        if (cfg.infrastructure.mode === "provision" &&
+            cfg.infrastructure.provider === "gcp") {
+            const adcCheck = await checkGcpApplicationDefaultCredentials();
+            if (!adcCheck.configured) {
+                throw new Error("GCP Application Default Credentials (ADC) not configured.\n\n" +
+                    "Terraform requires 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");
+            }
+        }
+        // Check Azure prerequisites if provisioning Azure infrastructure
+        if (cfg.infrastructure.mode === "provision" &&
+            cfg.infrastructure.provider === "azure") {
+            // 1. Verify resource providers are registered
+            const providerCheck = await checkAzureResourceProviders();
+            if (!providerCheck.allRegistered) {
+                throw new Error(`Azure resource providers not registered: ${providerCheck.missing.join(", ")}\n\n` +
+                    "To register:\n" +
+                    providerCheck.missing
+                        .map((p) => `  • az provider register --namespace ${p}`)
+                        .join("\n") +
+                    "\n\nNote: Registration may take a few minutes to complete.");
+            }
+            // 2. Check VM quota for the selected tier
+            const tier = cfg.tier || "small";
+            const region = cfg.infrastructure.region;
+            if (!region) {
+                throw new Error("Azure region is required for infrastructure provisioning");
+            }
+            const requiredCores = AZURE_TIER_CORES[tier] || AZURE_TIER_CORES.small;
+            const quotaCheck = await checkAzureVmQuota(region, requiredCores);
+            if (!quotaCheck.sufficient) {
+                throw new Error(`Insufficient Azure vCPU quota in ${region}.\n` +
+                    `Required: ${requiredCores} cores (${tier} tier), Available: ${quotaCheck.available}/${quotaCheck.limit}\n\n` +
+                    "Request a quota increase in the Azure portal:\n" +
+                    "  • Go to: Subscriptions > Usage + quotas\n" +
+                    "  • Request increase for 'Total Regional vCPUs' in your region");
+            }
+        }
         // Check cluster access if using existing infrastructure
         if (cfg.infrastructure.mode === "existing") {
             let clusterError = await checkClusterAccessible();

package/dist/commands/destroy.js

@@ -243,7 +243,7 @@ function DestroyCommandInner({ name, cluster, config, force, }) {
             // Only cleaning local files (with --config)
             _jsxs(_Fragment, { children: [_jsx(Text, { color: colors.warning, bold: true, children: "\u2139 Local Cleanup" }), _jsxs(Box, { marginY: 1, flexDirection: "column", children: [_jsx(Text, { children: "No cluster resources found to clean up." }), _jsx(Text, { children: "This will delete local configuration files." })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, children: "Press Enter to confirm, Esc to cancel" }) })] })) : (
             // Full destruction
-            _jsxs(_Fragment, { children: [_jsx(Text, { color: colors.accent, bold: true, children: "\u26A0 WARNING" }), _jsxs(Box, { marginY: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.muted, children: "This will permanently delete:" }), (scope?.hasHelmRelease || scope?.hasNamespace) && (_jsxs(_Fragment, { children: [_jsx(Text, { color: colors.muted, children: " \u2022 Rulebricks application" }), _jsxs(Text, { color: colors.muted, children: [" ", "\u2022 All databases and stored data"] }), _jsx(Text, { color: colors.muted, children: " \u2022 All persistent volumes" }), _jsx(Text, { color: colors.muted, children: " \u2022 Monitoring stack" }), _jsx(Text, { color: colors.muted, children: " \u2022 Kubernetes namespace" })] })), needsInfraConfirm && (_jsxs(_Fragment, { children: [_jsx(Text, { color: colors.accent, children: " \u2022 Kubernetes cluster" }), _jsx(Text, { color: colors.accent, children: " \u2022 All cloud infrastructure" })] })), willDeleteConfig && (_jsx(Text, { color: colors.muted, children: " \u2022 Local configuration files" })), !cluster && scope?.hasInfrastructure && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "Cloud infrastructure will be preserved. Use --cluster to remove it." }) })), cluster && !scope?.hasInfrastructure && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "No CLI managed infrastructure found for this deployment." }) })), !willDeleteConfig && (_jsx(Box, { marginTop: !needsInfraConfirm && !cluster ? 0 : 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "Local config files will be preserved. Use --config to remove them." }) })), !scope?.clusterAccessible && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, dimColor: true, children: "\u26A0 Cluster is not accessible. Cluster resources may need manual cleanup." }) }))] }), needsInfraConfirm ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["Type", " ", _jsx(Text, { color: colors.accent, bold: true, children: "destroy-all" }), " ", "to confirm:"] }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.accent, children: "\u276F " }), _jsx(Text, { children: confirmText }), _jsx(Text, { color: colors.muted, children: "\u2588" })] })] })) : (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, children: "Press Enter to confirm, Esc to cancel" }) }))] })) }) }));
+            _jsxs(_Fragment, { children: [_jsx(Text, { color: colors.accent, bold: true, children: "\u26A0 WARNING" }), _jsxs(Box, { marginY: 1, flexDirection: "column", children: [_jsx(Text, { color: colors.muted, children: "This will permanently delete:" }), (scope?.hasHelmRelease || scope?.hasNamespace) && (_jsxs(_Fragment, { children: [_jsx(Text, { color: colors.muted, children: " \u2022 Rulebricks application" }), _jsxs(Text, { color: colors.muted, children: [" ", "\u2022 All databases and stored data"] }), _jsx(Text, { color: colors.muted, children: " \u2022 All persistent volumes" }), _jsx(Text, { color: colors.muted, children: " \u2022 Monitoring stack" }), _jsx(Text, { color: colors.muted, children: " \u2022 Kubernetes namespace" })] })), needsInfraConfirm && (_jsxs(_Fragment, { children: [_jsx(Text, { color: colors.accent, children: " \u2022 Kubernetes cluster" }), _jsx(Text, { color: colors.accent, children: " \u2022 All cloud infrastructure" })] })), willDeleteConfig && (_jsx(Text, { color: colors.muted, children: " \u2022 Local configuration files" })), !cluster && scope?.hasInfrastructure && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "Cloud infrastructure will be preserved. Use --cluster to remove it." }) })), cluster && !scope?.hasInfrastructure && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "No CLI managed infrastructure found for this deployment." }) })), !willDeleteConfig && (_jsx(Box, { marginTop: !needsInfraConfirm && !cluster ? 0 : 1, children: _jsx(Text, { color: colors.muted, dimColor: true, children: "Local config files will be preserved. Use --config to remove them." }) })), !scope?.clusterAccessible && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, dimColor: true, children: "\u26A0 Cluster is not accessible. Some cluster resources may need manual cleanup." }) }))] }), needsInfraConfirm ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["Type", " ", _jsx(Text, { color: colors.accent, bold: true, children: "destroy-all" }), " ", "to confirm:"] }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.accent, children: "\u276F " }), _jsx(Text, { children: confirmText }), _jsx(Text, { color: colors.muted, children: "\u2588" })] })] })) : (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: colors.warning, children: "Press Enter to confirm, Esc to cancel" }) }))] })) }) }));
 }
 export function DestroyCommand(props) {
     return (_jsxs(ThemeProvider, { theme: "destroy", children: [_jsx(Logo, {}), _jsx(DestroyCommandInner, { ...props })] }));

package/dist/components/Wizard/steps/CloudProviderStep.js

@@ -89,12 +89,17 @@ export function CloudProviderStep({ onComplete, onBack, }) {
         const provider = item.value;
         dispatch({ type: "SET_PROVIDER", provider });
         if (provider === "gcp") {
-            // Try to auto-fill GCP project ID
+            // GCP requires project to be pre-configured, so use the detected project
             const detectedProject = await getGcpProjectId();
             if (detectedProject) {
-                setGcpProject(detectedProject);
+                dispatch({ type: "SET_GCP_PROJECT", projectId: detectedProject });
+                // Skip project input and go directly to regions
+                loadRegions(provider);
+            }
+            else {
+                // Fallback to project input if somehow not detected (shouldn't happen with new auth check)
+                setSubStep("gcp-project");
             }
-            setSubStep("gcp-project");
         }
         else if (provider === "azure") {
             setSubStep("azure-rg");
@@ -166,8 +171,9 @@ export function CloudProviderStep({ onComplete, onBack, }) {
         dispatch({ type: "SET_CLUSTER_NAME", clusterName });
         onComplete();
     };
-    const handleGcpProjectSubmit = () => {
+    const handleGcpProjectSubmit = async () => {
         dispatch({ type: "SET_GCP_PROJECT", projectId: gcpProject });
+        // ADC is now checked upfront in checkGcloudCli(), so proceed directly to regions
         loadRegions("gcp");
     };
     const handleAzureRgSubmit = () => {
@@ -181,11 +187,18 @@ export function CloudProviderStep({ onComplete, onBack, }) {
             return _jsx(Text, { color: "gray", children: " (not installed)" });
         }
         if (!status.authenticated) {
+            // Check for specific error types to show more helpful messages
+            if (status.error?.toLowerCase().includes("quota")) {
+                return _jsx(Text, { color: "yellow", children: " (insufficient quota)" });
+            }
+            if (status.error?.toLowerCase().includes("resource provider")) {
+                return _jsx(Text, { color: "yellow", children: " (providers not registered)" });
+            }
             return _jsx(Text, { color: "yellow", children: " (log in required)" });
         }
         return _jsx(Text, { color: "green", children: " \u2713" });
     };
-    return (_jsxs(BorderBox, { title: "Cloud Provider", children: [subStep === "checking" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Spinner, { label: "Checking cloud CLI tools..." }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", dimColor: true, children: "Detecting AWS, GCP, and Azure CLIs..." }) })] })), subStep === "no-cli" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { color: "red", bold: true, children: "No cloud CLI tools detected" }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(Text, { children: "To provision infrastructure, you need to install and authenticate with at least one cloud CLI:" }) }), _jsx(Box, { marginTop: 1, flexDirection: "column", marginLeft: 2, children: Object.entries(CLI_INSTALL_URLS).map(([provider, info]) => (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { bold: true, children: [info.name, ":"] }), _jsxs(Text, { color: "gray", children: [" ", info.installCmd] }), _jsxs(Text, { color: "gray", children: [" ", info.url] })] }, provider))) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "After installing, authenticate:" }) }), _jsx(Box, { marginLeft: 2, flexDirection: "column", children: Object.entries(CLI_LOGIN_COMMANDS).map(([provider, cmd]) => (_jsxs(Text, { color: "gray", children: [" ", provider, ": ", cmd] }, provider))) })] })), subStep === "provider" && cliStatus && (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Select your cloud provider:" }), !cliStatus.anyAvailable && cliStatus.anyInstalled && (_jsx(Text, { color: "yellow", dimColor: true, children: "\u26A0 Some CLIs are installed but not authenticated" })), needsTerraform &&
+    return (_jsxs(BorderBox, { title: "Cloud Provider", children: [subStep === "checking" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Spinner, { label: "Checking cloud CLI tools..." }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", dimColor: true, children: "Detecting AWS, GCP, and Azure CLIs..." }) })] })), subStep === "no-cli" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { color: "red", bold: true, children: "No cloud CLI tools detected" }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(Text, { children: "To provision infrastructure, you need to install and authenticate with at least one cloud CLI:" }) }), _jsx(Box, { marginTop: 1, flexDirection: "column", marginLeft: 2, children: Object.entries(CLI_INSTALL_URLS).map(([provider, info]) => (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { bold: true, children: [info.name, ":"] }), _jsxs(Text, { color: "gray", children: [" ", info.installCmd] }), _jsxs(Text, { color: "gray", children: [" ", info.url] })] }, provider))) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "After installing, authenticate:" }) }), _jsx(Box, { marginLeft: 2, flexDirection: "column", children: Object.entries(CLI_LOGIN_COMMANDS).map(([provider, cmd]) => (_jsx(Box, { flexDirection: "column", children: Array.isArray(cmd) ? (_jsxs(_Fragment, { children: [_jsxs(Text, { color: "gray", children: [" ", provider, ":"] }), cmd.map((c, i) => (_jsxs(Text, { color: "gray", children: ["   ", c] }, i)))] })) : (_jsxs(Text, { color: "gray", children: [" ", provider, ": ", cmd] })) }, provider))) })] })), subStep === "provider" && cliStatus && (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Select your cloud provider:" }), !cliStatus.anyAvailable && cliStatus.anyInstalled && (_jsx(Text, { color: "yellow", dimColor: true, children: "\u26A0 Some CLIs are installed but not authenticated" })), needsTerraform &&
                                 terraformStatus &&
                                 !terraformStatus.installed && (_jsxs(Box, { marginTop: 1, borderStyle: "round", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [_jsx(Text, { color: "yellow", bold: true, children: "\u26A0 Terraform not installed" }), _jsx(Text, { color: "gray", children: "You'll need Terraform to provision infrastructure." }), _jsxs(Text, { color: "gray", children: ["Install: ", TERRAFORM_INSTALL_INFO.installCmd] }), _jsx(Text, { color: "gray", dimColor: true, children: TERRAFORM_INSTALL_INFO.url })] })), needsTerraform && terraformStatus?.installed && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "green", children: "\u2713" }), _jsxs(Text, { color: "gray", children: [" ", "Terraform", " ", terraformStatus.version
                                                 ? `v${terraformStatus.version}`

package/dist/lib/cloudCli.d.ts

@@ -43,13 +43,26 @@ export declare function listS3Buckets(): Promise<string[]>;
  */
 export declare function listEksClusters(region: string): Promise<string[]>;
 /**
- * Check if gcloud CLI is installed and authenticated
+ * Check if gcloud CLI is installed and fully authenticated
+ *
+ * For GCP to be considered "authenticated", the user must have:
+ * 1. Logged in with `gcloud auth login`
+ * 2. Set a default project with `gcloud config set project PROJECT_ID`
+ * 3. Configured Application Default Credentials with `gcloud auth application-default login`
  */
 export declare function checkGcloudCli(): Promise<CloudCliStatus>;
 /**
  * Get the active GCP project ID
  */
 export declare function getGcpProjectId(): Promise<string | null>;
+/**
+ * Check if GCP Application Default Credentials (ADC) are configured
+ * ADC is required for Terraform to authenticate with Google Cloud
+ */
+export declare function checkGcpApplicationDefaultCredentials(): Promise<{
+    configured: boolean;
+    error?: string;
+}>;
 /**
  * List available GCP regions
  */
@@ -64,7 +77,13 @@ export declare function listGcsBuckets(): Promise<string[]>;
  */
 export declare function listGkeClusters(region: string): Promise<string[]>;
 /**
- * Check if Azure CLI is installed and authenticated
+ * Check if Azure CLI is installed and fully authenticated
+ *
+ * For Azure to be considered "authenticated", the user must have:
+ * 1. Logged in with `az login`
+ * 2. An active subscription in "Enabled" state
+ * 3. Required resource providers registered (Microsoft.ContainerService, etc.)
+ * 4. Sufficient vCPU quota for at least the small tier (8 cores)
  */
 export declare function checkAzureCli(): Promise<CloudCliStatus>;
 /**
@@ -87,6 +106,31 @@ export declare function listAzureBlobContainers(storageAccount: string): Promise
  * List AKS clusters, optionally filtered by resource group
  */
 export declare function listAksClusters(resourceGroup?: string): Promise<string[]>;
+/**
+ * Azure tier to vCPU core requirements mapping
+ */
+export declare const AZURE_TIER_CORES: Record<string, number>;
+/**
+ * Check if required Azure resource providers are registered
+ */
+export declare function checkAzureResourceProviders(): Promise<{
+    allRegistered: boolean;
+    missing: string[];
+}>;
+/**
+ * Check Azure VM quota for a specific region
+ *
+ * @param region - Azure region to check quota for
+ * @param requiredCores - Number of vCPUs required
+ * @returns Quota check result with availability info
+ */
+export declare function checkAzureVmQuota(region: string, requiredCores: number): Promise<{
+    sufficient: boolean;
+    available: number;
+    limit: number;
+    used: number;
+    error?: string;
+}>;
 /**
  * Check all cloud CLIs in parallel
  */
@@ -116,7 +160,7 @@ export declare const CLI_INSTALL_URLS: Record<CloudProvider, {
 /**
  * Get login commands for cloud CLIs
  */
-export declare const CLI_LOGIN_COMMANDS: Record<CloudProvider, string>;
+export declare const CLI_LOGIN_COMMANDS: Record<CloudProvider, string | string[]>;
 /**
  * Terraform installation status
  */