Remove unnecessary pointers

Signed-off-by: Dale Haiducek <[email protected]>

Author: dhaiducek

internal/patches.go

@@ -90,7 +90,7 @@ func (m *manifestPatcher) Validate() error {
 
 	// Apply defaults on the patches
 	for i := range m.patches {
-		err := setPatchDefaults(apiVersion, kind, name, namespace, &m.patches[i])
+		err := setPatchDefaults(apiVersion, kind, name, namespace, m.patches[i])
 		if err != nil {
 			return err
 		}
@@ -102,56 +102,56 @@ func (m *manifestPatcher) Validate() error {
 // setPatchDefaults is a helper function for Validate that sets any missing values on the patches
 // that can be derived. An error is returned if a patch is in an invalid format.
 func setPatchDefaults(
-	apiVersion, kind, name, namespace string, patch *map[string]interface{},
+	apiVersion, kind, name, namespace string, patch map[string]interface{},
 ) error {
 	errTemplate := `failed to retrieve the "%s" field from the manifest of name "` + name +
 		`"` + ` and kind "` + kind + `": %v`
 	setErrTemplate := `failed to set the "%s" field on the patch from the manifest of name "` +
 		name + `"` + ` and kind "` + kind + `": %v`
 
-	patchAPIVersion, _, err := unstructured.NestedString(*patch, "apiVersion")
+	patchAPIVersion, _, err := unstructured.NestedString(patch, "apiVersion")
 	if err != nil {
 		return fmt.Errorf(errTemplate, "apiVersion", err)
 	}
 
 	if patchAPIVersion == "" {
-		err = unstructured.SetNestedField(*patch, apiVersion, "apiVersion")
+		err = unstructured.SetNestedField(patch, apiVersion, "apiVersion")
 		if err != nil {
 			return fmt.Errorf(setErrTemplate, "apiVersion", err)
 		}
 	}
 
-	patchKind, _, err := unstructured.NestedString(*patch, "kind")
+	patchKind, _, err := unstructured.NestedString(patch, "kind")
 	if err != nil {
 		return fmt.Errorf(errTemplate, "kind", err)
 	}
 
 	if patchKind == "" {
-		err = unstructured.SetNestedField(*patch, kind, "kind")
+		err = unstructured.SetNestedField(patch, kind, "kind")
 		if err != nil {
 			return fmt.Errorf(setErrTemplate, "kind", err)
 		}
 	}
 
-	patchName, _, err := unstructured.NestedString(*patch, "metadata", "name")
+	patchName, _, err := unstructured.NestedString(patch, "metadata", "name")
 	if err != nil {
 		return fmt.Errorf(errTemplate, "metadata.name", err)
 	}
 
 	if patchName == "" {
-		err = unstructured.SetNestedField(*patch, name, "metadata", "name")
+		err = unstructured.SetNestedField(patch, name, "metadata", "name")
 		if err != nil {
 			return fmt.Errorf(setErrTemplate, "metadata.name", err)
 		}
 	}
 
-	patchNamespace, _, err := unstructured.NestedString(*patch, "metadata", "namespace")
+	patchNamespace, _, err := unstructured.NestedString(patch, "metadata", "namespace")
 	if err != nil {
 		return fmt.Errorf(errTemplate, "metadata.namespace", err)
 	}
 
 	if patchNamespace == "" {
-		err = unstructured.SetNestedField(*patch, namespace, "metadata", "namespace")
+		err = unstructured.SetNestedField(patch, namespace, "metadata", "namespace")
 		if err != nil {
 			return fmt.Errorf(setErrTemplate, "metadata.namespace", err)
 		}
@@ -163,7 +163,7 @@ func setPatchDefaults(
 // ApplyPatches applies the Kustomize patches on the input manifests using Kustomize and returns
 // the patched manifests. An error is returned if the patches can't be applied. This should be
 // run after the Validate method.
-func (m *manifestPatcher) ApplyPatches() (*[]map[string]interface{}, error) {
+func (m *manifestPatcher) ApplyPatches() ([]map[string]interface{}, error) {
 	kustomizeDir := "kustomize"
 
 	// Create the file system in memory with the Kustomize YAML files

internal/patches_test.go

@@ -244,12 +244,12 @@ func TestApplyPatches(t *testing.T) {
 
 	assertEqual(t, err, nil)
 
-	patchedManifest1 := (*patchedManifests)[0]
+	patchedManifest1 := patchedManifests[0]
 	_, found, _ := unstructured.NestedStringMap(patchedManifest1, "metadata", "labels")
 
 	assertEqual(t, found, false)
 
-	patchedManifest2 := (*patchedManifests)[1]
+	patchedManifest2 := patchedManifests[1]
 	labels, found, _ := unstructured.NestedStringMap(patchedManifest2, "metadata", "labels")
 
 	assertEqual(t, found, true)

internal/plugin.go

@@ -1217,7 +1217,7 @@ func (p *Plugin) getPlcFromPath(plcPath string) (string, map[string]interface{},
 	var name string
 	var placement map[string]interface{}
 
-	for _, manifest := range *manifests {
+	for _, manifest := range manifests {
 		kind, _, _ := unstructured.NestedString(manifest, "kind")
 		if kind != placementRuleKind && kind != placementKind {
 			continue

internal/plugin_test.go

@@ -2384,9 +2384,9 @@ func TestGenerateEvaluationInterval(t *testing.T) {
 		t.Fatal(err.Error())
 	}
 
-	assertEqual(t, len(*generatedManifests), 9)
+	assertEqual(t, len(generatedManifests), 9)
 
-	for _, manifest := range *generatedManifests {
+	for _, manifest := range generatedManifests {
 		kind, _ := manifest["kind"].(string)
 		if kind != "Policy" {
 			continue
@@ -2478,7 +2478,7 @@ func TestCreatePolicyWithConfigPolicyAnnotations(t *testing.T) {
 				t.Fatal(err.Error())
 			}
 			// nolint: forcetypeassert
-			spec := (*policyManifests)[0]["spec"].(map[string]interface{})
+			spec := policyManifests[0]["spec"].(map[string]interface{})
 			policyTemplates := spec["policy-templates"].([]interface{})
 			// nolint: forcetypeassert
 			configPolicy := policyTemplates[0].(map[string]interface{})["objectDefinition"].(map[string]interface{})
@@ -2586,7 +2586,7 @@ func TestCreatePolicyWithNamespaceSelector(t *testing.T) {
 				t.Fatal(err.Error())
 			}
 			// nolint: forcetypeassert
-			spec := (*policyManifests)[0]["spec"].(map[string]interface{})
+			spec := policyManifests[0]["spec"].(map[string]interface{})
 			policyTemplates := spec["policy-templates"].([]interface{})
 			// nolint: forcetypeassert
 			configPolicy := policyTemplates[0].(map[string]interface{})["objectDefinition"].(map[string]interface{})

internal/utils.go

@@ -77,14 +77,14 @@ func getManifests(policyConf *types.PolicyConfig) ([][]map[string]interface{}, e
 				return nil, err
 			}
 
-			if len(*manifestFile) == 0 {
+			if len(manifestFile) == 0 {
 				continue
 			}
 			// Allowing replace the original manifest metadata.name and/or metadata.namespace if it is a single
 			// yaml structure in the manifest path
-			if len(*manifestFile) == 1 && len(manifest.Patches) == 1 {
+			if len(manifestFile) == 1 && len(manifest.Patches) == 1 {
 				if patchMetadata, ok := manifest.Patches[0]["metadata"].(map[string]interface{}); ok {
-					if metadata, ok := (*manifestFile)[0]["metadata"].(map[string]interface{}); ok {
+					if metadata, ok := manifestFile[0]["metadata"].(map[string]interface{}); ok {
 						name, ok := patchMetadata["name"].(string)
 						if ok && name != "" {
 							metadata["name"] = name
@@ -93,16 +93,16 @@ func getManifests(policyConf *types.PolicyConfig) ([][]map[string]interface{}, e
 						if ok && namespace != "" {
 							metadata["namespace"] = namespace
 						}
-						(*manifestFile)[0]["metadata"] = metadata
+						manifestFile[0]["metadata"] = metadata
 					}
 				}
 			}
 
-			manifestFiles = append(manifestFiles, *manifestFile...)
+			manifestFiles = append(manifestFiles, manifestFile...)
 		}
 
 		for _, manifestPath := range manifestPaths {
-			var manifestFile *[]map[string]interface{}
+			var manifestFile []map[string]interface{}
 			var err error
 
 			if hasKustomize[manifestPath] {
@@ -115,11 +115,11 @@ func getManifests(policyConf *types.PolicyConfig) ([][]map[string]interface{}, e
 				return nil, err
 			}
 
-			if len(*manifestFile) == 0 {
+			if len(manifestFile) == 0 {
 				continue
 			}
 
-			manifestFiles = append(manifestFiles, *manifestFile...)
+			manifestFiles = append(manifestFiles, manifestFile...)
 		}
 
 		if len(manifest.Patches) > 0 {
@@ -136,7 +136,7 @@ func getManifests(policyConf *types.PolicyConfig) ([][]map[string]interface{}, e
 				return nil, fmt.Errorf(errTemplate, manifest.Path, err)
 			}
 
-			manifestFiles = *patchedFiles
+			manifestFiles = patchedFiles
 		}
 
 		manifests = append(manifests, manifestFiles)
@@ -207,10 +207,10 @@ func getPolicyTemplates(policyConf *types.PolicyConfig) ([]map[string]map[string
 				policyTemplate := buildPolicyTemplate(
 					policyConf,
 					len(policyTemplates)+1,
-					&[]map[string]interface{}{objTemplate},
-					policyConf.Manifests[i].ConfigurationPolicyOptions,
+					[]map[string]interface{}{objTemplate},
+					&policyConf.Manifests[i].ConfigurationPolicyOptions,
 				)
-				policyTemplates = append(policyTemplates, *policyTemplate)
+				policyTemplates = append(policyTemplates, policyTemplate)
 			}
 		}
 	}
@@ -227,15 +227,15 @@ func getPolicyTemplates(policyConf *types.PolicyConfig) ([]map[string]map[string
 		policyTemplate := buildPolicyTemplate(
 			policyConf,
 			1,
-			&objectTemplates,
-			policyConf.ConfigurationPolicyOptions,
+			objectTemplates,
+			&policyConf.ConfigurationPolicyOptions,
 		)
-		policyTemplates = append(policyTemplates, *policyTemplate)
+		policyTemplates = append(policyTemplates, policyTemplate)
 	}
 
 	// check the enabled expanders and add additional policy templates
 	for _, manifestGroup := range manifestGroups {
-		expandedPolicyTemplates := handleExpanders(manifestGroup, policyConf)
+		expandedPolicyTemplates := handleExpanders(manifestGroup, *policyConf)
 		policyTemplates = append(policyTemplates, expandedPolicyTemplates...)
 	}
 
@@ -263,7 +263,7 @@ func isPolicyTypeManifest(manifest map[string]interface{}) (bool, error) {
 
 // setNamespaceSelector sets the namespace selector, if set, on the input policy template.
 func setNamespaceSelector(
-	policyConf types.ConfigurationPolicyOptions,
+	policyConf *types.ConfigurationPolicyOptions,
 	policyTemplate map[string]map[string]interface{},
 ) {
 	selector := policyConf.NamespaceSelector
@@ -277,7 +277,7 @@ func setNamespaceSelector(
 }
 
 // processKustomizeDir runs a provided directory through Kustomize in order to generate the manifests within it.
-func processKustomizeDir(path string) (*[]map[string]interface{}, error) {
+func processKustomizeDir(path string) ([]map[string]interface{}, error) {
 	k := krusty.MakeKustomizer(krusty.MakeDefaultOptions())
 
 	resourceMap, err := k.Run(filesys.MakeFsOnDisk(), path)
@@ -304,9 +304,9 @@ func processKustomizeDir(path string) (*[]map[string]interface{}, error) {
 func buildPolicyTemplate(
 	policyConf *types.PolicyConfig,
 	policyNum int,
-	objectTemplates *[]map[string]interface{},
-	configPolicyOptionsOverrides types.ConfigurationPolicyOptions,
-) *map[string]map[string]interface{} {
+	objectTemplates []map[string]interface{},
+	configPolicyOptionsOverrides *types.ConfigurationPolicyOptions,
+) map[string]map[string]interface{} {
 	var name string
 	if policyNum > 1 {
 		name = fmt.Sprintf("%s%d", policyConf.Name, policyNum)
@@ -322,15 +322,15 @@ func buildPolicyTemplate(
 				"name": name,
 			},
 			"spec": map[string]interface{}{
-				"object-templates":  *objectTemplates,
+				"object-templates":  objectTemplates,
 				"remediationAction": policyConf.RemediationAction,
 				"severity":          policyConf.Severity,
 			},
 		},
 	}
 
 	// Set NamespaceSelector with policy configuration
-	setNamespaceSelector(policyConf.ConfigurationPolicyOptions, policyTemplate)
+	setNamespaceSelector(&policyConf.ConfigurationPolicyOptions, policyTemplate)
 
 	if len(policyConf.ConfigurationPolicyAnnotations) > 0 {
 		metadata := policyTemplate["objectDefinition"]["metadata"].(map[string]interface{})
@@ -373,19 +373,19 @@ func buildPolicyTemplate(
 		configSpec["severity"] = configPolicyOptionsOverrides.Severity
 	}
 
-	return &policyTemplate
+	return policyTemplate
 }
 
 // handleExpanders will go through all the enabled expanders and generate additional
 // policy templates to include in the policy.
 func handleExpanders(
-	manifests []map[string]interface{}, policyConf *types.PolicyConfig,
+	manifests []map[string]interface{}, policyConf types.PolicyConfig,
 ) []map[string]map[string]interface{} {
 	policyTemplates := []map[string]map[string]interface{}{}
 
 	for _, expander := range expanders.GetExpanders() {
 		for _, m := range manifests {
-			if expander.Enabled(policyConf) && expander.CanHandle(m) {
+			if expander.Enabled(&policyConf) && expander.CanHandle(m) {
 				expandedPolicyTemplates := expander.Expand(m, policyConf.Severity)
 				policyTemplates = append(policyTemplates, expandedPolicyTemplates...)
 			}
@@ -399,7 +399,7 @@ func handleExpanders(
 // a slice in order to account for multiple YAML documents in the same file.
 // If the file cannot be decoded or each document is not a map, an error will
 // be returned.
-func unmarshalManifestFile(manifestPath string) (*[]map[string]interface{}, error) {
+func unmarshalManifestFile(manifestPath string) ([]map[string]interface{}, error) {
 	// #nosec G304
 	manifestBytes, err := ioutil.ReadFile(manifestPath)
 	if err != nil {
@@ -417,7 +417,7 @@ func unmarshalManifestFile(manifestPath string) (*[]map[string]interface{}, erro
 // unmarshalManifestBytes unmarshals the input bytes slice of an object manifest/definition file
 // into a slice of maps in order to account for multiple YAML documents in the bytes slice. If each
 // document is not a map, an error will be returned.
-func unmarshalManifestBytes(manifestBytes []byte) (*[]map[string]interface{}, error) {
+func unmarshalManifestBytes(manifestBytes []byte) ([]map[string]interface{}, error) {
 	yamlDocs := []map[string]interface{}{}
 	d := yaml.NewDecoder(bytes.NewReader(manifestBytes))
 
@@ -445,7 +445,7 @@ func unmarshalManifestBytes(manifestBytes []byte) (*[]map[string]interface{}, er
 		}
 	}
 
-	return &yamlDocs, nil
+	return yamlDocs, nil
 }
 
 // verifyManifestPath verifies that the manifest path is in the directory tree under baseDirectory.

internal/utils_test.go

@@ -1110,12 +1110,12 @@ data:
 		t.Fatalf("Failed to unmarshal the YAML content, got: %v", err)
 	}
 
-	assertEqual(t, len(*manifests), 2)
+	assertEqual(t, len(manifests), 2)
 
-	name1, _, _ := unstructured.NestedString((*manifests)[0], "metadata", "name")
+	name1, _, _ := unstructured.NestedString((manifests)[0], "metadata", "name")
 	assertEqual(t, name1, "my-configmap")
 
-	name2, _, _ := unstructured.NestedString((*manifests)[1], "metadata", "name")
+	name2, _, _ := unstructured.NestedString((manifests)[1], "metadata", "name")
 	assertEqual(t, name2, "my-configmap2")
 }
 
@@ -1155,12 +1155,12 @@ data:
 		t.Fatalf("Failed to unmarshal the YAML content, got: %v", err)
 	}
 
-	assertEqual(t, len(*manifests), 2)
+	assertEqual(t, len(manifests), 2)
 
-	name1, _, _ := unstructured.NestedString((*manifests)[0], "metadata", "name")
+	name1, _, _ := unstructured.NestedString((manifests)[0], "metadata", "name")
 	assertEqual(t, name1, "my-configmap")
 
-	name2, _, _ := unstructured.NestedString((*manifests)[1], "metadata", "name")
+	name2, _, _ := unstructured.NestedString((manifests)[1], "metadata", "name")
 	assertEqual(t, name2, "my-configmap2")
 }
 
@@ -1409,9 +1409,9 @@ data:
 		t.Fatalf(fmt.Sprintf("Unexpected error: %s", err))
 	}
 
-	assertEqual(t, len(*manifests), 3)
+	assertEqual(t, len(manifests), 3)
 
-	for _, manifest := range *manifests {
+	for _, manifest := range manifests {
 		if metadata, ok := manifest["metadata"]; ok {
 			ns := metadata.(map[string]interface{})["namespace"]
 			assertEqual(t, ns, "kustomize-test")