Update domain api mappers to support ActiveClusters field (#1446)

taylanisikdemir · web-flow · commit ba6fe77b2e08 · 2025-07-30T12:26:16.000-07:00
diff --git a/internal/compatibility/proto/request.go b/internal/compatibility/proto/request.go
@@ -519,6 +519,7 @@ const (
 	DomainUpdateVisibilityArchivalURIField    = "visibility_archival_uri"
 	DomainUpdateActiveClusterNameField        = "active_cluster_name"
 	DomainUpdateClustersField                 = "clusters"
+	DomainUpdateActiveClustersField           = "active_clusters"
 	DomainUpdateDeleteBadBinaryField          = "delete_bad_binary"
 	DomainUpdateFailoverTimeoutField          = "failover_timeout"
 )
@@ -583,6 +584,10 @@ func UpdateDomainRequest(t *shared.UpdateDomainRequest) *apiv1.UpdateDomainReque
 			request.Clusters = ClusterReplicationConfigurationArray(replicationConfiguration.Clusters)
 			fields = append(fields, DomainUpdateClustersField)
 		}
+		if replicationConfiguration.ActiveClusters != nil {
+			request.ActiveClusters = ActiveClusters(replicationConfiguration.ActiveClusters)
+			fields = append(fields, DomainUpdateActiveClustersField)
+		}
 	}
 	if t.DeleteBadBinary != nil {
 		request.DeleteBadBinary = *t.DeleteBadBinary
diff --git a/internal/compatibility/proto/response.go b/internal/compatibility/proto/response.go
@@ -62,6 +62,7 @@ func DescribeDomainResponse(t *shared.DescribeDomainResponse) *apiv1.DescribeDom
 	if repl := t.ReplicationConfiguration; repl != nil {
 		domain.ActiveClusterName = repl.GetActiveClusterName()
 		domain.Clusters = ClusterReplicationConfigurationArray(repl.Clusters)
+		domain.ActiveClusters = ActiveClusters(repl.ActiveClusters)
 	}
 	return &apiv1.DescribeDomainResponse{Domain: &domain}
 }
@@ -341,6 +342,7 @@ func UpdateDomainResponse(t *shared.UpdateDomainResponse) *apiv1.UpdateDomainRes
 	if repl := t.ReplicationConfiguration; repl != nil {
 		domain.ActiveClusterName = repl.GetActiveClusterName()
 		domain.Clusters = ClusterReplicationConfigurationArray(repl.Clusters)
+		domain.ActiveClusters = ActiveClusters(repl.ActiveClusters)
 	}
 	return &apiv1.UpdateDomainResponse{
 		Domain: domain,
diff --git a/internal/compatibility/proto/types.go b/internal/compatibility/proto/types.go
@@ -552,6 +552,7 @@ func DescribeDomainResponseDomain(t *shared.DescribeDomainResponse) *apiv1.Domai
 	if repl := t.ReplicationConfiguration; repl != nil {
 		domain.ActiveClusterName = repl.GetActiveClusterName()
 		domain.Clusters = ClusterReplicationConfigurationArray(repl.Clusters)
+		domain.ActiveClusters = ActiveClusters(repl.ActiveClusters)
 	}
 	return &domain
 }
@@ -695,3 +696,21 @@ func ActivityLocalDispatchInfoMap(t map[string]*shared.ActivityLocalDispatchInfo
 	}
 	return v
 }
+
+func ActiveClusters(ac *shared.ActiveClusters) *apiv1.ActiveClusters {
+	if ac == nil {
+		return nil
+	}
+
+	regToCl := make(map[string]*apiv1.ActiveClusterInfo)
+	for reg, clusterInfo := range ac.ActiveClustersByRegion {
+		regToCl[reg] = &apiv1.ActiveClusterInfo{
+			ActiveClusterName: clusterInfo.GetActiveClusterName(),
+			FailoverVersion:   clusterInfo.GetFailoverVersion(),
+		}
+	}
+
+	return &apiv1.ActiveClusters{
+		RegionToCluster: regToCl,
+	}
+}
diff --git a/internal/compatibility/testdata/domain.go b/internal/compatibility/testdata/domain.go
@@ -81,6 +81,7 @@ var (
 		VisibilityArchivalUri:            VisibilityArchivalURI,
 		ActiveClusterName:                ClusterName1,
 		Clusters:                         ClusterReplicationConfigurationArray,
+		ActiveClusters:                   ActiveClusters,
 	}
 	ClusterReplicationConfiguration = apiv1.ClusterReplicationConfiguration{
 		ClusterName: ClusterName1,
@@ -92,4 +93,16 @@ var (
 		"Region1": ClusterName1,
 		"Region2": ClusterName2,
 	}
+	ActiveClusters = &apiv1.ActiveClusters{
+		RegionToCluster: map[string]*apiv1.ActiveClusterInfo{
+			"Region1": &apiv1.ActiveClusterInfo{
+				ActiveClusterName: ClusterName1,
+				FailoverVersion:   0,
+			},
+			"Region2": &apiv1.ActiveClusterInfo{
+				ActiveClusterName: ClusterName2,
+				FailoverVersion:   0,
+			},
+		},
+	}
 )
