snapshot metadata added

Author: 0ndi

docs/resources/gcore_snapshot.md

@@ -26,6 +26,9 @@ resource "gcore_snapshot" "snapshot" {
   name = "snapshot example"
   volume_id = "28e9edcb-1593-41fe-971b-da729c6ec301"
   description = "snapshot example description"
+  metadata = {
+    env = "test"
+  }
 }
 ```
 
@@ -42,6 +45,7 @@ resource "gcore_snapshot" "snapshot" {
 - **description** (String)
 - **id** (String) The ID of this resource.
 - **last_updated** (String)
+- **metadata** (Map of String)
 - **project_id** (Number)
 - **project_name** (String)
 - **region_id** (Number)

examples/resources/gcore_snapshot/resource.tf

@@ -11,6 +11,9 @@ resource "gcore_snapshot" "snapshot" {
   name = "snapshot example"
   volume_id = "28e9edcb-1593-41fe-971b-da729c6ec301"
   description = "snapshot example description"
+  metadata = {
+    env = "test"
+  }
 }
 
 

gcore/resource_gcore_k8s.go

@@ -464,7 +464,6 @@ func resourceK8sUpdate(ctx context.Context, d *schema.ResourceData, m interface{
 		if d.HasChange("pool.0.node_count") {
 			resizeOpts := clusters.ResizeOpts{
 				NodeCount: pool["node_count"].(int),
-				Pool:      poolID,
 			}
 			results, err := clusters.Resize(client, clusterID, poolID, resizeOpts).Extract()
 			if err != nil {

gcore/resource_gcore_k8s_pool.go

@@ -247,7 +247,6 @@ func resourceK8sPoolUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	if d.HasChange("node_count") {
 		resizeOpts := clusters.ResizeOpts{
 			NodeCount: d.Get("node_count").(int),
-			Pool:      poolID,
 		}
 		results, err := clusters.Resize(client, clusterID, poolID, resizeOpts).Extract()
 		if err != nil {

gcore/resource_gcore_snapshot.go

@@ -93,6 +93,14 @@ func resourceSnapshot() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"metadata": &schema.Schema{
+				Type:     schema.TypeMap,
+				Optional: true,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			"last_updated": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -174,6 +182,9 @@ func resourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m interfa
 	d.Set("volume_id", snapshot.VolumeID)
 	d.Set("region_id", snapshot.RegionID)
 	d.Set("project_id", snapshot.ProjectID)
+	if err := d.Set("metadata", snapshot.Metadata); err != nil {
+		return diag.FromErr(err)
+	}
 
 	log.Println("[DEBUG] Finish snapshot reading")
 	return diags
@@ -182,7 +193,24 @@ func resourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m interfa
 func resourceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Println("[DEBUG] Start snapshot updating")
 	snapshotID := d.Id()
-	log.Printf("[DEBUG] Snapshot id = %s", snapshotID)
+	if d.HasChange("metadata") {
+		config := m.(*Config)
+		provider := config.Provider
+		client, err := CreateClient(provider, d, snapshotsPoint, versionPointV1)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		newMeta := prepareRawMetadata(d.Get("metadata").(map[string]interface{}))
+		metadata := make([]snapshots.MetadataOpts, 0, len(newMeta))
+		for k, v := range newMeta {
+			metadata = append(metadata, snapshots.MetadataOpts{Key: k, Value: v})
+		}
+		opts := snapshots.MetadataSetOpts{Metadata: metadata}
+		if _, err := snapshots.MetadataReplace(client, snapshotID, opts).Extract(); err != nil {
+			return diag.FromErr(err)
+		}
+	}
 	d.Set("last_updated", time.Now().Format(time.RFC850))
 	log.Println("[DEBUG] Finish snapshot updating")
 	return resourceSnapshotRead(ctx, d, m)
@@ -233,6 +261,18 @@ func getSnapshotData(d *schema.ResourceData) (*snapshots.CreateOpts, error) {
 	snapshotData.Name = d.Get("name").(string)
 	snapshotData.VolumeID = d.Get("volume_id").(string)
 	snapshotData.Description = d.Get("description").(string)
+	metadataRaw := d.Get("metadata").(map[string]interface{})
+	if len(metadataRaw) > 0 {
+		snapshotData.Metadata = prepareRawMetadata(metadataRaw)
+	}
 
 	return &snapshotData, nil
 }
+
+func prepareRawMetadata(raw map[string]interface{}) map[string]string {
+	meta := make(map[string]string, len(raw))
+	for k, v := range raw {
+		meta[k] = v.(string)
+	}
+	return meta
+}

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/G-Core/g-dns-sdk-go v0.1.0
 	github.com/G-Core/gcorelabs-storage-sdk-go v0.0.9
 	github.com/G-Core/gcorelabscdn-go v0.0.0-20210503173228-b4ac8b2402ff
-	github.com/G-Core/gcorelabscloud-go v0.4.15
+	github.com/G-Core/gcorelabscloud-go v0.4.26
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-plugin-docs v0.4.0 // indirect
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0

go.sum

@@ -47,8 +47,8 @@ github.com/G-Core/gcorelabs-storage-sdk-go v0.0.9 h1:6uyKbknI8Q2pIJApPBf6JA0CN5O
 github.com/G-Core/gcorelabs-storage-sdk-go v0.0.9/go.mod h1:BZef79y4G28n8ic3x6iQWbW+mtpHPSUyJRfIRSkeAJw=
 github.com/G-Core/gcorelabscdn-go v0.0.0-20210503173228-b4ac8b2402ff h1:kIH66Shwb0Y9kvBgykpzmQn2soiHDTCJ/Rr5cQQ1cOk=
 github.com/G-Core/gcorelabscdn-go v0.0.0-20210503173228-b4ac8b2402ff/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
-github.com/G-Core/gcorelabscloud-go v0.4.15 h1:cu1GUGiUaGQlljlxRACqNvr6eKx2MCyEXyB8zEVcH50=
-github.com/G-Core/gcorelabscloud-go v0.4.15/go.mod h1:Z1MF80mWagEUrxygtYkvW/MJEYNmIUPsIEYBB3cKjOM=
+github.com/G-Core/gcorelabscloud-go v0.4.26 h1:jClzBf/JG9vX426Qjb+2IFFFSUF5N3E9JbjxaxuVuto=
+github.com/G-Core/gcorelabscloud-go v0.4.26/go.mod h1:Z1MF80mWagEUrxygtYkvW/MJEYNmIUPsIEYBB3cKjOM=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=