8000 Run unit tests for shared and ml packages (#1524) · arangodb/kube-arangodb@35967e9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 35967e9

Browse files
nikita-vanyasinnikita-vanyasin
authored
Run unit tests for shared and ml packages (#1524)
1 parent d74e1db commit 35967e9

File tree

5 files changed

+18
-26
lines changed

5 files changed

+18
-26
lines changed

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,10 +648,12 @@ manifest-verify-helm-ee: manifests-verify-env-reset
648648
.PHONY: run-unit-tests
649649
run-unit-tests: $(SOURCES)
650650
go test --count=1 --tags "$(GOBUILDTAGS)" $(TESTVERBOSEOPTIONS) \
651+
$(REPOPATH)/pkg/apis/shared/... \
651652
$(REPOPATH)/pkg/apis/backup/... \
652653
$(REPOPATH)/pkg/apis/deployment/... \
653654
$(REPOPATH)/pkg/apis/replication/... \
654655
$(REPOPATH)/pkg/apis/storage/... \
656+
$(REPOPATH)/pkg/apis/ml/... \
655657
$(REPOPATH)/pkg/deployment/... \
656658
$(REPOPATH)/pkg/storage/... \
657659
$(REPOPATH)/pkg/crd/... \

‎pkg/apis/ml/v1alpha1/storage_spec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ func (s *ArangoMLStorageSpec) GetBucketPath() string {
5555

5656
func (s *ArangoMLStorageSpec) GetMode() *ArangoMLStorageSpecMode {
5757
if s == nil || s.Mode == nil {
58-
return &ArangoMLStorageSpecMode{}
58+
return nil
5959
}
6060
return s.Mode
6161
}
6262

6363
func (s *ArangoMLStorageSpec) GetBackend() *ArangoMLStorageSpecBackend {
6464
if s == nil || s.Backend == nil {
65-
return &ArangoMLStorageSpecBackend{}
65+
return nil
6666
}
6767
return s.Backend
6868
}

‎pkg/apis/ml/v1alpha1/storage_spec_mode.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type ArangoMLStorageSpecMode struct {
3232

3333
func (s *ArangoMLStorageSpecMode) GetSidecar() *ArangoMLStorageSpecModeSidecar {
3434
if s == nil || s.Sidecar == nil {
35-
return &ArangoMLStorageSpecModeSidecar{}
35+
return nil
3636
}
3737
return s.Sidecar
3838
}

‎pkg/apis/ml/v1alpha1/storage_spec_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ import (
3333

3434
func Test_ArangoMLStorageSpec(t *testing.T) {
3535
s := ArangoMLStorageSpec{}
36+
require.Nil(t, s.GetMode())
37+
require.Nil(t, s.GetBackend())
3638
require.Error(t, s.Validate())
37-
require.NotNil(t, s.GetMode())
38-
require.NotNil(t, s.GetBackend())
3939

40-
require.NotNil(t, s.Mode.GetSidecar())
4140
s.Mode = &ArangoMLStorageSpecMode{}
41+
require.Nil(t, s.Mode.GetSidecar())
4242

43-
require.NotNil(t, s.Backend.GetS3())
4443
s.Backend = &ArangoMLStorageSpecBackend{}
44+
require.Nil(t, s.Backend.GetS3())
4545
require.Error(t, s.Validate())
4646

47-
require.NotNil(t, s.Mode.Sidecar.GetListenPort())
48-
require.NotNil(t, s.Mode.Sidecar.GetResources())
4947
s.Mode.Sidecar = &ArangoMLStorageSpecModeSidecar{}
48+
require.Nil(t, s.Mode.Sidecar.GetResources())
49+
require.NotNil(t, s.Mode.Sidecar.GetListenPort())
5050

5151
require.Error(t, s.Backend.S3.Validate())
5252
s.Backend.S3 = &ArangoMLStorageSpecBackendS3{
@@ -62,17 +62,17 @@ func Test_ArangoMLStorageSpec(t *testing.T) {
6262
t.Run("default requests and limits assigned", func(t *testing.T) {
6363
assignedRequirements := core.ResourceRequirements{
6464
Requests: core.ResourceList{
65-
core.ResourceCPU: resource.MustParse("200m"),
66-
core.ResourceMemory: resource.MustParse("200Mi"),
65+
core.ResourceCPU: resource.MustParse("100m"),
66+
core.ResourceMemory: resource.MustParse("128Mi"),
6767
},
6868
}
6969
s.Mode.Sidecar.Resources = &sharedApi.Resources{Resources: &assignedRequirements}
7070

7171
expectedRequirements := core.ResourceRequirements{
7272
Requests: assignedRequirements.Requests,
7373
Limits: core.ResourceList{
74-
core.ResourceCPU: resource.MustParse("200m"),
75-
core.ResourceMemory: resource.MustParse("200Mi"),
74+
core.ResourceCPU: resource.MustParse("100m"),
75+
core.ResourceMemory: resource.MustParse("128Mi"),
7676
},
7777
}
7878

‎pkg/apis/shared/validate.go

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import (
2424
"fmt"
2525
"regexp"
2626

27+
"github.com/google/uuid"
2728
core "k8s.io/api/core/v1"
2829
"k8s.io/apimachinery/pkg/types"
2930

3031
"github.com/arangodb/kube-arangodb/pkg/util/errors"
31-
"github.com/arangodb/kube-arangodb/pkg/util/strings"
3232
)
3333

3434
var (
@@ -62,18 +62,8 @@ func ValidateOptionalResourceName(name string) error {
6262

6363
// ValidateUID validates if it is valid Kubernetes UID
6464
func ValidateUID(uid types.UID) error {
65-
v := strings.Split(string(uid), "-")
66-
67-
if len(v) != 0 &&
68-
len(v[0]) != 6 &&
69-
len(v[1]) != 4 &&
70-
len(v[2]) != 4 &&
71-
len(v[3]) != 4 &&
72-
len(v[4]) != 6 {
73-
return errors.Newf("Invalid UID: %s", uid)
74-
}
75-
76-
return nil
65+
_, err := uuid.Parse(string(uid))
66+
return err
7767
}
7868

7969
// ValidatePullPolicy Validates core.PullPolicy

0 commit comments

Comments
 (0)
0