diff --git a/internal/compatibility/testdata/service.go b/internal/compatibility/testdata/service.go
@@ -72,11 +72,29 @@ var (
 		VisibilityArchivalStatus:         ArchivalStatus,
 		VisibilityArchivalUri:            VisibilityArchivalURI,
 		ActiveClusterName:                ClusterName1,
+		ActiveClusters:                   ActiveClusters,
 		Clusters:                         ClusterReplicationConfigurationArray,
 		SecurityToken:                    SecurityToken,
 		DeleteBadBinary:                  DeleteBadBinary,
 		FailoverTimeout:                  Duration1,
-		UpdateMask:                       &gogo.FieldMask{Paths: []string{"description", "owner_email", "data", "workflow_execution_retention_period", "bad_binaries", "history_archival_status", "history_archival_uri", "visibility_archival_status", "visibility_archival_uri", "active_cluster_name", "clusters", "delete_bad_binary", "failover_timeout"}},
+		UpdateMask: &gogo.FieldMask{
+			Paths: []string{
+				"description",
+				"owner_email",
+				"data",
+				"workflow_execution_retention_period",
+				"bad_binaries",
+				"history_archival_status",
+				"history_archival_uri",
+				"visibility_archival_status",
+				"visibility_archival_uri",
+				"active_cluster_name",
+				"clusters",
+				"active_clusters",
+				"delete_bad_binary",
+				"failover_timeout",
+			},
+		},
 	}
 	UpdateDomainResponse = apiv1.UpdateDomainResponse{
 		Domain: &Domain,
diff --git a/internal/compatibility/thrift/request.go b/internal/compatibility/thrift/request.go
@@ -509,6 +509,7 @@ const (
 	DomainUpdateVisibilityArchivalURIField    = "visibility_archival_uri"
 	DomainUpdateActiveClusterNameField        = "active_cluster_name"
 	DomainUpdateClustersField                 = "clusters"
+	DomainUpdateActiveClustersField           = "active_clusters"
 	DomainUpdateDeleteBadBinaryField          = "delete_bad_binary"
 	DomainUpdateFailoverTimeoutField          = "failover_timeout"
 )
@@ -556,6 +557,9 @@ func UpdateDomainRequest(t *apiv1.UpdateDomainRequest) *shared.UpdateDomainReque
 	if fs.isSet(DomainUpdateActiveClusterNameField) {
 		request.ReplicationConfiguration.ActiveClusterName = &t.ActiveClusterName
 	}
+	if fs.isSet(DomainUpdateActiveClustersField) {
+		request.ReplicationConfiguration.ActiveClusters = ActiveClusters(t.ActiveClusters)
+	}
 	if fs.isSet(DomainUpdateClustersField) {
 		request.ReplicationConfiguration.Clusters = ClusterReplicationConfigurationArray(t.Clusters)
 	}
diff --git a/internal/compatibility/thrift/response.go b/internal/compatibility/thrift/response.go
@@ -60,6 +60,7 @@ func DescribeDomainResponse(t *apiv1.DescribeDomainResponse) *shared.DescribeDom
 		ReplicationConfiguration: &shared.DomainReplicationConfiguration{
 			ActiveClusterName: &t.Domain.ActiveClusterName,
 			Clusters:          ClusterReplicationConfigurationArray(t.Domain.Clusters),
+			ActiveClusters:    ActiveClusters(t.Domain.ActiveClusters),
 		},
 		FailoverVersion: &t.Domain.FailoverVersion,
 		IsGlobalDomain:  &t.Domain.IsGlobalDomain,
@@ -353,6 +354,7 @@ func UpdateDomainResponse(t *apiv1.UpdateDomainResponse) *shared.UpdateDomainRes
 		ReplicationConfiguration: &shared.DomainReplicationConfiguration{
 			ActiveClusterName: &t.Domain.ActiveClusterName,
 			Clusters:          ClusterReplicationConfigurationArray(t.Domain.Clusters),
+			ActiveClusters:    ActiveClusters(t.Domain.ActiveClusters),
 		},
 		FailoverVersion: &t.Domain.FailoverVersion,
 		IsGlobalDomain:  &t.Domain.IsGlobalDomain,
diff --git a/internal/compatibility/thrift/types.go b/internal/compatibility/thrift/types.go
@@ -561,6 +561,7 @@ func DescribeDomainResponseDomain(t *apiv1.Domain) *shared.DescribeDomainRespons
 		ReplicationConfiguration: &shared.DomainReplicationConfiguration{
 			ActiveClusterName: &t.ActiveClusterName,
 			Clusters:          ClusterReplicationConfigurationArray(t.Clusters),
+			ActiveClusters:    ActiveClusters(t.ActiveClusters),
 		},
 		FailoverVersion: &t.FailoverVersion,
 		IsGlobalDomain:  &t.IsGlobalDomain,
@@ -706,3 +707,21 @@ func ActivityLocalDispatchInfoMap(t map[string]*apiv1.ActivityLocalDispatchInfo)
 	}
 	return v
 }
