Merge pull request #4190 from k8s-infra-cherrypick-robot/cherry-pick-4185-to-release-1.10

k8s-ci-robot · web-flow · commit e3224b82b238 · 2023-10-26T22:00:35.000+02:00
[release-1.10] Escape dots in hostname regexps
diff --git a/internal/test/env/env.go b/internal/test/env/env.go
@@ -49,7 +49,7 @@ var (
 	logger                 = record.NewLogger(record.WithThreshold(pointer.Int(1)), record.WithWriter(ginkgo.GinkgoWriter))
 	scheme                 = runtime.NewScheme()
 	env                    *envtest.Environment
-	clusterAPIVersionRegex = regexp.MustCompile(`^(\W)sigs.k8s.io/cluster-api v(.+)`)
+	clusterAPIVersionRegex = regexp.MustCompile(`^(\W)sigs\.k8s\.io/cluster-api v(.+)`)
 )
 
 func init() {
diff --git a/internal/test/env/env_test.go b/internal/test/env/env_test.go
@@ -28,5 +28,5 @@ func TestGetFilePathToCAPICRDs(t *testing.T) {
 	_, filename, _, _ := goruntime.Caller(0) //nolint:dogsled // Ignore "declaration has 3 blank identifiers" check.
 	root := path.Join(path.Dir(filename), "..", "..", "..")
 	g := gomega.NewWithT(t)
-	g.Expect(getFilePathToCAPICRDs(root)).To(gomega.MatchRegexp("(.+)/pkg/mod/sigs.k8s.io/cluster-api@v(.+)/config/crd/bases"))
+	g.Expect(getFilePathToCAPICRDs(root)).To(gomega.MatchRegexp(`(.+)/pkg/mod/sigs\.k8s\.io/cluster-api@v(.+)/config/crd/bases`))
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ var (`
`49`	`49`	`logger = record.NewLogger(record.WithThreshold(pointer.Int(1)), record.WithWriter(ginkgo.GinkgoWriter))`
`50`	`50`	`scheme = runtime.NewScheme()`
`51`	`51`	`env *envtest.Environment`
`52`		- clusterAPIVersionRegex = regexp.MustCompile(`^(\W)sigs.k8s.io/cluster-api v(.+)`)
	`52`	+ clusterAPIVersionRegex = regexp.MustCompile(`^(\W)sigs\.k8s\.io/cluster-api v(.+)`)
`53`	`53`	`)`
`54`	`54`
`55`	`55`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ func TestGetFilePathToCAPICRDs(t *testing.T) {`
`28`	`28`	`_, filename, _, _ := goruntime.Caller(0) //nolint:dogsled // Ignore "declaration has 3 blank identifiers" check.`
`29`	`29`	`root := path.Join(path.Dir(filename), "..", "..", "..")`
`30`	`30`	`g := gomega.NewWithT(t)`
`31`		`- g.Expect(getFilePathToCAPICRDs(root)).To(gomega.MatchRegexp("(.+)/pkg/mod/sigs.k8s.io/cluster-api@v(.+)/config/crd/bases"))`
	`31`	+ g.Expect(getFilePathToCAPICRDs(root)).To(gomega.MatchRegexp(`(.+)/pkg/mod/sigs\.k8s\.io/cluster-api@v(.+)/config/crd/bases`))
`32`	`32`	`}`