fix: use pointer for struct field so the default value from unmarshal…

… is nil (streamnative/pulsar-admin-go#36) Use pointer for struct field so the default value from unmarshal is nil Co-authored-by: Neng Lu <[email protected]>
tisonkun · Aug 15, 2023 · 08f1894 · 08f1894
1 parent c1b9f76
commit 08f1894
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/pulsaradmin/pkg/utils/consumer_config.go b/pulsaradmin/pkg/utils/consumer_config.go
@@ -22,6 +22,6 @@ type ConsumerConfig struct {
 	ReceiverQueueSize  int               `json:"receiverQueueSize,omitempty" yaml:"receiverQueueSize"`
 	SchemaProperties   map[string]string `json:"schemaProperties,omitempty" yaml:"schemaProperties"`
 	ConsumerProperties map[string]string `json:"consumerProperties,omitempty" yaml:"consumerProperties"`
-	CryptoConfig       CryptoConfig      `json:"cryptoConfig,omitempty" yaml:"cryptoConfig"`
+	CryptoConfig       *CryptoConfig     `json:"cryptoConfig,omitempty" yaml:"cryptoConfig"`
 	PoolMessages       bool              `json:"poolMessages,omitempty" yaml:"poolMessages"`
 }
diff --git a/pulsaradmin/pkg/utils/data.go b/pulsaradmin/pkg/utils/data.go
@@ -163,6 +163,7 @@ type SinkData struct {
 	MaxMessageRetries            int         `json:"maxMessageRetries,omitempty"`
 	DeadLetterTopic              string      `json:"deadLetterTopic,omitempty"`
 	ProcessingGuarantees         string      `json:"processingGuarantees,omitempty"`
+	RetainKeyOrdering            bool        `json:"retainKeyOrdering,omitempty"`
 	Archive                      string      `json:"archive,omitempty"`
 	ClassName                    string      `json:"className,omitempty"`
 	SinkConfigFile               string      `json:"sinkConfigFile,omitempty"`

diff --git a/pulsaradmin/pkg/utils/function_confg.go b/pulsaradmin/pkg/utils/function_confg.go
@@ -36,7 +36,7 @@ type FunctionConfig struct {
 
 	Output string `json:"output,omitempty" yaml:"output"`
 
-	ProducerConfig      ProducerConfig    `json:"producerConfig,omitempty" yaml:"producerConfig"`
+	ProducerConfig      *ProducerConfig   `json:"producerConfig,omitempty" yaml:"producerConfig"`
 	CustomSchemaOutputs map[string]string `json:"customSchemaOutputs,omitempty" yaml:"customSchemaOutputs"`
 
 	OutputSerdeClassName string `json:"outputSerdeClassName,omitempty" yaml:"outputSerdeClassName"`

diff --git a/pulsaradmin/pkg/utils/producer_config.go b/pulsaradmin/pkg/utils/producer_config.go
@@ -20,8 +20,8 @@ type ProducerConfig struct {
 	//nolint
 	MaxPendingMessagesAcrossPartitions int `json:"maxPendingMessagesAcrossPartitions" yaml:"maxPendingMessagesAcrossPartitions"`
 
-	UseThreadLocalProducers bool         `json:"useThreadLocalProducers" yaml:"useThreadLocalProducers"`
-	CryptoConfig            CryptoConfig `json:"cryptoConfig" yaml:"cryptoConfig"`
-	BatchBuilder            string       `json:"batchBuilder" yaml:"batchBuilder"`
-	CompressionType         string       `json:"compressionType" yaml:"compressionType"`
+	UseThreadLocalProducers bool          `json:"useThreadLocalProducers" yaml:"useThreadLocalProducers"`
+	CryptoConfig            *CryptoConfig `json:"cryptoConfig" yaml:"cryptoConfig"`
+	BatchBuilder            string        `json:"batchBuilder" yaml:"batchBuilder"`
+	CompressionType         string        `json:"compressionType" yaml:"compressionType"`
 }
diff --git a/pulsaradmin/pkg/utils/source_config.go b/pulsaradmin/pkg/utils/source_config.go
@@ -21,7 +21,7 @@ type SourceConfig struct {
 	Name      string `json:"name,omitempty" yaml:"name"`
 	ClassName string `json:"className,omitempty" yaml:"className"`
 
-	ProducerConfig ProducerConfig `json:"producerConfig,omitempty" yaml:"producerConfig"`
+	ProducerConfig *ProducerConfig `json:"producerConfig,omitempty" yaml:"producerConfig"`
 
 	TopicName      string `json:"topicName,omitempty" yaml:"topicName"`
 	SerdeClassName string `json:"serdeClassName,omitempty" yaml:"serdeClassName"`
@@ -45,6 +45,6 @@ type SourceConfig struct {
 
 	CustomRuntimeOptions string `json:"customRuntimeOptions,omitempty" yaml:"customRuntimeOptions"`
 
-	BatchSourceConfig BatchSourceConfig `json:"batchSourceConfig,omitempty" yaml:"batchSourceConfig"`
-	BatchBuilder      string            `json:"batchBuilder,omitempty" yaml:"batchBuilder"`
+	BatchSourceConfig *BatchSourceConfig `json:"batchSourceConfig,omitempty" yaml:"batchSourceConfig"`
+	BatchBuilder      string             `json:"batchBuilder,omitempty" yaml:"batchBuilder"`
 }