Skip to content

Commit

Permalink
Update list to filter resources using label selectors (#488)
Browse files Browse the repository at this point in the history 
Signed-off-by: jtucci <[email protected]>
  • Loading branch information
@jtucci
jtucci authored Nov 8, 2023
1 parent 7e78376 commit 46a545d
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 22 deletions.
37 changes: 25 additions & 12 deletions pkg/test/step.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"time"

k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/labels"
Expand Down Expand Up @@ -230,7 +231,7 @@ func (s *Step) GetTimeout() int {
return timeout
}

func list(cl client.Client, gvk schema.GroupVersionKind, namespace string) ([]unstructured.Unstructured, error) {
func list(cl client.Client, gvk schema.GroupVersionKind, namespace string, labelsMap map[string]string) ([]unstructured.Unstructured, error) {
list := unstructured.UnstructuredList{}
list.SetGroupVersionKind(gvk)

Expand All @@ -239,6 +240,10 @@ func list(cl client.Client, gvk schema.GroupVersionKind, namespace string) ([]un
listOptions = append(listOptions, client.InNamespace(namespace))
}

if len(labelsMap) > 0 {
listOptions = append(listOptions, client.MatchingLabels(labelsMap))
}

if err := cl.List(context.TODO(), &list, listOptions...); err != nil {
return []unstructured.Unstructured{}, err
}
Expand Down Expand Up @@ -268,35 +273,39 @@ func (s *Step) CheckResource(expected runtime.Object, namespace string) []error
gvk := expected.GetObjectKind().GroupVersionKind()

actuals := []unstructured.Unstructured{}

if name != "" {
actual := unstructured.Unstructured{}
actual.SetGroupVersionKind(gvk)

err = cl.Get(context.TODO(), client.ObjectKey{
if err := cl.Get(context.TODO(), client.ObjectKey{
Namespace: namespace,
Name: name,
}, &actual)
}, &actual); err != nil {
return append(testErrors, err)
}

actuals = append(actuals, actual)
} else {
actuals, err = list(cl, gvk, namespace)
if len(actuals) == 0 {
m, err := meta.Accessor(expected)
if err != nil {
return append(testErrors, err)
}
matches, err := list(cl, gvk, namespace, m.GetLabels())
if err != nil {
return append(testErrors, err)
}
if len(matches) == 0 {
testErrors = append(testErrors, fmt.Errorf("no resources matched of kind: %s", gvk.String()))
}
actuals = append(actuals, matches...)
}
if err != nil {
return append(testErrors, err)
}

expectedObj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(expected)
if err != nil {
return append(testErrors, err)
}

for _, actual := range actuals {
actual := actual

tmpTestErrors := []error{}

if err := testutils.IsSubset(expectedObj, actual.UnstructuredContent()); err != nil {
Expand Down Expand Up @@ -358,7 +367,11 @@ func (s *Step) CheckResourceAbsent(expected runtime.Object, namespace string) er

actuals = []unstructured.Unstructured{actual}
} else {
actuals, err = list(cl, gvk, namespace)
m, err := meta.Accessor(expected)
if err != nil {
return err
}
actuals, err = list(cl, gvk, namespace, m.GetLabels())
if err != nil {
return err
}
Expand Down
58 changes: 48 additions & 10 deletions pkg/test/step_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,34 +136,71 @@ func TestStepDeleteExisting(t *testing.T) {
func TestCheckResource(t *testing.T) {
for _, test := range []struct {
testName string
actual runtime.Object
actual []runtime.Object
expected runtime.Object
shouldError bool
}{
{
testName: "resource matches",
actual: testutils.NewPod("hello", ""),
actual: []runtime.Object{
testutils.NewPod("hello", ""),
},
expected: testutils.NewPod("hello", ""),
},
{
testName: "resource matches with labels",
actual: []runtime.Object{
testutils.WithSpec(t, testutils.NewPod("deploy-8b2d", ""),
map[string]interface{}{
"containers": nil,
"serviceAccountName": "invalid",
}),
testutils.WithSpec(
t,
testutils.WithLabels(
t,
testutils.NewPod("deploy-8c2z", ""),
map[string]string{"label": "my-label"},
),
map[string]interface{}{
"containers": nil,
"serviceAccountName": "valid",
},
),
},

expected: testutils.WithSpec(
t,
testutils.WithLabels(
t,
testutils.NewPod("", ""),
map[string]string{"label": "my-label"},
),
map[string]interface{}{
"containers": nil,
"serviceAccountName": "valid",
},
),
},
{
testName: "resource mis-match",
actual: testutils.NewPod("hello", ""),
actual: []runtime.Object{testutils.NewPod("hello", "")},
expected: testutils.WithSpec(t, testutils.NewPod("hello", ""), map[string]interface{}{"invalid": "key"}),
shouldError: true,
},
{
testName: "resource subset match",
actual: testutils.WithSpec(t, testutils.NewPod("hello", ""), map[string]interface{}{
actual: []runtime.Object{testutils.WithSpec(t, testutils.NewPod("hello", ""), map[string]interface{}{
"containers": nil,
"restartPolicy": "OnFailure",
}),
})},
expected: testutils.WithSpec(t, testutils.NewPod("hello", ""), map[string]interface{}{
"restartPolicy": "OnFailure",
}),
},
{
testName: "resource does not exist",
actual: testutils.NewPod("other", ""),
actual: []runtime.Object{testutils.NewPod("other", "")},
expected: testutils.NewPod("hello", ""),
shouldError: true,
},
Expand All @@ -174,19 +211,20 @@ func TestCheckResource(t *testing.T) {
fakeDiscovery := testutils.FakeDiscoveryClient()
namespace := testNamespace

_, _, err := testutils.Namespaced(fakeDiscovery, test.actual, namespace)
assert.Nil(t, err)
for _, actualObj := range test.actual {
_, _, err := testutils.Namespaced(fakeDiscovery, actualObj, namespace)
assert.Nil(t, err)
}

step := Step{
Logger: testutils.NewTestLogger(t, ""),
Client: func(bool) (client.Client, error) {
return fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(test.actual).Build(), nil
return fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(test.actual...).Build(), nil
},
DiscoveryClient: func() (discovery.DiscoveryInterface, error) { return fakeDiscovery, nil },
}

errors := step.CheckResource(test.expected, namespace)

if test.shouldError {
assert.NotEqual(t, []error{}, errors)
} else {
Expand Down

0 comments on commit 46a545d

Please sign in to comment.