unoverse 0.1.89 → 0.1.91

package/operator/infra/digitalocean/main.tf

@@ -381,9 +381,15 @@ resource "digitalocean_project" "universe" {
   description = "unoverse universe: ${var.name}"
   purpose     = "Web Application"
   environment = var.size == "small" ? "Development" : "Production"
+  # EVERY resource this stack creates, or the dashboard lies. The Canvas load balancer was
+  # added without being listed here, so it stayed in the account's default project while
+  # the rest of the universe sat in this one: two views each reporting "LOAD BALANCERS (1)"
+  # and no single place showing what this universe actually is. Anything added below must
+  # be added here in the same commit.
   resources = compact([
     digitalocean_droplet.app.urn,
     digitalocean_loadbalancer.public.urn,
+    local.has_domain && var.canvas_public ? digitalocean_loadbalancer.canvas[0].urn : "",
     digitalocean_database_cluster.redis.urn,
     local.provision_pg ? digitalocean_database_cluster.pg[0].urn : "",
   ])

package/operator/lib/deploy.sh

@@ -441,12 +441,26 @@ _ground_apply() {
 
   if [ "$summary_rc" = "3" ]; then
     local REPLY
+    # ENTER GOES AHEAD, ESC STOPS. This asked for a typed `y` and made Enter mean "stop",
+    # which is the opposite of every other prompt in this CLI — the developer who has just
+    # read the plan and decided has to break the habit of the whole tool to act on it. One
+    # meaning for Enter throughout, and the escape hatch is the key literally named for it.
     echo -e "  ${RED}This removes or rebuilds things that already exist.${NC}"
-    read -r -p "  Type y to go ahead, or Enter to stop: " REPLY
-    if [[ ! "$REPLY" =~ ^[Yy]$ ]]; then
+    echo ""
+    echo -e "  ${DIM}Enter to go ahead   ·   Esc to stop${NC}"
+    printf "  "
+    local key=""
+    if [ -t 0 ]; then
+      IFS= read -r -s -n 1 key
+    fi
+    # \e is Escape; anything else typed (n, q, a stray letter) also stops, because only a
+    # deliberate empty Enter should destroy something.
+    if [ -n "$key" ]; then
+      echo ""
       info "Nothing was changed. Run ${BOLD}unoverse deploy${NC} when you are ready"
       rm -rf "$tmp"; return 1
     fi
+    echo ""
   fi
 
   echo ""

package/operator/lib/ground.sh

@@ -13,6 +13,31 @@ _ground_my_ip() {
   curl -s --max-time 5 https://api.ipify.org 2>/dev/null || curl -s --max-time 5 https://ifconfig.me 2>/dev/null
 }
 
+# A GROUND WRITES SECRETS TO DISK, so the ignore rule ships with the ground itself.
+#
+# terraform.tfvars holds the database URL, the registry token and every service key; the
+# state file holds those plus everything Terraform generated, in plain text. The platform
+# repo has ignored them since the grounds landed. A universe scaffolded by the CLI did not,
+# because its .gitignore comes from the starter — which only changes when the starter is
+# re-synced and pushed, long after somebody's first `git init && git add .`.
+#
+# Fixing it here means the rule exists the moment the file it protects does, on every
+# universe, without waiting for a starter release. Idempotent: it appends only what is
+# missing, and never rewrites a line the developer put there.
+_ground_protect_secrets() {
+  local gi="$ROOT/.gitignore" rule
+  [ -f "$gi" ] || : > "$gi"
+  local added=0
+  for rule in 'infra/**/.terraform/' 'infra/**/*.tfstate*' 'infra/**/terraform.tfvars' '.unoverse/'; do
+    grep -qxF "$rule" "$gi" 2>/dev/null && continue
+    [ "$added" = "0" ] && printf '\n# Terraform (infra/*) — state and vars carry secrets\n' >> "$gi"
+    printf '%s\n' "$rule" >> "$gi"
+    added=1
+  done
+  [ "$added" = "1" ] && ok "Added the terraform files to .gitignore ${DIM}(they hold your database URL and keys)${NC}"
+  return 0
+}
+
 # THE UNIVERSE HAS A NAME, so ask for one. This file used to write name = "universe-poc"
 # as a literal, so every universe on every account carried the same placeholder — it names
 # the droplet, the cache, the load balancer and the cloud project, and the developer first
@@ -132,6 +157,7 @@ _ground_do() {
     echo ""
     echo -e "  ${DIM}Regions available to you: $regions${NC}"
   fi
+  _ground_protect_secrets
   _ground_identity "$regions"
 
   cat > "$out" <<EOF
@@ -232,6 +258,7 @@ _ground_aws() {
   fi
 
   # Region already came from the AWS CLI's own configuration, so only the name is asked.
+  _ground_protect_secrets
   _ground_identity "-"
 
   cat > "$out" <<EOF

package/operator/lib/tfsummary.mjs

@@ -71,6 +71,17 @@ function describe(r) {
         price: PRICE[a.size],
       };
     }
+    // NEVER "SUPPORTING". These were counted as plumbing, which is fair when they are being
+    // created alongside the cluster they live on — and badly wrong on a REPLACE, where a
+    // dropped and recreated database takes its contents with it. "plus 1 supporting
+    // resource (users, rules, keys)" is not something anyone reads as "your data is about
+    // to be deleted". Naming them costs one line and makes that impossible to miss.
+    case "digitalocean_database_db":
+      return { what: "Database", detail: a.name ? `${a.name} — its contents live here` : "" };
+    case "digitalocean_database_user":
+      return { what: "Database user", detail: a.name ?? "" };
+    case "digitalocean_database_connection_pool":
+      return { what: "Connection pool", detail: a.name ?? "" };
     case "digitalocean_loadbalancer":
       return { what: "Load balancer", detail: "the public way in", price: PRICE.lb };
     case "digitalocean_firewall":
@@ -168,7 +179,11 @@ process.stdin.on("end", () => {
     plan.planned_values?.outputs?.monthly_estimate?.value ??
     plan.outputs?.monthly_estimate?.value;
   const monthly = ground ?? Object.values(groups).flat().reduce((sum, d) => sum + (d.price ?? 0), 0);
+  // THE TOTAL, NOT THE PRICE OF THIS CHANGE. `monthly_estimate` is what the whole universe
+  // costs to run, and printing it under a change list read as the bill for that change:
+  // a one-line firewall update appeared to cost $135. Say which number this is.
   if (monthly) {
+    out.push(`  ${dim("Running total for the whole universe, not the cost of this change:")}`);
     out.push(`  ${bold("Roughly")} ${bold(`$${monthly}/month`)} ${dim("at your provider's current prices, billed by them, not by unoverse")}`);
     out.push("");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoverse",
-  "version": "0.1.89",
+  "version": "0.1.91",
   "description": "The Unoverse front door — create a Studio project, a universe, or a client app, and launch Studio.",
   "license": "SEE LICENSE IN README.md",
   "type": "module",