Bump to using go 1.23

Author: jeanduplessis

.golangci.yml

@@ -1,12 +1,12 @@
 run:
   deadline: 2m
 
-  skip-files:
-  - "zz_generated\\..+\\.go$"
-
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
-  format: colored-line-number
+  formats:
+    - format: colored-line-number
+  print-linter-name: true
+  show-stats: true
 
 linters-settings:
   errcheck:
@@ -18,18 +18,16 @@ linters-settings:
     # default is false: such cases aren't reported by default.
     check-blank: true
 
-    # [deprecated] comma-separated list of pairs of the form pkg:regex
-    # the regex is used to ignore names within pkg. (default "fmt:.*").
-    # see https://github.com/kisielk/errcheck#the-deprecated-method for details
-    ignore: fmt:.*,io/ioutil:^Read.*
+    # Updated to use exclude-functions instead of ignore
+    exclude-functions: fmt:.*,io/ioutil:^Read.*
 
   govet:
     # report about shadowed variables
     check-shadowing: false
 
-  golint:
-    # minimal confidence for issues, default is 0.8
-    min-confidence: 0.8
+  revive:
+    # confidence for issues, default is 0.8
+    confidence: 0.8
 
   gofmt:
     # simplify code: gofmt with `-s` option, true by default
@@ -38,16 +36,12 @@ linters-settings:
   goimports:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
-    local-prefixes: github.com/upbound/provider-gcp
+    local-prefixes: github.com/upbound/provider-aws
 
   gocyclo:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
     min-complexity: 10
 
-  maligned:
-    # print struct with more effective memory layout or not, false by default
-    suggest-new: true
-
   dupl:
     # tokens count to trigger issue, 150 by default
     threshold: 100
@@ -62,13 +56,6 @@ linters-settings:
     # tab width in spaces. Default to 1.
     tab-width: 1
 
-  unused:
-    # treat code as a program (not a library) and report unused exported identifiers; default is false.
-    # XXX: if you enable this setting, unused will report a lot of false-positives in text editors:
-    # if it's called for subdir of a project it can't find funcs usages. All text editor integrations
-    # with golangci-lint call it on a directory with the changed file.
-    check-exported: false
-
   unparam:
     # Inspect exported functions, default is false. Set to true if no external program/library imports your code.
     # XXX: if you enable this setting, unparam will report a lot of false-positives in text editors:
@@ -104,17 +91,18 @@ linters-settings:
 
 linters:
   enable:
-    - megacheck
     - govet
     - gocyclo
     - gocritic
-    - interfacer
     - goconst
     - goimports
     - gofmt  # We enable this as well as goimports for its simplify mode.
+    - gosimple
     - prealloc
-    - golint
+    - revive
+    - staticcheck
     - unconvert
+    - unused
     - misspell
     - nakedret
 
@@ -125,6 +113,10 @@ linters:
 
 
 issues:
+  # Added the exclude-files configuration here to replace run.skip-files
+  exclude-files:
+   - "zz_generated\\..+\\.go$"
+  
   # Excluding configuration per-path and per-linter
   exclude-rules:
     # Exclude some linters from running on tests files.

Makefile

@@ -10,6 +10,7 @@ PLATFORMS ?= linux_amd64 linux_arm64
 -include build/makelib/output.mk
 
 # Setup Go
+GO_REQUIRED_VERSION ?= 1.23
 NPROCS ?= 1
 # GOLANGCILINT_VERSION is inherited from build submodule by default.
 # Uncomment below if you need to override the version.
@@ -19,22 +20,45 @@ GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/provider
 GO_LDFLAGS += -X $(GO_PROJECT)/pkg/version.Version=$(VERSION)
 GO_SUBDIRS += cmd internal apis
 GO111MODULE = on
+
 -include build/makelib/golang.mk
 
 # ====================================================================================
 # Setup Kubernetes tools
 
 # Uncomment below to override the versions from the build module
-# KIND_VERSION = v0.15.0
-UP_VERSION = v0.28.0
-# UP_CHANNEL = stable
-UPTEST_VERSION = v0.5.0
-CROSSPLANE_VERSION = 1.16.0
+#KIND_VERSION = v0.27.0
+UP_VERSION = v0.34.2
+#UP_CHANNEL = stable
+UPTEST_VERSION = v0.11.1
+UPTEST_LOCAL_VERSION = v0.13.0
+UPTEST_LOCAL_CHANNEL = stable
+KUSTOMIZE_VERSION = v5.3.0
+YQ_VERSION = v4.40.5
+CROSSPLANE_VERSION = 1.14.6
+CRDDIFF_VERSION = v0.12.1
+
+export UP_VERSION := $(UP_VERSION)
+export UP_CHANNEL := $(UP_CHANNEL)
+
 -include build/makelib/k8s_tools.mk
 
+# uptest download and install
+UPTEST_LOCAL := $(TOOLS_HOST_DIR)/uptest-$(UPTEST_LOCAL_VERSION)
+
+$(UPTEST_LOCAL):
+	@$(INFO) installing uptest $(UPTEST_LOCAL)
+	@mkdir -p $(TOOLS_HOST_DIR)
+	@curl -fsSLo $(UPTEST_LOCAL) https://s3.us-west-2.amazonaws.com/crossplane.uptest.releases/$(UPTEST_LOCAL_CHANNEL)/$(UPTEST_LOCAL_VERSION)/bin/$(SAFEHOST_PLATFORM)/uptest || $(FAIL)
+	@chmod +x $(UPTEST_LOCAL)
+	@$(OK) installing uptest $(UPTEST_LOCAL)
+
 # Setup Images
 REGISTRY_ORGS ?= xpkg.upbound.io/upbound
 IMAGES = provider-terraform
