s3: cleaned up test
// fake creadentials used by minio server we're launching.
minioRootAccessKeyID = "fake-key"
minioRootSecretAccessKey = "fake-secret"
- minioUseSSL = false
minioRegion = "fake-region-1"
minioBucketName = "my-bucket" // we use ephemeral minio for each test so this does not need to be unique
@@ -232,7 +231,7 @@ func TestS3StorageMinio(t *testing.T) {
SecretAccessKey: minioRootSecretAccessKey,
BucketName: minioBucketName,
Region: minioRegion,
- DoNotUseTLS: !minioUseSSL,
+ DoNotUseTLS: true,
DoNotVerifyTLS: disableTLSVerify,
}
@@ -279,9 +278,6 @@ func TestS3StorageMinioSTS(t *testing.T) {
ma := newMinioAdmin(t, "http://"+minioEndpoint, minioRootAccessKeyID, minioRootSecretAccessKey)
- for _, disableTLSVerify := range []bool{true, false} {
- disableTLSVerify := disableTLSVerify
-
testutil.Retry(t, func(t *testutil.RetriableT) {
// create kopia user and session token
kopiaUserName := generateName("kopiauser")
@@ -299,8 +295,7 @@ func TestS3StorageMinioSTS(t *testing.T) {
SessionToken: kopiaSessionToken,
BucketName: minioBucketName,
Region: minioRegion,
- DoNotUseTLS: !minioUseSSL,
- DoNotVerifyTLS: disableTLSVerify,
+ DoNotUseTLS: true,
}
createBucket(t, &Options{
@@ -309,13 +304,11 @@ func TestS3StorageMinioSTS(t *testing.T) {
SecretAccessKey: minioRootSecretAccessKey,
BucketName: minioBucketName,
Region: minioRegion,
- DoNotUseTLS: !minioUseSSL,
- DoNotVerifyTLS: disableTLSVerify,
+ DoNotUseTLS: true,
})
testStorage(t, options)
})
}
-}
func TestNeedMD5AWS(t *testing.T) {
t.Parallel()
@@ -517,7 +510,7 @@ func createMinioSessionToken(t *testutil.RetriableT, minioEndpoint, kopiaUserNam
Endpoint: aws.String(minioEndpoint),
Region: aws.String(minioRegion),
S3ForcePathStyle: aws.Bool(true),
- DisableSSL: aws.Bool(!minioUseSSL),
+ DisableSSL: aws.Bool(true),
}
awsSession, err := session.NewSession(awsConfig)
