NET-6097 - sidecar proxy controller - give name to first failover policy target (#19239)

internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go

@@ -287,7 +287,12 @@ func (b *Builder) buildDestination(
 		)
 		clusterName := fmt.Sprintf("%s.%s", portName, sni)
 
-		egBase := b.newClusterEndpointGroup("", sni, portName, details.IdentityRefs, connectTimeout, loadBalancer)
+		egName := ""
+
+		if details.FailoverConfig != nil {
+			egName = fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, 0, clusterName)
+		}
+		egBase := b.newClusterEndpointGroup(egName, sni, portName, details.IdentityRefs, connectTimeout, loadBalancer)
 
 		var endpointGroups []*pbproxystate.EndpointGroup
 
@@ -319,7 +324,10 @@ func (b *Builder) buildDestination(
 					destDC,
 					b.trustDomain,
 				)
-				destClusterName := fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, i, clusterName)
+
+				// index 0 was already given to non-fail original
+				failoverGroupIndex := i + 1
+				destClusterName := fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, failoverGroupIndex, clusterName)
 
 				egDest := b.newClusterEndpointGroup(destClusterName, destSNI, destPortName, destDetails.IdentityRefs, destConnectTimeout, destLoadBalancer)
 

internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden

@@ -30,7 +30,8 @@
                     }
                   }
                 }
-              }
+              },
+              "name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul"
             },
             {
               "dynamic": {
@@ -54,7 +55,7 @@
                   }
                 }
               },
-              "name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul"
+              "name": "failover-target~1~http.api-1.default.dc1.internal.foo.consul"
             }
           ]
         },
@@ -310,7 +311,7 @@
     }
   },
   "requiredEndpoints": {
-    "failover-target~0~http.api-1.default.dc1.internal.foo.consul": {
+    "failover-target~1~http.api-1.default.dc1.internal.foo.consul": {
       "id": {
         "name": "backup-1",
         "tenancy": {