Remove last-applied... annotation from metadata (#201)

I appear to have made an error in #152.

It is looking for field annotations on objects which is never set,
annotation are nested under metadata.

Signed-off-by: Charlie Egan <[email protected]>

Author: charlieegan3

pkg/datagatherer/k8s/dynamic.go

@@ -200,15 +200,21 @@ func redactList(list *unstructured.UnstructuredList) error {
 					secret.Object["data"] = map[string]interface{}{}
 				}
 
-				// Redact last-applied-configuration annotation if set
-				annotations, present := secret.Object["annotations"].(map[string]interface{})
-				if present {
-					_, annotationPresent := annotations["kubectl.kubernetes.io/last-applied-configuration"]
-					if annotationPresent {
-						annotations["kubectl.kubernetes.io/last-applied-configuration"] = "redacted"
+				metadata, metadataPresent := secret.Object["metadata"].(map[string]interface{})
+				if metadataPresent {
+					// Redact last-applied-configuration annotation if set
+					annotations, present := metadata["annotations"].(map[string]interface{})
+					if present {
+						_, annotationPresent := annotations["kubectl.kubernetes.io/last-applied-configuration"]
+						if annotationPresent {
+							annotations["kubectl.kubernetes.io/last-applied-configuration"] = "redacted"
+						}
+						metadata["annotations"] = annotations
 					}
-					secret.Object["annotations"] = annotations
+					secret.Object["metadata"] = metadata
 				}
+				// break when the object has been processed as a secret, no
+				// other kinds have redact modifications
 				break
 			}
 		}

pkg/datagatherer/k8s/dynamic_test.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/d4l3k/messagediff"
 	"gopkg.in/yaml.v2"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -37,14 +38,16 @@ func getSecret(name, namespace string, data map[string]interface{}, isTLS bool,
 		object.Object["type"] = "kubernetes.io/tls"
 	}
 
+	metadata, _ := object.Object["metadata"].(map[string]interface{})
+
 	// if we're creating a 'raw' secret as scraped that was applied by kubectl
 	if withLastApplied {
 		jsonData, _ := json.Marshal(data)
-		object.Object["annotations"] = map[string]interface{}{
+		metadata["annotations"] = map[string]interface{}{
 			"kubectl.kubernetes.io/last-applied-configuration": string(jsonData),
 		}
 	} else { // generate an expected redacted secret
-		object.Object["annotations"] = map[string]interface{}{
+		metadata["annotations"] = map[string]interface{}{
 			"kubectl.kubernetes.io/last-applied-configuration": "redacted",
 		}
 	}
@@ -214,8 +217,8 @@ func TestDynamicGatherer_Fetch(t *testing.T) {
 			if err == nil && test.err {
 				t.Errorf("expected to get an error but didn't get one")
 			}
-			if !reflect.DeepEqual(res, test.expected) {
-				t.Errorf("unexpected difference: %v", diff.ObjectDiff(res, test.expected))
+			if diff, equal := messagediff.PrettyDiff(res, test.expected); !equal {
+				t.Errorf("\n%s", diff)
 			}
 		})
 	}