Skip to content

Commit a21bf82

Browse files
authored
Ginkgo v2 (#431)
* ginkgo v2 bump * changelog * ginkgo v2.8.1
1 parent b531d07 commit a21bf82

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+80
-85
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ install-go-tools: mod-download
2020
go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
2121
go install github.com/solo-io/[email protected]
2222
go install github.com/golang/mock/[email protected]
23-
go install github.com/onsi/ginkgo/ginkgo@v1.16.4
23+
go install github.com/onsi/ginkgo/v2/ginkgo@v2.8.1
2424
go install golang.org/x/tools/cmd/goimports
2525

2626
# proto compiler installation

changelog/v0.29.0/ginkgo-v2.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
changelog:
2+
- type: DEPENDENCY_BUMP
3+
dependencyOwner: onsi
4+
dependencyRepo: ginkgo
5+
dependencyTag: v2.8.1

ci/oss_compliance/osa_provided.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Name|Version|License
1616
[groupcache/lru](https://github.com/golang/groupcache)|v0.0.0-20210331224755-41bb18bfe9da|Apache License 2.0
1717
[golang/protobuf](https://github.com/golang/protobuf)|v1.5.2|BSD 3-clause "New" or "Revised" License
1818
[google/gnostic](https://github.com/google/gnostic)|v0.5.7-v3refs|Apache License 2.0
19-
[cmp/internal](https://github.com/google/go-cmp)|v0.5.8|BSD 3-clause "New" or "Revised" License
19+
[cmp/internal](https://github.com/google/go-cmp)|v0.5.9|BSD 3-clause "New" or "Revised" License
2020
[google/gofuzz](https://github.com/google/gofuzz)|v1.1.0|Apache License 2.0
2121
[google/uuid](https://github.com/google/uuid)|v1.2.0|BSD 3-clause "New" or "Revised" License
2222
[josharian/intern](https://github.com/josharian/intern)|v1.0.0|MIT License
@@ -36,11 +36,10 @@ Name|Version|License
3636
[go.uber.org/multierr](https://go.uber.org/multierr)|v1.6.0|MIT License
3737
[go.uber.org/zap](https://go.uber.org/zap)|v1.21.0|MIT License
3838
[exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20220921164117-439092de6870|BSD 3-clause "New" or "Revised" License
39-
[x/net](https://golang.org/x/net)|v0.0.0-20220722155237-a158d28d115b|BSD 3-clause "New" or "Revised" License
39+
[x/net](https://golang.org/x/net)|v0.6.0|BSD 3-clause "New" or "Revised" License
4040
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.0.0-20211104180415-d3ed0bb246c8|BSD 3-clause "New" or "Revised" License
41-
[x/sys](https://golang.org/x/sys)|v0.0.0-20220722155257-8c9f86f7a55f|BSD 3-clause "New" or "Revised" License
42-
[x/term](https://golang.org/x/term)|v0.0.0-20210927222741-03fcf44c2211|BSD 3-clause "New" or "Revised" License
43-
[x/text](https://golang.org/x/text)|v0.3.7|BSD 3-clause "New" or "Revised" License
41+
[x/term](https://golang.org/x/term)|v0.5.0|BSD 3-clause "New" or "Revised" License
42+
[x/text](https://golang.org/x/text)|v0.7.0|BSD 3-clause "New" or "Revised" License
4443
[time/rate](https://golang.org/x/time/rate)|v0.0.0-20220609170525-579cf78fd858|BSD 3-clause "New" or "Revised" License
4544
[jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2)|v2.2.0|Apache License 2.0
4645
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.28.0|BSD 3-clause "New" or "Revised" License

codegen/cmd_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import (
1212
goyaml "gopkg.in/yaml.v3"
1313
v12 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1414

15-
. "github.com/onsi/ginkgo"
16-
. "github.com/onsi/ginkgo/extensions/table"
15+
. "github.com/onsi/ginkgo/v2"
1716
. "github.com/onsi/gomega"
1817
. "github.com/solo-io/skv2/codegen"
1918
. "github.com/solo-io/skv2/codegen/model"

codegen/codegen_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package codegen_test
33
import (
44
"testing"
55

6-
. "github.com/onsi/ginkgo"
6+
. "github.com/onsi/ginkgo/v2"
77
. "github.com/onsi/gomega"
88
)
99

codegen/doc/doc_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package doc_test
33
import (
44
"testing"
55

6-
. "github.com/onsi/ginkgo"
6+
. "github.com/onsi/ginkgo/v2"
77
. "github.com/onsi/gomega"
88
)
99

codegen/doc/helm_values_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package doc_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66
"github.com/solo-io/skv2/codegen/doc"
77
)

codegen/kuberesource/crd_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package kuberesource_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
v1 "github.com/solo-io/skv2/codegen/test/api/things.test.io/v1"

codegen/kuberesource/kuberesource_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package kuberesource_test
33
import (
44
"testing"
55

6-
. "github.com/onsi/ginkgo"
6+
. "github.com/onsi/ginkgo/v2"
77
. "github.com/onsi/gomega"
88
)
99

codegen/render/funcs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
structpb "github.com/golang/protobuf/ptypes/struct"
1010
"github.com/lithammer/dedent"
11-
. "github.com/onsi/ginkgo"
11+
. "github.com/onsi/ginkgo/v2"
1212
. "github.com/onsi/gomega"
1313
v1 "k8s.io/api/core/v1"
1414
"k8s.io/apimachinery/pkg/api/resource"

0 commit comments

Comments
 (0)