refactor(shared): rename Org to Instance

shared/models/instance.go

@@ -0,0 +1,23 @@
+// Package models holds the MongoDB documents written by more than one Vantage
+// service. Documents only the control plane touches stay in
+// server/internal/models.
+package models
+
+import (
+	"time"
+
+	"go.mongodb.org/mongo-driver/v2/bson"
+)
+
+// Instance is one deployment of Vantage: its own subdomain, users, servers,
+// keys, workflows, monitors and secrets. It is the unit a licence attaches to.
+//
+// A paying customer may hold several. That grouping is called an Account and
+// lives only in the admin control plane — this service never sees it.
+type Instance struct {
+	ID         bson.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
+	InstanceID string        `bson:"instance_id" json:"instance_id"`
+	Name       string        `bson:"name" json:"name"`
+	Slug       string        `bson:"slug" json:"slug"`
+	CreatedAt  time.Time     `bson:"created_at" json:"created_at"`
+}

shared/models/org.go

@@ -1,18 +0,0 @@
-// Package models holds the MongoDB documents written by more than one Vantage
-// service. Documents only the control plane touches stay in
-// server/internal/models.
-package models
-
-import (
-	"time"
-
-	"go.mongodb.org/mongo-driver/v2/bson"
-)
-
-type Org struct {
-	ID        bson.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
-	OrgID     string        `bson:"org_id" json:"org_id"`
-	Name      string        `bson:"name" json:"name"`
-	Slug      string        `bson:"slug" json:"slug"`
-	CreatedAt time.Time     `bson:"created_at" json:"created_at"`
-}

shared/models/settings.go

@@ -30,11 +30,11 @@ type SecretsSettings struct {
 }
 
 type Settings struct {
-	ID      bson.ObjectID   `bson:"_id,omitempty" json:"-"`
-	OrgID   string          `bson:"org_id" json:"org_id"`
-	Alerts  AlertSettings   `bson:"alerts" json:"alerts"`
-	Email   EmailSettings   `bson:"email" json:"email"`
-	Secrets SecretsSettings `bson:"secrets" json:"secrets"`
+	ID         bson.ObjectID   `bson:"_id,omitempty" json:"-"`
+	InstanceID string          `bson:"instance_id" json:"instance_id"`
+	Alerts     AlertSettings   `bson:"alerts" json:"alerts"`
+	Email      EmailSettings   `bson:"email" json:"email"`
+	Secrets    SecretsSettings `bson:"secrets" json:"secrets"`
 
 	WorkflowLogRetentionDays *int `bson:"workflow_log_retention_days,omitempty" json:"workflow_log_retention_days,omitempty"`
 }

shared/models/user.go

@@ -23,7 +23,7 @@ func ValidRole(role string) bool {
 type User struct {
 	ID           bson.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
 	UserID       string        `bson:"user_id" json:"user_id"`
-	OrgID        string        `bson:"org_id" json:"org_id"`
+	InstanceID   string        `bson:"instance_id" json:"instance_id"`
 	Email        string        `bson:"email" json:"email"`
 	PasswordHash string        `bson:"password_hash,omitempty" json:"-"`
 	Role         string        `bson:"role" json:"role"`