Skip to content

Commit 61aaf55

Browse files
ewoutpewoutp
committed
Fixed int-test code
1 parent 15e3f75 commit 61aaf55

File tree

6 files changed

+42
-38
lines changed

6 files changed

+42
-38
lines changed

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

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

3030
// RocksDBEncryptionSpec holds rocksdb encryption at rest specific configuration settings
3131
type RocksDBEncryptionSpec struct {
32-
XKeySecretName *string `json:"keySecretName,omitempty"`
32+
KeySecretName *string `json:"keySecretName,omitempty"`
3333
}
3434

3535
// GetKeySecretName returns the value of keySecretName.
3636
func (s RocksDBEncryptionSpec) GetKeySecretName() string {
37-
return util.StringOrDefault(s.XKeySecretName)
37+
return util.StringOrDefault(s.KeySecretName)
3838
}
3939

4040
// IsEncrypted returns true when an encryption key secret name is provided,
@@ -69,8 +69,8 @@ func (s *RocksDBSpec) SetDefaults() {
6969

7070
// SetDefaultsFrom fills unspecified fields with a value from given source spec.
7171
func (s *RocksDBSpec) SetDefaultsFrom(source RocksDBSpec) {
72-
if s.Encryption.XKeySecretName == nil {
73-
s.Encryption.XKeySecretName = util.NewStringOrNil(source.Encryption.XKeySecretName)
72+
if s.Encryption.KeySecretName == nil {
73+
s.Encryption.KeySecretName = util.NewStringOrNil(source.Encryption.KeySecretName)
7474
}
7575
}
7676

@@ -81,7 +81,7 @@ func (s RocksDBSpec) ResetImmutableFields(fieldPrefix string, target *RocksDBSpe
8181
var resetFields []string
8282
if s.IsEncrypted() != target.IsEncrypted() {
8383
// Note: You can change the name, but not from empty to non-empty (or reverse).
84-
target.Encryption.XKeySecretName = util.NewStringOrNil(s.Encryption.XKeySecretName)
84+
target.Encryption.KeySecretName = util.NewStringOrNil(s.Encryption.KeySecretName)
8585
resetFields = append(resetFields, fieldPrefix+".encryption.keySecretName")
8686
}
8787
return resetFields

‎pkg/apis/deployment/v1alpha/zz_generated.deepcopy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,8 @@ func (in *MonitoringSpec) DeepCopy() *MonitoringSpec {
403403
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
404404
func (in *RocksDBEncryptionSpec) DeepCopyInto(out *RocksDBEncryptionSpec) {
405405
*out = *in
406-
if in.XKeySecretName != nil {
407-
in, out := &in.XKeySecretName, &out.XKeySecretName
406+
if in.KeySecretName != nil {
407+
in, out := &in.KeySecretName, &out.KeySecretName
408408
if *in == nil {
409409
*out = nil
410410
} else {

‎tests/auth_test.go

+21-20
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"
1212
"github.com/arangodb/kube-arangodb/pkg/client"
13+
"github.com/arangodb/kube-arangodb/pkg/util"
1314
"github.com/arangodb/kube-arangodb/pkg/util/arangod"
1415
"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
1516
)
@@ -24,7 +25,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) {
2425

2526
// Prepare deployment config
2627
depl := newDeployment("test-auth-sng-def-" + uniuri.NewLen(4))
27-
depl.Spec.Mode = api.DeploymentModeSingle
28+
depl.Spec.Mode = api.NewMode(api.DeploymentModeSingle)
2829
depl.Spec.SetDefaults(depl.GetName())
2930

3031
// Create deployment
@@ -39,7 +40,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) {
3940
}
4041

4142
// Secret must now exist
42-
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.JWTSecretName, ns, nil, time.Second); err != nil {
43+
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, nil, time.Second); err != nil {
4344
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.JWTSecretName, err)
4445
}
4546

@@ -56,7 +57,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) {
5657
removeDeployment(c, depl.GetName(), ns)
5758

5859
// Secret must no longer exist
59-
if err := waitUntilSecretNotFound(kubecli, depl.Spec.Authentication.JWTSecretName, ns, time.Minute); err != nil {
60+
if err := waitUntilSecretNotFound(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, time.Minute); err != nil {
6061
t.Fatalf("JWT secret '%s' still found: %v", depl.Spec.Authentication.JWTSecretName, err)
6162
}
6263
}
@@ -71,12 +72,12 @@ func TestAuthenticationSingleCustomSecret(t *testing.T) {
7172

7273
// Prepare deployment config
7374
depl := newDeployment("test-auth-sng-cst-" + uniuri.NewLen(4))
74-
depl.Spec.Mode = api.DeploymentModeSingle
75-
depl.Spec.Authentication.JWTSecretName = strings.ToLower(uniuri.New())
75+
depl.Spec.Mode = api.NewMode(api.DeploymentModeSingle)
76+
depl.Spec.Authentication.JWTSecretName = util.NewString(strings.ToLower(uniuri.New()))
7677
depl.Spec.SetDefaults(depl.GetName())
7778

7879
// Create secret
79-
if err := k8sutil.CreateJWTSecret(kubecli.CoreV1(), depl.Spec.Authentication.JWTSecretName, ns, "foo", nil); err != nil {
80+
if err := k8sutil.CreateJWTSecret(kubecli.CoreV1(), depl.Spec.Authentication.GetJWTSecretName(), ns, "foo", nil); err != nil {
8081
t.Fatalf("Create JWT secret failed: %v", err)
8182
}
8283

@@ -104,12 +105,12 @@ func TestAuthenticationSingleCustomSecret(t *testing.T) {
104105
removeDeployment(c, depl.GetName(), ns)
105106

106107
// Secret must still exist
107-
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.JWTSecretName, ns, nil, time.Second); err != nil {
108+
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, nil, time.Second); err != nil {
108109
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.JWTSecretName, err)
109110
}
110111

111112
// Cleanup secret
112-
removeSecret(kubecli, depl.Spec.Authentication.JWTSecretName, ns)
113+
removeSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns)
113114
}
114115

115116
// TestAuthenticationNoneSingle creating a single server
@@ -122,8 +123,8 @@ func TestAuthenticationNoneSingle(t *testing.T) {
122123

123124
// Prepare deployment config
124125
depl := newDeployment("test-auth-none-sng-" + uniuri.NewLen(4))
125-
depl.Spec.Mode = api.DeploymentModeSingle
126-
depl.Spec.Authentication.JWTSecretName = api.JWTSecretNameDisabled
126+
depl.Spec.Mode = api.NewMode(api.DeploymentModeSingle)
127+
depl.Spec.Authentication.JWTSecretName = util.NewString(api.JWTSecretNameDisabled)
127128
depl.Spec.SetDefaults(depl.GetName())
128129

129130
// Create deployment
@@ -160,7 +161,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) {
160161

161162
// Prepare deployment config
162163
depl := newDeployment("test-auth-cls-def-" + uniuri.NewLen(4))
163-
depl.Spec.Mode = api.DeploymentModeCluster
164+
depl.Spec.Mode = api.NewMode(api.DeploymentModeCluster)
164165
depl.Spec.SetDefaults(depl.GetName())
165166

166167
// Create deployment
@@ -175,7 +176,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) {
175176
}
176177

177178
// Secret must now exist
178-
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.JWTSecretName, ns, nil, time.Second); err != nil {
179+
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, nil, time.Second); err != nil {
179180
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.JWTSecretName, err)
180181
}
181182

@@ -192,7 +193,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) {
192193
removeDeployment(c, depl.GetName(), ns)
193194

194195
// Secret must no longer exist
195-
if err := waitUntilSecretNotFound(kubecli, depl.Spec.Authentication.JWTSecretName, ns, time.Minute); err != nil {
196+
if err := waitUntilSecretNotFound(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, time.Minute); err != nil {
196197
t.Fatalf("JWT secret '%s' still found: %v", depl.Spec.Authentication.JWTSecretName, err)
197198
}
198199
}
@@ -207,12 +208,12 @@ func TestAuthenticationClusterCustomSecret(t *testing.T) {
207208

208209
// Prepare deployment config
209210
depl := newDeployment("test-auth-cls-cst-" + uniuri.NewLen(4))
210-
depl.Spec.Mode = api.DeploymentModeCluster
211-
depl.Spec.Authentication.JWTSecretName = strings.ToLower(uniuri.New())
211+
depl.Spec.Mode = api.NewMode(api.DeploymentModeCluster)
212+
depl.Spec.Authentication.JWTSecretName = util.NewString(strings.ToLower(uniuri.New()))
212213
depl.Spec.SetDefaults(depl.GetName())
213214

214215
// Create secret
215-
if err := k8sutil.CreateJWTSecret(kubecli.CoreV1(), depl.Spec.Authentication.JWTSecretName, ns, "foo", nil); err != nil {
216+
if err := k8sutil.CreateJWTSecret(kubecli.CoreV1(), depl.Spec.Authentication.GetJWTSecretName(), ns, "foo", nil); err != nil {
216217
t.Fatalf("Create JWT secret failed: %v", err)
217218
}
218219

@@ -240,12 +241,12 @@ func TestAuthenticationClusterCustomSecret(t *testing.T) {
240241
removeDeployment(c, depl.GetName(), ns)
241242

242243
// Secret must still exist
243-
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.JWTSecretName, ns, nil, time.Second); err != nil {
244+
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, nil, time.Second); err != nil {
244245
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.JWTSecretName, err)
245246
}
246247

247248
// Cleanup secret
248-
removeSecret(kubecli, depl.Spec.Authentication.JWTSecretName, ns)
249+
removeSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns)
249250
}
250251

