From c065051cf867f1b1477e80aaac2fbbb38220a9a0 Mon Sep 17 00:00:00 2001
From: Joshua Mathew <umjoshua@gmail.com>
Date: Tue, 28 May 2024 18:52:53 +0530
Subject: [PATCH] fix protocol missing in ambassador canary mapping creation

Signed-off-by: Joshua Mathew <umjoshua@gmail.com>
---
 .../trafficrouting/ambassador/ambassador.go   | 22 +++++--------------
 .../ambassador/ambassador_test.go             | 12 +++++-----
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/rollout/trafficrouting/ambassador/ambassador.go b/rollout/trafficrouting/ambassador/ambassador.go
index 5c50f38f26..ceb389c81a 100644
--- a/rollout/trafficrouting/ambassador/ambassador.go
+++ b/rollout/trafficrouting/ambassador/ambassador.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -218,7 +217,8 @@ func (r *Reconciler) createCanaryMapping(ctx context.Context,
 	}
 
 	canarySvc := r.Rollout.Spec.Strategy.Canary.CanaryService
-	canaryMapping := buildCanaryMapping(baseMapping, canarySvc, desiredWeight)
+	stableService := r.Rollout.Spec.Strategy.Canary.StableService
+	canaryMapping := buildCanaryMapping(baseMapping, canarySvc, stableService, desiredWeight)
 	_, err = client.Create(ctx, canaryMapping, metav1.CreateOptions{})
 	if err != nil {
 		msg := fmt.Sprintf("Error creating canary mapping: %s", err)
@@ -227,9 +227,9 @@ func (r *Reconciler) createCanaryMapping(ctx context.Context,
 	return err
 }
 
-func buildCanaryMapping(baseMapping *unstructured.Unstructured, canarySvc string, desiredWeight int32) *unstructured.Unstructured {
+func buildCanaryMapping(baseMapping *unstructured.Unstructured, canarySvc string, stableService string, desiredWeight int32) *unstructured.Unstructured {
 	canaryMapping := baseMapping.DeepCopy()
-	svc := buildCanaryService(baseMapping, canarySvc)
+	svc := buildCanaryService(baseMapping, canarySvc, stableService)
 	unstructured.RemoveNestedField(canaryMapping.Object, "metadata")
 	cMappingName := buildCanaryMappingName(baseMapping.GetName())
 	canaryMapping.SetName(cMappingName)
@@ -239,19 +239,9 @@ func buildCanaryMapping(baseMapping *unstructured.Unstructured, canarySvc string
 	return canaryMapping
 }
 
-func buildCanaryService(baseMapping *unstructured.Unstructured, canarySvc string) string {
+func buildCanaryService(baseMapping *unstructured.Unstructured, canarySvc string, stableService string) string {
 	curSvc := GetMappingService(baseMapping)
-	parts := strings.Split(curSvc, ":")
-	if len(parts) < 2 {
-		return canarySvc
-	}
-	// Check if the last part is a valid int that can be used as the port
-	port := parts[len(parts)-1]
-	if _, err := strconv.Atoi(port); err != nil {
-		return canarySvc
-
-	}
-	return fmt.Sprintf("%s:%s", canarySvc, port)
+	return strings.Replace(curSvc, stableService, canarySvc, 1)
 }
 
 func (r *Reconciler) VerifyWeight(desiredWeight int32, additionalDestinations ...v1alpha1.WeightDestination) (*bool, error) {
diff --git a/rollout/trafficrouting/ambassador/ambassador_test.go b/rollout/trafficrouting/ambassador/ambassador_test.go
index 66d193b83a..ee1ac347e3 100644
--- a/rollout/trafficrouting/ambassador/ambassador_test.go
+++ b/rollout/trafficrouting/ambassador/ambassador_test.go
@@ -31,7 +31,7 @@ metadata:
 spec:
   prefix: /myapp/
   rewrite: /myapp/
-  service: myapp:8080`
+  service: main-service:8080`
 
 	baseMappingNoPort = `
 apiVersion: getambassador.io/v2
@@ -42,7 +42,7 @@ metadata:
 spec:
   prefix: /myapp/
   rewrite: /myapp/
-  service: myapp`
+  service: main-service`
 
 	baseMappingWithWeight = `
 apiVersion: getambassador.io/v2
@@ -53,7 +53,7 @@ metadata:
 spec:
   prefix: /myapp/
   rewrite: /myapp/
-  service: myapp:8080
+  service: main-service:8080
   weight: 20`
 
 	baseV3Mapping = `
@@ -66,7 +66,7 @@ spec:
   hostname: 'example.com'
   prefix: /myapp/
   rewrite: /myapp/
-  service: myapp:8080`
+  service: main-service:8080`
 
 	canaryMapping = `
 apiVersion: getambassador.io/v2
@@ -77,7 +77,7 @@ metadata:
 spec:
   prefix: /myapp/
   rewrite: /myapp/
-  service: myapp:8080
+  service: main-service:8080
   weight: 20`
 
 	canaryMappingWithZeroWeight = `
@@ -89,7 +89,7 @@ metadata:
 spec:
   prefix: /myapp/
   rewrite: /myapp/
-  service: myapp:8080
+  service: main-service:8080
   weight: 0`
 )