Bump Go versions

konstructio · Nov 26, 2024 · e1edd14 · e1edd14
1 parent 6b79b86
commit e1edd14
Show file tree

Hide file tree

Showing 8 changed files with 959 additions and 1,663 deletions.
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/internal/civo/objectStorage.go b/internal/civo/objectStorage.go
@@ -125,16 +125,23 @@ var errNoCredsFound = errors.New("no object store credentials found")
 // checkKubefirstCredentials determines whether or not object store credentials exist
 func (c *Configuration) checkKubefirstCredentials(credentialName string) (*civogo.ObjectStoreCredential, error) {
 	log.Info().Msgf("looking for credential: %s", credentialName)
-	remoteCredentials, err := c.Client.ListObjectStoreCredentials()
-	if err != nil {
-		log.Error().Msg(err.Error())
-		return nil, fmt.Errorf("error fetching object store credentials: %w", err)
-	}
 
-	for i, cred := range remoteCredentials.Items {
-		if cred.Name == credentialName {
-			log.Info().Msgf("found credential: %s", credentialName)
-			return &remoteCredentials.Items[i], nil
+	for page := 1; ; page++ {
+		remoteCredentials, err := c.Client.ListObjectStoreCredentials(page, 100)
+		if err != nil {
+			log.Error().Msg(err.Error())
+			return nil, fmt.Errorf("error fetching object store credentials: %w", err)
+		}
+
+		if len(remoteCredentials.Items) == 0 || remoteCredentials.Pages == page {
+			break
+		}
+
+		for _, credential := range remoteCredentials.Items {
+			if credential.Name == credentialName {
+				log.Info().Msgf("found credential: %s", credentialName)
+				return &credential, nil
+			}
 		}
 	}
 

diff --git a/internal/docker/docker.go b/internal/docker/docker.go
@@ -10,7 +10,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
 	"github.com/rs/zerolog/log"
 )
@@ -26,7 +26,7 @@ func NewDockerClient() *client.Client {
 }
 
 func (docker ClientWrapper) ListContainers() {
-	containers, err := docker.Client.ContainerList(context.Background(), types.ContainerListOptions{})
+	containers, err := docker.Client.ContainerList(context.Background(), container.ListOptions{})
 	if err != nil {
 		log.Error().Msg(err.Error())
 	}

diff --git a/internal/gitlab/gitlab.go b/internal/gitlab/gitlab.go
@@ -205,7 +205,7 @@ func (gl *Wrapper) DeleteUserSSHKey(keyTitle string) error {
 
 // GetUserSSHKeys
 func (gl *Wrapper) GetUserSSHKeys() ([]*gitlab.SSHKey, error) {
-	keys, _, err := gl.Client.Users.ListSSHKeys()
+	keys, _, err := gl.Client.Users.ListSSHKeys(nil)
 	if err != nil {
 		return nil, fmt.Errorf("could not get user ssh keys: %w", err)
 	}

diff --git a/internal/k3d/adjustContent.go b/internal/k3d/adjustContent.go
@@ -33,7 +33,7 @@ func AdjustGitopsRepo(cloudProvider, clusterName, clusterType, gitopsRepoDir, gi
 
 	// * copy options
 	opt := cp.Options{
-		Skip: func(src string) (bool, error) {
+		Skip: func(_ os.FileInfo, src, _ string) (bool, error) {
 			if strings.HasSuffix(src, ".git") || strings.Index(src, "/.terraform") > 0 {
 				return true, nil
 			}
@@ -125,7 +125,7 @@ func AdjustMetaphorRepo(destinationMetaphorRepoGitURL, gitopsRepoDir, gitProvide
 
 	// * copy options
 	opt := cp.Options{
-		Skip: func(src string) (bool, error) {
+		Skip: func(_ os.FileInfo, src, _ string) (bool, error) {
 			if strings.HasSuffix(src, ".git") {
 				return true, nil
 			} else if strings.Index(src, "/.terraform") > 0 {

diff --git a/internal/k8s/apply.go b/internal/k8s/apply.go
@@ -26,7 +26,7 @@ import (
 	memory "k8s.io/client-go/discovery/cached"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/restmapper"
-	kbuild "sigs.k8s.io/kustomize/kustomize/v4/commands/build"
+	kbuild "sigs.k8s.io/kustomize/kustomize/v5/commands/build"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
 

diff --git a/pkg/providerConfigs/adjustDriver.go b/pkg/providerConfigs/adjustDriver.go
@@ -8,6 +8,7 @@ package providerConfigs //nolint:revive,stylecheck // allowing temporarily for b
 
 import (
 	"fmt"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -50,7 +51,7 @@ func removeAllWithLogger(path string) {
 
 func adjustGitOpsRepoForProvider(cloudProvider, gitProvider, gitopsRepoDir, clusterType, clusterName string, apexContentExists, isK3D bool) error {
 	opt := cp.Options{
-		Skip: func(src string) (bool, error) {
+		Skip: func(_ fs.FileInfo, src string, _ string) (bool, error) {
 			if strings.HasSuffix(src, ".git") {
 				return true, nil
 			} else if strings.Index(src, "/.terraform") > 0 {
@@ -191,7 +192,7 @@ func AdjustGitopsRepo(
 
 func copyContents(source, destination string, createPath bool) error {
 	opt := cp.Options{
-		Skip: func(src string) (bool, error) {
+		Skip: func(_ fs.FileInfo, src string, _ string) (bool, error) {
 			if strings.HasSuffix(src, ".git") {
 				return true, nil
 			} else if strings.Index(src, "/.terraform") > 0 {