Fix

Author: remyleone

scaleway/helpers_object.go

@@ -3,6 +3,7 @@ package scaleway
 import (
 	"errors"
 	"fmt"
+	"net/http"
 	"os"
 	"strings"
 	"time"
@@ -20,11 +21,12 @@ const (
 	defaultObjectBucketTimeout = 10 * time.Minute
 )
 
-func newS3Client(region, accessKey, secretKey string) (*s3.S3, error) {
+func newS3Client(httpClient *http.Client, region, accessKey, secretKey string) (*s3.S3, error) {
 	config := &aws.Config{}
 	config.WithRegion(region)
 	config.WithCredentials(credentials.NewStaticCredentials(accessKey, secretKey, ""))
 	config.WithEndpoint("https://s3." + region + ".scw.cloud")
+	config.WithHTTPClient(httpClient)
 	if strings.ToLower(os.Getenv("TF_LOG")) == "debug" {
 		config.WithLogLevel(aws.LogDebugWithHTTPBody)
 	}
@@ -40,7 +42,7 @@ func newS3ClientFromMeta(meta *Meta) (*s3.S3, error) {
 	region, _ := meta.scwClient.GetDefaultRegion()
 	accessKey, _ := meta.scwClient.GetAccessKey()
 	secretKey, _ := meta.scwClient.GetSecretKey()
-	return newS3Client(region.String(), accessKey, secretKey)
+	return newS3Client(meta.httpClient, region.String(), accessKey, secretKey)
 }
 
 func s3ClientWithRegion(d *schema.ResourceData, m interface{}) (*s3.S3, scw.Region, error) {
@@ -53,7 +55,7 @@ func s3ClientWithRegion(d *schema.ResourceData, m interface{}) (*s3.S3, scw.Regi
 	accessKey, _ := meta.scwClient.GetAccessKey()
 	secretKey, _ := meta.scwClient.GetSecretKey()
 
-	s3Client, err := newS3Client(region.String(), accessKey, secretKey)
+	s3Client, err := newS3Client(meta.httpClient, region.String(), accessKey, secretKey)
 	if err != nil {
 		return nil, "", err
 	}
@@ -69,7 +71,7 @@ func s3ClientWithRegionAndName(m interface{}, name string) (*s3.S3, scw.Region,
 	}
 	accessKey, _ := meta.scwClient.GetAccessKey()
 	secretKey, _ := meta.scwClient.GetSecretKey()
-	s3Client, err := newS3Client(region.String(), accessKey, secretKey)
+	s3Client, err := newS3Client(meta.httpClient, region.String(), accessKey, secretKey)
 	if err != nil {
 		return nil, "", "", err
 	}

scaleway/provider.go

@@ -133,7 +133,8 @@ func Provider(config *ProviderConfig) plugin.ProviderFunc {
 // This meta value is passed into all resources.
 type Meta struct {
 	// scwClient is the Scaleway SDK client.
-	scwClient *scw.Client
+	scwClient  *scw.Client
+	httpClient *http.Client
 }
 
 type MetaConfig struct {
@@ -171,20 +172,20 @@ func buildMeta(config *MetaConfig) (*Meta, error) {
 		scw.WithProfile(profile),
 	}
 
-	defaultHTTPClient := &http.Client{Transport: newRetryableTransport(http.DefaultTransport)}
+	httpClient := &http.Client{Transport: newRetryableTransport(http.DefaultTransport)}
 	if config.httpClient != nil {
-		opts = append(opts, scw.WithHTTPClient(config.httpClient))
-	} else {
-		opts = append(opts, scw.WithHTTPClient(defaultHTTPClient))
+		httpClient = config.httpClient
 	}
+	opts = append(opts, scw.WithHTTPClient(httpClient))
 
 	scwClient, err := scw.NewClient(opts...)
 	if err != nil {
 		return nil, err
 	}
 
 	return &Meta{
-		scwClient: scwClient,
+		scwClient:  scwClient,
+		httpClient: httpClient,
 	}, nil
 }
 

scaleway/resource_object_bucket_test.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/s3"
@@ -24,9 +23,9 @@ func TestAccScalewayObjectBucket_Basic(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()
 
-	testBucketName := fmt.Sprintf("terraform-test-%d", time.Now().Unix())
-	testBucketNameAms := testBucketName + "ams"
-	testBucketNamePar := testBucketName + "par"
+	testBucketName := "test-acc-scaleway-object-bucket-basic"
+	testBucketNameAms := testBucketName + "-ams"
+	testBucketNamePar := testBucketName + "-par"
 	testBucketACL := "private"
 	testBucketUpdatedACL := "public-read"