Fixed validation regular expressions (GoogleCloudPlatform#4244)

David Cavazos · web-flow · commit 4a10ba22d7d8 · 2020-07-10T08:50:48.000-07:00
* Fixed validation regular expressions

* Refined Pub/Sub regex
diff --git a/dataflow/flex-templates/streaming_beam/metadata.json b/dataflow/flex-templates/streaming_beam/metadata.json
@@ -7,7 +7,7 @@
       "label": "Input PubSub subscription.",
       "helpText": "Name of the input PubSub subscription to consume from.",
       "regexes": [
-        "[/:-_.a-zA-Z0-9]+"
+        "(?!goog)[a-zA-Z][-_.~+%a-zA-Z0-9]{2,}"
       ]
     },
     {
@@ -16,7 +16,7 @@
       "helpText": "Name of the BigQuery output table name.",
       "is_optional": true,
       "regexes": [
-        "[/:-_.a-zA-Z0-9]+"
+        "[^:]+:[^.]+[.].+"
       ]
     }
   ]

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"label": "Input PubSub subscription.",`
`8`	`8`	`"helpText": "Name of the input PubSub subscription to consume from.",`
`9`	`9`	`"regexes": [`
`10`		`- "[/:-_.a-zA-Z0-9]+"`
	`10`	`+ "(?!goog)[a-zA-Z][-_.~+%a-zA-Z0-9]{2,}"`
`11`	`11`	`]`
`12`	`12`	`},`
`13`	`13`	`{`
`@@ -16,7 +16,7 @@`
`16`	`16`	`"helpText": "Name of the BigQuery output table name.",`
`17`	`17`	`"is_optional": true,`
`18`	`18`	`"regexes": [`
`19`		`- "[/:-_.a-zA-Z0-9]+"`
	`19`	`+ "[^:]+:[^.]+[.].+"`
`20`	`20`	`]`
`21`	`21`	`}`
`22`	`22`	`]`