Skip to content

Commit 2009f48

Browse files
merllsvcAPLBot
andauthored
feat: separate domain from netpol addresss validation (#983)
* feat: separate domain from netpol (fqdn, wildcard, ip) validation * fix: expression without wildcard --------- Co-authored-by: svcAPLBot <174728082+svcAPLBot@users.noreply.github.com>
1 parent ff420f7 commit 2009f48

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

src/openapi/definitions.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ dns:
526526
required:
527527
- other
528528
domain:
529-
pattern: ^((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]))|([a-f0-9:]+:+)+[a-f0-9]+$
529+
pattern: ^([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?\.)*[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?$
530530
x-message: a valid fully qualified domain name (FQDN)
531531
type: string
532532
domainSuffix:
@@ -1118,6 +1118,10 @@ volumes:
11181118
$ref: 'definitions.yaml#/idName'
11191119
type: object
11201120
type: array
1121+
wildcardDomainOrIp:
1122+
pattern: ^((\*\.)?([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?\.)*[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?|([a-f0-9:]+:+)+[a-f0-9]+)$
1123+
description: FQDN, wildcard domain, or IP address
1124+
type: string
11211125
wordCharacterPattern:
11221126
type: string
11231127
pattern: ^[^\s]+$

src/openapi/netpol.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ ruleType:
9797
type: object
9898
properties:
9999
domain:
100-
title: FQDN or IP address
101-
$ref: 'definitions.yaml#/domain'
100+
title: FQDN, wildcard domain, or IP address
101+
$ref: 'definitions.yaml#/wildcardDomainOrIp'
102102
ports:
103103
type: array
104104
items:

0 commit comments

Comments
 (0)