@@ -15,6 +15,7 @@ import (
15
15
16
16
"github.com/aws/aws-sdk-go-v2/aws"
17
17
"github.com/aws/aws-sdk-go-v2/service/s3"
18
+ "github.com/aws/aws-sdk-go-v2/service/s3/types"
18
19
"github.com/go-openapi/swag"
19
20
20
21
"github.com/minio/minio-go/v7"
@@ -188,13 +189,16 @@ func TestS3IfNoneMatch(t *testing.T) {
188
189
ctx , _ , repo := setupTest (t )
189
190
defer tearDownTest (repo )
190
191
191
- client := createS3Client (endpointURL + apiutil .BaseURL , t )
192
+ client := createS3Client (endpointURL , t )
193
+ bucketName := "test-bucket"
192
194
_ , err := client .CreateBucket (ctx , & s3.CreateBucketInput {
193
- Bucket : aws .String ("test-bucket" ),
195
+ Bucket : aws .String (bucketName ),
196
+ CreateBucketConfiguration : & types.CreateBucketConfiguration {
197
+ LocationConstraint : types .BucketLocationConstraint ("us-east-1" ),
198
+ },
194
199
})
195
200
196
201
require .NoError (t , err , "Error creating bucket" )
197
- //func (c *Client) CreateBucket(ctx context.Context, params *CreateBucketInput, optFns ...func(*Options)) (*CreateBucketOutput, error)
198
202
199
203
type TestCase struct {
200
204
Path string
@@ -221,13 +225,13 @@ func TestS3IfNoneMatch(t *testing.T) {
221
225
for tc := range objects {
222
226
// Create the PutObject request
223
227
_ , err := client .PutObject (ctx , & s3.PutObjectInput {
224
- Bucket : aws .String ("test-bucket" ),
228
+ Bucket : aws .String (bucketName ),
225
229
Key : aws .String (tc .Path ),
226
230
Body : strings .NewReader (tc .Content ),
227
231
})
228
- if ( err != nil ) != tc . ExpectError {
229
- t . Errorf ( "unexpected error for Path %s with If-None-Match %q: %v" , tc . Path , tc . IfNoneMatch , err )
230
- }
232
+
233
+ require . NoError ( t , err , "Error uploading bucket" )
234
+
231
235
}
232
236
}()
233
237
}
0 commit comments