Skip to content

Commit 15e3f75

Browse files
ewoutpewoutp
committed
Merged in master
1 parent 6599663 commit 15e3f75

18 files changed

+277
-281
lines changed

‎pkg/apis/deployment/v1alpha/authentication_spec.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
// AuthenticationSpec holds authentication specific configuration settings
3333
type AuthenticationSpec struct {
34-
XJWTSecretName *string `json:"jwtSecretName,omitempty"`
34+
JWTSecretName *string `json:"jwtSecretName,omitempty"`
3535
}
3636

3737
const (
@@ -41,7 +41,7 @@ const (
4141

4242
// GetJWTSecretName returns the value of jwtSecretName.
4343
func (s AuthenticationSpec) GetJWTSecretName() string {
44-
return util.StringOrDefault(s.XJWTSecretName)
44+
return util.StringOrDefault(s.JWTSecretName)
4545
}
4646

4747
// IsAuthenticated returns true if authentication is enabled.
@@ -68,14 +68,14 @@ func (s *AuthenticationSpec) SetDefaults(defaultJWTSecretName string) {
6868
if s.GetJWTSecretName() == "" {
6969
// Note that we don't check for nil here, since even a specified, but empty
7070
// string should result in the default value.
71-
s.XJWTSecretName = util.NewString(defaultJWTSecretName)
71+
s.JWTSecretName = util.NewString(defaultJWTSecretName)
7272
}
7373
}
7474

7575
// SetDefaultsFrom fills unspecified fields with a value from given source spec.
7676
func (s *AuthenticationSpec) SetDefaultsFrom(source AuthenticationSpec) {
77-
if s.XJWTSecretName == nil {
78-
s.XJWTSecretName = util.NewString(source.GetJWTSecretName())
77+
if s.JWTSecretName == nil {
78+
s.JWTSecretName = util.NewStringOrNil(source.JWTSecretName)
7979
}
8080
}
8181

@@ -86,7 +86,7 @@ func (s AuthenticationSpec) ResetImmutableFields(fieldPrefix string, target *Aut
8686
var resetFields []string
8787
if s.IsAuthenticated() != target.IsAuthenticated() {
8888
// Note: You can change the name, but not from empty to non-empty (or reverse).
89-
target.XJWTSecretName = util.NewStringOrNil(s.XJWTSecretName)
89+
target.JWTSecretName = util.NewStringOrNil(s.JWTSecretName)
9090
resetFields = append(resetFields, fieldPrefix+".jwtSecretName")
9191
}
9292
return resetFields

‎pkg/apis/deployment/v1alpha/authentication_spec_test.go

+23-23
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ import (
3131

3232
func TestAuthenticationSpecValidate(t *testing.T) {
3333
// Valid
34-
assert.Nil(t, AuthenticationSpec{XJWTSecretName: util.NewString("None")}.Validate(false))
35-
assert.Nil(t, AuthenticationSpec{XJWTSecretName: util.NewString("foo")}.Validate(false))
36-
assert.Nil(t, AuthenticationSpec{XJWTSecretName: util.NewString("foo")}.Validate(true))
34+
assert.Nil(t, AuthenticationSpec{JWTSecretName: util.NewString("None")}.Validate(false))
35+
assert.Nil(t, AuthenticationSpec{JWTSecretName: util.NewString("foo")}.Validate(false))
36+
assert.Nil(t, AuthenticationSpec{JWTSecretName: util.NewString("foo")}.Validate(true))
3737

3838
// Not valid
39-
assert.Error(t, AuthenticationSpec{XJWTSecretName: util.NewString("Foo")}.Validate(false))
39+
assert.Error(t, AuthenticationSpec{JWTSecretName: util.NewString("Foo")}.Validate(false))
4040
}
4141

4242
func TestAuthenticationSpecIsAuthenticated(t *testing.T) {
43-
assert.False(t, AuthenticationSpec{XJWTSecretName: util.NewString("None")}.IsAuthenticated())
44-
assert.True(t, AuthenticationSpec{XJWTSecretName: util.NewString("foo")}.IsAuthenticated())
45-
assert.True(t, AuthenticationSpec{XJWTSecretName: util.NewString("")}.IsAuthenticated())
43+
assert.False(t, AuthenticationSpec{JWTSecretName: util.NewString("None")}.IsAuthenticated())
44+
assert.True(t, AuthenticationSpec{JWTSecretName: util.NewString("foo")}.IsAuthenticated())
45+
assert.True(t, AuthenticationSpec{JWTSecretName: util.NewString("")}.IsAuthenticated())
4646
}
4747

4848
func TestAuthenticationSpecSetDefaults(t *testing.T) {
@@ -52,7 +52,7 @@ func TestAuthenticationSpecSetDefaults(t *testing.T) {
5252
}
5353

5454
assert.Equal(t, "test-jwt", def(AuthenticationSpec{}).GetJWTSecretName())
55-
assert.Equal(t, "foo", def(AuthenticationSpec{XJWTSecretName: util.NewString("foo")}).GetJWTSecretName())
55+
assert.Equal(t, "foo", def(AuthenticationSpec{JWTSecretName: util.NewString("foo")}).GetJWTSecretName())
5656
}
5757

5858
func TestAuthenticationSpecResetImmutableFields(t *testing.T) {
@@ -64,35 +64,35 @@ func TestAuthenticationSpecResetImmutableFields(t *testing.T) {
6464
}{
6565
// Valid "changes"
6666
{
67-
AuthenticationSpec{XJWTSecretName: util.NewString("None")},
68-
AuthenticationSpec{XJWTSecretName: util.NewString("None")},
69-
AuthenticationSpec{XJWTSecretName: util.NewString("None")},
67+
AuthenticationSpec{JWTSecretName: util.NewString("None")},
68+
AuthenticationSpec{JWTSecretName: util.NewString("None")},
69+
AuthenticationSpec{JWTSecretName: util.NewString("None")},
7070
nil,
7171
},
7272
{
73-
AuthenticationSpec{XJWTSecretName: util.NewString("foo")},
74-
AuthenticationSpec{XJWTSecretName: util.NewString("foo")},
75-
AuthenticationSpec{XJWTSecretName: util.NewString("foo")},
73+
AuthenticationSpec{JWTSecretName: util.NewString("foo")},
74+
AuthenticationSpec{JWTSecretName: util.NewString("foo")},
75+
AuthenticationSpec{JWTSecretName: util.NewString("foo")},
7676
nil,
7777
},
7878
{
79-
AuthenticationSpec{XJWTSecretName: util.NewString("foo")},
80-
AuthenticationSpec{XJWTSecretName: util.NewString("foo2")},
81-
AuthenticationSpec{XJWTSecretName: util.NewString("foo2")},
79+
AuthenticationSpec{JWTSecretName: util.NewString("foo")},
80+
AuthenticationSpec{JWTSecretName: util.NewString("foo2")},
81+
AuthenticationSpec{JWTSecretName: util.NewString("foo2")},
8282
nil,
8383
},
8484

8585
// Invalid changes
8686
{
87-
AuthenticationSpec{XJWTSecretName: util.NewString("foo")},
88-
AuthenticationSpec{XJWTSecretName: util.NewString("None")},
89-
AuthenticationSpec{XJWTSecretName: util.NewString("foo")},
87+
AuthenticationSpec{JWTSecretName: util.NewString("foo")},
88+
AuthenticationSpec{JWTSecretName: util.NewString("None")},
89+
AuthenticationSpec{JWTSecretName: util.NewString("foo")},
9090
[]string{"test.jwtSecretName"},
9191
},
9292
{
93-
AuthenticationSpec{XJWTSecretName: util.NewString("None")},
94-
AuthenticationSpec{XJWTSecretName: util.NewString("foo")},
95-
AuthenticationSpec{XJWTSecretName: util.NewString("None")},
93+
AuthenticationSpec{JWTSecretName: util.NewString("None")},
94+
AuthenticationSpec{JWTSecretName: util.NewString("foo")},
95+
AuthenticationSpec{JWTSecretName: util.NewString("None")},
9696
[]string{"test.jwtSecretName"},
9797
},
9898
}

‎pkg/apis/deployment/v1alpha/deployment_spec.go

+27-27
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ func validatePullPolicy(v v1.PullPolicy) error {
4545

4646
// DeploymentSpec contains the spec part of a ArangoDeployment resource.
4747
type DeploymentSpec struct {
48-
XMode *DeploymentMode `json:"mode,omitempty"`
49-
XEnvironment *Environment `json:"environment,omitempty"`
50-
XStorageEngine *StorageEngine `json:"storageEngine,omitempty"`
51-
XImage *string `json:"image,omitempty"`
52-
XImagePullPolicy *v1.PullPolicy `json:"imagePullPolicy,omitempty"`
48+
Mode *DeploymentMode `json:"mode,omitempty"`
49+
Environment *Environment `json:"environment,omitempty"`
50+
StorageEngine *StorageEngine `json:"storageEngine,omitempty"`
51+
Image *string `json:"image,omitempty"`
52+
ImagePullPolicy *v1.PullPolicy `json:"imagePullPolicy,omitempty"`
5353

5454
RocksDB RocksDBSpec `json:"rocksdb"`
5555
Authentication AuthenticationSpec `json:"auth"`
@@ -66,27 +66,27 @@ type DeploymentSpec struct {
6666

6767
// GetMode returns the value of mode.
6868
func (s DeploymentSpec) GetMode() DeploymentMode {
69-
return ModeOrDefault(s.XMode)
69+
return ModeOrDefault(s.Mode)
7070
}
7171

7272
// GetEnvironment returns the value of environment.
7373
func (s DeploymentSpec) GetEnvironment() Environment {
74-
return EnvironmentOrDefault(s.XEnvironment)
74+
return EnvironmentOrDefault(s.Environment)
7575
}
7676

7777
// GetStorageEngine returns the value of storageEngine.
7878
func (s DeploymentSpec) GetStorageEngine() StorageEngine {
79-
return StorageEngineOrDefault(s.XStorageEngine)
79+
return StorageEngineOrDefault(s.StorageEngine)
8080
}
8181

8282
// GetImage returns the value of image.
8383
func (s DeploymentSpec) GetImage() string {
84-
return util.StringOrDefault(s.XImage)
84+
return util.StringOrDefault(s.Image)
8585
}
8686

8787
// GetImagePullPolicy returns the value of imagePullPolicy.
8888
func (s DeploymentSpec) GetImagePullPolicy() v1.PullPolicy {
89-
return util.PullPolicyOrDefault(s.XImagePullPolicy)
89+
return util.PullPolicyOrDefault(s.ImagePullPolicy)
9090
}
9191

9292
// IsAuthenticated returns true when authentication is enabled
@@ -123,19 +123,19 @@ func (s DeploymentSpec) GetServerGroupSpec(group ServerGroup) ServerGroupSpec {
123123
// SetDefaults fills in default values when a field is not specified.
124124
func (s *DeploymentSpec) SetDefaults(deploymentName string) {
125125
if s.GetMode() == "" {
126-
s.XMode = NewMode(DeploymentModeCluster)
126+
s.Mode = NewMode(DeploymentModeCluster)
127127
}
128128
if s.GetEnvironment() == "" {
129-
s.XEnvironment = NewEnvironment(EnvironmentDevelopment)
129+
s.Environment = NewEnvironment(EnvironmentDevelopment)
130130
}
131131
if s.GetStorageEngine() == "" {
132-
s.XStorageEngine = NewStorageEngine(StorageEngineRocksDB)
132+
s.StorageEngine = NewStorageEngine(StorageEngineRocksDB)
133133
}
134134
if s.GetImage() == "" && s.IsDevelopment() {
135-
s.XImage = util.NewString(defaultImage)
135+
s.Image = util.NewString(defaultImage)
136136
}
137137
if s.GetImagePullPolicy() == "" {
138-
s.XImagePullPolicy = util.NewPullPolicy(v1.PullIfNotPresent)
138+
s.ImagePullPolicy = util.NewPullPolicy(v1.PullIfNotPresent)
139139
}
140140
s.RocksDB.SetDefaults()
141141
s.Authentication.SetDefaults(deploymentName + "-jwt")
@@ -151,20 +151,20 @@ func (s *DeploymentSpec) SetDefaults(deploymentName string) {
151151

152152
// SetDefaultsFrom fills unspecified fields with a value from given source spec.
153153
func (s *DeploymentSpec) SetDefaultsFrom(source DeploymentSpec) {
154-
if s.XMode == nil {
155-
s.XMode = NewModeOrNil(source.XMode)
154+
if s.Mode == nil {
155+
s.Mode = NewModeOrNil(source.Mode)
156156
}
157-
if s.XEnvironment == nil {
158-
s.XEnvironment = NewEnvironmentOrNil(source.XEnvironment)
157+
if s.Environment == nil {
158+
s.Environment = NewEnvironmentOrNil(source.Environment)
159159
}
160-
if s.XStorageEngine == nil {
161-
s.XStorageEngine = NewStorageEngineOrNil(source.XStorageEngine)
160+
if s.StorageEngine == nil {
161+
s.StorageEngine = NewStorageEngineOrNil(source.StorageEngine)
162162
}
163-
if s.XImage == nil {
164-
s.XImage = util.NewStringOrNil(source.XImage)
163+
if s.Image == nil {
164+
s.Image = util.NewStringOrNil(source.Image)
165165
}
166-
if s.XImagePullPolicy == nil {
167-
s.XImagePullPolicy = util.NewPullPolicyOrNil(source.XImagePullPolicy)
166+
if s.ImagePullPolicy == nil {
167+
s.ImagePullPolicy = util.NewPullPolicyOrNil(source.ImagePullPolicy)
168168
}
169169
s.RocksDB.SetDefaultsFrom(source.RocksDB)
170170
s.Authentication.SetDefaultsFrom(source.Authentication)
@@ -240,11 +240,11 @@ func (s DeploymentSpec) IsDevelopment() bool {
240240
func (s DeploymentSpec) ResetImmutableFields(target *DeploymentSpec) []string {
241241
var resetFields []string
242242
if s.GetMode() != target.GetMode() {
243-
target.XMode = NewModeOrNil(s.XMode)
243+
target.Mode = NewModeOrNil(s.Mode)
244244
resetFields = append(resetFields, "mode")
245245
}
246246
if s.GetStorageEngine() != target.GetStorageEngine() {
247-
target.XStorageEngine = NewStorageEngineOrNil(s.XStorageEngine)
247+
target.StorageEngine = NewStorageEngineOrNil(s.StorageEngine)
248248
resetFields = append(resetFields, "storageEngine")
249249
}
250250
if l := s.RocksDB.ResetImmutableFields("rocksdb", &target.RocksDB); l != nil {

‎pkg/apis/deployment/v1alpha/deployment_spec_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,23 @@ func TestDeploymentSpecResetImmutableFields(t *testing.T) {
5252
}{
5353
// Valid "changes"
5454
{
55-
DeploymentSpec{XImage: util.NewString("foo")},
56-
DeploymentSpec{XImage: util.NewString("foo2")},
57-
DeploymentSpec{XImage: util.NewString("foo2")},
55+
DeploymentSpec{Image: util.NewString("foo")},
56+
DeploymentSpec{Image: util.NewString("foo2")},
57+
DeploymentSpec{Image: util.NewString("foo2")},
5858
nil,
5959
},
6060
{
61-
DeploymentSpec{XImagePullPolicy: util.NewPullPolicy(v1.PullAlways)},
62-
DeploymentSpec{XImagePullPolicy: util.NewPullPolicy(v1.PullNever)},
63-
DeploymentSpec{XImagePullPolicy: util.NewPullPolicy(v1.PullNever)},
61+
DeploymentSpec{ImagePullPolicy: util.NewPullPolicy(v1.PullAlways)},
62+
DeploymentSpec{ImagePullPolicy: util.NewPullPolicy(v1.PullNever)},
63+
DeploymentSpec{ImagePullPolicy: util.NewPullPolicy(v1.PullNever)},
6464
nil,
6565
},
6666

6767
// Invalid changes
6868
{
69-
DeploymentSpec{XMode: NewMode(DeploymentModeSingle)},
70-
DeploymentSpec{XMode: NewMode(DeploymentModeCluster)},
71-
DeploymentSpec{XMode: NewMode(DeploymentModeSingle)},
69+
DeploymentSpec{Mode: NewMode(DeploymentModeSingle)},
70+
DeploymentSpec{Mode: NewMode(DeploymentModeCluster)},
71+
DeploymentSpec{Mode: NewMode(DeploymentModeSingle)},
7272
[]string{"mode"},
7373
},
7474
}

‎pkg/apis/deployment/v1alpha/monitoring_spec.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import (
2929

3030
// MonitoringSpec holds monitoring specific configuration settings
3131
type MonitoringSpec struct {
32-
XTokenSecretName *string `json:"tokenSecretName,omitempty"`
32+
TokenSecretName *string `json:"tokenSecretName,omitempty"`
3333
}
3434

3535
// GetTokenSecretName returns the value of tokenSecretName.
3636
func (s MonitoringSpec) GetTokenSecretName() string {
37-
return util.StringOrDefault(s.XTokenSecretName)
37+
return util.StringOrDefault(s.TokenSecretName)
3838
}
3939

4040
// Validate the given spec
@@ -52,7 +52,7 @@ func (s *MonitoringSpec) SetDefaults() {
5252

5353
// SetDefaultsFrom fills unspecified fields with a value from given source spec.
5454
func (s *MonitoringSpec) SetDefaultsFrom(source MonitoringSpec) {
55-
if s.XTokenSecretName == nil {
56-
s.XTokenSecretName = util.NewStringOrNil(source.XTokenSecretName)
55+
if s.TokenSecretName == nil {
56+
s.TokenSecretName = util.NewStringOrNil(source.TokenSecretName)
5757
}
5858
}

‎pkg/apis/deployment/v1alpha/monitoring_spec_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ import (
3131

3232
func TestMonitoringSpecValidate(t *testing.T) {
3333
// Valid
34-
assert.Nil(t, MonitoringSpec{XTokenSecretName: nil}.Validate())
35-
assert.Nil(t, MonitoringSpec{XTokenSecretName: util.NewString("")}.Validate())
36-
assert.Nil(t, MonitoringSpec{XTokenSecretName: util.NewString("foo")}.Validate())
37-
assert.Nil(t, MonitoringSpec{XTokenSecretName: util.NewString("foo")}.Validate())
34+
assert.Nil(t, MonitoringSpec{TokenSecretName: nil}.Validate())
35+
assert.Nil(t, MonitoringSpec{TokenSecretName: util.NewString("")}.Validate())
36+
assert.Nil(t, MonitoringSpec{TokenSecretName: util.NewString("foo")}.Validate())
37+
assert.Nil(t, MonitoringSpec{TokenSecretName: util.NewString("foo")}.Validate())
3838

3939
// Not valid
40-
assert.Error(t, MonitoringSpec{XTokenSecretName: util.NewString("Foo")}.Validate())
40+
assert.Error(t, MonitoringSpec{TokenSecretName: util.NewString("Foo")}.Validate())
4141
}
4242

4343
func TestMonitoringSpecSetDefaults(t *testing.T) {
@@ -47,5 +47,5 @@ func TestMonitoringSpecSetDefaults(t *testing.T) {
4747
}
4848

4949
assert.Equal(t, "", def(MonitoringSpec{}).GetTokenSecretName())
50-
assert.Equal(t, "foo", def(MonitoringSpec{XTokenSecretName: util.NewString("foo")}).GetTokenSecretName())
50+
assert.Equal(t, "foo", def(MonitoringSpec{TokenSecretName: util.NewString("foo")}).GetTokenSecretName())
5151
}

0 commit comments

Comments
 (0)