[CD] - Merge SLO and saml callback urls (#1046)

* merge SLO and saml callback urls

Signed-off-by: rashmi_kh <[email protected]>

* update tests and run gofmt

Signed-off-by: rashmi_kh <[email protected]>

* Update routes_test.go

---------

Signed-off-by: rashmi_kh <[email protected]>
Co-authored-by: Robert W. Hundley <[email protected]>

Author: rashmi43

controllers/operator/routes.go

@@ -270,12 +270,11 @@ func (r *AuthenticationReconciler) getAllRoutesFields(authCR *operatorv1alpha1.A
 			},
 			"saml-ui-callback": {
 				Annotations: map[string]string{
-					"haproxy.router.openshift.io/balance":        "source",
-					"haproxy.router.openshift.io/rewrite-target": "/ibm/saml20/defaultSP/acs",
+					"haproxy.router.openshift.io/balance": "source",
 				},
 				Name:              "saml-ui-callback",
 				RouteHost:         routeHost,
-				RoutePath:         "/ibm/saml20/defaultSP/acs",
+				RoutePath:         "/ibm/saml20/defaultSP",
 				RoutePort:         9443,
 				ServiceName:       PlatformAuthServiceName,
 				DestinationCAcert: platformAuthCert,

controllers/operator/routes_test.go

@@ -796,12 +796,11 @@ var _ = Describe("Route handling", func() {
 					Expect(route.Spec.TLS.DestinationCACertificate).To(Equal(string(platformAuthSecretSecret.Data["ca.crt"])))
 					Expect(route.Annotations).To(HaveKeyWithValue("haproxy.router.openshift.io/balance", "source"))
 				case "saml-ui-callback":
-					Expect(route.Spec.Path).To(Equal("/ibm/saml20/defaultSP/acs"))
+					Expect(route.Spec.Path).To(Equal("/ibm/saml20/defaultSP"))
 					Expect(route.Spec.Port).To(Equal(&routev1.RoutePort{TargetPort: intstr.FromInt(9443)}))
 					Expect(route.Spec.To.Name).To(Equal(PlatformAuthServiceName))
 					Expect(route.Spec.TLS.DestinationCACertificate).To(Equal(string(platformAuthSecretSecret.Data["ca.crt"])))
 					Expect(route.Annotations).To(HaveKeyWithValue("haproxy.router.openshift.io/balance", "source"))
-					Expect(route.Annotations).To(HaveKeyWithValue("haproxy.router.openshift.io/rewrite-target", "/ibm/saml20/defaultSP/acs"))
 				case "social-login-callback":
 					Expect(route.Spec.Path).To(Equal("/ibm/api/social-login"))
 					Expect(route.Spec.Port).To(Equal(&routev1.RoutePort{TargetPort: intstr.FromInt(9443)}))