feat(store): persist instance Source for engine-routed teardown

Author: juicycleff

store/mongo/models.go

@@ -69,21 +69,22 @@ func fromTenantModel(m *tenantModel) *admin.Tenant {
 type instanceModel struct {
 	grove.BaseModel `grove:"table:cp_instances"`
 
-	ID           string                 `bson:"_id"                    grove:"id,pk"`
-	TenantID     string                 `bson:"tenant_id"              grove:"tenant_id"`
-	Slug         string                 `bson:"slug"                   grove:"slug"`
-	Name         string                 `bson:"name"                   grove:"name"`
-	State        string                 `bson:"state"                  grove:"state"`
-	ProviderName string                 `bson:"provider_name"          grove:"provider_name"`
-	ProviderRef  string                 `bson:"provider_ref,omitempty" grove:"provider_ref"`
-	Region       string                 `bson:"region,omitempty"       grove:"region"`
-	Kind         string                 `bson:"kind,omitempty"         grove:"kind"`
-	Services     []provider.ServiceSpec `bson:"services,omitempty"     grove:"services"`
-	ServiceRefs  map[string]string      `bson:"service_refs,omitempty" grove:"service_refs"`
-	Endpoints    []endpointModel        `bson:"endpoints,omitempty"    grove:"endpoints"`
-	Labels       map[string]string      `bson:"labels,omitempty"       grove:"labels"`
-	CreatedAt    time.Time              `bson:"created_at"             grove:"created_at"`
-	UpdatedAt    time.Time              `bson:"updated_at"             grove:"updated_at"`
+	ID           string                    `bson:"_id"                    grove:"id,pk"`
+	TenantID     string                    `bson:"tenant_id"              grove:"tenant_id"`
+	Slug         string                    `bson:"slug"                   grove:"slug"`
+	Name         string                    `bson:"name"                   grove:"name"`
+	State        string                    `bson:"state"                  grove:"state"`
+	ProviderName string                    `bson:"provider_name"          grove:"provider_name"`
+	ProviderRef  string                    `bson:"provider_ref,omitempty" grove:"provider_ref"`
+	Region       string                    `bson:"region,omitempty"       grove:"region"`
+	Kind         string                    `bson:"kind,omitempty"         grove:"kind"`
+	Services     []provider.ServiceSpec    `bson:"services,omitempty"     grove:"services"`
+	ServiceRefs  map[string]string         `bson:"service_refs,omitempty" grove:"service_refs"`
+	Endpoints    []endpointModel           `bson:"endpoints,omitempty"    grove:"endpoints"`
+	Labels       map[string]string         `bson:"labels,omitempty"       grove:"labels"`
+	Source       provider.DeploymentSource `bson:"source,omitempty"`
+	CreatedAt    time.Time                 `bson:"created_at"             grove:"created_at"`
+	UpdatedAt    time.Time                 `bson:"updated_at"             grove:"updated_at"`
 }
 
 // endpointModel is the bson form of provider.Endpoint.
@@ -110,6 +111,7 @@ func toInstanceModel(inst *instance.Instance) *instanceModel {
 		ServiceRefs:  inst.ServiceRefs,
 		Endpoints:    toEndpointModels(inst.Endpoints),
 		Labels:       inst.Labels,
+		Source:       inst.Source,
 		CreatedAt:    inst.CreatedAt,
 		UpdatedAt:    inst.UpdatedAt,
 	}
@@ -134,6 +136,7 @@ func fromInstanceModel(m *instanceModel) *instance.Instance {
 		ServiceRefs:  m.ServiceRefs,
 		Endpoints:    fromEndpointModels(m.Endpoints),
 		Labels:       m.Labels,
+		Source:       m.Source,
 	}
 
 	return out

store/postgres/models.go

@@ -54,6 +54,7 @@ type instanceModel struct {
 	Config       []byte    `grove:"config,type:jsonb"`
 	Metadata     []byte    `grove:"metadata,type:jsonb"`
 	Endpoints    []byte    `grove:"endpoints,type:jsonb"`
+	Source       []byte    `grove:"source,type:jsonb"`
 	CreatedAt    time.Time `grove:"created_at,notnull"`
 	UpdatedAt    time.Time `grove:"updated_at,notnull"`
 }
@@ -300,6 +301,7 @@ func toInstanceModel(inst *instance.Instance) *instanceModel {
 		ServiceRefs:  marshalJSONB(inst.ServiceRefs),
 		Labels:       marshalJSONB(inst.Labels),
 		Endpoints:    marshalJSONB(inst.Endpoints),
+		Source:       marshalJSONB(inst.Source),
 		CreatedAt:    inst.CreatedAt,
 		UpdatedAt:    inst.UpdatedAt,
 	}
@@ -326,6 +328,7 @@ func fromInstanceModel(m *instanceModel) *instance.Instance {
 	unmarshalJSONB(m.ServiceRefs, &out.ServiceRefs)
 	unmarshalJSONB(m.Labels, &out.Labels)
 	unmarshalJSONB(m.Endpoints, &out.Endpoints)
+	unmarshalJSONB(m.Source, &out.Source)
 
 	return out
 }

store/sqlite/models.go

@@ -54,6 +54,7 @@ type instanceModel struct {
 	Endpoints    []byte    `grove:"endpoints"`
 	Config       []byte    `grove:"config"`
 	Metadata     []byte    `grove:"metadata"`
+	Source       []byte    `grove:"source"`
 	CreatedAt    time.Time `grove:"created_at,notnull"`
 	UpdatedAt    time.Time `grove:"updated_at,notnull"`
 }
@@ -300,6 +301,7 @@ func toInstanceModel(inst *instance.Instance) *instanceModel {
 		ServiceRefs:  marshalJSON(inst.ServiceRefs),
 		Labels:       marshalJSON(inst.Labels),
 		Endpoints:    marshalJSON(inst.Endpoints),
+		Source:       marshalJSON(inst.Source),
 		CreatedAt:    inst.CreatedAt,
 		UpdatedAt:    inst.UpdatedAt,
 	}
@@ -326,6 +328,7 @@ func fromInstanceModel(m *instanceModel) *instance.Instance {
 	unmarshalJSON(m.ServiceRefs, &out.ServiceRefs)
 	unmarshalJSON(m.Labels, &out.Labels)
 	unmarshalJSON(m.Endpoints, &out.Endpoints)
+	unmarshalJSON(m.Source, &out.Source)
 
 	return out
 }