unoverse 0.1.130 → 0.1.132

package/operator/lib/deploy.sh

@@ -41,8 +41,12 @@
 # exists because the opposite mistake is what wiped this exact cluster's firewall once
 # already: an authoritative write that assumed the whole list was ours to own.
 _operator_db_access() {
-  local cloud="$1" dir="$ROOT/infra/$cloud" cluster
-  cluster=$(grep -E '^existing_pg_cluster_name[[:space:]]*=' "$dir/terraform.tfvars" 2>/dev/null | sed -E 's/.*"([^"]+)".*/\1/')
+  # `$2` is the cluster, when the CALLER already knows it. The monorepo has no ground to
+  # read one from — it develops against a cluster named only in .env — so re-deriving it
+  # from terraform.tfvars here meant this returned 0 and did nothing in the one place the
+  # developer actually types `npm run dev`.
+  local cloud="$1" dir="$ROOT/infra/$cloud" cluster="${2:-}"
+  [ -n "$cluster" ] || cluster=$(grep -E '^existing_pg_cluster_name[[:space:]]*=' "$dir/terraform.tfvars" 2>/dev/null | sed -E 's/.*"([^"]+)".*/\1/')
   [ -n "$cluster" ] || return 0
   [ -n "${DIGITALOCEAN_TOKEN:-}" ] || return 0
   mkdir -p "$ROOT/.unoverse"
@@ -103,13 +107,26 @@ NODE
 # database.
 cmd_db_allow() {
   local cloud
-  SELF_CMD="unoverse db-allow" cloud=$(_pick_ground "${1:-}") || {
-    [ -z "${1:-}" ] && [ ! -d "$ROOT/infra" ] && fail "No ground here. There is no database to reach"
-    return 1
-  }
+  # DIGITALOCEAN ONLY, and it is not an oversight. This joins a MANAGED DATABASE's
+  # trusted-source list through the DO API, and AWS has no equivalent to join: RDS
+  # reachability is a VPC security group, owned by Terraform and changed by `deploy`, not by
+  # a developer's laptop asking an API at runtime. Offering `db-allow aws` produced a
+  # ground-picker prompt for a cloud that would then have done nothing.
+  # A GROUND IS OPTIONAL HERE. This used to `return 1` the moment the picker found none,
+  # which made the .env fallback below unreachable in the monorepo — the one checkout that
+  # has no ground and the one the fallback was written for. Only ask the picker when there
+  # is something to pick, so an ambiguous two-ground universe still stops, while a
+  # groundless checkout proceeds to look the cluster up where it actually knows it.
+  cloud=""
+  if ls "$ROOT"/infra/*/terraform.tfvars >/dev/null 2>&1; then
+    SELF_CMD="unoverse db-allow" \
+    GROUNDS_ONLY="digitalocean" \
+    GROUNDS_ONLY_WHY="On AWS the database is reached through its VPC security group, which the ground owns — change it in infra/aws and run ${BOLD}unoverse deploy aws${NC}." \
+    cloud=$(_pick_ground "${1:-}") || return 1
+  fi
 
-  local cluster
-  cluster=$(grep -E '^existing_pg_cluster_name[[:space:]]*=' "$ROOT/infra/$cloud/terraform.tfvars" 2>/dev/null | sed -E 's/.*"([^"]+)".*/\1/')
+  local cluster=""
+  [ -n "$cloud" ] && cluster=$(grep -E '^existing_pg_cluster_name[[:space:]]*=' "$ROOT/infra/$cloud/terraform.tfvars" 2>/dev/null | sed -E 's/.*"([^"]+)".*/\1/')
 
   # THE MONOREPO NEEDS THIS TOO, and it has no ground. The platform's own checkout is
   # developed against a managed cluster named only in .env, so a ground-only lookup found
@@ -139,7 +156,9 @@ cmd_db_allow() {
   fi
 
   echo ""
-  _operator_db_access "$cloud"
+  # Hand the cluster over: we already resolved it, from a ground OR from .env, and the
+  # helper cannot re-derive the .env case (there is no tfvars to read).
+  _operator_db_access "$cloud" "$cluster"
   echo ""
   info "Run this again whenever you change network"
   echo ""
@@ -210,11 +229,23 @@ _pick_ground() {
     *) fail "Unknown ground '$want'. Use ${BOLD}digitalocean${NC} or ${BOLD}aws${NC}" >&2; return 1 ;;
   esac
 
+  # A command may not apply to every cloud. `GROUNDS_ONLY` names the ones it does, so a
+  # ground that cannot answer is never offered as a choice and never named in the
+  # "say which" prompt. Unset means all of them, which is every other caller.
   local configured=()
   for g in digitalocean aws; do
-    [ -f "$ROOT/infra/$g/terraform.tfvars" ] && configured+=("$g")
+    [ -f "$ROOT/infra/$g/terraform.tfvars" ] || continue
+    if [ -n "${GROUNDS_ONLY:-}" ] && [[ " ${GROUNDS_ONLY} " != *" $g "* ]]; then continue; fi
+    configured+=("$g")
   done
 
+  # Asked for a ground this command cannot serve: say so plainly rather than "no such
+  # ground here", which sends someone off to create one that would not have helped.
+  if [ -n "$want" ] && [ -n "${GROUNDS_ONLY:-}" ] && [[ " ${GROUNDS_ONLY} " != *" $want "* ]]; then
+    fail "${SELF_CMD:-This command} does not apply to $want. ${GROUNDS_ONLY_WHY:-}" >&2
+    return 1
+  fi
+
   if [ -n "$want" ]; then
     for g in "${configured[@]}"; do
       [ "$g" = "$want" ] && { printf '%s' "$want"; return 0; }
@@ -229,7 +260,9 @@ _pick_ground() {
     *)
       # Two grounds and no name. Refuse rather than pick: this decides which cloud a
       # destroy lands on.
-      fail "Two grounds are configured. Say which: ${BOLD}${SELF_CMD:-unoverse deploy} digitalocean${NC} or ${BOLD}${SELF_CMD:-unoverse deploy} aws${NC}" >&2
+      # Names the grounds THIS command can actually serve, not both clouds unconditionally:
+      # offering a choice that would be refused is worse than not offering it.
+      fail "Two grounds are configured. Say which: ${BOLD}${SELF_CMD:-unoverse deploy} ${configured[0]}${NC} or ${BOLD}${SELF_CMD:-unoverse deploy} ${configured[1]}${NC}" >&2
       return 1
       ;;
   esac

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoverse",
-  "version": "0.1.130",
+  "version": "0.1.132",
   "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",