Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-07-31 11:08:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

cli: don't validate unused ownerID field (#2556)

Browse source 
Signed-off-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
Daniel Weiße 2023-11-06 11:55:20 +01:00 • committed by GitHub
parent b0ee39a96d
commit ac4ac6a148
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cli/internal/state/state.go
View file

@ -268,8 +268,10 @@ func (s *State) preCreateConstraints() []*validation.Constraint {
// each field individually. // each field individually.
validation.Empty(s.ClusterValues.ClusterID). validation.Empty(s.ClusterValues.ClusterID).
WithFieldTrace(s, &s.ClusterValues.ClusterID), WithFieldTrace(s, &s.ClusterValues.ClusterID),
validation.Empty(s.ClusterValues.OwnerID). // ownerID is currently unused as functionality is not implemented
WithFieldTrace(s, &s.ClusterValues.OwnerID), // Therefore, we don't want to validate it
// validation.Empty(s.ClusterValues.OwnerID).
// WithFieldTrace(s, &s.ClusterValues.OwnerID),
validation.EmptySlice(s.ClusterValues.MeasurementSalt). validation.EmptySlice(s.ClusterValues.MeasurementSalt).
WithFieldTrace(s, &s.ClusterValues.MeasurementSalt), WithFieldTrace(s, &s.ClusterValues.MeasurementSalt),
} }
@ -396,8 +398,10 @@ func (s *State) preInitConstraints() []*validation.Constraint {
// each field individually. // each field individually.
validation.Empty(s.ClusterValues.ClusterID). validation.Empty(s.ClusterValues.ClusterID).
WithFieldTrace(s, &s.ClusterValues.ClusterID), WithFieldTrace(s, &s.ClusterValues.ClusterID),
validation.Empty(s.ClusterValues.OwnerID). // ownerID is currently unused as functionality is not implemented
WithFieldTrace(s, &s.ClusterValues.OwnerID), // Therefore, we don't want to validate it
// validation.Empty(s.ClusterValues.OwnerID).
// WithFieldTrace(s, &s.ClusterValues.OwnerID),
validation.EmptySlice(s.ClusterValues.MeasurementSalt). validation.EmptySlice(s.ClusterValues.MeasurementSalt).
WithFieldTrace(s, &s.ClusterValues.MeasurementSalt), WithFieldTrace(s, &s.ClusterValues.MeasurementSalt),
} }
@ -442,9 +446,10 @@ func (s *State) postInitConstraints(csp cloudprovider.Provider) func() []*valida
// ClusterID needs to be filled. // ClusterID needs to be filled.
validation.NotEmpty(s.ClusterValues.ClusterID). validation.NotEmpty(s.ClusterValues.ClusterID).
WithFieldTrace(s, &s.ClusterValues.ClusterID), WithFieldTrace(s, &s.ClusterValues.ClusterID),
// OwnerID needs to be filled. // ownerID is currently unused as functionality is not implemented
validation.NotEmpty(s.ClusterValues.OwnerID). // Therefore, we don't want to validate it
WithFieldTrace(s, &s.ClusterValues.OwnerID), // validation.NotEmpty(s.ClusterValues.OwnerID).
// WithFieldTrace(s, &s.ClusterValues.OwnerID),
// MeasurementSalt needs to be filled. // MeasurementSalt needs to be filled.
validation.NotEmptySlice(s.ClusterValues.MeasurementSalt). validation.NotEmptySlice(s.ClusterValues.MeasurementSalt).
WithFieldTrace(s, &s.ClusterValues.MeasurementSalt), WithFieldTrace(s, &s.ClusterValues.MeasurementSalt),