refactor: update indent to 2 with yaml.v3 and fix minor test inconsistencies

Signed-off-by: Chiman Jain <chimanjain15@gmail.com>

Author: chimanjain

pkg/lib/bundle/generate.go

@@ -1,6 +1,7 @@
 package bundle
 
 import (
+	"bytes"
 	"fmt"
 	"io"
 	"os"
@@ -315,12 +316,17 @@ func GenerateAnnotations(mediaType, manifests, metadata, packageName, channels,
 		annotations.Annotations[ChannelDefaultLabel] = channelDefault
 	}
 
-	afile, err := yaml.Marshal(annotations)
-	if err != nil {
+	var buf bytes.Buffer
+	encoder := yaml.NewEncoder(&buf)
+	encoder.SetIndent(2)
+	if err := encoder.Encode(annotations); err != nil {
+		return nil, err
+	}
+	if err := encoder.Close(); err != nil {
 		return nil, err
 	}
 
-	return afile, nil
+	return buf.Bytes(), nil
 }
 
 // GenerateDockerfile builds Dockerfile with mediatype, manifests &

pkg/lib/bundle/validate_test.go

@@ -30,7 +30,7 @@ func TestValidateBundleDependencies(t *testing.T) {
 		logger: logger,
 	}
 
-	var table = []struct {
+	table := []struct {
 		description string
 		mediaType   string
 		directory   string
@@ -108,7 +108,7 @@ func TestValidateBundleContent(t *testing.T) {
 		logger: logger,
 	}
 
-	var table = []struct {
+	table := []struct {
 		description string
 		mediaType   string
 		directory   string
@@ -134,7 +134,7 @@ func TestValidateBundleContent(t *testing.T) {
 			mediaType:   RegistryV1Type,
 			directory:   "./testdata/validate/invalid_manifests_bundle/invalid_sa/",
 			numErrors:   1,
-			errStrings:  []string{"json: cannot unmarshal number into Go struct field ObjectMeta.metadata.namespace of type string"},
+			errStrings:  []string{"json: cannot unmarshal number into Go struct field Meta.metadata.namespace of type string"},
 		},
 		{
 			description: "registryv1 bundle/invalid type",

pkg/prettyunmarshaler/prettyunmarshaler_test.go

@@ -149,9 +149,9 @@ func TestJsonUnmarshalError(t *testing.T) {
 //
 // If the data does not cause a syntax error, this function will panic.
 func customOffsetSyntaxError(data []byte, offset int64) *json.SyntaxError {
-	var d *byte = nil
+	var d byte
 	var se *json.SyntaxError
-	err := json.Unmarshal(data, d)
+	err := json.Unmarshal(data, &d)
 	if errors.As(err, &se) {
 		se.Offset = offset
 		return se