Create resource ydb_topic_consumer #6

.github/workflows/lint.yml

@@ -13,19 +13,19 @@ jobs:
       cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.48.0
+          version: v1.50.1
   autoformatter:
     name: autoformat check
     concurrency:
       group: lint-autoformat-${{ github.ref }}
       cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install Go
         uses: actions/setup-go@v3

.gitignore

@@ -10,3 +10,4 @@ terraform-provider-ydb
 bin/
 *.idea
 vendor/
+terraform.*

go.mod

@@ -10,7 +10,6 @@ require (
 
 require (
 	github.com/agext/levenshtein v1.2.2 // indirect
-	github.com/apparentlymart/go-cidr v1.1.0 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.7.0 // indirect
@@ -19,25 +18,22 @@ require (
 	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
-	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
 	github.com/hashicorp/go-hclog v1.2.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-plugin v1.4.3 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/go-version v1.4.0 // indirect
-	github.com/hashicorp/hc-install v0.3.1 // indirect
 	github.com/hashicorp/hcl/v2 v2.11.1 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-exec v0.16.1 // indirect
-	github.com/hashicorp/terraform-json v0.13.0 // indirect
 	github.com/hashicorp/terraform-plugin-go v0.9.0 // indirect
 	github.com/hashicorp/terraform-plugin-log v0.3.0 // indirect
 	github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 // indirect
 	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
 	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
 	github.com/jonboulle/clockwork v0.2.2 // indirect
+	github.com/kr/pretty v0.2.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
 	github.com/mattn/go-isatty v0.0.10 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -52,14 +48,14 @@ require (
 	github.com/vmihailenco/tagparser v0.1.1 // indirect
 	github.com/ydb-platform/ydb-go-genproto v0.0.0-20221215182650-986f9d10542f // indirect
 	github.com/zclconf/go-cty v1.10.0 // indirect
-	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
+	golang.org/x/net v0.7.0 // indirect
 	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
-	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
 	google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
 	google.golang.org/grpc v1.49.0 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.0 // indirect
 )

internal/resources/changefeed/changefeed.go

@@ -138,14 +138,33 @@ func flattenCDCDescription(
 	changefeedResource *changeDataCaptureSettings,
 	cdcDescription options.ChangefeedDescription,
 	consumers []topictypes.Consumer,
-) {
-	_ = d.Set("table_path", changefeedResource.getTablePath())
-	_ = d.Set("connection_string", changefeedResource.getConnectionString())
-	_ = d.Set("table_id", changefeedResource.getConnectionString()+"/"+changefeedResource.getTablePath())
-	_ = d.Set("name", cdcDescription.Name)
-	_ = d.Set("mode", changefeedModeToStringMap[cdcDescription.Mode])
-	_ = d.Set("format", changefeedFormatToStringMap[cdcDescription.Format])
-	_ = d.Set("consumer", topic.FlattenConsumersDescription(consumers))
+) (err error) {
+	err = d.Set("table_path", changefeedResource.getTablePath())
+	if err != nil {
+		return
+	}
+	err = d.Set("connection_string", changefeedResource.getConnectionString())
+	if err != nil {
+		return
+	}
+	err = d.Set("table_id", changefeedResource.getConnectionString()+"&path="+changefeedResource.getTablePath())
+	if err != nil {
+		return
+	}
+	err = d.Set("name", cdcDescription.Name)
+	if err != nil {
+		return
+	}
+	err = d.Set("mode", changefeedModeToStringMap[cdcDescription.Mode])
+	if err != nil {
+		return
+	}
+	err = d.Set("format", changefeedFormatToStringMap[cdcDescription.Format])
+	if err != nil {
+		return
+	}
+
+	return d.Set("consumer", topic.FlattenConsumersDescription(consumers))
 }
 
 func parseTablePathFromCDCEntity(entityPath string) string {

internal/resources/changefeed/read.go

@@ -75,6 +75,5 @@ func (h *handler) Read(ctx context.Context, d *schema.ResourceData, meta interfa
 		return diag.FromErr(err)
 	}
 
-	flattenCDCDescription(d, cdcResource, cdcDescription, topicDesc.Consumers)
-	return nil
+	return diag.FromErr(flattenCDCDescription(d, cdcResource, cdcDescription, topicDesc.Consumers))
 }

internal/resources/table/index/index.go

@@ -100,21 +100,37 @@ func flattenIndexDescription(
 	d *schema.ResourceData,
 	indexResource *resource,
 	indexDescription options.IndexDescription,
-) {
-	_ = d.Set("table_path", indexResource.getTablePath())
-	_ = d.Set("connection_string", indexResource.getConnectionString())
-	_ = d.Set("table_id", indexResource.getConnectionString()+"/"+indexResource.getTablePath())
-	_ = d.Set("name", indexDescription.Name)
+) (err error) {
+	err = d.Set("table_path", indexResource.getTablePath())
+	if err != nil {
+		return
+	}
+	err = d.Set("connection_string", indexResource.getConnectionString())
+	if err != nil {
+		return
+	}
+	err = d.Set("table_id", indexResource.getConnectionString()+"&path="+indexResource.getTablePath())
+	if err != nil {
+		return
+	}
+	err = d.Set("name", indexDescription.Name)
+	if err != nil {
+		return
+	}
 	cols := make([]interface{}, 0, len(indexDescription.IndexColumns))
 	for _, c := range indexDescription.IndexColumns {
 		cols = append(cols, c)
 	}
-	_ = d.Set("columns", cols)
+	err = d.Set("columns", cols)
+	if err != nil {
+		return
+	}
 	covers := make([]interface{}, 0, len(indexDescription.DataColumns))
 	for _, c := range indexDescription.DataColumns {
 		covers = append(covers, c)
 	}
-	_ = d.Set("cover", covers)
+
+	return d.Set("cover", covers)
 }
 
 func parseTablePathFromIndexEntity(entityPath string) string {

internal/resources/table/index/read.go

@@ -58,7 +58,5 @@ func (h *handler) Read(ctx context.Context, d *schema.ResourceData, meta interfa
 		return h.Create(ctx, d, meta)
 	}
 
-	// TODO(shmel1k@): bug here.
-	flattenIndexDescription(d, indexResource, indexDescription)
-	return nil
+	return diag.FromErr(flattenIndexDescription(d, indexResource, indexDescription))
 }

internal/resources/table/read.go

@@ -67,6 +67,5 @@ func (h *handler) Read(ctx context.Context, d *schema.ResourceData, cfg interfac
 	if db.Secure() {
 		prefix = "grpcs://"
 	}
-	flattenTableDescription(d, description, prefix+db.Endpoint()+"/?database="+db.Name())
-	return nil
+	return diag.FromErr(flattenTableDescription(d, description, prefix+db.Endpoint()+"/?database="+db.Name()))
 }

internal/resources/table/table.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/url"
 	"strings"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table/options"
@@ -275,23 +276,16 @@ func tableResourceSchemaToTableResource(d *schema.ResourceData) (*Resource, erro
 func flattenTablePartitioningSettings(d *schema.ResourceData, settings options.PartitioningSettings) []interface{} {
 	output := make([]interface{}, 0, 1)
 	partitioningSettings := make(map[string]interface{})
-	if d.HasChange("partitioning_settings.partition_at_keys") {
-		oldPartitionAtKeys, _ := d.GetChange("partitioning_settings.partition_at_keys")
-		partitioningSettings["partition_at_keys"] = oldPartitionAtKeys
-	} else {
-		partitioningSettings["partition_at_keys"] = d.Get("partitioning_settings.partition_at_keys")
-	}
-
-	if d.HasChange("partitioning_settings.uniform_partitions") {
-		oldUniformPartitions, _ := d.GetChange("partitioning_settings.uniform_partitions")
-		partitioningSettings["uniform_partitions"] = oldUniformPartitions
-	} else {
-		partitioningSettings["uniform_partitions"] = d.Get("partitioning_settings.uniform_partitions")
-	}
 	partitioningSettings["auto_partitioning_by_load"] = settings.PartitioningByLoad == options.FeatureEnabled
 	partitioningSettings["auto_partitioning_partition_size_mb"] = settings.PartitionSizeMb
 	partitioningSettings["auto_partitioning_min_partitions_count"] = settings.MinPartitionsCount
 	partitioningSettings["auto_partitioning_max_partitions_count"] = settings.MaxPartitionsCount
+	pSet := d.Get("partitioning_settings").(*schema.Set)
+	for _, l := range pSet.List() {
+		m := l.(map[string]interface{})
+		partitioningSettings["partition_at_keys"] = m["partition_at_keys"]
+		partitioningSettings["uniform_partitions"] = m["uniform_partitions"]
+	}
 
 	output = append(output, partitioningSettings)
 	return output
@@ -315,9 +309,15 @@ func unwrapType(t types.Type) (typ string, notNull bool) {
 	return typ, notNull
 }
 
-func flattenTableDescription(d *schema.ResourceData, desc options.Description, databaseEndpoint string) {
-	_ = d.Set("path", d.Get("path").(string))
-	_ = d.Set("connection_string", databaseEndpoint)
+func flattenTableDescription(d *schema.ResourceData, desc options.Description, databaseEndpoint string) (err error) {
+	err = d.Set("path", d.Get("path").(string))
+	if err != nil {
+		return
+	}
+	err = d.Set("connection_string", databaseEndpoint)
+	if err != nil {
+		return
+	}
 
 	cols := make([]interface{}, 0, len(desc.Columns))
 	for _, col := range desc.Columns {
@@ -327,36 +327,53 @@ func flattenTableDescription(d *schema.ResourceData, desc options.Description, d
 		mp["family"] = col.Family
 		cols = append(cols, mp)
 	}
-	_ = d.Set("column", cols)
+	err = d.Set("column", cols)
+	if err != nil {
+		return
+	}
 
 	pk := make([]interface{}, 0, len(desc.PrimaryKey))
 	for _, p := range desc.PrimaryKey {
 		pk = append(pk, p)
 	}
-	_ = d.Set("primary_key", pk)
+	err = d.Set("primary_key", pk)
+	if err != nil {
+		return
+	}
 
 	if desc.TimeToLiveSettings != nil {
 		var ttlSettings []interface{}
 		ttlSettings = append(ttlSettings, map[string]interface{}{
-			"column_name":          desc.TimeToLiveSettings.ColumnName,
-			"mode":                 desc.TimeToLiveSettings.Mode,
-			"expire_after_seconds": desc.TimeToLiveSettings.ExpireAfterSeconds,
-			"column_unit":          desc.TimeToLiveSettings.ColumnUnit.ToYDB().String(),
+			"column_name":     desc.TimeToLiveSettings.ColumnName,
+			"expire_interval": ttlToISO8601(time.Duration(desc.TimeToLiveSettings.ExpireAfterSeconds) * time.Second),
 		})
-		_ = d.Set("ttl", ttlSettings)
+		err = d.Set("ttl", ttlSettings)
+		if err != nil {
+			return
+		}
 	}
 
 	attributes := make(map[string]interface{})
 	for k, v := range desc.Attributes {
 		attributes[k] = v
 	}
-	_ = d.Set("attributes", attributes)
-	_ = d.Set("partitioning_settings", flattenTablePartitioningSettings(d, desc.PartitioningSettings))
+	err = d.Set("attributes", attributes)
+	if err != nil {
+		return
+	}
+	err = d.Set("partitioning_settings", flattenTablePartitioningSettings(d, desc.PartitioningSettings))
+	if err != nil {
+		return
+	}
 
-	_ = d.Set("key_bloom_filter", desc.KeyBloomFilter == options.FeatureEnabled)
+	err = d.Set("key_bloom_filter", desc.KeyBloomFilter == options.FeatureEnabled)
+	if err != nil {
+		return
+	}
 	if desc.ReadReplicaSettings.Type == options.ReadReplicasAnyAzReadReplicas {
-		_ = d.Set("read_replicas_settings", fmt.Sprintf("ANY_AZ:%d", desc.ReadReplicaSettings.Count))
+		err = d.Set("read_replicas_settings", fmt.Sprintf("ANY_AZ:%d", desc.ReadReplicaSettings.Count))
 	} else {
-		_ = d.Set("read_replicas_settings", fmt.Sprintf("PER_AZ:%d", desc.ReadReplicaSettings.Count))
+		err = d.Set("read_replicas_settings", fmt.Sprintf("PER_AZ:%d", desc.ReadReplicaSettings.Count))
 	}
+	return err
 }

internal/resources/table/util.go

@@ -3,6 +3,7 @@ package table
 import (
 	"fmt"
 	"strconv"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -119,3 +120,69 @@ func expandAttributes(d *schema.ResourceData) map[string]string {
 	}
 	return attributes
 }
+
+func ttlToISO8601(ttl time.Duration) string {
+	const (
+		day   = 24 * time.Hour
+		month = 30 * day
+		year  = 365 * day
+	)
+
+	if ttl == 0 {
+		return ""
+	}
+
+	result := make([]byte, 0, 16)
+	result = append(result, "P"...)
+	y := ttl / year
+	if y > 0 {
+		result = strconv.AppendInt(result, int64(y), 10)
+		result = append(result, 'Y')
+	}
+	ttl %= year
+	mn := ttl / month
+	if mn > 0 {
+		result = strconv.AppendInt(result, int64(mn), 10)
+		result = append(result, 'M')
+	}
+	ttl %= month
+	d := ttl / day
+	if d > 0 {
+		result = strconv.AppendInt(result, int64(d), 10)
+		result = append(result, 'D')
+	}
+	ttl %= day
+
+	hasT := false
+	h := ttl / time.Hour
+	if h > 0 {
+		hasT = true
+		result = append(result, 'T')
+		result = strconv.AppendInt(result, int64(h), 10)
+		result = append(result, 'H')
+	}
+	ttl %= time.Hour
+
+	min := ttl / time.Minute
+	if min > 0 {
+		if !hasT {
+			result = append(result, 'T')
+		}
+		hasT = true
+		result = strconv.AppendInt(result, int64(min), 10)
+		result = append(result, 'M')
+	}
+	ttl %= time.Minute
+
+	sec := ttl / time.Second
+	if sec > 0 {
+		if !hasT {
+			result = append(result, 'T')
+		}
+		hasT = true
+		_ = hasT
+		result = strconv.AppendInt(result, int64(sec), 10)
+		result = append(result, 'S')
+	}
+	return string(result)
+}