Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
886fc86
chore(object): refactor code for bucket resource
remyleone Oct 21, 2020
f1f12dd
Merge branch 'master' into refacto_object
remyleone Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions scaleway/helpers_object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package scaleway
import (
"errors"
"fmt"
"net/http"
"os"
"strings"
"time"
Expand All @@ -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)
}
Expand All @@ -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) {
Expand All @@ -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
}
Expand All @@ -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
}
Expand Down
14 changes: 9 additions & 5 deletions scaleway/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}

Expand Down
13 changes: 6 additions & 7 deletions scaleway/resource_object_bucket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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,
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
Loading