From 826245f511d7508f8f50d02cf88c8f6195ed7746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Jim=C3=A9nez=20S=C3=A1nchez?= Date: Fri, 27 Sep 2024 09:22:38 +0200 Subject: [PATCH] CloudMigrations: Avoid building GMS base path when provided (#93793) Avoid building GMS base path when provided --- .../cloudmigration/gmsclient/gms_client.go | 2 +- .../cloudmigration/gmsclient/gms_client_test.go | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkg/services/cloudmigration/gmsclient/gms_client.go b/pkg/services/cloudmigration/gmsclient/gms_client.go index d9804d4e157..935ee003e53 100644 --- a/pkg/services/cloudmigration/gmsclient/gms_client.go +++ b/pkg/services/cloudmigration/gmsclient/gms_client.go @@ -297,7 +297,7 @@ func (c *gmsClientImpl) ReportEvent(ctx context.Context, session cloudmigration. func (c *gmsClientImpl) buildBasePath(clusterSlug string) string { domain := c.cfg.CloudMigration.GMSDomain - if strings.HasPrefix(domain, "http://localhost") { + if strings.HasPrefix(domain, "http://") || strings.HasPrefix(domain, "https://") { return domain } return fmt.Sprintf("https://cms-%s.%s/cloud-migrations", clusterSlug, domain) diff --git a/pkg/services/cloudmigration/gmsclient/gms_client_test.go b/pkg/services/cloudmigration/gmsclient/gms_client_test.go index 0e04bb0ad75..a2eb92d76cb 100644 --- a/pkg/services/cloudmigration/gmsclient/gms_client_test.go +++ b/pkg/services/cloudmigration/gmsclient/gms_client_test.go @@ -35,13 +35,19 @@ func Test_buildBasePath(t *testing.T) { expected string }{ { - description: "domain starts with http://localhost, should return domain", - domain: "http://localhost:8080", + description: "domain starts with http://, should return domain", + domain: "http://some-domain:8080", clusterSlug: "anything", - expected: "http://localhost:8080", + expected: "http://some-domain:8080", }, { - description: "domain doesn't start with http://localhost, should build a string using the domain and clusterSlug", + description: "domain starts with https://, should return domain", + domain: "https://some-domain:8080", + clusterSlug: "anything", + expected: "https://some-domain:8080", + }, + { + description: "domain doesn't start with http or https, should build a string using the domain and clusterSlug", domain: "gms-dev", clusterSlug: "us-east-1", expected: "https://cms-us-east-1.gms-dev/cloud-migrations",