Fix linting errors

giantswarm · Dec 9, 2024 · ec1252b · ec1252b
1 parent 06ba1cc
commit ec1252b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/pkg/crd/crd.go b/pkg/crd/crd.go
@@ -38,20 +38,20 @@ func Read(filePath string) ([]any, error) {
 			xrd := crossplanev1.CompositeResourceDefinition{}
 			err = yaml.Unmarshal(crdYAMLBytes, &xrd)
 			if err != nil {
-				return nil, microerror.Maskf(CouldNotParseCRDFileError, err.Error())
+				return nil, microerror.Maskf(CouldNotParseCRDFileError, "%s", err.Error())
 			}
 			crds = append(crds, xrd)
 			continue
 		} else if crd.GroupVersionKind().Group == "platform.kratix.io" && crd.Kind == "Promise" {
 			var iface any
 			err = yaml.Unmarshal(crdYAMLBytes, &iface)
 			if err != nil {
-				return nil, microerror.Maskf(CouldNotParseCRDFileError, err.Error())
+				return nil, microerror.Maskf(CouldNotParseCRDFileError, "%s", err.Error())
 			}
 
 			err = ParsePromise(iface, &crd)
 			if err != nil {
-				return nil, microerror.Maskf(CouldNotParseCRDFileError, err.Error())
+				return nil, microerror.Maskf(CouldNotParseCRDFileError, "%s", err.Error())
 			}
 		}
 
@@ -76,22 +76,22 @@ func ParsePromise(iface any, crd *apiextensionsv1.CustomResourceDefinition) (err
 
 	spec, ok = iface.(map[string]any)["spec"].(map[string]any)
 	if !ok {
-		return microerror.Maskf(CouldNotParseCRDFileError, "kratix promise is missing its spec")
+		return microerror.Maskf(CouldNotParseCRDFileError, "%s", "kratix promise is missing its spec")
 	}
 
 	api, ok = spec["api"].(map[string]any)
 	if !ok {
-		return microerror.Maskf(CouldNotParseCRDFileError, "kratix promise is missing its spec.api")
+		return microerror.Maskf(CouldNotParseCRDFileError, "%s", "kratix promise is missing its spec.api")
 	}
 
 	crdYAMLBytes, err = yaml.Marshal(api)
 	if err != nil {
-		return microerror.Maskf(CouldNotParseCRDFileError, err.Error())
+		return microerror.Maskf(CouldNotParseCRDFileError, "%s", err.Error())
 	}
 
 	err = yaml.Unmarshal(crdYAMLBytes, &crd)
 	if err != nil {
-		return microerror.Maskf(CouldNotParseCRDFileError, err.Error())
+		return microerror.Maskf(CouldNotParseCRDFileError, "%s", err.Error())
 	}
 
 	return

diff --git a/pkg/output/error.go b/pkg/output/error.go
@@ -5,7 +5,3 @@ import "github.com/giantswarm/microerror"
 var cannotOpenTemplate = &microerror.Error{
 	Kind: "cannotOpenTemplate",
 }
-
-var cannotUnmarshalCRD = &microerror.Error{
-	Kind: "cannotUnmarshalCRD",
-}
diff --git a/pkg/output/output.go b/pkg/output/output.go
@@ -189,8 +189,8 @@ func rawString(input string) template.HTML {
 }
 
 func rawIndent(input string) template.HTML {
+	input = strings.ReplaceAll(input, "\n", "\n  ")
 	// To mitigate gosec "this method will not auto-escape HTML. Verify data is well formed"
 	// #nosec G203
-	input = strings.ReplaceAll(input, "\n", "\n  ")
 	return template.HTML(input)
 }