+BATCH_PLATFORMS ?= linux_amd64,linux_arm64
+export BATCH_PLATFORMS := $(BATCH_PLATFORMS)
+
 -include build/makelib/imagelight.mk
 
 # ====================================================================================
@@ -110,11 +134,19 @@ CROSSPLANE_NAMESPACE = upbound-system
 
 # This target requires the following environment variables to be set:
 # - UPTEST_EXAMPLE_LIST, a comma-separated list of examples to test
-# - UPTEST_CLOUD_CREDENTIALS (optional), cloud credentials for the provider being tested, e.g. export UPTEST_CLOUD_CREDENTIALS=$(cat ~/.aws/credentials)
+# - UPTEST_CLOUD_CREDENTIALS (optional), multiple sets of AWS IAM User credentials specified as key=value pairs.
+#   The support keys are currently `DEFAULT` and `PEER`. So, an example for the value of this env. variable is:
+#   DEFAULT='[default]
+#   aws_access_key_id = REDACTED
+#   aws_secret_access_key = REDACTED'
+#   PEER='[default]
+#   aws_access_key_id = REDACTED
+#   aws_secret_access_key = REDACTED'
+#   The associated `ProviderConfig`s will be named as `default` and `peer`.
 # - UPTEST_DATASOURCE_PATH (optional), see https://github.com/upbound/uptest#injecting-dynamic-values-and-datasource
-uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
+uptest: $(UPTEST_LOCAL) $(KUBECTL) $(KUTTL)
 	@$(INFO) running automated tests
-	@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) $(UPTEST) e2e "${UPTEST_EXAMPLE_LIST}" --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=cluster/test/setup.sh || $(FAIL)
+	@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) CROSSPLANE_NAMESPACE=$(CROSSPLANE_NAMESPACE) $(UPTEST_LOCAL) e2e "${UPTEST_EXAMPLE_LIST}" --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=cluster/test/setup.sh --default-conditions="Test" || $(FAIL)
 	@$(OK) running automated tests
 
 local-deploy: build controlplane.up local.xpkg.deploy.provider.$(PROJECT_NAME)

apis/v1beta1/storeconfig_types.go

@@ -35,6 +35,16 @@ type StoreConfigStatus struct {
 	xpv1.ConditionedStatus `json:",inline"`
 }
 
+// GetCondition of this StoreConfigStatus.
+func (s *StoreConfigStatus) GetCondition(ct xpv1.ConditionType) xpv1.Condition {
+	return s.ConditionedStatus.GetCondition(ct)
+}
+
+// SetConditions of this StoreConfigStatus.
+func (s *StoreConfigStatus) SetConditions(c ...xpv1.Condition) {
+	s.ConditionedStatus.SetConditions(c...)
+}
+
 // +kubebuilder:object:root=true
 
 // A StoreConfig configures how GCP controller should store connection details.

build

@@ -29,10 +29,10 @@ import (
 	"github.com/crossplane/crossplane-runtime/pkg/statemetrics"
 	zapuber "go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
 
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 
-	"gopkg.in/alecthomas/kingpin.v2"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"

cmd/provider/main.go

@@ -1,6 +1,6 @@
 module github.com/upbound/provider-terraform
 
-go 1.22.12
+go 1.23.7
 
 require (
 	github.com/MakeNowJust/heredoc v1.0.0

go.mod

@@ -28,6 +28,7 @@ import (
 
 	"github.com/crossplane/crossplane-runtime/pkg/logging"
 	"github.com/crossplane/crossplane-runtime/pkg/statemetrics"
+	getter "github.com/hashicorp/go-getter"
 	"github.com/pkg/errors"
 	"github.com/spf13/afero"
 	corev1 "k8s.io/api/core/v1"
@@ -45,8 +46,6 @@ import (
 	"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
 	"github.com/crossplane/crossplane-runtime/pkg/resource"
 
-	"github.com/hashicorp/go-getter"
-
 	"github.com/upbound/provider-terraform/apis/v1beta1"
 	"github.com/upbound/provider-terraform/internal/controller/features"
 	"github.com/upbound/provider-terraform/internal/terraform"

internal/controller/workspace/workspace.go

@@ -1107,7 +1107,7 @@ func TestObserve(t *testing.T) {
 					ResourceExists:   true,
 					ResourceUpToDate: true,
 					ConnectionDetails: managed.ConnectionDetails{
-						"string": {},
+						"string": []byte{},
 						"object": []byte("null"), // Because we JSON decode the the value, which is any{}
 					},
 				},
@@ -1150,7 +1150,7 @@ func TestObserve(t *testing.T) {
 					ResourceExists:   true,
 					ResourceUpToDate: true,
 					ConnectionDetails: managed.ConnectionDetails{
-						"string": {},
+						"string": []byte{},
 						"object": []byte("null"), // Because we JSON decode the the value, which is any{}
 					},
 				},
@@ -1374,7 +1374,7 @@ func TestCreate(t *testing.T) {
 			want: want{
 				c: managed.ExternalCreation{
 					ConnectionDetails: managed.ConnectionDetails{
-						"string": {},
+						"string": []byte{},
 						"object": []byte("null"), // Because we JSON decode the value, which is any{}
 					},
 				},