Skip to content

Commit a18d24e

Browse files
author
Paulo Gomes
committed
Remove minio region
Twice recently the minio region seemed to have changed unsetting it seems to work consistently. Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
1 parent 39f1c5c commit a18d24e

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

pkg/minio/minio_test.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ import (
3939
const (
4040
objectName string = "test.yaml"
4141
objectEtag string = "2020beab5f1711919157756379622d1d"
42-
region string = "us-west-2"
4342
)
4443

4544
var (
46-
minioClient *MinioClient
47-
bucketName = "test-bucket-minio" + uuid.New().String()
48-
secret = corev1.Secret{
45+
firstFailure = true
46+
minioClient *MinioClient
47+
bucketName = "test-bucket-minio" + uuid.New().String()
48+
secret = corev1.Secret{
4949
ObjectMeta: v1.ObjectMeta{
5050
Name: "minio-secret",
5151
Namespace: "default",
@@ -72,7 +72,6 @@ var (
7272
Spec: sourcev1.BucketSpec{
7373
BucketName: bucketName,
7474
Endpoint: "play.min.io",
75-
Region: region,
7675
Provider: "generic",
7776
Insecure: true,
7877
SecretRef: &meta.LocalObjectReference{
@@ -88,7 +87,6 @@ var (
8887
Spec: sourcev1.BucketSpec{
8988
BucketName: bucketName,
9089
Endpoint: "play.min.io",
91-
Region: region,
9290
Provider: "aws",
9391
Insecure: true,
9492
},
@@ -226,11 +224,14 @@ func TestValidateSecret(t *testing.T) {
226224
}
227225

228226
func createBucket(ctx context.Context) {
229-
if err := minioClient.Client.MakeBucket(ctx, bucketName, miniov7.MakeBucketOptions{Region: region}); err != nil {
227+
if err := minioClient.Client.MakeBucket(ctx, bucketName, miniov7.MakeBucketOptions{}); err != nil {
230228
exists, errBucketExists := minioClient.BucketExists(ctx, bucketName)
231229
if errBucketExists == nil && exists {
232230
deleteBucket(ctx)
233-
} else {
231+
return
232+
} else if firstFailure {
233+
firstFailure = false
234+
234235
log.Fatalln(err)
235236
}
236237
}

0 commit comments

Comments
 (0)