feat(object): added object resource (#1464)

Author: Codelax

docs/resources/object.md

@@ -0,0 +1,55 @@
+---
+page_title: "Scaleway: scaleway_object"
+description: |-
+Manages Scaleway object storage objects.
+---
+
+# scaleway_object
+
+Creates and manages Scaleway object storage objects.
+For more information, see [the documentation](https://www.scaleway.com/en/docs/object-storage-feature/).
+
+## Example Usage
+
+```hcl
+resource "scaleway_object_bucket" "some_bucket" {
+  name = "some-unique-name"
+}
+
+resource scaleway_object "some_file" {
+  bucket = scaleway_object_bucket.some_bucket.name
+  key = "object_path"
+  
+  file = "myfile"
+  hash = filemd5("myfile")
+}
+```
+
+## Arguments Reference
+
+
+The following arguments are supported:
+
+* `bucket` - (Required) The name of the bucket.
+* `key` - (Required) The path of the object.
+* `file` - (Optional) The name of the file to upload, defaults to an empty file
+* `hash` - (Optional) Hash of the file, used to trigger upload on file change
+* `storage_class` - (Optional) Specifies the Scaleway [storage class](https://www.scaleway.com/en/docs/storage/object/concepts/#storage-class) `STANDARD`, `GLACIER`, `ONEZONE_IA` used to store the object.
+* `visibility` - (Optional) Visibility of the object, `public-read` or `private`
+* `metadata` - (Optional) Map of metadata used for the object, keys must be lowercase
+* `tags` - (Optional) Map of tags
+
+## Attributes Reference
+
+In addition to all above arguments, the following attribute is exported:
+
+* `id` - The path of the object, including bucket name.
+* `region` - The Scaleway region this bucket resides in.
+
+## Import
+
+Objects can be imported using the `{region}/{bucketName}/{objectKey}` identifier, e.g.
+
+```bash
+$ terraform import scaleway_object.some_object fr-par/some-bucket/some-file
+```

scaleway/helpers.go

@@ -151,6 +151,17 @@ func parseRegionalID(regionalID string) (region scw.Region, id string, err error
 	return
 }
 
+// parseRegionalNestedID parses a regionalNestedID and extracts the resource region, inner and outer ID.
+func parseRegionalNestedID(regionalNestedID string) (region scw.Region, outerID, innerID string, err error) {
+	locality, innerID, outerID, err := parseLocalizedNestedID(regionalNestedID)
+	if err != nil {
+		return
+	}
+
+	region, err = scw.ParseRegion(locality)
+	return
+}
+
 // newZonedIDString constructs a unique identifier based on resource zone and id
 func newZonedIDString(zone scw.Zone, id string) string {
 	return fmt.Sprintf("%s/%s", zone, id)
@@ -585,6 +596,21 @@ func flattenMap(m map[string]string) interface{} {
 	return flattenedMap
 }
 
+func flattenMapStringStringPtr(m map[string]*string) interface{} {
+	if m == nil {
+		return nil
+	}
+	flattenedMap := make(map[string]interface{})
+	for k, v := range m {
+		if v != nil {
+			flattenedMap[k] = *v
+		} else {
+			flattenedMap[k] = ""
+		}
+	}
+	return flattenedMap
+}
+
 func diffSuppressFuncDuration(k, oldValue, newValue string, d *schema.ResourceData) bool {
 	if oldValue == newValue {
 		return true
@@ -632,6 +658,17 @@ func expandMapPtrStringString(data interface{}) *map[string]string {
 	return &m
 }
 
+func expandMapStringStringPtr(data interface{}) map[string]*string {
+	if data == nil {
+		return nil
+	}
+	m := make(map[string]*string)
+	for k, v := range data.(map[string]interface{}) {
+		m[k] = expandStringPtr(v)
+	}
+	return m
+}
+
 func errorCheck(err error, message string) bool {
 	return strings.Contains(err.Error(), message)
 }
@@ -707,3 +744,20 @@ func ErrorCheck(t *testing.T, endpointIDs ...string) resource.ErrorCheckFunc {
 		return err
 	}
 }
+
+func validateMapKeyLowerCase() schema.SchemaValidateDiagFunc {
+	return func(i interface{}, path cty.Path) diag.Diagnostics {
+		m := expandMapStringStringPtr(i)
+		for k := range m {
+			if strings.ToLower(k) != k {
+				return diag.Diagnostics{diag.Diagnostic{
+					Severity:      diag.Error,
+					AttributePath: cty.IndexStringPath(k),
+					Summary:       "Invalid map content",
+					Detail:        fmt.Sprintf("key (%s) should be lowercase", k),
+				}}
+			}
+		}
+		return nil
+	}
+}

scaleway/helpers_object.go

@@ -86,6 +86,21 @@ func s3ClientWithRegionAndName(m interface{}, name string) (*s3.S3, scw.Region,
 	return s3Client, region, name, err
 }
 
+func s3ClientWithRegionAndNestedName(m interface{}, name string) (*s3.S3, scw.Region, string, string, error) {
+	meta := m.(*Meta)
+	region, outerID, innerID, err := parseRegionalNestedID(name)
+	if err != nil {
+		return nil, "", outerID, innerID, err
+	}
+	accessKey, _ := meta.scwClient.GetAccessKey()
+	secretKey, _ := meta.scwClient.GetSecretKey()
+	s3Client, err := newS3Client(meta.httpClient, region.String(), accessKey, secretKey)
+	if err != nil {
+		return nil, "", "", "", err
+	}
+	return s3Client, region, outerID, innerID, err
+}
+
 func flattenObjectBucketTags(tagsSet []*s3.Tag) map[string]interface{} {
 	tags := map[string]interface{}{}
 

scaleway/provider.go

@@ -139,6 +139,7 @@ func Provider(config *ProviderConfig) plugin.ProviderFunc {
 				"scaleway_rdb_user":                            resourceScalewayRdbUser(),
 				"scaleway_rdb_read_replica":                    resourceScalewayRdbReadReplica(),
 				"scaleway_redis_cluster":                       resourceScalewayRedisCluster(),
+				"scaleway_object":                              resourceScalewayObject(),
 				"scaleway_object_bucket":                       resourceScalewayObjectBucket(),
 				"scaleway_object_bucket_policy":                resourceScalewayObjectBucketPolicy(),
 				"scaleway_object_bucket_website_configuration": ResourceBucketWebsiteConfiguration(),