fix conversion/comparison of shared clusters (#1867)

Author: helderjs

internal/translation/deployment/compare.go

@@ -202,7 +202,8 @@ func regionConfigAreEqual(desired, current *akov2.AdvancedRegionConfig, autoscal
 	}
 
 	if desired.ProviderName == string(provider.ProviderTenant) {
-		return desired.BackingProviderName == current.BackingProviderName
+		return (desired.BackingProviderName == current.BackingProviderName) &&
+			(desired.ElectableSpecs.InstanceSize == current.ElectableSpecs.InstanceSize)
 	}
 
 	if desired.RegionName != current.RegionName {

internal/translation/deployment/compare_test.go

@@ -829,6 +829,50 @@ func TestSpecAreEqual(t *testing.T) {
 				},
 			},
 		},
+		"should return false when instance size of shared cluster changed": {
+			ako: &akov2.AtlasDeployment{
+				Spec: akov2.AtlasDeploymentSpec{
+					DeploymentSpec: &akov2.AdvancedDeploymentSpec{
+						Name:        "cluster0",
+						ClusterType: "REPLICASET",
+						ReplicationSpecs: []*akov2.AdvancedReplicationSpec{
+							{
+								RegionConfigs: []*akov2.AdvancedRegionConfig{
+									{
+										ProviderName:        "TENANT",
+										BackingProviderName: "AWS",
+										RegionName:          "US_EAST_1",
+										ElectableSpecs: &akov2.Specs{
+											InstanceSize: "M2",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			atlas: &admin.AdvancedClusterDescription{
+				Name:        pointer.MakePtr("cluster0"),
+				ClusterType: pointer.MakePtr("REPLICASET"),
+				ReplicationSpecs: &[]admin.ReplicationSpec{
+					{
+						NumShards: pointer.MakePtr(1),
+						RegionConfigs: &[]admin.CloudRegionConfig{
+							{
+								ProviderName:        pointer.MakePtr("TENANT"),
+								BackingProviderName: pointer.MakePtr("AWS"),
+								RegionName:          pointer.MakePtr("US_EAST_1"),
+								ElectableSpecs: &admin.HardwareSpec{
+									InstanceSize: pointer.MakePtr("M0"),
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: false,
+		},
 		"should return true when cluster are the same": {
 			ako: &akov2.AtlasDeployment{
 				Spec: akov2.AtlasDeploymentSpec{

internal/translation/deployment/conversion.go

@@ -483,8 +483,8 @@ func labelsFromAtlas(cLabels []admin.ComponentLabel) []common.LabelSpec {
 }
 
 func replicationSpecFromAtlas(replicationSpecs []admin.ReplicationSpec) []*akov2.AdvancedReplicationSpec {
-	hSpecOrDefault := func(spec admin.HardwareSpec) *akov2.Specs {
-		if spec.GetNodeCount() == 0 {
+	hSpecOrDefault := func(spec admin.HardwareSpec, providerName string) *akov2.Specs {
+		if spec.GetNodeCount() == 0 && providerName != string(provider.ProviderTenant) {
 			return nil
 		}
 
@@ -545,7 +545,7 @@ func replicationSpecFromAtlas(replicationSpecs []admin.ReplicationSpec) []*akov2
 					BackingProviderName: regionConfig.GetBackingProviderName(),
 					RegionName:          regionConfig.GetRegionName(),
 					Priority:            regionConfig.Priority,
-					ElectableSpecs:      hSpecOrDefault(regionConfig.GetElectableSpecs()),
+					ElectableSpecs:      hSpecOrDefault(regionConfig.GetElectableSpecs(), regionConfig.GetProviderName()),
 					ReadOnlySpecs:       dHSpecOrDefault(regionConfig.GetReadOnlySpecs()),
 					AnalyticsSpecs:      dHSpecOrDefault(regionConfig.GetAnalyticsSpecs()),
 					AutoScaling:         autoScalingOrDefault(regionConfig.GetAutoScaling()),