feat: added scaleway_storage_object_bucket resource (scaleway#150)

Author: DenBeke

go.mod

@@ -1,9 +1,10 @@
 module github.com/terraform-providers/terraform-provider-scaleway
 
 require (
+	github.com/aws/aws-sdk-go v1.19.18
 	github.com/hashicorp/go-retryablehttp v0.5.2
 	github.com/hashicorp/terraform v0.12.1
-	github.com/mitchellh/go-homedir v1.0.0
+	github.com/mitchellh/go-homedir v1.1.0
 	github.com/nicolai86/scaleway-sdk v0.0.0-20181024210327-b20018e944c4
 	github.com/scaleway/scaleway-sdk-go v0.0.0-20190628150506-6175a43111c8
 	github.com/stretchr/testify v1.3.0

go.sum

@@ -257,6 +257,8 @@ github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMK
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnGC8aR0=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb h1:GRiLv4rgyqjqzxbhJke65IYUf4NCOOvrPOJbV/sPxkM=
 github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod h1:OaY7UOoTkkrX3wRwjpYRKafIkkyeD0UtweSHAWWiqQM=
 github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=

scaleway/config.go

@@ -12,6 +12,10 @@ import (
 	"os"
 	"time"
 
+	"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/go-retryablehttp"
 	"github.com/hashicorp/terraform/helper/logging"
 	sdk "github.com/nicolai86/scaleway-sdk"
@@ -32,11 +36,34 @@ type Meta struct {
 	// scwClient is the Scaleway SDK client.
 	scwClient *scw.Client
 
+	// s3Client is the S3 client
+	s3Client *s3.S3
+
 	// Deprecated: deprecatedClient is the deprecated Scaleway SDK (will be removed in `v2.0.0`).
 	deprecatedClient *sdk.API
 }
 
-// bootstrapScwClient returns a new scw.Client from the configuration.
+// bootstrap initializes all the clients for this meta config object.
+func (m *Meta) bootstrap() error {
+	err := m.bootstrapScwClient()
+	if err != nil {
+		return err
+	}
+
+	err = m.bootstrapDeprecatedClient()
+	if err != nil {
+		return err
+	}
+
+	err = m.bootstrapS3Client()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// bootstrapScwClient initializes a new scw.Client from the configuration.
 func (m *Meta) bootstrapScwClient() error {
 	options := []scw.ClientOption{
 		scw.WithHTTPClient(createRetryableHTTPClient(false)),
@@ -115,7 +142,7 @@ func (c *client) Do(r *http.Request) (*http.Response, error) {
 	return c.Client.Do(req)
 }
 
-// bootstrapDeprecatedClient creates a new deprecated client from the configuration.
+// bootstrapDeprecatedClient initializes a new deprecated client from the configuration.
 func (m *Meta) bootstrapDeprecatedClient() error {
 	options := func(sdkApi *sdk.API) {
 		sdkApi.Client = createRetryableHTTPClient(true)
@@ -143,6 +170,30 @@ func (m *Meta) bootstrapDeprecatedClient() error {
 	return nil
 }
 
+// bootstrapS3Client initializes a new s3 client from the configuration.
+func (m *Meta) bootstrapS3Client() error {
+	var err error
+
+	config := &aws.Config{}
+	config.WithRegion(string(m.DefaultRegion))
+	config.WithCredentials(credentials.NewStaticCredentials(m.AccessKey, m.SecretKey, ""))
+	config.WithEndpoint(m.getS3Endpoint(m.DefaultRegion))
+
+	s, err := session.NewSession(config)
+	if err != nil {
+		return err
+	}
+
+	m.s3Client = s3.New(s)
+	return nil
+}
+
+// getS3Endpoint returns the correct S3 endpoint for object storage based on the current region
+func (m *Meta) getS3Endpoint(region utils.Region) string {
+	return "https://s3." + string(region) + ".scw.cloud"
+
+}
+
 // deprecatedScalewayConfig is the structure of the deprecated Scaleway config file.
 type deprecatedScalewayConfig struct {
 	Organization string `json:"organization"`

scaleway/helper_storage_object.go

@@ -0,0 +1,58 @@
+package scaleway
+
+import (
+	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/scaleway/scaleway-sdk-go/utils"
+)
+
+// getS3ClientWithRegion returns a new S3 client with the correct region extracted from the resource data.
+func getS3ClientWithRegion(d *schema.ResourceData, m interface{}) (*s3.S3, utils.Region, error) {
+	meta := m.(*Meta)
+
+	region, err := getRegion(d, meta)
+	if err != nil {
+		return nil, "", err
+	}
+
+	if region != meta.DefaultRegion {
+		// if the region is not the same as the default region:
+		// we have to clone the meta object with the new region and create a new S3 client.
+		newMeta := *meta
+		newMeta.DefaultRegion = region
+
+		err := newMeta.bootstrapS3Client()
+		if err != nil {
+			return nil, "", err
+		}
+		return newMeta.s3Client, region, nil
+	}
+
+	return meta.s3Client, region, err
+}
+
+// getS3ClientWithRegion returns a new S3 client with the correct region and id  extracted from the resource data.
+func getS3ClientWithRegionAndID(m interface{}, id string) (*s3.S3, utils.Region, string, error) {
+	meta := m.(*Meta)
+
+	region, id, err := parseRegionalID(id)
+	if err != nil {
+		return nil, "", id, err
+	}
+
+	if region != meta.DefaultRegion {
+		// if the region is not the same as the default region:
+		// we have to clone the meta object with the new region and create a new S3 client.
+		newMeta := *meta
+		newMeta.DefaultRegion = region
+
+		err := newMeta.bootstrapS3Client()
+		if err != nil {
+			return nil, "", id, err
+		}
+		return newMeta.s3Client, region, id, nil
+	}
+
+	return meta.s3Client, region, id, err
+
+}

scaleway/helpers.go

@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
-	"github.com/nicolai86/scaleway-sdk"
+	api "github.com/nicolai86/scaleway-sdk"
 	"github.com/scaleway/scaleway-sdk-go/namegenerator"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/scaleway-sdk-go/utils"

scaleway/provider.go

@@ -156,6 +156,7 @@ func Provider() terraform.ResourceProvider {
 			"scaleway_compute_instance_ip":     resourceScalewayComputeInstanceIP(),
 			"scaleway_compute_instance_volume": resourceScalewayComputeInstanceVolume(),
 			"scaleway_compute_instance_server": resourceScalewayComputeInstanceServer(),
+			"scaleway_storage_object_bucket":   resourceScalewayStorageObjectBucket(),
 			"scaleway_user_data":               resourceScalewayUserData(),
 			"scaleway_server":                  resourceScalewayServer(),
 			"scaleway_token":                   resourceScalewayToken(),
@@ -229,12 +230,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		DefaultZone:      zone,
 	}
 
-	err = meta.bootstrapScwClient()
-	if err != nil {
-		return nil, err
-	}
-
-	err = meta.bootstrapDeprecatedClient()
+	meta.bootstrap()
 	if err != nil {
 		return nil, err
 	}

scaleway/resource_storage_object_bucket.go

@@ -0,0 +1,123 @@
+package scaleway
+
+import (
+	"fmt"
+
+	"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/helper/schema"
+	"github.com/hashicorp/terraform/helper/validation"
+)
+
+func resourceScalewayStorageObjectBucket() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceScalewayStorageObjectBucketCreate,
+		Read:   resourceScalewayStorageObjectBucketRead,
+		Update: resourceScalewayStorageObjectBucketUpdate,
+		Delete: resourceScalewayStorageObjectBucketDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "The name of the bucket",
+			},
+			"acl": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Default:     "private",
+				Description: "ACL of the bucket: either 'public-read' or 'private'.",
+				ValidateFunc: validation.StringInSlice([]string{
+					"private",
+					"public-read",
+					"public-read-write",
+					"aws-exec-read",
+					"authenticated-read",
+					"bucket-owner-read",
+					"bucket-owner-full-control",
+					"log-delivery-write",
+				}, false),
+			},
+			"region": regionSchema(),
+		},
+	}
+}
+
+func resourceScalewayStorageObjectBucketCreate(d *schema.ResourceData, m interface{}) error {
+	bucketName := d.Get("name").(string)
+	acl := d.Get("acl").(string)
+
+	s3Client, region, err := getS3ClientWithRegion(d, m)
+
+	_, err = s3Client.CreateBucket(&s3.CreateBucketInput{
+		Bucket: aws.String(bucketName),
+		ACL:    aws.String(acl),
+	})
+	if err != nil {
+		return err
+	}
+
+	d.SetId(newRegionalId(region, bucketName))
+
+	return resourceScalewayStorageObjectBucketRead(d, m)
+}
+
+func resourceScalewayStorageObjectBucketRead(d *schema.ResourceData, m interface{}) error {
+	s3Client, _, bucketName, err := getS3ClientWithRegionAndID(m, d.Id())
+	if err != nil {
+		return err
+	}
+
+	_, err = s3Client.ListObjects(&s3.ListObjectsInput{
+		Bucket: aws.String(bucketName),
+	})
+	if err != nil {
+		if serr, ok := err.(awserr.Error); ok && serr.Code() == s3.ErrCodeNoSuchBucket {
+			l.Errorf("Bucket %q was not found - removing from state!", bucketName)
+			d.SetId("")
+			return nil
+		}
+		return fmt.Errorf("couldn't read bucket: %s", err)
+	}
+
+	return nil
+}
+
+func resourceScalewayStorageObjectBucketUpdate(d *schema.ResourceData, m interface{}) error {
+	s3Client, _, bucketName, err := getS3ClientWithRegionAndID(m, d.Id())
+	if err != nil {
+		return err
+	}
+
+	if d.HasChange("acl") {
+		acl := d.Get("acl").(string)
+
+		_, err := s3Client.PutBucketAcl(&s3.PutBucketAclInput{
+			Bucket: aws.String(bucketName),
+			ACL:    aws.String(acl),
+		})
+		if err != nil {
+			l.Errorf("Couldn't update bucket ACL: %s", err)
+			return fmt.Errorf("couldn't update bucket ACL: %s", err)
+		}
+	}
+
+	return resourceScalewayStorageObjectBucketRead(d, m)
+}
+
+func resourceScalewayStorageObjectBucketDelete(d *schema.ResourceData, m interface{}) error {
+	s3Client, _, bucketName, err := getS3ClientWithRegionAndID(m, d.Id())
+	if err != nil {
+		return err
+	}
+
+	_, err = s3Client.DeleteBucket(&s3.DeleteBucketInput{
+		Bucket: aws.String(bucketName),
+	})
+	return err
+}