fix: set s3 region to auto

christophwitzko · christophwitzko · commit ffc85256a8a4 · 2024-02-18T16:25:38.000+01:00
diff --git a/internal/config/server.go b/internal/config/server.go
@@ -64,6 +64,7 @@ func (s *ServerConfig) CreateS3Client() (*s3.Client, error) {
 	s3Cfg, err := awsConfig.LoadDefaultConfig(context.TODO(),
 		awsConfig.WithEndpointResolverWithOptions(aws.EndpointResolverWithOptionsFunc(s.r2CloudflareEndpointResolver)),
 		awsConfig.WithCredentialsProvider(staticCredentialsProvider),
+		awsConfig.WithRegion("auto"),
 	)
 	if err != nil {
 		return nil, err
diff --git a/internal/server/handlers_test.go b/internal/server/handlers_test.go
@@ -126,6 +126,7 @@ func createS3Client(t *testing.T) (*s3.Client, func()) {
 			}, nil
 		})),
 		awsConfig.WithCredentialsProvider(credentials.NewStaticCredentialsProvider("test", "test", "")),
+		awsConfig.WithRegion("auto"),
 	)
 	require.NoError(t, err)
 	return s3.NewFromConfig(s3Cfg), ts.Close

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ func (s ServerConfig) CreateS3Client() (s3.Client, error) {`
`64`	`64`	`s3Cfg, err := awsConfig.LoadDefaultConfig(context.TODO(),`
`65`	`65`	`awsConfig.WithEndpointResolverWithOptions(aws.EndpointResolverWithOptionsFunc(s.r2CloudflareEndpointResolver)),`
`66`	`66`	`awsConfig.WithCredentialsProvider(staticCredentialsProvider),`
	`67`	`+ awsConfig.WithRegion("auto"),`
`67`	`68`	`)`
`68`	`69`	`if err != nil {`
`69`	`70`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ func createS3Client(t testing.T) (s3.Client, func()) {`
`126`	`126`	`}, nil`
`127`	`127`	`})),`
`128`	`128`	`awsConfig.WithCredentialsProvider(credentials.NewStaticCredentialsProvider("test", "test", "")),`
	`129`	`+ awsConfig.WithRegion("auto"),`
`129`	`130`	`)`
`130`	`131`	`require.NoError(t, err)`
`131`	`132`	`return s3.NewFromConfig(s3Cfg), ts.Close`