Correct last-applied-configuration annotations key (#205)

This isn't essential since we're now selecting fields but it should
still be fixed.

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

Author: charlieegan3

pkg/datagatherer/k8s/fieldfilter.go

@@ -21,6 +21,12 @@ var SecretSelectedFields = []string{
 	"/data/ca.crt",
 }
 
+// RedactFields are removed from all objects
+var RedactFields = []string{
+	"metadata.managedFields",
+	"/metadata.annotations/kubectl.kubernetes.io~1last-applied-configuration",
+}
+
 // Select removes all but the supplied fields from the resource
 func Select(fields []string, resource *unstructured.Unstructured) error {
 	// convert the object to JSON for field filtering
@@ -45,8 +51,11 @@ func Select(fields []string, resource *unstructured.Unstructured) error {
 				// fail to select field if missing, just continue
 				continue
 			}
-			pathComponents := strings.Split(v, "/")
-			filteredObject.Set(gObject.Data(), pathComponents[1:]...)
+			pathComponents, err := gabs.JSONPointerToSlice(v)
+			if err != nil {
+				return fmt.Errorf("invalid JSONPointer: %s", v)
+			}
+			filteredObject.Set(gObject.Data(), pathComponents...)
 		} else {
 			if jsonParsed.ExistsP(v) {
 				filteredObject.SetP(jsonParsed.Path(v).Data(), v)
@@ -81,7 +90,10 @@ func Redact(fields []string, resource *unstructured.Unstructured) error {
 	for _, v := range fields {
 		// also support JSONPointers for keys containing '.' chars
 		if strings.HasPrefix(v, "/") {
-			pathComponents := strings.Split(v, "/")[1:]
+			pathComponents, err := gabs.JSONPointerToSlice(v)
+			if err != nil {
+				return fmt.Errorf("invalid JSONPointer: %s", v)
+			}
 			if jsonParsed.Exists(pathComponents...) {
 				jsonParsed.Delete(pathComponents...)
 			}

pkg/datagatherer/k8s/fieldfilter_test.go

@@ -13,9 +13,11 @@ func TestSelect(t *testing.T) {
 			"apiVersion": "v1",
 			"kind":       "Secret",
 			"metadata": map[string]interface{}{
-				"name":                       "example",
-				"namespace":                  "example",
-				"last-applied-configuration": "secret",
+				"name":      "example",
+				"namespace": "example",
+				"annotations": map[string]string{
+					"kubectl.kubernetes.io/last-applied-configuration": "secret",
+				},
 			},
 			"type": "kubernetes.io/tls",
 			"data": map[string]interface{}{
@@ -90,9 +92,12 @@ func TestRedact(t *testing.T) {
 			"apiVersion": "v1",
 			"kind":       "Secret",
 			"metadata": map[string]interface{}{
-				"name":                       "example",
-				"namespace":                  "example",
-				"last-applied-configuration": "secret",
+				"name":      "example",
+				"namespace": "example",
+				"annotations": map[string]string{
+					"kubectl.kubernetes.io/last-applied-configuration": "secret",
+				},
+				"managedFields": nil,
 			},
 			"type": "kubernetes.io/tls",
 			"data": map[string]interface{}{
@@ -103,7 +108,8 @@ func TestRedact(t *testing.T) {
 	}
 
 	fieldsToRedact := []string{
-		"metadata.last-applied-configuration",
+		"metadata.managedFields",
+		"/metadata/annotations/kubectl.kubernetes.io~1last-applied-configuration",
 		"/data/tls.key",
 	}
 
@@ -120,6 +126,7 @@ func TestRedact(t *testing.T) {
     },
     "kind": "Secret",
     "metadata": {
+        "annotations": {},
         "name": "example",
         "namespace": "example"
     },