review comments

Author: dgrove-oss

support/appwrapper.go

@@ -20,15 +20,16 @@ import (
 	"github.com/onsi/gomega"
 	mcadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
 
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
 var appWrapperResource = mcadv1beta2.GroupVersion.WithResource("appwrappers")
 
-func AppWrapper(t Test, namespace string, name string) func(g gomega.Gomega) *mcadv1beta2.AppWrapper {
+func AppWrapper(t Test, namespace *corev1.Namespace, name string) func(g gomega.Gomega) *mcadv1beta2.AppWrapper {
 	return func(g gomega.Gomega) *mcadv1beta2.AppWrapper {
-		unstruct, err := t.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace).Get(t.Ctx(), name, metav1.GetOptions{})
+		unstruct, err := t.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace.Name).Get(t.Ctx(), name, metav1.GetOptions{})
 		g.Expect(err).NotTo(gomega.HaveOccurred())
 		aw := &mcadv1beta2.AppWrapper{}
 		err = runtime.DefaultUnstructuredConverter.FromUnstructured(unstruct.UnstructuredContent(), aw)
@@ -37,14 +38,14 @@ func AppWrapper(t Test, namespace string, name string) func(g gomega.Gomega) *mc
 	}
 }
 
-func GetAppWrapper(t Test, namespace string, name string) *mcadv1beta2.AppWrapper {
+func GetAppWrapper(t Test, namespace *corev1.Namespace, name string) *mcadv1beta2.AppWrapper {
 	t.T().Helper()
 	return AppWrapper(t, namespace, name)(t)
 }
 
-func AppWrappers(t Test, namespace string) func(g gomega.Gomega) []*mcadv1beta2.AppWrapper {
+func AppWrappers(t Test, namespace *corev1.Namespace) func(g gomega.Gomega) []*mcadv1beta2.AppWrapper {
 	return func(g gomega.Gomega) []*mcadv1beta2.AppWrapper {
-		aws, err := t.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace).List(t.Ctx(), metav1.ListOptions{})
+		aws, err := t.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace.Name).List(t.Ctx(), metav1.ListOptions{})
 		g.Expect(err).NotTo(gomega.HaveOccurred())
 
 		awsp := []*mcadv1beta2.AppWrapper{}

support/appwrapper_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/onsi/gomega"
 	mcadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
 
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -15,21 +16,21 @@ func TestGetAppWrapper(t *testing.T) {
 	test := NewTest(t)
 
 	name := "my-appwrapper-1"
-	namespace := "my-namespace-1"
+	namespace := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "my-namespace-1"}}
 	aw := &mcadv1beta2.AppWrapper{
-		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace.Name},
 		Status:     mcadv1beta2.AppWrapperStatus{Phase: mcadv1beta2.AppWrapperRunning},
 	}
 	awMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(aw)
 	test.Expect(err).NotTo(gomega.HaveOccurred())
 	unstruct := unstructured.Unstructured{Object: awMap}
 
-	_, err = test.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace).Create(test.ctx, &unstruct, metav1.CreateOptions{})
+	_, err = test.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace.Name).Create(test.ctx, &unstruct, metav1.CreateOptions{})
 	test.Expect(err).NotTo(gomega.HaveOccurred())
 
 	aw2 := GetAppWrapper(test, namespace, name)
 	test.Expect(aw2.Name).To(gomega.Equal(name))
-	test.Expect(aw2.Namespace).To(gomega.Equal(namespace))
+	test.Expect(aw2.Namespace).To(gomega.Equal(namespace.Name))
 	test.Expect(AppWrapperName(aw2)).To(gomega.Equal(name))
 	test.Expect(AppWrapperPhase(aw)).To(gomega.Equal(mcadv1beta2.AppWrapperRunning))
 }