From ac58d319d2b725224ff42d750aeb4c5d5fb15891 Mon Sep 17 00:00:00 2001 From: Ishan Khare Date: Thu, 21 Sep 2023 21:16:52 +0530 Subject: [PATCH] fix failing test --- pkg/controllers/resources/ingresses/syncer_test.go | 8 ++++---- pkg/controllers/resources/ingresses/util/util.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controllers/resources/ingresses/syncer_test.go b/pkg/controllers/resources/ingresses/syncer_test.go index 04b20f095..25b9286d1 100644 --- a/pkg/controllers/resources/ingresses/syncer_test.go +++ b/pkg/controllers/resources/ingresses/syncer_test.go @@ -368,7 +368,7 @@ func TestSync(t *testing.T) { Labels: baseIngress.Labels, Annotations: map[string]string{ "nginx.ingress.kubernetes.io/auth-secret": "my-secret", - "alb.ingress.kubernetes.io/actions.testservice": "{\"forwardConfig\":{\"targetGroups\":[{\"serviceName\":\"nginx-service\",\"servicePort\":\"80\",\"weight\":100}]}}", + "alb.ingress.kubernetes.io/actions.testservice": `{"forwardConfig":{"targetGroups":[{"serviceName":"nginx-service","servicePort":"80","weight":100}]}}`, "alb.ingress.kubernetes.io/actions.ssl-redirect": `{"type": "redirect", "redirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}`, }, }, @@ -391,7 +391,7 @@ func TestSync(t *testing.T) { Namespace: baseIngress.Namespace, Labels: baseIngress.Labels, Annotations: map[string]string{ - "alb.ingress.kubernetes.io/actions.testservice": "{\"forwardConfig\":{\"targetGroups\":[{\"serviceName\":\"nginx-service\",\"servicePort\":\"80\",\"weight\":100}]}}", + "alb.ingress.kubernetes.io/actions.testservice": `{"forwardConfig":{"targetGroups":[{"serviceName":"nginx-service","servicePort":"80","weight":100}]}}`, "alb.ingress.kubernetes.io/actions.ssl-redirect": `{"type": "redirect", "redirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}`, "nginx.ingress.kubernetes.io/auth-secret": "my-secret", }, @@ -412,8 +412,8 @@ func TestSync(t *testing.T) { "vcluster.loft.sh/object-name": baseIngress.Name, "vcluster.loft.sh/object-namespace": baseIngress.Namespace, translate.UIDAnnotation: "", - "alb.ingress.kubernetes.io/actions.testservice-x-test-x-suffix": "{\"targetGroupARN\":null,\"forwardConfig\":{\"targetGroups\":[{\"serviceName\":\"nginx-service-x-test-x-suffix\",\"servicePort\":\"80\",\"weight\":100}]}}", - "alb.ingress.kubernetes.io/actions.ssl-redirect-x-test-x-suffix": `{"type":"redirect","targetGroupARN":null,"forwardConfig":{},"redirectConfig":{"Port":"443","Protocol":"HTTPS","StatusCode":"HTTP_301"}}`, + "alb.ingress.kubernetes.io/actions.testservice-x-test-x-suffix": `{"forwardConfig":{"targetGroups":[{"serviceName":"nginx-service-x-test-x-suffix","servicePort":"80","weight":100}]}}`, + "alb.ingress.kubernetes.io/actions.ssl-redirect-x-test-x-suffix": `{"type":"redirect","forwardConfig":{},"redirectConfig":{"Port":"443","Protocol":"HTTPS","StatusCode":"HTTP_301"}}`, }, }, }, diff --git a/pkg/controllers/resources/ingresses/util/util.go b/pkg/controllers/resources/ingresses/util/util.go index e4bcfd79e..c8f1a507d 100644 --- a/pkg/controllers/resources/ingresses/util/util.go +++ b/pkg/controllers/resources/ingresses/util/util.go @@ -25,7 +25,7 @@ func getActionOrConditionValue(annotation, actionOrCondition string) string { // ref https://github.com/kubernetes-sigs/aws-load-balancer-controller/blob/main/pkg/ingress/config_types.go type actionPayload struct { Type string `json:"type,omitempty"` - TargetGroupARN *string `json:"targetGroupARN"` + TargetGroupARN *string `json:"targetGroupARN,omitempty"` FixedResponseConfig map[string]interface{} `json:"fixedResponseConfig,omitempty"` ForwardConfig struct { TargetGroups []map[string]interface{} `json:"targetGroups,omitempty"`