fix

Author: ludydoo

.secrets.baseline

@@ -268,7 +268,7 @@
         "filename": "internal/central/pkg/services/centralservice_moq.go",
         "hashed_secret": "44e17306b837162269a410204daaa5ecee4ec22c",
         "is_verified": false,
-        "line_number": 1180
+        "line_number": 1085
       }
     ],
     "pkg/client/fleetmanager/impl/testdata/token": [
@@ -391,5 +391,5 @@
       }
     ]
   },
-  "generated_at": "2025-06-10T08:35:01Z"
+  "generated_at": "2025-08-26T17:34:57Z"
 }

e2e/dns/record_cleanup.go

@@ -16,7 +16,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	openshiftRouteV1 "github.com/openshift/api/route/v1"
-	"github.com/stackrox/acs-fleet-manager/e2e/dns"
 	"github.com/stackrox/acs-fleet-manager/e2e/testutil"
 	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/k8s"
 	"github.com/stackrox/acs-fleet-manager/internal/central/constants"
@@ -200,30 +199,6 @@ var _ = Describe("Central", Ordered, func() {
 				Should(Succeed())
 		})
 
-		It("should have created AWS Route53 records", func() {
-			testutil.SkipIf(!dnsEnabled, testutil.SkipDNSMsg)
-
-			var centralRequest public.CentralRequest
-			Expect(testutil.GetCentralRequest(ctx, client, centralRequestID, &centralRequest)).
-				To(Succeed())
-
-			var reencryptIngress openshiftRouteV1.RouteIngress
-			Eventually(testutil.AssertReencryptIngressRouteExist(context.Background(), routeService, centralRequest, &reencryptIngress)).
-				WithTimeout(waitTimeout).
-				WithPolling(defaultPolling).
-				Should(Succeed())
-
-			dnsRecordsLoader := dns.NewRecordsLoader(route53Client, centralRequest)
-
-			Eventually(dnsRecordsLoader.LoadDNSRecords).
-				WithTimeout(waitTimeout).
-				WithPolling(defaultPolling).
-				Should(HaveLen(len(dnsRecordsLoader.CentralDomainNames)), "Started at %s", time.Now())
-
-			recordSets := dnsRecordsLoader.LastResult
-			testutil.AssertDNSMatchesRouter(dnsRecordsLoader.CentralDomainNames, recordSets, &reencryptIngress)
-		})
-
 		It("should backup important secrets in FM database", func() {
 			expectedSecrets := k8s.NewSecretBackup(k8sClient, false).GetWatchedSecrets()
 			Eventually(assertStoredSecrets(ctx, privateAPI, centralRequestID, expectedSecrets)).
@@ -348,18 +323,6 @@ var _ = Describe("Central", Ordered, func() {
 				Should(Succeed())
 		})
 
-		It("should delete external DNS entries", func() {
-			testutil.SkipIf(!dnsEnabled, testutil.SkipDNSMsg)
-			var centralRequest public.CentralRequest
-			Expect(testutil.GetCentralRequest(ctx, client, centralRequestID, &centralRequest)).
-				To(Succeed())
-			dnsRecordsLoader := dns.NewRecordsLoader(route53Client, centralRequest)
-			Eventually(dnsRecordsLoader.LoadDNSRecords).
-				WithTimeout(waitTimeout).
-				WithPolling(defaultPolling).
-				Should(BeEmpty(), "Started at %s", time.Now())
-		})
-
 		AfterAll(func() {
 			Expect(restoreDefaultGitopsConfig()).To(Succeed())
 		})
@@ -428,18 +391,6 @@ var _ = Describe("Central", Ordered, func() {
 				Should(Succeed())
 		})
 
-		It("should delete external DNS entries", func() {
-			testutil.SkipIf(!dnsEnabled, testutil.SkipDNSMsg)
-			var centralRequest public.CentralRequest
-			Expect(testutil.GetCentralRequest(ctx, client, centralRequestID, &centralRequest)).
-				To(Succeed())
-			dnsRecordsLoader := dns.NewRecordsLoader(route53Client, centralRequest)
-			Eventually(dnsRecordsLoader.LoadDNSRecords).
-				WithTimeout(waitTimeout).
-				WithPolling(defaultPolling).
-				Should(BeEmpty(), "Started at %s", time.Now())
-		})
-
 		It("should be restorable", func() {
 			By("calling the admin restore API", func() {
 				res, err := adminAPI.RestoreCentral(ctx, centralRequestID)
@@ -468,17 +419,6 @@ var _ = Describe("Central", Ordered, func() {
 					Should(Succeed())
 			})
 
-			By("deleting external DNS entries", func() {
-				testutil.SkipIf(!dnsEnabled, testutil.SkipDNSMsg)
-				var centralRequest public.CentralRequest
-				Expect(testutil.GetCentralRequest(ctx, client, centralRequestID, &centralRequest)).
-					To(Succeed())
-				dnsRecordsLoader := dns.NewRecordsLoader(route53Client, centralRequest)
-				Eventually(dnsRecordsLoader.LoadDNSRecords).
-					WithTimeout(waitTimeout).
-					WithPolling(defaultPolling).
-					Should(BeEmpty(), "Started at %s", time.Now())
-			})
 		})
 
 	})
@@ -551,14 +491,6 @@ var _ = Describe("Central", Ordered, func() {
 			Expect(k8sClient.Delete(ctx, namespace)).ToNot(HaveOccurred())
 		})
 
-		It("should delete external DNS entries", func() {
-			testutil.SkipIf(!dnsEnabled, testutil.SkipDNSMsg)
-			dnsRecordsLoader := dns.NewRecordsLoader(route53Client, readyCentralRequest)
-			Eventually(dnsRecordsLoader.LoadDNSRecords).
-				WithTimeout(waitTimeout).
-				WithPolling(defaultPolling).
-				Should(BeEmpty(), "Started at %s", time.Now())
-		})
 	})
 })
 

