unoverse 0.1.68 → 0.1.69

package/operator/lib/tfsummary.mjs

@@ -11,9 +11,14 @@
  * their size, counts the plumbing (database users, firewall rules, generated passwords)
  * rather than listing it, and shouts about anything being destroyed.
  *
- * NOT A COST ORACLE. Prices are DigitalOcean's published monthly rates for the sizes this
- * ground uses, so the developer sees an order of magnitude rather than a surprise. They
+ * NOT A COST ORACLE. The developer sees an order of magnitude rather than a surprise. Rates
  * move, so the total is labelled approximate and the real bill is the provider's.
+ *
+ * THE GROUND PRICES ITSELF. Every ground exposes a `prices` output (its own prices.tf)
+ * keyed by the size slugs it actually uses, and this reads that out of the plan. Keeping
+ * a table here instead meant one more copy to forget: it still quoted t3-series rates
+ * after the AWS ground moved to t4g, so that ground's database and cache priced at zero
+ * and nobody could see it. A ground without the output is simply not priced.
  */
 
 const COLOR = !process.env.NO_COLOR;
@@ -24,14 +29,11 @@ const green = paint("32");
 const red = paint("31");
 const yellow = paint("33");
 
-/** Monthly USD for the sizes these grounds use. Absent size → no guess. */
-const PRICE = {
-  "s-1vcpu-1gb": 6, "s-1vcpu-2gb": 12, "s-2vcpu-2gb": 18, "s-2vcpu-4gb": 24,
-  "s-4vcpu-8gb": 48, "s-4vcpu-16gb-amd": 96, "s-8vcpu-16gb": 96,
-  "db-s-1vcpu-1gb": 15, "db-s-1vcpu-2gb": 30, "db-s-2vcpu-4gb": 60,
-  lb: 12,
-  "t3.large": 60, "t3.xlarge": 120, "db.t3.medium": 50, "cache.t3.micro": 12,
-};
+/**
+ * Monthly USD by size slug, read from the ground's own `prices` output. Empty until the
+ * plan is parsed, and empty stays harmless: every lookup misses and nothing is priced.
+ */
+let PRICE = {};
 
 /** vCPU/RAM read out of a size slug, when it says so. */
 function spec(size) {
@@ -70,7 +72,7 @@ function describe(r) {
     case "aws_elasticache_replication_group":
       return { what: "Redis cache", detail: a.node_type ?? "", price: PRICE[a.node_type] };
     case "aws_lb":
-      return { what: "Load balancer", detail: "the public way in", price: 18 };
+      return { what: "Load balancer", detail: "the public way in", price: PRICE.alb };
     case "aws_cognito_user_pool":
       return { what: "Login (Cognito)", detail: "who may use your universe" };
     case "aws_acm_certificate":
@@ -101,6 +103,16 @@ process.stdin.on("end", () => {
     process.exit(2); // caller falls back to raw terraform output
   }
 
+  // THE GROUND'S OWN NUMBERS, or none. `prices` is an output of infra/<cloud>/prices.tf, so a
+  // planned run carries it under output_changes and an applied one under outputs. A
+  // ground that does not expose it simply prices nothing: an invented figure is worse
+  // than a missing one.
+  PRICE =
+    plan.output_changes?.prices?.after ??
+    plan.planned_values?.outputs?.prices?.value ??
+    plan.outputs?.prices?.value ??
+    {};
+
   const groups = { create: [], update: [], delete: [], replace: [] };
   const supporting = { create: 0, update: 0, delete: 0, replace: 0 };
 
@@ -135,7 +147,12 @@ process.stdin.on("end", () => {
     out.push("");
   }
 
-  const monthly = Object.values(groups).flat().reduce((sum, d) => sum + (d.price ?? 0), 0);
+  // The GROUND's own total when it publishes one (it knows what an adopted database
+  // does not cost); otherwise the sum of what is on screen.
+  const ground = plan.output_changes?.monthly_estimate?.after ??
+    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);
   if (monthly) {
     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.68",
+  "version": "0.1.69",
   "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",