251252
// TestAuthenticationNoneCluster creating a cluster
@@ -258,8 +259,8 @@ func TestAuthenticationNoneCluster(t *testing.T) {
258259

259260
// Prepare deployment config
260261
depl := newDeployment("test-auth-none-cls-" + uniuri.NewLen(4))
261-
depl.Spec.Mode = api.DeploymentModeCluster
262-
depl.Spec.Authentication.JWTSecretName = api.JWTSecretNameDisabled
262+
depl.Spec.Mode = api.NewMode(api.DeploymentModeCluster)
263+
depl.Spec.Authentication.JWTSecretName = util.NewString(api.JWTSecretNameDisabled)
263264
depl.Spec.SetDefaults(depl.GetName())
264265

265266
// Create deployment

‎tests/rocksdb_encryption_test.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"
1212
"github.com/arangodb/kube-arangodb/pkg/client"
13+
"github.com/arangodb/kube-arangodb/pkg/util"
1314
"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
1415
)
1516

@@ -24,15 +25,15 @@ func TestRocksDBEncryptionSingle(t *testing.T) {
2425

2526
// Prepare deployment config
2627
depl := newDeployment("test-rocksdb-enc-sng-" + uniuri.NewLen(4))
27-
depl.Spec.Mode = api.DeploymentModeSingle
28-
depl.Spec.Image = image
29-
depl.Spec.StorageEngine = api.StorageEngineRocksDB
30-
depl.Spec.RocksDB.Encryption.KeySecretName = strings.ToLower(uniuri.New())
28+
depl.Spec.Mode = api.NewMode(api.DeploymentModeSingle)
29+
depl.Spec.Image = util.NewString(image)
30+
depl.Spec.StorageEngine = api.NewStorageEngine(api.StorageEngineRocksDB)
31+
depl.Spec.RocksDB.Encryption.KeySecretName = util.NewString(strings.ToLower(uniuri.New()))
3132

3233
// Create encryption key secret
3334
key := make([]byte, 32)
3435
rand.Read(key)
35-
if err := k8sutil.CreateEncryptionKeySecret(kubecli.CoreV1(), depl.Spec.RocksDB.Encryption.KeySecretName, ns, key); err != nil {
36+
if err := k8sutil.CreateEncryptionKeySecret(kubecli.CoreV1(), depl.Spec.RocksDB.Encryption.GetKeySecretName(), ns, key); err != nil {
3637
t.Fatalf("Create encryption key secret failed: %v", err)
3738
}
3839

@@ -59,5 +60,5 @@ func TestRocksDBEncryptionSingle(t *testing.T) {
5960

6061
// Cleanup
6162
removeDeployment(c, depl.GetName(), ns)
62-
removeSecret(kubecli, depl.Spec.RocksDB.Encryption.KeySecretName, ns)
63+
removeSecret(kubecli, depl.Spec.RocksDB.Encryption.GetKeySecretName(), ns)
6364
}

‎tests/scale_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ package tests
33
import (
44
"context"
55
"testing"
6+
"time"
67

78
"github.com/dchest/uniuri"
89

910
driver "github.com/arangodb/go-driver"
1011
api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"
1112
"github.com/arangodb/kube-arangodb/pkg/client"
13+
"github.com/arangodb/kube-arangodb/pkg/util"
1214
)
1315

1416
// TestScaleCluster tests scaling up/down the number of DBServers & coordinators
@@ -21,8 +23,8 @@ func TestScaleClusterNonTLS(t *testing.T) {
2123

2224
// Prepare deployment config
2325
depl := newDeployment("test-scale-non-tls" + uniuri.NewLen(4))
24-
depl.Spec.Mode = api.DeploymentModeCluster
25-
depl.Spec.TLS = api.TLSSpec{"None", nil, 50}
26+
depl.Spec.Mode = api.NewMode(api.DeploymentModeCluster)
27+
depl.Spec.TLS = api.TLSSpec{util.NewString("None"), nil, util.NewDuration(time.Second * 50)}
2628
depl.Spec.SetDefaults(depl.GetName()) // this must be last
2729

2830
// Create deployment

‎tests/simple_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestSimpleSingle(t *testing.T) {
2121

2222
// Prepare deployment config
2323
depl := newDeployment("test-sng-" + uniuri.NewLen(4))
24-
depl.Spec.Mode = api.DeploymentModeSingle
24+
depl.Spec.Mode = api.NewMode(api.DeploymentModeSingle)
2525

2626
// Create deployment
2727
_, err := c.DatabaseV1alpha().ArangoDeployments(ns).Create(depl)
@@ -62,7 +62,7 @@ func TestSimpleResilientSingle(t *testing.T) {
6262

6363
// Prepare deployment config
6464
depl := newDeployment("test-rs-" + uniuri.NewLen(4))
65-
depl.Spec.Mode = api.DeploymentModeResilientSingle
65+
depl.Spec.Mode = api.NewMode(api.DeploymentModeResilientSingle)
6666

6767
// Create deployment
6868
_, err := c.DatabaseV1alpha().ArangoDeployments(ns).Create(depl)
@@ -103,7 +103,7 @@ func TestSimpleCluster(t *testing.T) {
103103

104104
// Prepare deployment config
105105
depl := newDeployment("test-cls-" + uniuri.NewLen(4))
106-
depl.Spec.Mode = api.DeploymentModeCluster
106+
depl.Spec.Mode = api.NewMode(api.DeploymentModeCluster)
107107

108108
// Create deployment
109109
_, err := c.DatabaseV1alpha().ArangoDeployments(ns).Create(depl)

0 commit comments

Comments
 (0)