Skip to content

Commit 75efde5

Browse files
review comments
1 parent b4b6d7c commit 75efde5

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

support/appwrapper.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ import (
2020
"github.com/onsi/gomega"
2121
mcadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
2222

23+
corev1 "k8s.io/api/core/v1"
2324
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2425
"k8s.io/apimachinery/pkg/runtime"
2526
)
2627

2728
var appWrapperResource = mcadv1beta2.GroupVersion.WithResource("appwrappers")
2829

29-
func AppWrapper(t Test, namespace string, name string) func(g gomega.Gomega) *mcadv1beta2.AppWrapper {
30+
func AppWrapper(t Test, namespace *corev1.Namespace, name string) func(g gomega.Gomega) *mcadv1beta2.AppWrapper {
3031
return func(g gomega.Gomega) *mcadv1beta2.AppWrapper {
31-
unstruct, err := t.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace).Get(t.Ctx(), name, metav1.GetOptions{})
32+
unstruct, err := t.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace.Name).Get(t.Ctx(), name, metav1.GetOptions{})
3233
g.Expect(err).NotTo(gomega.HaveOccurred())
3334
aw := &mcadv1beta2.AppWrapper{}
3435
err = runtime.DefaultUnstructuredConverter.FromUnstructured(unstruct.UnstructuredContent(), aw)
@@ -37,14 +38,14 @@ func AppWrapper(t Test, namespace string, name string) func(g gomega.Gomega) *mc
3738
}
3839
}
3940

40-
func GetAppWrapper(t Test, namespace string, name string) *mcadv1beta2.AppWrapper {
41+
func GetAppWrapper(t Test, namespace *corev1.Namespace, name string) *mcadv1beta2.AppWrapper {
4142
t.T().Helper()
4243
return AppWrapper(t, namespace, name)(t)
4344
}
4445

45-
func AppWrappers(t Test, namespace string) func(g gomega.Gomega) []*mcadv1beta2.AppWrapper {
46+
func AppWrappers(t Test, namespace *corev1.Namespace) func(g gomega.Gomega) []*mcadv1beta2.AppWrapper {
4647
return func(g gomega.Gomega) []*mcadv1beta2.AppWrapper {
47-
aws, err := t.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace).List(t.Ctx(), metav1.ListOptions{})
48+
aws, err := t.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace.Name).List(t.Ctx(), metav1.ListOptions{})
4849
g.Expect(err).NotTo(gomega.HaveOccurred())
4950

5051
awsp := []*mcadv1beta2.AppWrapper{}

support/appwrapper_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/onsi/gomega"
77
mcadv1beta2 "github.com/project-codeflare/appwrapper/api/v1beta2"
88

9+
corev1 "k8s.io/api/core/v1"
910
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1011
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1112
"k8s.io/apimachinery/pkg/runtime"
@@ -15,21 +16,21 @@ func TestGetAppWrapper(t *testing.T) {
1516
test := NewTest(t)
1617

1718
name := "my-appwrapper-1"
18-
namespace := "my-namespace-1"
19+
namespace := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "my-namespace-1"}}
1920
aw := &mcadv1beta2.AppWrapper{
20-
ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},
21+
ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace.Name},
2122
Status: mcadv1beta2.AppWrapperStatus{Phase: mcadv1beta2.AppWrapperRunning},
2223
}
2324
awMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(aw)
2425
test.Expect(err).NotTo(gomega.HaveOccurred())
2526
unstruct := unstructured.Unstructured{Object: awMap}
2627

27-
_, err = test.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace).Create(test.ctx, &unstruct, metav1.CreateOptions{})
28+
_, err = test.Client().Dynamic().Resource(appWrapperResource).Namespace(namespace.Name).Create(test.ctx, &unstruct, metav1.CreateOptions{})
2829
test.Expect(err).NotTo(gomega.HaveOccurred())
2930

3031
aw2 := GetAppWrapper(test, namespace, name)
3132
test.Expect(aw2.Name).To(gomega.Equal(name))
32-
test.Expect(aw2.Namespace).To(gomega.Equal(namespace))
33+
test.Expect(aw2.Namespace).To(gomega.Equal(namespace.Name))
3334
test.Expect(AppWrapperName(aw2)).To(gomega.Equal(name))
3435
test.Expect(AppWrapperPhase(aw)).To(gomega.Equal(mcadv1beta2.AppWrapperRunning))
3536
}

0 commit comments

Comments
 (0)