+
+func ActiveClusters(ac *apiv1.ActiveClusters) *shared.ActiveClusters {
+	if ac == nil {
+		return nil
+	}
+
+	clByRegion := make(map[string]*shared.ActiveClusterInfo)
+	for region, clInfo := range ac.RegionToCluster {
+		clByRegion[region] = &shared.ActiveClusterInfo{
+			ActiveClusterName: &clInfo.ActiveClusterName,
+			FailoverVersion:   &clInfo.FailoverVersion,
+		}
+	}
+
+	return &shared.ActiveClusters{
+		ActiveClustersByRegion: clByRegion,
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -519,6 +519,7 @@ const (`
`519`	`519`	`DomainUpdateVisibilityArchivalURIField = "visibility_archival_uri"`
`520`	`520`	`DomainUpdateActiveClusterNameField = "active_cluster_name"`
`521`	`521`	`DomainUpdateClustersField = "clusters"`
	`522`	`+ DomainUpdateActiveClustersField = "active_clusters"`
`522`	`523`	`DomainUpdateDeleteBadBinaryField = "delete_bad_binary"`
`523`	`524`	`DomainUpdateFailoverTimeoutField = "failover_timeout"`
`524`	`525`	`)`
`@@ -583,6 +584,10 @@ func UpdateDomainRequest(t shared.UpdateDomainRequest) apiv1.UpdateDomainReque`
`583`	`584`	`request.Clusters = ClusterReplicationConfigurationArray(replicationConfiguration.Clusters)`
`584`	`585`	`fields = append(fields, DomainUpdateClustersField)`
`585`	`586`	`}`
	`587`	`+ if replicationConfiguration.ActiveClusters != nil {`
	`588`	`+ request.ActiveClusters = ActiveClusters(replicationConfiguration.ActiveClusters)`
	`589`	`+ fields = append(fields, DomainUpdateActiveClustersField)`
	`590`	`+ }`
`586`	`591`	`}`
`587`	`592`	`if t.DeleteBadBinary != nil {`
`588`	`593`	`request.DeleteBadBinary = *t.DeleteBadBinary`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ func DescribeDomainResponse(t shared.DescribeDomainResponse) apiv1.DescribeDom`
`62`	`62`	`if repl := t.ReplicationConfiguration; repl != nil {`
`63`	`63`	`domain.ActiveClusterName = repl.GetActiveClusterName()`
`64`	`64`	`domain.Clusters = ClusterReplicationConfigurationArray(repl.Clusters)`
	`65`	`+ domain.ActiveClusters = ActiveClusters(repl.ActiveClusters)`
`65`	`66`	`}`
`66`	`67`	`return &apiv1.DescribeDomainResponse{Domain: &domain}`
`67`	`68`	`}`
`@@ -341,6 +342,7 @@ func UpdateDomainResponse(t shared.UpdateDomainResponse) apiv1.UpdateDomainRes`
`341`	`342`	`if repl := t.ReplicationConfiguration; repl != nil {`
`342`	`343`	`domain.ActiveClusterName = repl.GetActiveClusterName()`
`343`	`344`	`domain.Clusters = ClusterReplicationConfigurationArray(repl.Clusters)`
	`345`	`+ domain.ActiveClusters = ActiveClusters(repl.ActiveClusters)`
`344`	`346`	`}`
`345`	`347`	`return &apiv1.UpdateDomainResponse{`
`346`	`348`	`Domain: domain,`
Original file line number	Diff line number	Diff line change
`@@ -509,6 +509,7 @@ const (`
`509`	`509`	`DomainUpdateVisibilityArchivalURIField = "visibility_archival_uri"`
`510`	`510`	`DomainUpdateActiveClusterNameField = "active_cluster_name"`
`511`	`511`	`DomainUpdateClustersField = "clusters"`
	`512`	`+ DomainUpdateActiveClustersField = "active_clusters"`
`512`	`513`	`DomainUpdateDeleteBadBinaryField = "delete_bad_binary"`
`513`	`514`	`DomainUpdateFailoverTimeoutField = "failover_timeout"`
`514`	`515`	`)`
`@@ -556,6 +557,9 @@ func UpdateDomainRequest(t apiv1.UpdateDomainRequest) shared.UpdateDomainReque`
`556`	`557`	`if fs.isSet(DomainUpdateActiveClusterNameField) {`
`557`	`558`	`request.ReplicationConfiguration.ActiveClusterName = &t.ActiveClusterName`
`558`	`559`	`}`
	`560`	`+ if fs.isSet(DomainUpdateActiveClustersField) {`
	`561`	`+ request.ReplicationConfiguration.ActiveClusters = ActiveClusters(t.ActiveClusters)`
	`562`	`+ }`
`559`	`563`	`if fs.isSet(DomainUpdateClustersField) {`
`560`	`564`	`request.ReplicationConfiguration.Clusters = ClusterReplicationConfigurationArray(t.Clusters)`
`561`	`565`	`}`