Merge pull request #354 from shmel1k/bugfix/topictypes_consumers_missprint

[topic] fix missprint for topictypes

Author: asmyasnikov

.gitignore

@@ -5,6 +5,7 @@
 .history/
 .devcontainer
 *.vsix
+*.swp
 
 
 *.exe

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Added more fields to `DescribeTopicResult` from `TopicService`
+
 ## v3.34.2
 * Added some description to error message from table pool get
 * Moved implementation `sugar.GenerateDeclareSection` to `internal/table`

internal/grpcwrapper/rawtopic/describe_topic.go

@@ -2,11 +2,13 @@ package rawtopic
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/ydb-platform/ydb-go-genproto/protos/Ydb_Topic"
 	"google.golang.org/protobuf/proto"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawscheme"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopiccommon"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawydb"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 )
@@ -26,9 +28,14 @@ func (req *DescribeTopicRequest) ToProto() *Ydb_Topic.DescribeTopicRequest {
 type DescribeTopicResult struct {
 	Operation rawydb.Operation
 
-	Self                 rawscheme.Entry
-	PartitioningSettings PartitioningSettings
-	Consumers            []Consumer
+	Self                              rawscheme.Entry
+	PartitioningSettings              PartitioningSettings
+	Consumers                         []Consumer
+	SupportedCodecs                   rawtopiccommon.SupportedCodecs
+	RetentionPeriod                   time.Duration
+	PartitionWriteBurstBytes          int64
+	PartitionWriteSpeedBytesPerSecond int64
+	Attributes                        map[string]string
 }
 
 func (res *DescribeTopicResult) FromProto(protoResponse *Ydb_Topic.DescribeTopicResponse) error {
@@ -49,6 +56,24 @@ func (res *DescribeTopicResult) FromProto(protoResponse *Ydb_Topic.DescribeTopic
 		return err
 	}
 
+	res.PartitionWriteBurstBytes = protoResult.PartitionWriteBurstBytes
+	res.PartitionWriteSpeedBytesPerSecond = protoResult.PartitionWriteSpeedBytesPerSecond
+
+	if protoResult.RetentionPeriod != nil {
+		res.RetentionPeriod = protoResult.RetentionPeriod.AsDuration()
+	}
+
+	if protoResult.SupportedCodecs != nil {
+		for _, v := range protoResult.SupportedCodecs.Codecs {
+			res.SupportedCodecs = append(res.SupportedCodecs, rawtopiccommon.Codec(v))
+		}
+	}
+
+	res.Attributes = make(map[string]string)
+	for k, v := range protoResult.Attributes {
+		res.Attributes[k] = v
+	}
+
 	res.Consumers = make([]Consumer, len(protoResult.Consumers))
 	for i := range res.Consumers {
 		res.Consumers[i].MustFromProto(protoResult.Consumers[i])

topic/client_e2e_test.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3"
+	ydb "github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/topic/topicoptions"
 	"github.com/ydb-platform/ydb-go-sdk/v3/topic/topictypes"
 )

topic/example_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3"
+	ydb "github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/topic/topicoptions"
 )
 

topic/reader_e2e_test.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/ydb-platform/ydb-go-sdk/v3"
+	ydb "github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xtest"

topic/topictypes/topictypes.go

@@ -59,6 +59,26 @@ func (c *Consumer) ToRaw(raw *rawtopic.Consumer) {
 	raw.Attributes = c.Attributes
 }
 
+// FromRaw
+//
+// # Experimental
+//
+// Notice: This API is EXPERIMENTAL and may be changed or removed in a later release.
+func (c *Consumer) FromRaw(raw *rawtopic.Consumer) {
+	c.Attributes = raw.Attributes
+	c.Important = raw.Important
+	c.Name = raw.Name
+
+	c.SupportedCodecs = make([]Codec, len(raw.SupportedCodecs))
+	for index, codec := range raw.SupportedCodecs {
+		c.SupportedCodecs[index] = Codec(codec)
+	}
+
+	if raw.ReadFrom.HasValue {
+		c.ReadFrom = raw.ReadFrom.Value
+	}
+}
+
 // PartitionSettings
 //
 // # Experimental
@@ -95,9 +115,14 @@ func (s *PartitionSettings) FromRaw(raw *rawtopic.PartitioningSettings) {
 //
 // Notice: This API is EXPERIMENTAL and may be changed or removed in a later release.
 type TopicDescription struct {
-	Path              string
-	PartitionSettings PartitionSettings
-	Consmers          []Consumer
+	Path                              string
+	PartitionSettings                 PartitionSettings
+	Consumers                         []Consumer
+	SupportedCodecs                   []Codec
+	RetentionPeriod                   time.Duration
+	PartitionWriteBurstBytes          int64
+	PartitionWriteSpeedBytesPerSecond int64
+	Attributes                        map[string]string
 }
 
 // FromRaw
@@ -108,4 +133,50 @@ type TopicDescription struct {
 func (d *TopicDescription) FromRaw(raw *rawtopic.DescribeTopicResult) {
 	d.Path = raw.Self.Name
 	d.PartitionSettings.FromRaw(&raw.PartitioningSettings)
+
+	d.Consumers = make([]Consumer, len(raw.Consumers))
+	for i := 0; i < len(raw.Consumers); i++ {
+		d.Consumers[i].FromRaw(&raw.Consumers[i])
+	}
+
+	d.SupportedCodecs = make([]Codec, len(raw.SupportedCodecs))
+	for i := 0; i < len(raw.SupportedCodecs); i++ {
+		d.SupportedCodecs[i] = Codec(raw.SupportedCodecs[i])
+	}
+
+	d.PartitionWriteSpeedBytesPerSecond = raw.PartitionWriteSpeedBytesPerSecond
+	d.PartitionWriteBurstBytes = raw.PartitionWriteBurstBytes
+
+	d.Attributes = make(map[string]string)
+	for k, v := range raw.Attributes {
+		d.Attributes[k] = v
+	}
+}
+
+// ToRaw
+//
+// # Experimental
+//
+// Notice: This API is EXPERIMENTAL and may be changed or removed in a later release.
+func (d *TopicDescription) ToRaw(raw *rawtopic.DescribeTopicResult) {
+	raw.Self.Name = d.Path
+	d.PartitionSettings.ToRaw(&raw.PartitioningSettings)
+
+	raw.Consumers = make([]rawtopic.Consumer, len(d.Consumers))
+	for i := 0; i < len(d.Consumers); i++ {
+		d.Consumers[i].ToRaw(&raw.Consumers[i])
+	}
+
+	raw.SupportedCodecs = make([]rawtopiccommon.Codec, len(d.SupportedCodecs))
+	for i := 0; i < len(d.SupportedCodecs); i++ {
+		raw.SupportedCodecs[i] = rawtopiccommon.Codec(d.SupportedCodecs[i])
+	}
+
+	raw.PartitionWriteBurstBytes = d.PartitionWriteBurstBytes
+	raw.PartitionWriteSpeedBytesPerSecond = d.PartitionWriteSpeedBytesPerSecond
+
+	raw.Attributes = make(map[string]string)
+	for k, v := range d.Attributes {
+		raw.Attributes[k] = v
+	}
 }