Skip to content

Use regex instead of format help for KMS secret name validation #2966

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

Open
JoelSpeed wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use regex instead of format help for KMS secret name validation #2966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 config/v1/types_kmsencryption.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ type VaultSecretReference struct {
//
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:MaxLength=253
// +kubebuilder:validation:XValidation:rule="!format.dns1123Subdomain().validate(self).hasValue()",message="name must be a valid DNS subdomain name: contain no more than 253 characters, contain only lowercase alphanumeric characters, '-' or '.', and start and end with an alphanumeric character"
// +kubebuilder:validation:XValidation:rule="self.matches('^[a-z0-9]([a-z0-9\\\\-]*[a-z0-9])?(\\\\.[a-z0-9]([a-z0-9\\\\-]*[a-z0-9])?)*$')",message="name must be a valid DNS subdomain name: contain no more than 253 characters, contain only lowercase alphanumeric characters, '-' or '.', and start and end with an alphanumeric character"
// +required
Name string `json:"name,omitempty"`
}
Expand All @@ -76,7 +76,7 @@ type VaultConfigMapReference struct {
//
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:MaxLength=253
// +kubebuilder:validation:XValidation:rule="!format.dns1123Subdomain().validate(self).hasValue()",message="name must be a valid DNS subdomain name: contain no more than 253 characters, contain only lowercase alphanumeric characters, '-' or '.', and start and end with an alphanumeric character"
// +kubebuilder:validation:XValidation:rule="self.matches('^[a-z0-9]([a-z0-9\\\\-]*[a-z0-9])?(\\\\.[a-z0-9]([a-z0-9\\\\-]*[a-z0-9])?)*$')",message="name must be a valid DNS subdomain name: contain no more than 253 characters, contain only lowercase alphanumeric characters, '-' or '.', and start and end with an alphanumeric character"
// +required
Name string `json:"name,omitempty"`
}
Expand Down Expand Up @@ -300,7 +300,7 @@ type VaultTLSConfig struct {
//
// +kubebuilder:validation:MaxLength=253
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:XValidation:rule="!format.dns1123Subdomain().validate(self).hasValue()",message="serverName must be a valid DNS hostname: contain no more than 253 characters, contain only lowercase alphanumeric characters, '-' or '.', and start and end with an alphanumeric character"
// +kubebuilder:validation:XValidation:rule="self.matches('^[a-z0-9]([a-z0-9\\\\-]*[a-z0-9])?(\\\\.[a-z0-9]([a-z0-9\\\\-]*[a-z0-9])?)*$')",message="serverName must be a valid DNS hostname: contain no more than 253 characters, contain only lowercase alphanumeric characters, '-' or '.', and start and end with an alphanumeric character"
// +optional
ServerName string `json:"serverName,omitempty"`
}
6 changes: 3 additions & 3 deletions ...zz_generated.crd-manifests/0000_10_config-operator_01_apiservers-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with
an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand Down Expand Up @@ -307,7 +307,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with an
alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand All @@ -327,7 +327,7 @@ spec:
contain no more than 253 characters, contain only
lowercase alphanumeric characters, ''-'' or ''.'',
and start and end with an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
type: object
vaultAddress:
description: |-
Expand Down
6 changes: 3 additions & 3 deletions ...enerated.crd-manifests/0000_10_config-operator_01_apiservers-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with
an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand Down Expand Up @@ -307,7 +307,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with an
alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand All @@ -327,7 +327,7 @@ spec:
contain no more than 253 characters, contain only
lowercase alphanumeric characters, ''-'' or ''.'',
and start and end with an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
type: object
vaultAddress:
description: |-
Expand Down
6 changes: 3 additions & 3 deletions ...nerated.crd-manifests/0000_10_config-operator_01_apiservers-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with
an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand Down Expand Up @@ -307,7 +307,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with an
alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand All @@ -327,7 +327,7 @@ spec:
contain no more than 253 characters, contain only
lowercase alphanumeric characters, ''-'' or ''.'',
and start and end with an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
type: object
vaultAddress:
description: |-
Expand Down
6 changes: 3 additions & 3 deletions ...zz_generated.featuregated-crd-manifests/apiservers.config.openshift.io/KMSEncryption.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with
an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand Down Expand Up @@ -307,7 +307,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with an
alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand All @@ -327,7 +327,7 @@ spec:
contain no more than 253 characters, contain only
lowercase alphanumeric characters, ''-'' or ''.'',
and start and end with an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
type: object
vaultAddress:
description: |-
Expand Down
6 changes: 3 additions & 3 deletions payload-manifests/crds/0000_10_config-operator_01_apiservers-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with
an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand Down Expand Up @@ -307,7 +307,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with an
alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand All @@ -327,7 +327,7 @@ spec:
contain no more than 253 characters, contain only
lowercase alphanumeric characters, ''-'' or ''.'',
and start and end with an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
type: object
vaultAddress:
description: |-
Expand Down
6 changes: 3 additions & 3 deletions payload-manifests/crds/0000_10_config-operator_01_apiservers-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with
an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand Down Expand Up @@ -307,7 +307,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with an
alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand All @@ -327,7 +327,7 @@ spec:
contain no more than 253 characters, contain only
lowercase alphanumeric characters, ''-'' or ''.'',
and start and end with an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
type: object
vaultAddress:
description: |-
Expand Down
6 changes: 3 additions & 3 deletions payload-manifests/crds/0000_10_config-operator_01_apiservers-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with
an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand Down Expand Up @@ -307,7 +307,7 @@ spec:
contain only lowercase alphanumeric characters,
''-'' or ''.'', and start and end with an
alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
required:
- name
type: object
Expand All @@ -327,7 +327,7 @@ spec:
contain no more than 253 characters, contain only
lowercase alphanumeric characters, ''-'' or ''.'',
and start and end with an alphanumeric character'
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
rule: self.matches('^[a-z0-9]([a-z0-9\\-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9\\-]*[a-z0-9])?)*$')
type: object
vaultAddress:
description: |-
Expand Down