test: openshift environment using hooks

Author: manusa

pkg/mcp/common_test.go

@@ -93,8 +93,8 @@ func TestMain(m *testing.M) {
 
 type mcpContext struct {
 	profile       Profile
-	before        *func(*mcpContext)
-	after         *func(*mcpContext)
+	before        func(*mcpContext)
+	after         func(*mcpContext)
 	ctx           context.Context
 	tempDir       string
 	cancel        context.CancelFunc
@@ -108,8 +108,11 @@ func (c *mcpContext) beforeEach(t *testing.T) {
 	c.ctx, c.cancel = context.WithCancel(t.Context())
 	c.tempDir = t.TempDir()
 	c.withKubeConfig(nil)
+	if c.profile == nil {
+		c.profile = &FullProfile{}
+	}
 	if c.before != nil {
-		(*c.before)(c)
+		c.before(c)
 	}
 	if c.mcpServer, err = NewSever(Configuration{Profile: c.profile}); err != nil {
 		t.Fatal(err)
@@ -136,7 +139,7 @@ func (c *mcpContext) beforeEach(t *testing.T) {
 
 func (c *mcpContext) afterEach() {
 	if c.after != nil {
-		(*c.after)(c)
+		c.after(c)
 	}
 	c.cancel()
 	c.mcpServer.Close()
@@ -192,8 +195,8 @@ func (c *mcpContext) withEnvTest() {
 }
 
 // inOpenShift sets up the kubernetes environment to seem to be running OpenShift
-func (c *mcpContext) inOpenShift() func() {
-	c.withKubeConfig(envTestRestConfig)
+func inOpenShift(c *mcpContext) {
+	c.withEnvTest()
 	crdTemplate := `
           {
             "apiVersion": "apiextensions.k8s.io/v1",
@@ -209,14 +212,16 @@ func (c *mcpContext) inOpenShift() func() {
               "names": {"plural": "%s","singular": "%s","kind": "%s"}
             }
           }`
-	removeProjects := c.crdApply(fmt.Sprintf(crdTemplate, "projects.project.openshift.io", "project.openshift.io",
+	c.crdApply(fmt.Sprintf(crdTemplate, "projects.project.openshift.io", "project.openshift.io",
 		"Cluster", "projects", "project", "Project"))
-	removeRoutes := c.crdApply(fmt.Sprintf(crdTemplate, "routes.route.openshift.io", "route.openshift.io",
+	c.crdApply(fmt.Sprintf(crdTemplate, "routes.route.openshift.io", "route.openshift.io",
 		"Namespaced", "routes", "route", "Route"))
-	return func() {
-		removeProjects()
-		removeRoutes()
-	}
+}
+
+// inOpenShiftClear clears the kubernetes environment so it no longer seems to be running OpenShift
+func inOpenShiftClear(c *mcpContext) {
+	c.crdDelete("projects.project.openshift.io")
+	c.crdDelete("routes.route.openshift.io")
 }
 
 // newKubernetesClient creates a new Kubernetes client with the envTest kubeconfig
@@ -241,8 +246,8 @@ func (c *mcpContext) newApiExtensionsClient() *apiextensionsv1.ApiextensionsV1Cl
 	return apiextensionsv1.NewForConfigOrDie(envTestRestConfig)
 }
 
-// crdApply creates a CRD from the provided resource string and waits for it to be established, returns a cleanup function
-func (c *mcpContext) crdApply(resource string) func() {
+// crdApply creates a CRD from the provided resource string and waits for it to be established
+func (c *mcpContext) crdApply(resource string) {
 	apiExtensionsV1Client := c.newApiExtensionsClient()
 	var crd = &apiextensionsv1spec.CustomResourceDefinition{}
 	err := json.Unmarshal([]byte(resource), crd)
@@ -251,21 +256,24 @@ func (c *mcpContext) crdApply(resource string) func() {
 		panic(fmt.Errorf("failed to create CRD %v", err))
 	}
 	c.crdWaitUntilReady(crd.Name)
-	return func() {
-		err = apiExtensionsV1Client.CustomResourceDefinitions().Delete(c.ctx, crd.Name, metav1.DeleteOptions{
-			GracePeriodSeconds: ptr.To(int64(0)),
-		})
-		iteration := 0
-		for iteration < 10 {
-			if _, derr := apiExtensionsV1Client.CustomResourceDefinitions().Get(c.ctx, crd.Name, metav1.GetOptions{}); derr != nil {
-				break
-			}
-			time.Sleep(50 * time.Millisecond)
-			iteration++
-		}
-		if err != nil {
-			panic(fmt.Errorf("failed to delete CRD %v", err))
+}
+
+// crdDelete deletes a CRD by name and waits for it to be removed
+func (c *mcpContext) crdDelete(name string) {
+	apiExtensionsV1Client := c.newApiExtensionsClient()
+	err := apiExtensionsV1Client.CustomResourceDefinitions().Delete(c.ctx, name, metav1.DeleteOptions{
+		GracePeriodSeconds: ptr.To(int64(0)),
+	})
+	iteration := 0
+	for iteration < 100 {
+		if _, derr := apiExtensionsV1Client.CustomResourceDefinitions().Get(c.ctx, name, metav1.GetOptions{}); derr != nil {
+			break
 		}
+		time.Sleep(5 * time.Millisecond)
+		iteration++
+	}
+	if err != nil {
+		panic(fmt.Errorf("failed to delete CRD %v", err))
 	}
 }
 

pkg/mcp/namespaces_test.go

@@ -47,9 +47,7 @@ func TestNamespacesList(t *testing.T) {
 }
 
 func TestProjectsListInOpenShift(t *testing.T) {
-	testCase(t, func(c *mcpContext) {
-		defer c.inOpenShift()() // n.b. two sets of parentheses to invoke the first function
-		c.mcpServer.server.AddTools(c.mcpServer.initNamespaces()...)
+	testCaseWithContext(t, &mcpContext{before: inOpenShift, after: inOpenShiftClear}, func(c *mcpContext) {
 		dynamicClient := dynamic.NewForConfigOrDie(envTestRestConfig)
 		_, _ = dynamicClient.Resource(schema.GroupVersionResource{Group: "project.openshift.io", Version: "v1", Resource: "projects"}).
 			Create(c.ctx, &unstructured.Unstructured{Object: map[string]interface{}{

pkg/mcp/pods_test.go

@@ -418,9 +418,7 @@ func TestPodsDelete(t *testing.T) {
 }
 
 func TestPodsDeleteInOpenShift(t *testing.T) {
-	testCase(t, func(c *mcpContext) {
-		// Managed Pod in OpenShift
-		defer c.inOpenShift()() // n.b. two sets of parentheses to invoke the first function
+	testCaseWithContext(t, &mcpContext{before: inOpenShift, after: inOpenShiftClear}, func(c *mcpContext) {
 		managedLabels := map[string]string{
 			"app.kubernetes.io/managed-by": "kubernetes-mcp-server",
 			"app.kubernetes.io/name":       "a-manged-pod-to-delete",
@@ -710,8 +708,7 @@ func TestPodsRun(t *testing.T) {
 }
 
 func TestPodsRunInOpenShift(t *testing.T) {
-	testCase(t, func(c *mcpContext) {
-		defer c.inOpenShift()() // n.b. two sets of parentheses to invoke the first function
+	testCaseWithContext(t, &mcpContext{before: inOpenShift, after: inOpenShiftClear}, func(c *mcpContext) {
 		t.Run("pods_run with image, namespace, and port returns route with port", func(t *testing.T) {
 			podsRunInOpenShift, err := c.callTool("pods_run", map[string]interface{}{"image": "nginx", "port": 80})
 			if err != nil {

pkg/mcp/profiles_test.go

@@ -52,17 +52,10 @@ func TestFullProfileTools(t *testing.T) {
 }
 
 func TestFullProfileToolsInOpenShift(t *testing.T) {
-	var after func(c *mcpContext)
-	before := func(c *mcpContext) {
-		cleanCrds := c.inOpenShift()
-		after = func(_ *mcpContext) {
-			cleanCrds()
-		}
-	}
 	mcpCtx := &mcpContext{
 		profile: &FullProfile{},
-		before:  &before,
-		after:   &after,
+		before:  inOpenShift,
+		after:   inOpenShiftClear,
 	}
 	testCaseWithContext(t, mcpCtx, func(c *mcpContext) {
 		tools, err := c.mcpClient.ListTools(c.ctx, mcp.ListToolsRequest{})