unoverse 0.1.55 → 0.1.57

package/operator/lib/deploy.sh

@@ -35,25 +35,83 @@ cmd_deploy() {
     pick_option "DigitalOcean" "AWS"
     [ "$PICKED" = "1" ] && cloud=aws || cloud=digitalocean
     echo ""
-    cmd_ground "$([ "$cloud" = "aws" ] && echo aws || echo do)" || {
+    # An existing tfvars is PROGRESS, not a conflict: the previous run wrote it. Only
+    # a missing file needs the ground; either way the flow continues below.
+    if [ -f "$ROOT/infra/$cloud/terraform.tfvars" ]; then
+      ok "Using your existing infra/$cloud/terraform.tfvars"
+    else
+      cmd_ground "$([ "$cloud" = "aws" ] && echo aws || echo do)" || {
+        echo ""
+        info "Once that is sorted, run ${BOLD}unoverse deploy${NC} again. It picks up right here."
+        echo ""
+        exit 1
+      }
+    fi
+    echo ""
+    ok "Your $cloud ground is prefilled ${DIM}(infra/$cloud/terraform.tfvars)${NC}"
+
+    # FILL THE BLANKS OURSELVES. Every FILL_ME the universe already knows (.env from
+    # setup) is copied in silently; only genuine unknowns are asked. Hand-copying
+    # values between our own files is not a step a developer should ever see.
+    local tfv="$ROOT/infra/$cloud/terraform.tfvars"
+    _tf_put() {  # key value — safe replacement via node (values may hold sed specials)
+      node -e 'const fs=require("fs");const[f,k,v]=process.argv.slice(1);let s=fs.readFileSync(f,"utf8");s=s.replace(new RegExp("^"+k+"(\\s*)=\\s*\"FILL_ME\"","m"),k+"$1= "+JSON.stringify(v));fs.writeFileSync(f,s)' "$tfv" "$1" "$2"
+    }
+    _tf_fill() {  # key envname prompt
+      local key="$1" envname="$2" prompt="$3" val
+      grep -q "^${key}[[:space:]]*=[[:space:]]*\"FILL_ME\"" "$tfv" 2>/dev/null || return 0
+      val=$(grep "^${envname}=" "$ROOT/.env" 2>/dev/null | head -1 | cut -d= -f2-)
+      if [ -n "$val" ]; then
+        _tf_put "$key" "$val"
+        ok "$key ${DIM}from your .env${NC}"
+      else
+        read -r -p "  $prompt: " val
+        [ -n "$val" ] && _tf_put "$key" "$val"
+      fi
+    }
+    echo ""
+    _tf_fill docr_token     DOCR_TOKEN     "Registry access token (from your Unoverse admin)"
+    _tf_fill openai_api_key OPENAI_API_KEY "OPENAI_API_KEY (powers the platform's AI)"
+    if grep -q '^auth_issuer[[:space:]]*=[[:space:]]*"FILL_ME"' "$tfv" 2>/dev/null; then
+      local env_auth
+      env_auth=$(grep "^AUTH_ISSUER=" "$ROOT/.env" 2>/dev/null | cut -d= -f2-)
+      if [ -z "$env_auth" ]; then
+        echo ""
+        info "A deployed universe requires a login. Local auth-off does not deploy"
+        info "${DIM}(Auth0 or any OIDC provider; the issuer looks like https://your-tenant.auth0.com)${NC}"
+      fi
+    fi
+    _tf_fill auth_issuer    AUTH_ISSUER    "AUTH_ISSUER"
+    _tf_fill auth_client_id AUTH_CLIENT_ID "AUTH_CLIENT_ID"
+
+    if grep -q "FILL_ME" "$tfv" 2>/dev/null; then
       echo ""
-      info "Once that is sorted, run ${BOLD}unoverse deploy${NC} again. It picks up right here."
+      warn "Some values are still blank in ${BOLD}infra/$cloud/terraform.tfvars${NC} — fill them, then:"
+      info "  cd infra/$cloud && terraform init && terraform apply"
+      info "  cd ../.. && unoverse deploy"
       echo ""
       exit 1
-    }
-    echo ""
-    ok "Your $cloud ground is prefilled ${DIM}(infra/$cloud/terraform.tfvars)${NC}"
+    fi
+    ok "terraform.tfvars is complete"
+
+    # PROVISION FROM RIGHT HERE, if wanted. terraform apply prints its plan and asks
+    # for its own explicit yes — creating billable infrastructure stays a deliberate,
+    # visible act, it just no longer requires leaving the flow.
     echo ""
-    local step=1
-    if grep -q "FILL_ME" "$ROOT/infra/$cloud/terraform.tfvars" 2>/dev/null; then
-      info "$step. Fill in each FILL_ME value: ${BOLD}infra/$cloud/terraform.tfvars${NC}"
-      step=$((step+1))
+    local REPLY
+    read -r -p "  Provision now? terraform runs here and shows its plan first. [Y/n] " REPLY
+    if [[ "$REPLY" =~ ^[Nn]$ ]]; then
+      info "When ready:  cd infra/$cloud && terraform init && terraform apply && cd ../.. && unoverse deploy"
+      exit 0
     fi
-    info "$step. ${BOLD}cd infra/$cloud && terraform init && terraform apply${NC}   ${DIM}creates the server (billable)${NC}"
-    step=$((step+1))
-    info "$step. ${BOLD}cd ../.. && unoverse deploy${NC}   ${DIM}ships the platform onto it${NC}"
+    command -v terraform >/dev/null 2>&1 || { fail "terraform is not installed"; info "  brew install terraform"; exit 1; }
+    terraform -chdir="$ROOT/infra/$cloud" init -input=false >/dev/null 2>&1 || { fail "terraform init failed"; exit 1; }
+    terraform -chdir="$ROOT/infra/$cloud" apply || { fail "apply did not complete. Re-run: unoverse deploy"; exit 1; }
+    echo ""
+    ok "Infrastructure is up. Shipping the platform onto it..."
     echo ""
-    exit 0
+    cmd_deploy init
+    return $?
   fi
 
   # Read deploy target from .env.production

package/package.json

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