Skip to content

chore: fixed escape character issue in regular expressions #765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Aug 29, 2025
Merged

chore: fixed escape character issue in regular expressions #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ca7592e
Addng UI validations for MySql and PostgreSQL
amrkk123 Aug 11, 2025
daee67a
Fixing display metadata
amrkk123 Aug 11, 2025
c627b3e
fixing whitespaces
amrkk123 Aug 11, 2025
4aba764
Removing double quotes from metadata display yaml
amrkk123 Aug 12, 2025
c8f1080
Removing day labels
amrkk123 Aug 12, 2025
f348109
Fixing regex for modules
amrkk123 Aug 12, 2025
8c5c667
Merge branch 'main' into main
amrkk123 Aug 12, 2025
7d97701
Merge branch 'terraform-google-modules:main' into main
amrkk123 Aug 19, 2025
42ef467
Resolving comments
amrkk123 Aug 19, 2025
22e3989
fix whitespace error
amrkk123 Aug 19, 2025
0f1db27
Remove whitespace
amrkk123 Aug 20, 2025
5e85492
Merge branch 'main' into main
amrkk123 Aug 20, 2025
0165b0d
Fix regex for escape sequences
amrkk123 Aug 22, 2025
1204064
Merge remote-tracking branch 'upstream/main'
amrkk123 Aug 22, 2025
7c14df8
Merge branch 'main' into main
bharathkkb Aug 23, 2025
1b2d4bc
fixing regex with escape chars
amrkk123 Aug 25, 2025
144aba6
fix repeated code issue
amrkk123 Aug 25, 2025
eb1998c
fix regx for email in mysql
amrkk123 Aug 25, 2025
a067325
Merge branch 'main' into main
amrkk123 Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/mysql/metadata.display.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ spec:
email:
name: email
title: Email
regexValidation: ^([a-zA-Z][a-zA-Z0-9_]{0,15}|[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})$
regexValidation: "^([a-zA-Z][a-zA-Z0-9_]{0,15}|[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,})$"
validation: Must be a valid email address or a Google service account email.
type:
name: type
Expand Down Expand Up @@ -306,7 +306,7 @@ spec:
name: private_network
title: private_network
subtext: The VPC network used to enable private IP access to the Cloud SQL instance. Cannot be unset once configured.
regexValidation: ^(?:http(?:s)?://.+/)?projects/((?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z0-9](?:[-a-z0-9]{0,61}[a-z0-9])?)))/global/networks/((?:[a-z](?:[-a-z0-9]*[a-z0-9])?))$
regexValidation: "^(?:http(?:s)?://.+/)?projects/((?:(?:[-a-z0-9]{1,63}.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z0-9](?:[-a-z0-9]{0,61}[a-z0-9])?)))/global/networks/((?:[a-z](?:[-a-z0-9]*[a-z0-9])?))$"
validation: Invalid format. Expected a valid Google Cloud network resource name, e.g. projects/{project}/global/networks/{network}.
ssl_mode:
name: ssl_mode
Expand All @@ -325,7 +325,7 @@ spec:
value:
name: value
title: Value
regexValidation: ^((25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\/(3[0-2]|[1-2]\d|\d)$
regexValidation: "^((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\\/(3[0-2]|[1-2][0-9]|[0-9])$"
validation: Must be a valid IPv4 address in CIDR format.
level: 1
maintenance_window_day:
Expand Down
6 changes: 2 additions & 4 deletions modules/postgresql/metadata.display.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ spec:
email:
name: email
title: Email
regexValidation: ^([a-zA-Z][a-zA-Z0-9_]{0,15}|[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,})$
regexValidation: "^([a-zA-Z][a-zA-Z0-9_]{0,15}|[a-z0-9._%+-]+@[a-z0-9.-]+.[a-z]{2,})$"
validation: Must be a valid email address or a Google service account email.
type:
name: type
Expand Down Expand Up @@ -276,7 +276,7 @@ spec:
name: private_network
title: private_network
subtext: The VPC network used to enable private IP access to the Cloud SQL instance. Cannot be unset once configured.
regexValidation: ^(?:http(?:s)?://.+/)?projects/((?:(?:[-a-z0-9]{1,63}\\.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z0-9](?:[-a-z0-9]{0,61}[a-z0-9])?)))/global/networks/((?:[a-z](?:[-a-z0-9]*[a-z0-9])?))$
regexValidation: "^(?:http(?:s)?://.+/)?projects/((?:(?:[-a-z0-9]{1,63}.)*(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?):)?(?:[0-9]{1,19}|(?:[a-z0-9](?:[-a-z0-9]{0,61}[a-z0-9])?)))/global/networks/((?:[a-z](?:[-a-z0-9]*[a-z0-9])?))$"
validation: Invalid format. Expected a valid Google Cloud network resource name, e.g. projects/{project}/global/networks/{network}.
ssl_mode:
name: ssl_mode
Expand All @@ -294,8 +294,6 @@ spec:
enumValueLabels:
- label: GOOGLE_MANAGED_INTERNAL_CA
value: GOOGLE_MANAGED_INTERNAL_CA
- label: GOOGLE_MANAGED_INTERNAL_CA
value: GOOGLE_MANAGED_INTERNAL_CA
level: 1
maintenance_window_day:
name: maintenance_window_day
Expand Down