Fix linter and unit tests

Signed-off-by: Hasan Turken <turkenh@gmail.com>
jastang · Dec 7, 2023 · 17ceb75 · 17ceb75
1 parent 3ace72a
commit 17ceb75
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,8 +10,8 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.19.5'
-  GOLANGCI_VERSION: 'v1.50.1'
+  GO_VERSION: '1.20.12'
+  GOLANGCI_VERSION: 'v1.55.2'
   DOCKER_BUILDX_VERSION: 'v0.8.2'
 
   # Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run

diff --git a/Makefile b/Makefile
@@ -26,6 +26,7 @@ GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/provider
 GO_LDFLAGS += -X $(GO_PROJECT)/pkg/version.Version=$(VERSION)
 GO_SUBDIRS += cmd pkg apis
 GO111MODULE = on
+GOLANGCILINT_VERSION = 1.55.2
 
 -include build/makelib/golang.mk
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/crossplane-contrib/provider-helm
 
-go 1.19
+go 1.20
 
 require (
 	github.com/Azure/kubelogin v0.0.34
@@ -180,4 +180,6 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
 
+// This is a workaround until kubelogin project supports being consumed as a go module
+// See https://github.com/Azure/kubelogin/pull/371
 replace github.com/Azure/kubelogin => github.com/upbound/kubelogin v0.0.34-hotfix.1
diff --git a/pkg/clients/helm/kustomize_test.go b/pkg/clients/helm/kustomize_test.go
@@ -2,14 +2,13 @@ package helm
 
 import (
 	"bytes"
-	"fmt"
 	"reflect"
 	"testing"
 
 	"github.com/crossplane/crossplane-runtime/pkg/test"
 	"github.com/google/go-cmp/cmp"
-	"github.com/pkg/errors"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/errors"
 	"sigs.k8s.io/kustomize/kyaml/resid"
 )
 
@@ -80,7 +79,7 @@ func TestKustomize(t *testing.T) {
 			},
 			want: want{
 				result: "",
-				err:    errors.WithStack(fmt.Errorf("trouble configuring builtin PatchTransformer with config: `\npatch: '- bad patch'\ntarget:\n  kind: Deployment\n`: unable to parse SM or JSON patch from [- bad patch]")),
+				err:    errors.WrapPrefixf(errors.Errorf("unable to parse SM or JSON patch from [- bad patch]"), "trouble configuring builtin PatchTransformer with config: `\npatch: '- bad patch'\ntarget:\n  kind: Deployment\n`"),
 			},
 		},
 	}