chore(object): refactor code for bucket resource (#720)

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

@@ -134,6 +134,10 @@ func Provider(config *ProviderConfig) plugin.ProviderFunc {
 type Meta struct {
 	// scwClient is the Scaleway SDK client.
 	scwClient *scw.Client
+	// httpClient can be either a regular http.Client used to make real HTTP requests
+	// or it can be a http.Client used to record and replay cassettes which is useful
+	// to replay recorded interactions with APIs locally
+	httpClient *http.Client
 }
 
 type MetaConfig struct {
@@ -171,20 +175,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,9 +4,7 @@ import (
 	"fmt"
 	"strings"
 	"testing"
-	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -25,11 +23,12 @@ 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"
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
@@ -220,7 +219,7 @@ func testAccCheckScalewayObjectBucketExists(tt *TestTools, n string, bucketName
 		}
 
 		_, err = conn.HeadBucketWithContext(tt.ctx, &s3.HeadBucketInput{
-			Bucket: aws.String(bucketName),
+			Bucket: scw.StringPtr(bucketName),
 		})
 
 		if err != nil {
@@ -241,7 +240,7 @@ func testAccCheckScalewayObjectBucketVersioning(tt *TestTools, versioningStatus
 		}
 
 		out, err := conn.GetBucketVersioningWithContext(tt.ctx, &s3.GetBucketVersioningInput{
-			Bucket: aws.String(bucketName),
+			Bucket: scw.StringPtr(bucketName),
 		})
 
 		if err != nil {