Skip to content

Commit c1e30ae

Browse files
haoxinshaoxins
committed
chore: mod
1 parent b40bbc6 commit c1e30ae

File tree

5 files changed

+129
-150
lines changed

5 files changed

+129
-150
lines changed

‎go.mod‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,29 @@
11
module github.com/haoxins/flink-apis
22

3-
go 1.22.5
3+
go 1.23
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.19.1
7-
github.com/onsi/gomega v1.34.1
8-
k8s.io/api v0.31.0
9-
k8s.io/apimachinery v0.31.0
6+
k8s.io/api v0.31.1
7+
k8s.io/apimachinery v0.31.1
108
sigs.k8s.io/controller-runtime v0.19.0
119
)
1210

11+
require github.com/stretchr/testify v1.9.0
12+
1313
require (
14+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1415
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
1516
github.com/go-logr/logr v1.4.2 // indirect
16-
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
1717
github.com/gogo/protobuf v1.3.2 // indirect
18-
github.com/google/go-cmp v0.6.0 // indirect
1918
github.com/google/gofuzz v1.2.0 // indirect
20-
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
2119
github.com/json-iterator/go v1.1.12 // indirect
2220
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2321
github.com/modern-go/reflect2 v1.0.2 // indirect
22+
github.com/onsi/ginkgo/v2 v2.19.1 // indirect
23+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
2424
github.com/x448/float16 v0.8.4 // indirect
25-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
2625
golang.org/x/net v0.27.0 // indirect
27-
golang.org/x/sys v0.22.0 // indirect
2826
golang.org/x/text v0.16.0 // indirect
29-
golang.org/x/tools v0.23.0 // indirect
3027
gopkg.in/inf.v0 v0.9.1 // indirect
3128
gopkg.in/yaml.v2 v2.4.0 // indirect
3229
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
8585
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8686
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8787
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
88-
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
89-
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
9088
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
9189
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
9290
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -97,10 +95,10 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
9795
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
9896
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
9997
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
100-
k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
101-
k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
102-
k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
103-
k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
98+
k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
99+
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
100+
k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
101+
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
104102
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
105103
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
106104
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=

‎v1beta1/flink_sessionjob_types_test.go‎

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,57 @@
11
package v1beta1
22

33
import (
4-
. "github.com/onsi/ginkgo/v2"
5-
. "github.com/onsi/gomega"
4+
"testing"
5+
6+
"github.com/stretchr/testify/assert"
67
)
78

8-
var _ = Describe("Test FlinkSessionJobSpec", func() {
9-
It("FlinkSessionJobSpec Equals should work", func() {
10-
j1 := &FlinkSessionJobSpec{
11-
DeploymentName: "test",
12-
Job: JobSpec{
13-
JarURI: "test",
14-
Parallelism: 1,
15-
},
16-
}
17-
j2 := &FlinkSessionJobSpec{
18-
DeploymentName: "test",
19-
Job: JobSpec{
20-
JarURI: "test",
21-
Parallelism: 1,
22-
},
23-
}
24-
25-
v := j1.Equals(j2)
26-
Expect(v).To(BeTrue())
27-
28-
j2.DeploymentName = "test2"
29-
v = j1.Equals(j2)
30-
Expect(v).To(BeFalse())
31-
32-
j2.DeploymentName = "test"
33-
j2.Job.Parallelism = 2
34-
v = j1.Equals(j2)
35-
Expect(v).To(BeFalse())
36-
37-
j2.Job.Parallelism = 1
38-
j1.Job.Args = []string{""}
39-
j2.Job.Args = []string{""}
40-
v = j1.Equals(j2)
41-
Expect(v).To(BeTrue())
42-
43-
j1.Job.Args = []string{"--name", "a", "--topic", "b"}
44-
j2.Job.Args = []string{"--name", "a", "--topic", "b"}
45-
v = j1.Equals(j2)
46-
Expect(v).To(BeTrue())
47-
48-
j1.Job.Args = []string{"--name", "a", "--topic", "b"}
49-
j2.Job.Args = []string{"--topic", "b", "--name", "a"}
50-
v = j1.Equals(j2)
51-
Expect(v).To(BeTrue())
52-
53-
j1.Job.Args = []string{"--name", "a", "--topic", "b"}
54-
j2.Job.Args = []string{"--name", "b", "--topic", "a"}
55-
v = j1.Equals(j2)
56-
Expect(v).To(BeFalse())
57-
})
58-
})
9+
func Test_FlinkSessionJobSpec_Equals(t *testing.T) {
10+
j1 := &FlinkSessionJobSpec{
11+
DeploymentName: "test",
12+
Job: JobSpec{
13+
JarURI: "test",
14+
Parallelism: 1,
15+
},
16+
}
17+
j2 := &FlinkSessionJobSpec{
18+
DeploymentName: "test",
19+
Job: JobSpec{
20+
JarURI: "test",
21+
Parallelism: 1,
22+
},
23+
}
24+
25+
v := j1.Equals(j2)
26+
assert.True(t, v)
27+
28+
j2.DeploymentName = "test2"
29+
v = j1.Equals(j2)
30+
assert.False(t, v)
31+
32+
j2.DeploymentName = "test"
33+
j2.Job.Parallelism = 2
34+
v = j1.Equals(j2)
35+
assert.False(t, v)
36+
37+
j2.Job.Parallelism = 1
38+
j1.Job.Args = []string{""}
39+
j2.Job.Args = []string{""}
40+
v = j1.Equals(j2)
41+
assert.True(t, v)
42+
43+
j1.Job.Args = []string{"--name", "a", "--topic", "b"}
44+
j2.Job.Args = []string{"--name", "a", "--topic", "b"}
45+
v = j1.Equals(j2)
46+
assert.True(t, v)
47+
48+
j1.Job.Args = []string{"--name", "a", "--topic", "b"}
49+
j2.Job.Args = []string{"--topic", "b", "--name", "a"}
50+
v = j1.Equals(j2)
51+
assert.True(t, v)
52+
53+
j1.Job.Args = []string{"--name", "a", "--topic", "b"}
54+
j2.Job.Args = []string{"--name", "b", "--topic", "a"}
55+
v = j1.Equals(j2)
56+
assert.False(t, v)
57+
}

‎v1beta1/suite_test.go‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎v1beta1/utils_test.go‎

Lines changed: 65 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,74 @@
11
package v1beta1
22

33
import (
4-
. "github.com/onsi/ginkgo/v2"
5-
. "github.com/onsi/gomega"
4+
"testing"
5+
6+
"github.com/stretchr/testify/assert"
67
)
78

8-
var _ = Describe("Test Utils", func() {
9-
It("IsArgsEqual should work", func() {
10-
v := IsArgsEqual(nil, nil)
11-
Expect(v).To(BeTrue())
12-
v = IsArgsEqual([]string{}, []string{})
13-
Expect(v).To(BeTrue())
14-
v = IsArgsEqual([]string{""}, []string{""})
15-
Expect(v).To(BeTrue())
16-
v = IsArgsEqual([]string{"", ""}, []string{"", ""})
17-
Expect(v).To(BeTrue())
9+
func Test_IsArgsEqual(t *testing.T) {
10+
v := IsArgsEqual(nil, nil)
11+
assert.True(t, v)
12+
v = IsArgsEqual([]string{}, []string{})
13+
assert.True(t, v)
14+
v = IsArgsEqual([]string{""}, []string{""})
15+
assert.True(t, v)
16+
v = IsArgsEqual([]string{"", ""}, []string{"", ""})
17+
assert.True(t, v)
1818

19-
v = IsArgsEqual([]string{"a"}, []string{"a"})
20-
Expect(v).To(BeTrue())
21-
v = IsArgsEqual([]string{"a", "b"}, []string{"b", "a"})
22-
Expect(v).To(BeTrue())
23-
v = IsArgsEqual([]string{"a", ""}, []string{"", "a"})
24-
Expect(v).To(BeTrue())
25-
v = IsArgsEqual([]string{"a", "b"}, []string{"a", "b"})
26-
Expect(v).To(BeTrue())
27-
v = IsArgsEqual([]string{"a", "b", "c"}, []string{"b", "a", "c"})
28-
Expect(v).To(BeTrue())
29-
v = IsArgsEqual([]string{"a", "b", "c"}, []string{"b"})
30-
Expect(v).To(BeFalse())
19+
v = IsArgsEqual([]string{"a"}, []string{"a"})
20+
assert.True(t, v)
21+
v = IsArgsEqual([]string{"a", "b"}, []string{"b", "a"})
22+
assert.True(t, v)
23+
v = IsArgsEqual([]string{"a", ""}, []string{"", "a"})
24+
assert.True(t, v)
25+
v = IsArgsEqual([]string{"a", "b"}, []string{"a", "b"})
26+
assert.True(t, v)
27+
v = IsArgsEqual([]string{"a", "b", "c"}, []string{"b", "a", "c"})
28+
assert.True(t, v)
29+
v = IsArgsEqual([]string{"a", "b", "c"}, []string{"b"})
30+
assert.False(t, v)
3131

32-
v = IsArgsEqual([]string{"-a", "b", "-c"}, []string{"-a", "b", "-c"})
33-
Expect(v).To(BeTrue())
34-
v = IsArgsEqual([]string{"-a", "b", "-c"}, []string{"-c", "-a", "b"})
35-
Expect(v).To(BeTrue())
36-
v = IsArgsEqual([]string{"-a", "b", "-c"}, []string{"c", "-a", "b"})
37-
Expect(v).To(BeFalse())
38-
v = IsArgsEqual([]string{"-a", "b", "-c", "d"}, []string{"-c", "d", "-a", "b"})
39-
Expect(v).To(BeTrue())
40-
v = IsArgsEqual([]string{"-a", "b", "-c", "d"}, []string{"-c", "d", "-a", "bb"})
41-
Expect(v).To(BeFalse())
42-
v = IsArgsEqual([]string{"-a", "b", "d"}, []string{"d", "-a", "b"})
43-
Expect(v).To(BeTrue())
44-
v = IsArgsEqual([]string{"-a", "b", "d"}, []string{"-a", "b", "d"})
45-
Expect(v).To(BeTrue())
32+
v = IsArgsEqual([]string{"-a", "b", "-c"}, []string{"-a", "b", "-c"})
33+
assert.True(t, v)
34+
v = IsArgsEqual([]string{"-a", "b", "-c"}, []string{"-c", "-a", "b"})
35+
assert.True(t, v)
36+
v = IsArgsEqual([]string{"-a", "b", "-c"}, []string{"c", "-a", "b"})
37+
assert.False(t, v)
38+
v = IsArgsEqual([]string{"-a", "b", "-c", "d"}, []string{"-c", "d", "-a", "b"})
39+
assert.True(t, v)
40+
v = IsArgsEqual([]string{"-a", "b", "-c", "d"}, []string{"-c", "d", "-a", "bb"})
41+
assert.False(t, v)
42+
v = IsArgsEqual([]string{"-a", "b", "d"}, []string{"d", "-a", "b"})
43+
assert.True(t, v)
44+
v = IsArgsEqual([]string{"-a", "b", "d"}, []string{"-a", "b", "d"})
45+
assert.True(t, v)
4646

47-
v = IsArgsEqual([]string{"--topic", "a", "--name", "xin"}, []string{"--name", "xin", "--topic", "a"})
48-
Expect(v).To(BeTrue())
49-
v = IsArgsEqual([]string{"--name", "xin", "--topic", "a"}, []string{"--name", "xin", "--topic", "a"})
50-
Expect(v).To(BeTrue())
51-
v = IsArgsEqual([]string{"--name", "xin", "ver"}, []string{"--name", "xin", "ver"})
52-
Expect(v).To(BeTrue())
53-
v = IsArgsEqual([]string{"--name", "xin", "ver"}, []string{"ver", "--name", "xin"})
54-
Expect(v).To(BeTrue())
55-
v = IsArgsEqual([]string{"--name", "xin", "-V"}, []string{"--name", "xin", "-V"})
56-
Expect(v).To(BeTrue())
57-
v = IsArgsEqual([]string{"--name", "xin", "-V"}, []string{"-V", "--name", "xin"})
58-
Expect(v).To(BeTrue())
59-
v = IsArgsEqual([]string{"--name", "xin", "--topic", "a"}, []string{"--name", "xin", "--topic", "b"})
60-
Expect(v).To(BeFalse())
61-
v = IsArgsEqual([]string{"--name", "xin", "--topic"}, []string{"--name", "xin", "--topic"})
62-
Expect(v).To(BeTrue())
63-
v = IsArgsEqual([]string{"--name", "xin", "--topic"}, []string{"--topic", "--name", "xin"})
64-
Expect(v).To(BeTrue())
47+
v = IsArgsEqual([]string{"--topic", "a", "--name", "xin"}, []string{"--name", "xin", "--topic", "a"})
48+
assert.True(t, v)
49+
v = IsArgsEqual([]string{"--name", "xin", "--topic", "a"}, []string{"--name", "xin", "--topic", "a"})
50+
assert.True(t, v)
51+
v = IsArgsEqual([]string{"--name", "xin", "ver"}, []string{"--name", "xin", "ver"})
52+
assert.True(t, v)
53+
v = IsArgsEqual([]string{"--name", "xin", "ver"}, []string{"ver", "--name", "xin"})
54+
assert.True(t, v)
55+
v = IsArgsEqual([]string{"--name", "xin", "-V"}, []string{"--name", "xin", "-V"})
56+
assert.True(t, v)
57+
v = IsArgsEqual([]string{"--name", "xin", "-V"}, []string{"-V", "--name", "xin"})
58+
assert.True(t, v)
59+
v = IsArgsEqual([]string{"--name", "xin", "--topic", "a"}, []string{"--name", "xin", "--topic", "b"})
60+
assert.False(t, v)
61+
v = IsArgsEqual([]string{"--name", "xin", "--topic"}, []string{"--name", "xin", "--topic"})
62+
assert.True(t, v)
63+
v = IsArgsEqual([]string{"--name", "xin", "--topic"}, []string{"--topic", "--name", "xin"})
64+
assert.True(t, v)
6565

66-
v = IsArgsEqual([]string{"--name", "xin", "-v", "9", "-V", "--topic", "new"}, []string{"--name", "xin", "-v", "9", "-V", "--topic", "new"})
67-
Expect(v).To(BeTrue())
68-
v = IsArgsEqual([]string{"--name", "xin", "-v", "9", "-V", "--topic", "new"}, []string{"-v", "9", "--name", "xin", "-V", "--topic", "new"})
69-
Expect(v).To(BeTrue())
70-
v = IsArgsEqual([]string{"--name", "xin", "-v", "9", "-V", "--topic", "new"}, []string{"-v", "9", "--name", "xin", "--topic", "new", "-V"})
71-
Expect(v).To(BeTrue())
72-
v = IsArgsEqual([]string{"--name", "xin", "-v", "9", "-V", "--topic", "new"}, []string{"-v", "10", "--name", "xin", "--topic", "new", "-V"})
73-
Expect(v).To(BeFalse())
74-
})
75-
})
66+
v = IsArgsEqual([]string{"--name", "xin", "-v", "9", "-V", "--topic", "new"}, []string{"--name", "xin", "-v", "9", "-V", "--topic", "new"})
67+
assert.True(t, v)
68+
v = IsArgsEqual([]string{"--name", "xin", "-v", "9", "-V", "--topic", "new"}, []string{"-v", "9", "--name", "xin", "-V", "--topic", "new"})
69+
assert.True(t, v)
70+
v = IsArgsEqual([]string{"--name", "xin", "-v", "9", "-V", "--topic", "new"}, []string{"-v", "9", "--name", "xin", "--topic", "new", "-V"})
71+
assert.True(t, v)
72+
v = IsArgsEqual([]string{"--name", "xin", "-v", "9", "-V", "--topic", "new"}, []string{"-v", "10", "--name", "xin", "--topic", "new", "-V"})
73+
assert.False(t, v)
74+
}

0 commit comments

Comments
 (0)