Make devsession region specific for cleanup to work properly

Signed-off-by: Darren Shepherd <darren@acorn.io>
acorn-io · Aug 5, 2023 · 96d1c00 · 96d1c00
1 parent 7f7fd41
commit 96d1c00
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/pkg/apis/internal.acorn.io/v1/devsession.go b/pkg/apis/internal.acorn.io/v1/devsession.go
@@ -20,7 +20,12 @@ type DevSessionInstance struct {
 	Status DevSessionInstanceStatus `json:"status,omitempty"`
 }
 
+func (in *DevSessionInstance) HasRegion(region string) bool {
+	return in.Spec.Region == region
+}
+
 type DevSessionInstanceSpec struct {
+	Region                string                   `json:"region,omitempty"`
 	Client                DevSessionInstanceClient `json:"client,omitempty"`
 	SessionTimeoutSeconds int32                    `json:"sessionTimeoutSeconds,omitempty"`
 	SessionStartTime      metav1.Time              `json:"sessionStartTime,omitempty"`

diff --git a/pkg/client/app.go b/pkg/client/app.go
@@ -230,6 +230,7 @@ func (c *DefaultClient) appUpdate(ctx context.Context, name string, opts *AppUpd
 				SessionStartTime:      metav1.Now(),
 				SessionRenewTime:      metav1.Now(),
 				SpecOverride:          &app.Spec,
+				Region:                app.GetRegion(),
 			},
 		}))
 	}

diff --git a/pkg/openapi/generated/openapi_generated.go b/pkg/openapi/generated/openapi_generated.go
diff --git a/pkg/server/registry/apigroups/acorn/devsessions/strategy.go b/pkg/server/registry/apigroups/acorn/devsessions/strategy.go
@@ -31,6 +31,12 @@ func (v *Validator) Validate(ctx context.Context, obj runtime.Object) (result fi
 		return
 	}
 
+	if devSession.Spec.Region != app.GetRegion() {
+		result = append(result, field.Invalid(field.NewPath("spec", "region"), devSession.Name,
+			"Region on devSession and app must match"))
+		return
+	}
+
 	if devSession.Spec.SpecOverride == nil {
 		return nil
 	}