enhance: add handler to set the default cc status field on projects

Signed-off-by: Nick Hale <4175918+njhale@users.noreply.github.com>
acorn-io · Feb 7, 2024 · d8f39d1 · d8f39d1
1 parent b4b66f3
commit d8f39d1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/pkg/controller/routes.go b/pkg/controller/routes.go
@@ -99,7 +99,9 @@ func routes(router *router.Router, cfg *rest.Config, registryTransport http.Roun
 	appRouter.HandlerFunc(appstatus.CLIStatus)
 
 	projectRouter := router.Type(&v1.ProjectInstance{})
-	projectRouter.HandlerFunc(project.SetProjectSupportedRegions)
+	projectRouter.HandlerFunc(project.SetSupportedRegions)
+	projectRouter.HandlerFunc(project.SetDefaultComputeClass)
+
 	// Don't delete the namespace until the project instance is deleted.
 	projectRouter.IncludeFinalizing().HandlerFunc(project.CreateNamespace)
 	projectRouter.FinalizeFunc(labels.Prefix+"project-app-delete", project.EnsureAllAppsRemoved)

diff --git a/pkg/project/handlers.go b/pkg/project/handlers.go
@@ -14,7 +14,20 @@ import (
 	kclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func SetProjectSupportedRegions(req router.Request, resp router.Response) error {
+// SetDefaultComputeClass sets the default compute class status field of a [v1.ProjectInstance] to the value of its spec
+// field if set.
+func SetDefaultComputeClass(req router.Request, resp router.Response) error {
+	project := req.Object.(*v1.ProjectInstance)
+	if cc := project.Spec.DefaultComputeClass; cc != "" &&
+		project.Status.DefaultComputeClass != cc {
+		project.Status.DefaultComputeClass = cc
+	}
+
+	resp.Objects(req.Object)
+	return nil
+}
+
+func SetSupportedRegions(req router.Request, resp router.Response) error {
 	project := req.Object.(*v1.ProjectInstance)
 	project.SetDefaultRegion(apiv1.LocalRegion)
 	if slices.Contains(project.Status.SupportedRegions, apiv1.AllRegions) {

diff --git a/pkg/project/handlers_test.go b/pkg/project/handlers_test.go
@@ -15,10 +15,10 @@ import (
 )
 
 func TestSetProjectSupportedRegions(t *testing.T) {
-	tester.DefaultTest(t, scheme.Scheme, "testdata/setsupportedregions/no-default", SetProjectSupportedRegions)
-	tester.DefaultTest(t, scheme.Scheme, "testdata/setsupportedregions/with-supported-regions", SetProjectSupportedRegions)
-	tester.DefaultTest(t, scheme.Scheme, "testdata/setsupportedregions/with-default-and-supported", SetProjectSupportedRegions)
-	tester.DefaultTest(t, scheme.Scheme, "testdata/setsupportedregions/all-supported-regions-with-default", SetProjectSupportedRegions)
+	tester.DefaultTest(t, scheme.Scheme, "testdata/setsupportedregions/no-default", SetSupportedRegions)
+	tester.DefaultTest(t, scheme.Scheme, "testdata/setsupportedregions/with-supported-regions", SetSupportedRegions)
+	tester.DefaultTest(t, scheme.Scheme, "testdata/setsupportedregions/with-default-and-supported", SetSupportedRegions)
+	tester.DefaultTest(t, scheme.Scheme, "testdata/setsupportedregions/all-supported-regions-with-default", SetSupportedRegions)
 }
 
 func TestCreateNamespace(t *testing.T) {