Update deps

Signed-off-by: Tamal Saha <[email protected]>

go.mod

@@ -19,11 +19,11 @@ require (
 	k8s.io/cli-runtime v0.30.1
 	k8s.io/client-go v0.30.1
 	k8s.io/klog/v2 v2.120.1
-	k8s.io/kubectl v0.29.0
+	k8s.io/kubectl v0.30.1
 	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
-	kmodules.xyz/client-go v0.30.13
+	kmodules.xyz/client-go v0.30.14
 	kmodules.xyz/offshoot-api v0.29.4
-	kubestash.dev/apimachinery v0.12.1-0.20240912104406-a2f719cbd88e
+	kubestash.dev/apimachinery v0.12.1-0.20240912114724-e2698888fc6a
 	sigs.k8s.io/controller-runtime v0.18.4
 	sigs.k8s.io/yaml v1.4.0
 )

go.sum

@@ -797,20 +797,20 @@ k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
 k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a h1:zD1uj3Jf+mD4zmA7W+goE5TxDkI7OGJjBNBzq5fJtLA=
 k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc=
-k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI=
-k8s.io/kubectl v0.29.0/go.mod h1:0jMjGWIcMIQzmUaMgAzhSELv5WtHo2a8pq67DtviAJs=
+k8s.io/kubectl v0.30.1 h1:sHFIRI3oP0FFZmBAVEE8ErjnTyXDPkBcvO88mH9RjuY=
+k8s.io/kubectl v0.30.1/go.mod h1:7j+L0Cc38RYEcx+WH3y44jRBe1Q1jxdGPKkX0h4iDq0=
 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak=
 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-kmodules.xyz/client-go v0.30.13 h1:Tpvg7ZlSNlzjB0NZT9hUe9JrO7FN4PjUUF1hNUXSku0=
-kmodules.xyz/client-go v0.30.13/go.mod h1:XL3PDQIXG4s3xNRL2SSxIvi8b2WyMGpn26dFnOBz0j4=
+kmodules.xyz/client-go v0.30.14 h1:Zi3hoIoJOeEYXzafrbwN8ql+L1I5/pKCjcjRHuwiNfU=
+kmodules.xyz/client-go v0.30.14/go.mod h1:XL3PDQIXG4s3xNRL2SSxIvi8b2WyMGpn26dFnOBz0j4=
 kmodules.xyz/objectstore-api v0.29.1 h1:uUsjf8KU0w4LYowSEOnl0AbHT3hsHIu1wNLHqGe1o6s=
 kmodules.xyz/objectstore-api v0.29.1/go.mod h1:xG+5awH1SXYKxwN/+k1FEQvzixd5tgNqEN/1LEiB2FE=
 kmodules.xyz/offshoot-api v0.29.4 h1:WQV2BIUIoVKKiqZNmZ4gAy367jEdwBhEl3dFCLZM1qA=
 kmodules.xyz/offshoot-api v0.29.4/go.mod h1:e+NQ0s4gW/YTPWBWEfdISZcmk+tlTq8IjvP5SLdqvko=
 kmodules.xyz/prober v0.29.0 h1:Ex7m4F9rH7uWNNJlLgP63ROOM+nUATJkC2L5OQ7nwMg=
 kmodules.xyz/prober v0.29.0/go.mod h1:UtK+HKyI1lFLEKX+HFLyOCVju6TO93zv3kwGpzqmKOo=
-kubestash.dev/apimachinery v0.12.1-0.20240912104406-a2f719cbd88e h1:xiUn8eom/4/hAJaqoC72zpYZ5C3uV7HZUlHFB0GY8uw=
-kubestash.dev/apimachinery v0.12.1-0.20240912104406-a2f719cbd88e/go.mod h1:gtVSpHtK8LvS26+rKyLTnZvijvSSCdfG83n6GL6+Kwc=
+kubestash.dev/apimachinery v0.12.1-0.20240912114724-e2698888fc6a h1:CiTlSi3CIfTY+gbIBFm4oMmbhTknYvrRGWn4LZC82wA=
+kubestash.dev/apimachinery v0.12.1-0.20240912114724-e2698888fc6a/go.mod h1:gtVSpHtK8LvS26+rKyLTnZvijvSSCdfG83n6GL6+Kwc=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=

pkg/debug_backupstorage.go

@@ -30,7 +30,7 @@ import (
 
 const (
 	debugMetaFile   = "debug_metadata.yaml"
-	yamlContentType = "application/yaml"
+	contentTypeYAML = "application/yaml"
 )
 
 func NewCmdDebugBackupStorage() *cobra.Command {
@@ -61,7 +61,7 @@ func NewCmdDebugBackupStorage() *cobra.Command {
 				return err
 			}
 
-			return backend.Debug(ctx, debugMetaFile, d, yamlContentType)
+			return backend.Debug(ctx, debugMetaFile, d, contentTypeYAML)
 		},
 	}
 	return cmd

vendor/kubestash.dev/apimachinery/pkg/blob/blob.go

