Rename cadence-cluster-topics to temporal-cluster-topics (#612)

Author: alexshtin

common/messaging/kafkaClient.go

@@ -108,8 +108,8 @@ func (c *kafkaClient) NewConsumer(app, consumerName string, concurrency int) (Co
 
 // NewConsumerWithClusterName is used to create a Kafka consumer for consuming replication tasks
 func (c *kafkaClient) NewConsumerWithClusterName(currentCluster, sourceCluster, consumerName string, concurrency int) (Consumer, error) {
-	currentTopics := c.config.getTopicsForCadenceCluster(currentCluster)
-	sourceTopics := c.config.getTopicsForCadenceCluster(sourceCluster)
+	currentTopics := c.config.getTopicsForTemporalCluster(currentCluster)
+	sourceTopics := c.config.getTopicsForTemporalCluster(sourceCluster)
 	kafkaClusterNameForTopic := c.config.getKafkaClusterForTopic(sourceTopics.Topic)
 	kafkaClusterNameForDLQTopic := c.config.getKafkaClusterForTopic(currentTopics.DLQTopic)
 
@@ -153,7 +153,7 @@ func (c *kafkaClient) NewProducer(app string) (Producer, error) {
 
 // NewProducerWithClusterName is used to create a Kafka producer for shipping replication tasks
 func (c *kafkaClient) NewProducerWithClusterName(sourceCluster string) (Producer, error) {
-	topics := c.config.getTopicsForCadenceCluster(sourceCluster)
+	topics := c.config.getTopicsForTemporalCluster(sourceCluster)
 	return c.newProducerHelper(topics.Topic)
 }
 

common/messaging/kafkaConfig.go

@@ -36,7 +36,7 @@ type (
 		TLS            auth.TLS                 `yaml:"tls"`
 		Clusters       map[string]ClusterConfig `yaml:"clusters"`
 		Topics         map[string]TopicConfig   `yaml:"topics"`
-		ClusterToTopic map[string]TopicList     `yaml:"cadence-cluster-topics"`
+		ClusterToTopic map[string]TopicList     `yaml:"temporal-cluster-topics"`
 		Applications   map[string]TopicList     `yaml:"applications"`
 	}
 
@@ -99,8 +99,8 @@ func (k *KafkaConfig) Validate(checkCluster bool, checkApp bool) {
 	}
 }
 
-func (k *KafkaConfig) getTopicsForCadenceCluster(cadenceCluster string) TopicList {
-	return k.ClusterToTopic[cadenceCluster]
+func (k *KafkaConfig) getTopicsForTemporalCluster(temporalCluster string) TopicList {
+	return k.ClusterToTopic[temporalCluster]
 }
 
 func (k *KafkaConfig) getKafkaClusterForTopic(topic string) string {

common/persistence/serializer.go

@@ -423,7 +423,7 @@ func NewSerializationError(msg string) *SerializationError {
 }
 
 func (e *SerializationError) Error() string {
-	return fmt.Sprintf("cadence serialization error: %v", e.msg)
+	return fmt.Sprintf("serialization error: %v", e.msg)
 }
 
 // NewDeserializationError returns a DeserializationError
@@ -432,5 +432,5 @@ func NewDeserializationError(msg string) *DeserializationError {
 }
 
 func (e *DeserializationError) Error() string {
-	return fmt.Sprintf("cadence deserialization error: %v", e.msg)
+	return fmt.Sprintf("deserialization error: %v", e.msg)
 }

config/development_active.yaml

@@ -110,7 +110,7 @@ kafka:
       cluster: test
     other-dlq:
       cluster: test
-  cadence-cluster-topics:
+  temporal-cluster-topics:
     active:
       topic: active
       dlq-topic: active-dlq

config/development_other.yaml

@@ -111,7 +111,7 @@ kafka:
       cluster: test
     other-dlq:
       cluster: test
-  cadence-cluster-topics:
+  temporal-cluster-topics:
     active:
       topic: active
       dlq-topic: active-dlq

config/development_standby.yaml

@@ -111,7 +111,7 @@ kafka:
       cluster: test
     other-dlq:
       cluster: test
-  cadence-cluster-topics:
+  temporal-cluster-topics:
     active:
       topic: active
       dlq-topic: active-dlq

docker/config_template.yaml

@@ -194,7 +194,7 @@ namespaceDefaults:
       URI: "file:///tmp/temporal_archival/development"
     visibility:
       state: "enabled"
-      URI: "file:///tmp/cadence_vis_archival/development"
+      URI: "file:///tmp/temporal_vis_archival/development"
 
 kafka:
     tls:

host/testdata/ndc_integration_test_clusters.yaml

@@ -62,7 +62,7 @@
           cluster: test
         other-dlq:
           cluster: test
-      cadence-cluster-topics:
+      temporal-cluster-topics:
         active:
           topic: active
           dlq-topic: active-dlq
@@ -137,7 +137,7 @@
           cluster: test
         other-dlq:
           cluster: test
-      cadence-cluster-topics:
+      temporal-cluster-topics:
         active:
           topic: active
           dlq-topic: active-dlq
@@ -212,7 +212,7 @@
           cluster: test
         other-dlq:
           cluster: test
-      cadence-cluster-topics:
+      temporal-cluster-topics:
         active:
           topic: active
           dlq-topic: active-dlq

host/testdata/xdc_integration_es_clusters.yaml

@@ -56,7 +56,7 @@
           cluster: test
         test-visibility-topic-0-dlq:
           cluster: test
-      cadence-cluster-topics:
+      temporal-cluster-topics:
         active-es:
           topic: active-es
           dlq-topic: active-es-dlq
@@ -132,7 +132,7 @@
           cluster: test
         test-visibility-topic-1-dlq:
           cluster: test
-      cadence-cluster-topics:
+      temporal-cluster-topics:
         active-es:
           topic: active-es
           dlq-topic: active-es-dlq

host/testdata/xdc_integration_test_clusters.yaml

@@ -52,7 +52,7 @@
           cluster: test
         standby-dlq:
           cluster: test
-      cadence-cluster-topics:
+      temporal-cluster-topics:
         active:
           topic: active
           dlq-topic: active-dlq
@@ -114,7 +114,7 @@
           cluster: test
         standby-dlq:
           cluster: test
-      cadence-cluster-topics:
+      temporal-cluster-topics:
         active:
           topic: active
           dlq-topic: active-dlq