@rulebricks/cli 2.1.6 → 2.3.1

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

@@ -1,40 +1,33 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useEffect } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import SelectInput from "ink-select-input";
 import TextInput from "ink-text-input";
 import { useWizard } from "../WizardContext.js";
-import { BorderBox, useTheme } from "../../common/index.js";
+import { BorderBox, useGatedInput, useTheme } from "../../common/index.js";
 import { Spinner } from "../../common/Spinner.js";
-import { CLOUD_REGIONS } from "../../../types/index.js";
-import { checkAllCloudClis, checkTerraform, listRegions, listClusters, getGcpProjectId, CLI_INSTALL_URLS, CLI_LOGIN_COMMANDS, TERRAFORM_INSTALL_INFO, } from "../../../lib/cloudCli.js";
+import { CLOUD_PROVIDER_NAMES, CLOUD_REGIONS, } from "../../../types/index.js";
+import { checkAllCloudClis, discoverClustersInRegion, listRegions, getGcpProjectId, updateKubeconfig, CLI_INSTALL_URLS, CLI_LOGIN_COMMANDS, } from "../../../lib/cloudCli.js";
 export function CloudProviderStep({ onComplete, onBack, }) {
     const { state, dispatch } = useWizard();
     const { colors } = useTheme();
     const [subStep, setSubStep] = useState("checking");
     const [cliStatus, setCliStatus] = useState(null);
-    const [terraformStatus, setTerraformStatus] = useState(null);
     const [clusterName, setClusterName] = useState(state.clusterName || "rulebricks-cluster");
-    const [gcpProject, setGcpProject] = useState(state.gcpProjectId || "");
-    const [azureRg, setAzureRg] = useState(state.azureResourceGroup || "");
-    const [regions, setRegions] = useState([]);
-    const [regionsLoading, setRegionsLoading] = useState(false);
     const [clusters, setClusters] = useState([]);
-    const [clustersLoading, setClustersLoading] = useState(false);
-    // Whether we need infrastructure provisioning (Terraform required)
-    const needsTerraform = state.infrastructureMode === "provision";
+    const [selectedProvider, setSelectedProvider] = useState(state.provider);
+    // Manual-entry path (no clusters discovered): region and, on Azure, the
+    // resource group still need to be captured so downstream steps (kubeconfig,
+    // storage/monitoring discovery) aren't left blind.
+    const [manualRegion, setManualRegion] = useState(state.region || "");
+    const [manualRegions, setManualRegions] = useState([]);
+    const [manualResourceGroup, setManualResourceGroup] = useState(state.azureResourceGroup || "");
+    const [rgError, setRgError] = useState(null);
     // Check CLIs on mount
     useEffect(() => {
         async function checkClis() {
-            // Check cloud CLIs and Terraform in parallel
-            const [status, tfStatus] = await Promise.all([
-                checkAllCloudClis(),
-                needsTerraform
-                    ? checkTerraform()
-                    : Promise.resolve({ installed: true }),
-            ]);
+            const status = await checkAllCloudClis();
             setCliStatus(status);
-            setTerraformStatus(tfStatus);
             if (!status.anyInstalled) {
                 setSubStep("no-cli");
             }
@@ -43,8 +36,8 @@ export function CloudProviderStep({ onComplete, onBack, }) {
             }
         }
         checkClis();
-    }, [needsTerraform]);
-    useInput((input, key) => {
+    }, []);
+    useGatedInput((input, key) => {
         if (key.escape) {
             if (subStep === "provider" ||
                 subStep === "no-cli" ||
@@ -54,17 +47,20 @@ export function CloudProviderStep({ onComplete, onBack, }) {
             else if (subStep === "region" || subStep === "region-loading") {
                 setSubStep("provider");
             }
+            else if (subStep === "manual-region" ||
+                subStep === "manual-region-loading") {
+                setSubStep("cluster");
+            }
+            else if (subStep === "manual-rg") {
+                setRgError(null);
+                setSubStep("manual-region");
+            }
             else if (subStep === "cluster" ||
                 subStep === "cluster-loading" ||
-                subStep === "cluster-select") {
+                subStep === "cluster-select" ||
+                subStep === "kubeconfig-loading") {
                 setSubStep("region");
             }
-            else if (subStep === "gcp-project") {
-                setSubStep("provider");
-            }
-            else if (subStep === "azure-rg") {
-                setSubStep("provider");
-            }
         }
     });
     // Build provider items with status
@@ -78,74 +74,37 @@ export function CloudProviderStep({ onComplete, onBack, }) {
         ];
         return providers.map((p) => ({
             ...p,
-            disabled: !p.status.installed || !p.status.authenticated,
+            disabled: !p.status.authenticated,
         }));
     };
     const providerItems = getProviderItems();
-    const handleProviderSelect = async (item) => {
+    const handleProviderSelect = (item) => {
         const selectedItem = providerItems.find((p) => p.value === item.value);
         if (!selectedItem || selectedItem.disabled)
             return;
         const provider = item.value;
+        setSelectedProvider(provider);
+        setClusterName("rulebricks-cluster");
+        setManualRegion("");
+        setManualResourceGroup("");
         dispatch({ type: "SET_PROVIDER", provider });
-        if (provider === "gcp") {
-            // GCP requires project to be pre-configured, so use the detected project
-            const detectedProject = await getGcpProjectId();
-            if (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");
-            }
-        }
-        else if (provider === "azure") {
-            setSubStep("azure-rg");
-        }
-        else {
-            loadRegions(provider);
-        }
+        loadProviderRegions(provider);
     };
-    const loadRegions = async (provider) => {
+    const loadProviderRegions = async (provider) => {
         setSubStep("region-loading");
-        setRegionsLoading(true);
         try {
-            const dynamicRegions = await listRegions(provider);
-            if (dynamicRegions.length > 0) {
-                setRegions(dynamicRegions);
-            }
-            else {
-                // Fall back to static regions
-                setRegions(CLOUD_REGIONS[provider]);
-            }
+            const regions = await listRegions(provider);
+            setManualRegions(regions.length > 0 ? regions : CLOUD_REGIONS[provider]);
         }
         catch {
-            // Fall back to static regions on error
-            setRegions(CLOUD_REGIONS[provider]);
+            setManualRegions(CLOUD_REGIONS[provider]);
         }
-        setRegionsLoading(false);
         setSubStep("region");
     };
-    const handleRegionSelect = (item) => {
-        dispatch({ type: "SET_REGION", region: item.value });
-        // For existing infrastructure, load available clusters
-        if (state.infrastructureMode === "existing" && state.provider) {
-            loadClusters(state.provider, item.value);
-        }
-        else {
-            // For provisioning, go directly to cluster name input
-            setSubStep("cluster");
-        }
-    };
     const loadClusters = async (provider, region) => {
         setSubStep("cluster-loading");
-        setClustersLoading(true);
         try {
-            const availableClusters = await listClusters(provider, region, {
-                azureResourceGroup: state.azureResourceGroup || undefined,
-            });
+            const availableClusters = await discoverClustersInRegion(provider, region);
             setClusters(availableClusters);
             if (availableClusters.length > 0) {
                 setSubStep("cluster-select");
@@ -160,27 +119,130 @@ export function CloudProviderStep({ onComplete, onBack, }) {
             setClusters([]);
             setSubStep("cluster");
         }
-        setClustersLoading(false);
     };
-    const handleClusterSelect = (item) => {
-        setClusterName(item.value);
-        dispatch({ type: "SET_CLUSTER_NAME", clusterName: item.value });
+    const completeWithCluster = async (cluster) => {
+        dispatch({ type: "SET_REGION", region: cluster.region });
+        dispatch({ type: "SET_CLUSTER_NAME", clusterName: cluster.name });
+        dispatch({ type: "SET_AZURE_RG", resourceGroup: cluster.resourceGroup || "" });
+        dispatch({ type: "SET_GCP_PROJECT", projectId: cluster.projectId || "" });
+        if (cluster.provider && cluster.region) {
+            setSubStep("kubeconfig-loading");
+            try {
+                await updateKubeconfig(cluster.provider, cluster.name, cluster.region, {
+                    gcpProjectId: cluster.projectId,
+                    azureResourceGroup: cluster.resourceGroup,
+                });
+            }
+            catch {
+                // The next step performs a direct kubectl scan and will show a concrete
+                // access error if kubeconfig still points at the wrong cluster.
+            }
+        }
         onComplete();
     };
+    const handleClusterSelect = (item) => {
+        const cluster = clusters.find((c) => getClusterKey(c) === item.value);
+        if (!cluster)
+            return;
+        setClusterName(cluster.name);
+        completeWithCluster(cluster);
+    };
     const handleClusterSubmit = () => {
         dispatch({ type: "SET_CLUSTER_NAME", clusterName });
-        onComplete();
+        const provider = selectedProvider || state.provider;
+        if (!manualRegion) {
+            loadManualRegions();
+            return;
+        }
+        if (provider === "azure" && !manualResourceGroup.trim()) {
+            setSubStep("manual-rg");
+            return;
+        }
+        completeManual(manualRegion, manualResourceGroup.trim());
+    };
+    // Manual path: the cluster wasn't discovered, so the region (and Azure
+    // resource group) are collected explicitly before refreshing kubeconfig
+    // otherwise the cluster capability scan runs against whatever kubectl happens
+    // to point at and storage/monitoring discovery start without a region.
+    const loadManualRegions = async () => {
+        const provider = selectedProvider || state.provider;
+        if (!provider) {
+            onComplete();
+            return;
+        }
+        setSubStep("manual-region-loading");
+        try {
+            const regions = await listRegions(provider);
+            setManualRegions(regions.length > 0 ? regions : CLOUD_REGIONS[provider]);
+        }
+        catch {
+            setManualRegions(CLOUD_REGIONS[provider]);
+        }
+        setSubStep("manual-region");
+    };
+    const handleManualRegionSelect = (item) => {
+        setManualRegion(item.value);
+        dispatch({ type: "SET_REGION", region: item.value });
+        const provider = selectedProvider || state.provider;
+        if (provider === "azure") {
+            setSubStep("manual-rg");
+        }
+        else {
+            completeManual(item.value, "");
+        }
     };
-    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 handleRegionSelect = (item) => {
+        const provider = selectedProvider || state.provider;
+        if (!provider)
+            return;
+        setManualRegion(item.value);
+        dispatch({ type: "SET_REGION", region: item.value });
+        loadClusters(provider, item.value);
+    };
+    const handleManualResourceGroupSubmit = () => {
+        if (!manualResourceGroup.trim()) {
+            setRgError("Resource group is required for AKS clusters");
+            return;
+        }
+        setRgError(null);
+        dispatch({
+            type: "SET_AZURE_RG",
+            resourceGroup: manualResourceGroup.trim(),
+        });
+        completeManual(manualRegion, manualResourceGroup.trim());
     };
-    const handleAzureRgSubmit = () => {
-        dispatch({ type: "SET_AZURE_RG", resourceGroup: azureRg });
-        loadRegions("azure");
+    const completeManual = async (region, resourceGroup) => {
+        const provider = selectedProvider || state.provider;
+        if (!provider) {
+            onComplete();
+            return;
+        }
+        setSubStep("kubeconfig-loading");
+        // GCP: derive the project from the active gcloud config instead of asking.
+        let gcpProjectId;
+        if (provider === "gcp") {
+            try {
+                gcpProjectId = (await getGcpProjectId()) || undefined;
+            }
+            catch {
+                gcpProjectId = undefined;
+            }
+            if (gcpProjectId) {
+                dispatch({ type: "SET_GCP_PROJECT", projectId: gcpProjectId });
+            }
+        }
+        try {
+            await updateKubeconfig(provider, clusterName, region, {
+                gcpProjectId,
+                azureResourceGroup: resourceGroup || undefined,
+            });
+        }
+        catch {
+            // The next step performs a direct kubectl scan and will show a concrete
+            // access error if kubeconfig still points at the wrong cluster.
+        }
+        onComplete();
     };
-    const regionItems = regions.map((r) => ({ label: r, value: r }));
     // Render status indicator for a provider
     const renderStatusIndicator = (status) => {
         if (!status.installed) {
@@ -198,11 +260,15 @@ export function CloudProviderStep({ onComplete, onBack, }) {
         }
         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]) => (_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}`
-                                                : "", " ", "detected"] })] }))] }), _jsx(SelectInput, { items: providerItems.map((p) => ({
+    const clusterItems = clusters.map((cluster) => ({
+        label: formatClusterRow(cluster),
+        value: getClusterKey(cluster),
+    }));
+    const activeProvider = selectedProvider || state.provider;
+    const providerName = activeProvider
+        ? CLOUD_PROVIDER_NAMES[activeProvider]
+        : "";
+    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 discover clusters, install 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: "Some CLIs are installed but not authenticated" }))] }), _jsx(SelectInput, { items: providerItems.map((p) => ({
                             label: p.label,
                             value: p.value,
                         })), onSelect: handleProviderSelect, indicatorComponent: () => null, itemComponent: ({ isSelected, label }) => {
@@ -214,10 +280,34 @@ export function CloudProviderStep({ onComplete, onBack, }) {
                                 : isSelected
                                     ? colors.accent
                                     : undefined;
-                            return (_jsxs(Box, { children: [_jsxs(Text, { color: textColor, dimColor: item.disabled, children: [isSelected && !item.disabled ? "❯ " : "  ", label] }), renderStatusIndicator(item.status), item.status.identity && item.status.authenticated && (_jsxs(Text, { color: "gray", dimColor: true, children: [" ", "(", item.status.identity, ")"] }))] }));
-                        } })] })), subStep === "gcp-project" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Enter your GCP Project ID:" }), gcpProject && (_jsxs(Text, { color: "gray", dimColor: true, children: ["Detected project: ", gcpProject] })), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.accent, children: "\u276F " }), _jsx(TextInput, { value: gcpProject, onChange: setGcpProject, onSubmit: handleGcpProjectSubmit, placeholder: "my-gcp-project" })] })] })), subStep === "azure-rg" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Enter your Azure Resource Group name:" }), _jsx(Text, { color: "gray", dimColor: true, children: "This resource group will contain all Rulebricks resources" }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.accent, children: "\u276F " }), _jsx(TextInput, { value: azureRg, onChange: setAzureRg, onSubmit: handleAzureRgSubmit, placeholder: "rulebricks-rg" })] })] })), subStep === "region-loading" && (_jsx(Box, { flexDirection: "column", marginY: 1, children: _jsx(Spinner, { label: `Fetching ${state.provider?.toUpperCase()} regions...` }) })), subStep === "region" && (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsxs(Text, { children: ["Select a region for ", state.provider?.toUpperCase(), ":"] }), _jsxs(Text, { color: "gray", dimColor: true, children: [regions.length, " regions available"] })] }), _jsx(Box, { height: 10, flexDirection: "column", overflowY: "hidden", children: _jsx(SelectInput, { items: regionItems, onSelect: handleRegionSelect, limit: 8, indicatorComponent: () => null, itemComponent: ({ isSelected, label }) => (_jsxs(Text, { color: isSelected ? colors.accent : undefined, children: [isSelected ? "❯ " : "  ", label] })) }) })] })), subStep === "cluster-loading" && (_jsx(Box, { flexDirection: "column", marginY: 1, children: _jsx(Spinner, { label: `Fetching ${state.provider?.toUpperCase()} clusters in ${state.region}...` }) })), subStep === "cluster-select" && (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Select your Kubernetes cluster:" }), _jsxs(Text, { color: "gray", dimColor: true, children: [clusters.length, " cluster", clusters.length !== 1 ? "s" : "", " found in ", state.region] })] }), _jsx(Box, { height: 10, flexDirection: "column", overflowY: "hidden", children: _jsx(SelectInput, { items: clusters.map((c) => ({ label: c, value: c })), onSelect: handleClusterSelect, limit: 8, indicatorComponent: () => null, itemComponent: ({ isSelected, label }) => (_jsxs(Text, { color: isSelected ? colors.accent : undefined, children: [isSelected ? "❯ " : "  ", label] })) }) }), state.provider && state.region && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.success, children: "\u2713" }), _jsxs(Text, { color: "gray", children: [" ", state.provider?.toUpperCase(), " \u2022 ", state.region] })] }))] })), subStep === "cluster" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Enter the Kubernetes cluster name:" }), _jsx(Text, { color: "gray", dimColor: true, children: state.infrastructureMode === "provision"
-                            ? "This cluster will be created"
-                            : clusters.length === 0 && state.infrastructureMode === "existing"
-                                ? "No clusters found in this region - enter the name manually"
-                                : "Enter the name of your existing cluster" }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.accent, children: "\u276F " }), _jsx(TextInput, { value: clusterName, onChange: setClusterName, onSubmit: handleClusterSubmit, placeholder: "rulebricks-cluster" })] }), state.provider && state.region && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.success, children: "\u2713" }), _jsxs(Text, { color: "gray", children: [" ", state.provider?.toUpperCase(), " \u2022 ", state.region] })] }))] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", dimColor: true, children: "Esc to go back \u2022 Enter to continue" }) })] }));
+                            return (_jsxs(Box, { children: [_jsxs(Text, { color: textColor, dimColor: item.disabled, children: [isSelected && !item.disabled ? "> " : "  ", label] }), renderStatusIndicator(item.status), item.status.identity && item.status.authenticated && (_jsxs(Text, { color: "gray", dimColor: true, children: [" ", "(", item.status.identity, ")"] }))] }));
+                        } })] })), subStep === "region-loading" && (_jsx(Box, { flexDirection: "column", marginY: 1, children: _jsx(Spinner, { label: "Loading available regions..." }) })), subStep === "region" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Select the cluster's region:" }), _jsxs(Text, { color: "gray", dimColor: true, children: ["Rulebricks will only search ", providerName, " clusters in this region."] }), _jsx(Box, { marginTop: 1, height: 10, flexDirection: "column", overflowY: "hidden", children: _jsx(SelectInput, { items: manualRegions.map((r) => ({ label: r, value: r })), onSelect: handleRegionSelect, limit: 8, initialIndex: Math.max(0, manualRegions.indexOf(manualRegion)), indicatorComponent: () => null, itemComponent: ({ isSelected, label }) => (_jsxs(Text, { color: isSelected ? colors.accent : undefined, children: [isSelected ? "> " : "  ", label] })) }) })] })), subStep === "cluster-loading" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Spinner, { label: `Fetching ${providerName} clusters in ${manualRegion}...` }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", dimColor: true, children: "This keeps discovery targeted to the selected region." }) })] })), subStep === "cluster-select" && (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Select your Kubernetes cluster:" }), _jsxs(Text, { color: "gray", dimColor: true, children: [clusters.length, " cluster", clusters.length !== 1 ? "s" : "", " found for ", providerName, " in ", manualRegion] })] }), _jsx(Text, { color: "gray", dimColor: true, children: `  ${formatClusterColumns("Name", "Location", "Details", "Nodes")}` }), _jsx(Box, { height: 10, flexDirection: "column", overflowY: "hidden", children: _jsx(SelectInput, { items: clusterItems, onSelect: handleClusterSelect, limit: 8, indicatorComponent: () => null, itemComponent: ({ isSelected, label }) => (_jsxs(Text, { color: isSelected ? colors.accent : undefined, children: [isSelected ? "> " : "  ", label] })) }) })] })), subStep === "cluster" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Enter the Kubernetes cluster name:" }), _jsxs(Text, { color: "gray", dimColor: true, children: ["No clusters were discovered for ", providerName, ". If kubectl already points at the cluster, you can enter its name manually."] }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(Text, { color: "yellow", children: "Need a basic cluster? See cluster-setup/ for minimum Rulebricks examples." }) }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.accent, children: " > " }), _jsx(TextInput, { value: clusterName, onChange: setClusterName, onSubmit: handleClusterSubmit, placeholder: "rulebricks-cluster" })] })] })), subStep === "manual-region-loading" && (_jsx(Box, { flexDirection: "column", marginY: 1, children: _jsx(Spinner, { label: "Loading available regions..." }) })), subStep === "manual-region" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Select the cluster's region:" }), _jsxs(Text, { color: "gray", dimColor: true, children: ["Used to refresh kubeconfig and discover storage and monitoring resources for ", clusterName, "."] }), _jsx(Box, { marginTop: 1, height: 10, flexDirection: "column", overflowY: "hidden", children: _jsx(SelectInput, { items: manualRegions.map((r) => ({ label: r, value: r })), onSelect: handleManualRegionSelect, limit: 8, initialIndex: Math.max(0, manualRegions.indexOf(manualRegion)), indicatorComponent: () => null, itemComponent: ({ isSelected, label }) => (_jsxs(Text, { color: isSelected ? colors.accent : undefined, children: [isSelected ? "> " : "  ", label] })) }) })] })), subStep === "manual-rg" && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Enter the cluster's resource group:" }), _jsx(Text, { color: "gray", dimColor: true, children: "The Azure resource group containing the AKS cluster (needed for kubeconfig access)." }), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: colors.accent, children: " > " }), _jsx(TextInput, { value: manualResourceGroup, onChange: setManualResourceGroup, onSubmit: handleManualResourceGroupSubmit, placeholder: "my-resource-group" })] }), rgError && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", children: ["\u2717 ", rgError] }) }))] })), subStep === "kubeconfig-loading" && (_jsx(Box, { flexDirection: "column", marginY: 1, children: _jsx(Spinner, { label: "Refreshing kubeconfig for selected cluster..." }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", dimColor: true, children: "Esc to go back \u2022 Enter to continue" }) })] }));
+}
+function getClusterKey(cluster) {
+    return [
+        cluster.provider,
+        cluster.region,
+        cluster.resourceGroup || cluster.projectId || "",
+        cluster.name,
+    ].join(":");
+}
+function formatClusterRow(cluster) {
+    const details = cluster.resourceGroup || cluster.projectId || cluster.version || "-";
+    const nodes = cluster.nodeCount === undefined || cluster.nodeCount === null
+        ? "-"
+        : String(cluster.nodeCount);
+    return formatClusterColumns(cluster.name, cluster.region, details, nodes);
+}
+function formatClusterColumns(name, location, details, nodes) {
+    return [
+        fit(name, 26),
+        fit(location, 16),
+        fit(details, 24),
+        fit(nodes, 5),
+    ].join(" ");
+}
+function fit(value, width) {
+    const text = value || "-";
+    const clipped = text.length > width ? `${text.slice(0, Math.max(width - 1, 0))}~` : text;
+    return clipped.padEnd(width, " ");
 }

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

@@ -25,7 +25,6 @@ export function DomainStep({ onComplete, onBack }) {
     const [subStep, setSubStep] = useState('domain');
     const [domain, setDomain] = useState(state.domain || '');
     const [adminEmail, setAdminEmail] = useState(state.adminEmail || '');
-    const [tlsEmail, setTlsEmail] = useState(state.tlsEmail || '');
     const [error, setError] = useState(null);
     useInput((input, key) => {
         if (key.escape) {
@@ -36,11 +35,8 @@ export function DomainStep({ onComplete, onBack }) {
             else if (subStep === 'admin-email') {
                 setSubStep('domain');
             }
-            else if (subStep === 'tls-email') {
-                setSubStep('admin-email');
-            }
             else if (subStep === 'dns-provider') {
-                setSubStep('tls-email');
+                setSubStep('admin-email');
             }
             else if (subStep === 'dns-auto-manage') {
                 setSubStep('dns-provider');
@@ -85,23 +81,8 @@ export function DomainStep({ onComplete, onBack }) {
         }
         setError(null);
         dispatch({ type: 'SET_ADMIN_EMAIL', email: adminEmail });
-        // Default TLS email to admin email if not set
-        if (!tlsEmail) {
-            setTlsEmail(adminEmail);
-        }
-        setSubStep('tls-email');
-    };
-    const handleTlsEmailSubmit = () => {
-        if (!tlsEmail) {
-            setError('TLS email is required');
-            return;
-        }
-        if (!isValidEmail(tlsEmail)) {
-            setError('Invalid email format');
-            return;
-        }
-        setError(null);
-        dispatch({ type: 'SET_TLS_EMAIL', email: tlsEmail });
+        // The TLS (Let's Encrypt) email defaults to the admin email in toConfig;
+        // advanced users can override `tlsEmail` in config.yaml.
         setSubStep('dns-provider');
     };
     const handleDnsProviderSelect = (item) => {
@@ -121,6 +102,6 @@ export function DomainStep({ onComplete, onBack }) {
         onComplete();
     };
     // Progress summary component
-    const ProgressSummary = () => (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [domain && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: "\u2713" }), _jsxs(Text, { color: "gray", children: [" Domain: ", domain] })] })), adminEmail && subStep !== 'admin-email' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: "\u2713" }), _jsxs(Text, { color: "gray", children: [" Admin: ", adminEmail] })] })), tlsEmail && subStep !== 'tls-email' && subStep !== 'admin-email' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: "\u2713" }), _jsxs(Text, { color: "gray", children: [" TLS email: ", tlsEmail] })] }))] }));
-    return (_jsxs(BorderBox, { title: "Domain & DNS", children: [subStep === 'domain' && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Enter your Rulebricks domain:" }), _jsx(Text, { color: "gray", dimColor: true, children: "This is where Rulebricks will be accessible (e.g., rulebricks.example.com)" }), _jsx(Box, { marginTop: 1, children: _jsx(TextInput, { value: domain, onChange: setDomain, onSubmit: handleDomainSubmit, placeholder: "rulebricks.example.com" }) }), error && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", children: ["\u2717 ", error] }) }))] })), subStep === 'validating' && (_jsx(Box, { flexDirection: "column", marginY: 1, children: _jsx(Spinner, { label: "Validating domain..." }) })), subStep === 'admin-email' && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Enter the admin email address:" }), _jsx(Text, { color: "gray", dimColor: true, children: "This email will be used for Rulebricks administration and notifications" }), _jsx(Box, { marginTop: 1, children: _jsx(TextInput, { value: adminEmail, onChange: setAdminEmail, onSubmit: handleAdminEmailSubmit, placeholder: "admin@example.com" }) }), _jsx(ProgressSummary, {}), error && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", children: ["\u2717 ", error] }) }))] })), subStep === 'tls-email' && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Enter the email for TLS certificates:" }), _jsx(Text, { color: "gray", dimColor: true, children: "Let's Encrypt will send certificate expiration notices here" }), _jsx(Box, { marginTop: 1, children: _jsx(TextInput, { value: tlsEmail, onChange: setTlsEmail, onSubmit: handleTlsEmailSubmit, placeholder: adminEmail || 'admin@example.com' }) }), _jsx(ProgressSummary, {}), error && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", children: ["\u2717 ", error] }) }))] })), subStep === 'dns-provider' && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { bold: true, children: "Where is your domain's DNS hosted?" }), _jsx(Text, { color: "gray", dimColor: true, children: "This determines whether we can automatically manage DNS records for you" }), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: DNS_PROVIDER_OPTIONS, onSelect: handleDnsProviderSelect, itemComponent: ({ isSelected, label }) => (_jsx(Text, { color: isSelected ? colors.accent : undefined, children: label })) }) }), _jsx(ProgressSummary, {})] })), subStep === 'dns-auto-manage' && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { bold: true, children: "Automatic DNS Management" }), _jsx(Text, { color: "gray", dimColor: true, children: "Would you like Rulebricks to automatically create and manage DNS records?" }), _jsx(Text, { color: "gray", dimColor: true, children: "This enables single-step deployment without manual DNS configuration." }), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: AUTO_MANAGE_OPTIONS, onSelect: handleAutoManageSelect, itemComponent: ({ isSelected, label }) => (_jsx(Text, { color: isSelected ? colors.accent : undefined, children: label })) }) }), _jsx(ProgressSummary, {}), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "green", children: "\u2713" }), _jsxs(Text, { color: "gray", children: [" DNS Provider: ", DNS_PROVIDER_NAMES[state.dnsProvider]] })] }), state.infrastructureMode === 'existing' && (_jsx(Box, { marginTop: 1, borderStyle: "round", borderColor: "yellow", paddingX: 1, children: _jsx(Text, { color: "yellow", children: "Note: Auto-DNS requires external-dns with proper IAM credentials in your cluster." }) }))] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", dimColor: true, children: "Esc to go back \u2022 Enter to continue" }) })] }));
+    const ProgressSummary = () => (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [domain && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: "\u2713" }), _jsxs(Text, { color: "gray", children: [" Domain: ", domain] })] })), adminEmail && subStep !== 'admin-email' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: "\u2713" }), _jsxs(Text, { color: "gray", children: [" Admin: ", adminEmail] })] }))] }));
+    return (_jsxs(BorderBox, { title: "Domain & DNS", children: [subStep === 'domain' && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Enter your Rulebricks domain:" }), _jsx(Text, { color: "gray", dimColor: true, children: "This is where Rulebricks will be accessible (e.g., rulebricks.example.com)" }), _jsx(Box, { marginTop: 1, children: _jsx(TextInput, { value: domain, onChange: setDomain, onSubmit: handleDomainSubmit, placeholder: "rulebricks.example.com" }) }), error && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", children: ["\u2717 ", error] }) }))] })), subStep === 'validating' && (_jsx(Box, { flexDirection: "column", marginY: 1, children: _jsx(Spinner, { label: "Validating domain..." }) })), subStep === 'admin-email' && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { children: "Enter the admin email address:" }), _jsx(Text, { color: "gray", dimColor: true, children: "Used for Rulebricks administration, notifications, and TLS certificate (Let's Encrypt) notices" }), _jsx(Box, { marginTop: 1, children: _jsx(TextInput, { value: adminEmail, onChange: setAdminEmail, onSubmit: handleAdminEmailSubmit, placeholder: "admin@example.com" }) }), _jsx(ProgressSummary, {}), error && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", children: ["\u2717 ", error] }) }))] })), subStep === 'dns-provider' && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { bold: true, children: "Where is your domain's DNS hosted?" }), _jsx(Text, { color: "gray", dimColor: true, children: "This determines whether we can automatically manage DNS records for you" }), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: DNS_PROVIDER_OPTIONS, onSelect: handleDnsProviderSelect, itemComponent: ({ isSelected, label }) => (_jsx(Text, { color: isSelected ? colors.accent : undefined, children: label })) }) }), _jsx(ProgressSummary, {})] })), subStep === 'dns-auto-manage' && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Text, { bold: true, children: "Automatic DNS Management" }), _jsx(Text, { color: "gray", dimColor: true, children: "Would you like Rulebricks to automatically create and manage DNS records?" }), _jsx(Text, { color: "gray", dimColor: true, children: "This enables single-step deployment without manual DNS configuration." }), _jsx(Box, { marginTop: 1, children: _jsx(SelectInput, { items: AUTO_MANAGE_OPTIONS, onSelect: handleAutoManageSelect, itemComponent: ({ isSelected, label }) => (_jsx(Text, { color: isSelected ? colors.accent : undefined, children: label })) }) }), _jsx(ProgressSummary, {}), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "green", children: "\u2713" }), _jsxs(Text, { color: "gray", children: [" DNS Provider: ", DNS_PROVIDER_NAMES[state.dnsProvider]] })] }), _jsx(Box, { marginTop: 1, borderStyle: "round", borderColor: "yellow", paddingX: 1, children: _jsx(Text, { color: "yellow", children: "Note: Auto-DNS requires external-dns with proper IAM credentials in your cluster." }) })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", dimColor: true, children: "Esc to go back \u2022 Enter to continue" }) })] }));
 }

package/dist/components/Wizard/steps/ExternalServicesStep.d.ts

@@ -0,0 +1,6 @@
+interface ExternalServicesStepProps {
+    onComplete: () => void;
+    onBack: () => void;
+}
+export declare function ExternalServicesStep({ onComplete, onBack, }: ExternalServicesStepProps): import("react/jsx-runtime").JSX.Element;
+export {};