@@ -21,6 +21,12 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path"
+	"strings"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
@@ -34,19 +40,14 @@ import (
 	_ "gocloud.dev/blob/gcsblob"
 	"gocloud.dev/blob/s3blob"
 	_ "gocloud.dev/blob/s3blob"
-	"io"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/klog/v2"
 	"kubestash.dev/apimachinery/apis"
 	storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
-	"net/http"
-	"os"
-	"path"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"strings"
 )
 
 const (
@@ -256,15 +257,10 @@ func (b *Blob) Upload(ctx context.Context, filepath string, data []byte, content
 	}
 	defer closeBucket(ctx, bucket)
 
-	writerOptions := &blob.WriterOptions{
+	w, err := bucket.NewWriter(ctx, fileName, &blob.WriterOptions{
+		ContentType:                 contentType,
 		DisableContentTypeDetection: true,
-	}
-	if contentType != "" {
-		writerOptions.ContentType = contentType
-		writerOptions.DisableContentTypeDetection = false
-	}
-
-	w, err := bucket.NewWriter(ctx, fileName, writerOptions)
+	})
 	if err != nil {
 		return err
 	}
@@ -281,23 +277,18 @@ func (b *Blob) Upload(ctx context.Context, filepath string, data []byte, content
 
 func (b *Blob) Debug(ctx context.Context, filepath string, data []byte, contentType string) error {
 	dir, fileName := path.Split(filepath)
-	bucket, err := b.openBucketWithDebug(ctx, dir)
+	bucket, err := b.openBucketWithDebug(ctx, dir, true)
 	if err != nil {
 		return err
 	}
 
 	defer closeBucket(ctx, bucket)
 
-	writerOptions := &blob.WriterOptions{
-		DisableContentTypeDetection: true,
-	}
-	if contentType != "" {
-		writerOptions.ContentType = contentType
-		writerOptions.DisableContentTypeDetection = false
-	}
-
 	klog.Infof("Uploading data to backend...")
-	w, err := bucket.NewWriter(ctx, fileName, writerOptions)
+	w, err := bucket.NewWriter(ctx, fileName, &blob.WriterOptions{
+		ContentType:                 contentType,
+		DisableContentTypeDetection: true,
+	})
 	if err != nil {
 		return err
 	}
@@ -389,41 +380,21 @@ func checkIfObjectFile(obj *blob.ListObject) bool {
 }
 
 func (b *Blob) openBucket(ctx context.Context, dir string) (*blob.Bucket, error) {
-	var bucket *blob.Bucket
-	var err error
-	if b.backupStorage.Spec.Storage.Provider == storageapi.ProviderS3 {
-		sess, err := b.getS3Session()
-		if err != nil {
-			return nil, err
-		}
-		bucket, err = s3blob.OpenBucket(ctx, sess, b.backupStorage.Spec.Storage.S3.Bucket, nil)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		bucket, err = blob.OpenBucket(ctx, b.storageURL)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	suffix := strings.Trim(path.Join(b.prefix, dir), "/") + "/"
-	if suffix == string(os.PathSeparator) {
-		return bucket, nil
-	}
-	return blob.PrefixedBucket(bucket, suffix), nil
+	return b.openBucketWithDebug(ctx, dir, false)
 }
 
-func (b *Blob) openBucketWithDebug(ctx context.Context, dir string) (*blob.Bucket, error) {
+func (b *Blob) openBucketWithDebug(ctx context.Context, dir string, debug bool) (*blob.Bucket, error) {
 	var bucket *blob.Bucket
 	var err error
 	if b.backupStorage.Spec.Storage.Provider == storageapi.ProviderS3 {
 		sess, err := b.getS3Session()
 		if err != nil {
 			return nil, err
 		}
-		// Currently Only S3 has debugging support, because for the rest of providers we're using default blob.
-		sess.Config.WithLogLevel(aws.LogDebug)
+		if debug {
+			// Currently Only S3 has debugging support, because for the rest of providers we're using default blob.
+			sess.Config.WithLogLevel(aws.LogDebug)
+		}
 		bucket, err = s3blob.OpenBucket(ctx, sess, b.backupStorage.Spec.Storage.S3.Bucket, nil)
 		if err != nil {
 			return nil, err

vendor/modules.txt

@@ -1335,8 +1335,8 @@ k8s.io/kube-openapi/pkg/spec3
 k8s.io/kube-openapi/pkg/util/proto
 k8s.io/kube-openapi/pkg/util/proto/validation
 k8s.io/kube-openapi/pkg/validation/spec
-# k8s.io/kubectl v0.29.0
-## explicit; go 1.21
+# k8s.io/kubectl v0.30.1
+## explicit; go 1.22.0
 k8s.io/kubectl/pkg/cmd/util
 k8s.io/kubectl/pkg/scheme
 k8s.io/kubectl/pkg/util/i18n
@@ -1357,7 +1357,7 @@ k8s.io/utils/pointer
 k8s.io/utils/ptr
 k8s.io/utils/strings/slices
 k8s.io/utils/trace
-# kmodules.xyz/client-go v0.30.13
+# kmodules.xyz/client-go v0.30.14
 ## explicit; go 1.22.0
 kmodules.xyz/client-go
 kmodules.xyz/client-go/api/v1
@@ -1377,7 +1377,7 @@ kmodules.xyz/offshoot-api/api/v1
 # kmodules.xyz/prober v0.29.0
 ## explicit; go 1.21.5
 kmodules.xyz/prober/api/v1
-# kubestash.dev/apimachinery v0.12.1-0.20240912104406-a2f719cbd88e
+# kubestash.dev/apimachinery v0.12.1-0.20240912114724-e2698888fc6a
 ## explicit; go 1.22.0
 kubestash.dev/apimachinery/apis
 kubestash.dev/apimachinery/apis/addons/v1alpha1