Merge pull request #1160 from k8up-io/fix/s3-trailing-slash-1038

Fix trailing slash in S3 endpoint causing empty bucket name

Author: Kidswiss

api/v1/backend.go

@@ -135,6 +135,7 @@ func (in *S3Spec) String() string {
 	if in.Endpoint != "" {
 		endpoint = in.Endpoint
 	}
+	endpoint = strings.TrimRight(endpoint, "/")
 
 	bucket := cfg.Config.GlobalS3Bucket
 	if in.Bucket != "" {

api/v1/backend_test.go

@@ -96,6 +96,21 @@ var tests = map[string]struct {
 		},
 		expectedRepositoryString: "s3:https://endpoint/bucket",
 	},
+	"GivenS3BackendWithTrailingSlash_ThenExpectCleanEndpointURL": {
+		givenBackend: &Backend{
+			S3: &S3Spec{
+				Bucket:                   "bucket",
+				Endpoint:                 "https://endpoint/",
+				SecretAccessKeySecretRef: newSecretRef("secret"),
+				AccessKeyIDSecretRef:     newSecretRef("id"),
+			},
+		},
+		expectedVars: map[string]*corev1.EnvVarSource{
+			cfg.AwsAccessKeyIDEnvName:     {SecretKeyRef: newSecretRef("id")},
+			cfg.AwsSecretAccessKeyEnvName: {SecretKeyRef: newSecretRef("secret")},
+		},
+		expectedRepositoryString: "s3:https://endpoint/bucket",
+	},
 	"GivenSwiftBackend_ThenExpectSwiftBucket": {
 		givenBackend: &Backend{
 			Swift: &SwiftSpec{