Correct JSONPointer for redacting last-applied (#206)

charlieegan3 · web-flow · commit 8972f457960f · 2020-11-18T18:33:38.000Z
This will only make a difference for non-secret resources. Secret
resources lose this annotation via selection.

Also use the Redact fields package var

Signed-off-by: Charlie Egan &lt;charlieegan3@users.noreply.github.com&gt;
diff --git a/go.mod b/go.mod
@@ -8,7 +8,6 @@ require (
 	github.com/Azure/go-autorest/autorest v0.11.8 // indirect
 	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
 	github.com/Azure/go-autorest/autorest/validation v0.3.0 // indirect
-	github.com/Jeffail/gabs v1.1.1
 	github.com/Jeffail/gabs/v2 v2.6.0
 	github.com/aws/aws-sdk-go v1.34.10
 	github.com/cenkalti/backoff v2.0.0+incompatible
diff --git a/go.sum b/go.sum
@@ -90,7 +90,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E=
 github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
-github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo=
 github.com/Jeffail/gabs/v2 v2.6.0 h1:WdCnGaDhNa4LSRTMwhLZzJ7SRDXjABNP13SOKvCpL5w=
 github.com/Jeffail/gabs/v2 v2.6.0/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
diff --git a/pkg/agent/run.go b/pkg/agent/run.go
@@ -156,7 +156,7 @@ func gatherAndOutputData(ctx context.Context, config Config, preflightClient *cl
 	}
 
 	if OutputPath != "" {
-		data, err := json.MarshalIndent(readings, " ", " ")
+		data, err := json.MarshalIndent(readings, "", "  ")
 		err = ioutil.WriteFile(OutputPath, data, 0644)
 		if err != nil {
 			log.Fatal(err)
diff --git a/pkg/datagatherer/k8s/dynamic.go b/pkg/datagatherer/k8s/dynamic.go
@@ -183,12 +183,11 @@ func redactList(list *unstructured.UnstructuredList) error {
 				break
 			}
 
-			// remove managedFields from all resources
-			Redact([]string{
-				"metadata.managedFields",
-			}, &resource)
 		}
 
+		// remove managedFields from all resources
+		Redact(RedactFields, &resource)
+
 		// update the object in the list
 		list.Items[i] = resource
 	}
diff --git a/pkg/datagatherer/k8s/fieldfilter.go b/pkg/datagatherer/k8s/fieldfilter.go
@@ -24,7 +24,7 @@ var SecretSelectedFields = []string{
 // RedactFields are removed from all objects
 var RedactFields = []string{
 	"metadata.managedFields",
-	"/metadata.annotations/kubectl.kubernetes.io~1last-applied-configuration",
+	"/metadata/annotations/kubectl.kubernetes.io~1last-applied-configuration",
 }
 
 // Select removes all but the supplied fields from the resource

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func gatherAndOutputData(ctx context.Context, config Config, preflightClient *cl`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`if OutputPath != "" {`
`159`		`- data, err := json.MarshalIndent(readings, " ", " ")`
	`159`	`+ data, err := json.MarshalIndent(readings, "", " ")`
`160`	`160`	`err = ioutil.WriteFile(OutputPath, data, 0644)`
`161`	`161`	`if err != nil {`
`162`	`162`	`log.Fatal(err)`
Original file line number	Diff line number	Diff line change
`@@ -183,12 +183,11 @@ func redactList(list *unstructured.UnstructuredList) error {`
`183`	`183`	`break`
`184`	`184`	`}`
`185`	`185`
`186`		`- // remove managedFields from all resources`
`187`		`- Redact([]string{`
`188`		`- "metadata.managedFields",`
`189`		`- }, &resource)`
`190`	`186`	`}`
`191`	`187`
	`188`	`+ // remove managedFields from all resources`
	`189`	`+ Redact(RedactFields, &resource)`
	`190`	`+`
`192`	`191`	`// update the object in the list`
`193`	`192`	`list.Items[i] = resource`
`194`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ var SecretSelectedFields = []string{`
`24`	`24`	`// RedactFields are removed from all objects`
`25`	`25`	`var RedactFields = []string{`
`26`	`26`	`"metadata.managedFields",`
`27`		`- "/metadata.annotations/kubectl.kubernetes.io~1last-applied-configuration",`
	`27`	`+ "/metadata/annotations/kubectl.kubernetes.io~1last-applied-configuration",`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`// Select removes all but the supplied fields from the resource`