Fix linter issues

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
crossplane · Jan 9, 2024 · 1906bf1 · 1906bf1
1 parent a94d692
commit 1906bf1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/pkg/config/resource.go b/pkg/config/resource.go
@@ -9,8 +9,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/crossplane/upjet/pkg/config/conversion"
-
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
 	"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
@@ -23,6 +21,7 @@ import (
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/crossplane/upjet/pkg/config/conversion"
 	"github.com/crossplane/upjet/pkg/registry"
 )
 

diff --git a/pkg/controller/conversion/functions.go b/pkg/controller/conversion/functions.go
@@ -10,14 +10,13 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/crossplane/upjet/pkg/config/conversion"
-
 	"github.com/crossplane/upjet/pkg/resource"
 )
 
 // RoundTrip round-trips from `src` to `dst` via an unstructured map[string]any
 // representation of the `src` object and applies the registered webhook
 // conversion functions.
-func RoundTrip(dst, src resource.Terraformed) error {
+func RoundTrip(dst, src resource.Terraformed) error { //nolint:gocyclo // considered breaking this according to the converters and I did not like it
 	srcMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(src)
 	if err != nil {
 		return errors.Wrap(err, "cannot convert the conversion source object into the map[string]any representation")

diff --git a/pkg/pipeline/conversion_spoke.go b/pkg/pipeline/conversion_spoke.go
@@ -45,7 +45,7 @@ type ConversionSpokeGenerator struct {
 }
 
 // Generate writes generated conversion.Convertible interface functions
-func (cg *ConversionSpokeGenerator) Generate(cfgs []*terraformedInput) error {
+func (cg *ConversionSpokeGenerator) Generate(cfgs []*terraformedInput) error { //nolint:gocyclo
 	entries, err := os.ReadDir(cg.LocalDirectoryPath)
 	if err != nil {
 		return errors.Wrapf(err, "cannot list the directory entries for the source folder %s while generating the conversion.Convertible interface functions", cg.LocalDirectoryPath)
@@ -91,7 +91,8 @@ func (cg *ConversionSpokeGenerator) Generate(cfgs []*terraformedInput) error {
 					"Kind": c.Kind,
 				},
 			})
-			cg.SpokeVersionsMap[fmt.Sprintf("%s.%s", c.ShortGroup, c.Kind)] = append(cg.SpokeVersionsMap[c.Kind], filepath.Base(versionDir))
+			sk := fmt.Sprintf("%s.%s", c.ShortGroup, c.Kind)
+			cg.SpokeVersionsMap[sk] = append(cg.SpokeVersionsMap[sk], filepath.Base(versionDir))
 		}
 
 		vars["Resources"] = resources
@@ -104,7 +105,7 @@ func (cg *ConversionSpokeGenerator) Generate(cfgs []*terraformedInput) error {
 
 func findKindTerraformedInput(cfgs []*terraformedInput, name string) *terraformedInput {
 	for _, c := range cfgs {
-		if name == strings.ToLower(c.Kind) {
+		if strings.EqualFold(name, c.Kind) {
 			return c
 		}
 	}