refactor: provider configuration (#613)

Author: jerome-quere

scaleway/config.go

@@ -36,7 +36,6 @@ type KubeconfigStruct struct {
 }
 
 const (
-	K8SClusterWaitForReadyTimeout        = 10 * time.Minute
 	K8SClusterWaitForPoolRequiredTimeout = 10 * time.Minute
 	K8SClusterWaitForDeletedTimeout      = 10 * time.Minute
 	K8SPoolWaitForReadyTimeout           = 10 * time.Minute

scaleway/helper_storage_object.go

@@ -1,9 +1,67 @@
 package scaleway
 
 import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
+func newS3Client(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")
+
+	s, err := session.NewSession(config)
+	if err != nil {
+		return nil, err
+	}
+	return s3.New(s), nil
+}
+
+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)
+}
+
+func s3ClientWithRegion(d *schema.ResourceData, m interface{}) (*s3.S3, scw.Region, error) {
+	meta := m.(*Meta)
+	region, err := extractRegion(d, meta)
+	if err != nil {
+		return nil, "", err
+	}
+
+	accessKey, _ := meta.scwClient.GetAccessKey()
+	secretKey, _ := meta.scwClient.GetSecretKey()
+
+	s3Client, err := newS3Client(region.String(), accessKey, secretKey)
+	if err != nil {
+		return nil, "", err
+	}
+
+	return s3Client, region, err
+}
+
+func s3ClientWithRegionAndName(m interface{}, name string) (*s3.S3, scw.Region, string, error) {
+	meta := m.(*Meta)
+	region, name, err := parseRegionalID(name)
+	if err != nil {
+		return nil, "", name, err
+	}
+	accessKey, _ := meta.scwClient.GetAccessKey()
+	secretKey, _ := meta.scwClient.GetSecretKey()
+	s3Client, err := newS3Client(region.String(), accessKey, secretKey)
+	if err != nil {
+		return nil, "", "", err
+	}
+	return s3Client, region, name, err
+}
+
 func flattenObjectBucketTags(tagsSet []*s3.Tag) map[string]interface{} {
 	tags := map[string]interface{}{}
 

scaleway/helpers_k8s.go

@@ -1,17 +1,11 @@
 package scaleway
 
 import (
-	"time"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
-const (
-	RdbWaitForTimeout = 10 * time.Minute
-)
-
 // rdbAPIWithRegion returns a new lb API and the region for a Create request
 func rdbAPIWithRegion(d *schema.ResourceData, m interface{}) (*rdb.API, scw.Region, error) {
 	meta := m.(*Meta)