e2e/dns/records_loader.go

@@ -9,7 +9,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	openshiftRouteV1 "github.com/openshift/api/route/v1"
-	"github.com/stackrox/acs-fleet-manager/e2e/dns"
 	"github.com/stackrox/acs-fleet-manager/e2e/testutil"
 	"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/k8s"
 	"github.com/stackrox/acs-fleet-manager/internal/central/pkg/api/admin/private"
@@ -64,11 +63,6 @@ var _ = Describe("Central Migration Test", Ordered, func() {
 	})
 
 	AfterAll(func() {
-		// if the Id is empty we've never successfully created a CentralRequest, thus no cleanup necessary
-		if dnsEnabled && centralRequest.Id != "" {
-			dns.CleanupCentralRequestRecords(route53Client, centralRequest)
-		}
-
 		for _, note := range notes {
 			GinkgoWriter.Println(note)
 		}
@@ -104,11 +98,9 @@ var _ = Describe("Central Migration Test", Ordered, func() {
 				Should(Succeed())
 		})
 
-		It("should have DNS CNAME records for cluster1 routes", func() {
-			testutil.SkipIf(!dnsEnabled, testutil.SkipDNSMsg)
+		It("should have routes configured on cluster1", func() {
 			testutil.GetCentralRequest(context.Background(), fleetmanagerClient, centralRequest.Id, &centralRequest)
 
-			dnsRecordsLoader := dns.NewRecordsLoader(route53Client, centralRequest)
 			routeService := k8s.NewRouteService(cluster1KubeClient)
 
 			var reencryptIngress openshiftRouteV1.RouteIngress
@@ -117,12 +109,7 @@ var _ = Describe("Central Migration Test", Ordered, func() {
 				WithPolling(defaultPolling).
 				Should(Succeed())
 
-			Eventually(dnsRecordsLoader.LoadDNSRecords).
-				WithTimeout(waitTimeout).
-				WithPolling(3 * defaultPolling).
-				Should(HaveLen(len(dnsRecordsLoader.CentralDomainNames)))
-
-			testutil.AssertDNSMatchesRouter(dnsRecordsLoader.CentralDomainNames, dnsRecordsLoader.LastResult, &reencryptIngress)
+			GinkgoWriter.Printf("Route host configured: %s\n", reencryptIngress.Host)
 		})
 	})
 
@@ -155,11 +142,9 @@ var _ = Describe("Central Migration Test", Ordered, func() {
 				WithPolling(defaultPolling).
 				Should(Succeed())
 		})
-		It("should have DNS CNAME records for cluster2 routes", func() {
-			testutil.SkipIf(!dnsEnabled, testutil.SkipDNSMsg)
+		It("should have routes configured on cluster2", func() {
 			testutil.GetCentralRequest(context.Background(), fleetmanagerClient, centralRequest.Id, &centralRequest)
 
-			dnsRecordsLoader := dns.NewRecordsLoader(route53Client, centralRequest)
 			routeService := k8s.NewRouteService(cluster2KubeClient)
 
 			var reencryptIngress openshiftRouteV1.RouteIngress
@@ -168,12 +153,7 @@ var _ = Describe("Central Migration Test", Ordered, func() {
 				WithPolling(defaultPolling).
 				Should(Succeed())
 
-			Eventually(dnsRecordsLoader.LoadDNSRecords).
-				WithTimeout(waitTimeout).
-				WithPolling(3 * defaultPolling).
-				Should(HaveLen(len(dnsRecordsLoader.CentralDomainNames)))
-
-			testutil.AssertDNSMatchesRouter(dnsRecordsLoader.CentralDomainNames, dnsRecordsLoader.LastResult, &reencryptIngress)
+			GinkgoWriter.Printf("Route host configured: %s\n", reencryptIngress.Host)
 		})
 	})