Merge pull request #1544 from pwschuurman/fix-gce-link-cleaning

k8s-ci-robot · web-flow · commit e8582ae47a16 · 2023-12-21T05:50:01.000+01:00
Increase strictness of fully qualified GCP link cleaning in e2e test parsing code
diff --git a/test/e2e/tests/single_zone_e2e_test.go b/test/e2e/tests/single_zone_e2e_test.go
@@ -1407,7 +1407,7 @@ func createAndValidateUniqueZonalMultiWriterDisk(client *remote.CsiClient, proje
 }
 
 func cleanSelfLink(selfLink string) string {
-	r, _ := regexp.Compile("https:\\/\\/www.*apis.com\\/.*(v1|beta|alpha)\\/")
+	r, _ := regexp.Compile("https:\\/\\/www.*apis.com\\/[a-z]+\\/(v1|beta|alpha)\\/")
 	return r.ReplaceAllString(selfLink, "")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1407,7 +1407,7 @@ func createAndValidateUniqueZonalMultiWriterDisk(client *remote.CsiClient, proje`
`1407`	`1407`	`}`
`1408`	`1408`
`1409`	`1409`	`func cleanSelfLink(selfLink string) string {`
`1410`		`- r, _ := regexp.Compile("https:\\/\\/www.apis.com\\/.(v1\|beta\|alpha)\\/")`
	`1410`	`+ r, _ := regexp.Compile("https:\\/\\/www.*apis.com\\/[a-z]+\\/(v1\|beta\|alpha)\\/")`
`1411`	`1411`	`return r.ReplaceAllString(selfLink, "")`
`1412`	`1412`	`}`
`1413`	`1413`