Skip to content

Commit 38b83da

Browse files
authored
Bump ginkgo v2 (#18)
* Bump to ginkgo v2 bump dependencies and minimum go version for better compatiblity Bare minimum implemented * Use non deprecated flake-attempts instead of flakeAttempts flag
1 parent d575860 commit 38b83da

File tree

1,002 files changed

+136623
-46070
lines changed

Some content is hidden

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

1,002 files changed

+136623
-46070
lines changed

concourse/task.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ mkdir -p "${GOPATH}/src/code.cloudfoundry.org"
7878
cp -a sync-integration-tests "${GOPATH}/src/code.cloudfoundry.org"
7979

8080
pushd "${GOPATH}/src/code.cloudfoundry.org/sync-integration-tests" > /dev/null
81-
ginkgo -nodes="${NODES}" --flakeAttempts="${FLAKE_ATTEMPTS}"
81+
ginkgo -nodes="${NODES}" --flake-attempts="${FLAKE_ATTEMPTS}"
8282
popd > /dev/null
8383

8484
exit 0

config/config.go

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,37 @@ func (c Config) GetScaledTimeout(timeout time.Duration) time.Duration {
123123
}
124124

125125
// the following are not used but need to be implemented to satisfy the required interface
126-
func (c Config) GetConfigurableTestPassword() string { return "" }
127-
func (c Config) GetExistingUser() string { return "" }
128-
func (c Config) GetExistingUserPassword() string { return "" }
129-
func (c Config) GetPersistentAppOrg() string { return "" }
130-
func (c Config) GetPersistentAppQuotaName() string { return "" }
131-
func (c Config) GetPersistentAppSpace() string { return "" }
132-
func (c Config) GetShouldKeepUser() bool { return false }
133-
func (c Config) GetUseExistingUser() bool { return false }
126+
func (c Config) GetConfigurableTestPassword() string { return "" }
127+
func (c Config) GetExistingUser() string { return "" }
128+
func (c Config) GetExistingUserPassword() string { return "" }
129+
func (c Config) GetPersistentAppOrg() string { return "" }
130+
func (c Config) GetPersistentAppQuotaName() string { return "" }
131+
func (c Config) GetPersistentAppSpace() string { return "" }
132+
func (c Config) GetShouldKeepUser() bool { return false }
133+
func (c Config) GetUseExistingUser() bool { return false }
134+
func (c Config) GetAdminOrigin() string { return "" }
135+
func (c Config) GetUserOrigin() string { return "" }
136+
func (c Config) GetUseExistingOrganization() bool { return false }
137+
func (c Config) GetUseExistingSpace() bool { return false }
138+
func (c Config) GetAddExistingUserToExistingSpace() bool { return false }
139+
func (c Config) GetAdminClient() string { return "" }
140+
func (c Config) GetExistingClient() string { return "" }
141+
func (c Config) GetExistingOrganization() string {
142+
//TODO implement me
143+
panic("implement me")
144+
}
145+
146+
func (c Config) GetExistingSpace() string {
147+
//TODO implement me
148+
panic("implement me")
149+
}
150+
151+
func (c Config) GetAdminClientSecret() string {
152+
//TODO implement me
153+
panic("implement me")
154+
}
155+
156+
func (c Config) GetExistingClientSecret() string {
157+
//TODO implement me
158+
panic("implement me")
159+
}

go.mod

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,44 @@
11
module code.cloudfoundry.org/sync-integration-tests
22

3-
go 1.17
3+
go 1.21
44

55
require (
6-
code.cloudfoundry.org/bbs v0.0.0-20230214212838-952b49bdead8
7-
code.cloudfoundry.org/copilot v0.0.0-20180824172104-8d5c57eac99e
8-
code.cloudfoundry.org/lager v0.0.0-20161121181203-6cfe365fb6bb
9-
github.com/cloudfoundry-incubator/cf-test-helpers v0.0.0-20170110015013-a36cb53dbca7
10-
github.com/onsi/ginkgo v1.7.0
11-
github.com/onsi/gomega v1.4.3
6+
code.cloudfoundry.org/bbs v0.0.0-20231023154559-8a30f5a0e17b
7+
code.cloudfoundry.org/copilot v0.0.0-20190805213701-993a85bcdc3a
8+
code.cloudfoundry.org/lager/v3 v3.0.2
9+
github.com/cloudfoundry/cf-test-helpers/v2 v2.8.0
10+
github.com/onsi/ginkgo/v2 v2.13.0
11+
github.com/onsi/gomega v1.28.1
1212
)
1313

1414
require (
1515
code.cloudfoundry.org/cfhttp/v2 v2.0.0 // indirect
1616
code.cloudfoundry.org/clock v0.0.0-20161212184238-07af930eb5e5 // indirect
17+
code.cloudfoundry.org/lager v0.0.0-20161121181203-6cfe365fb6bb // indirect
1718
code.cloudfoundry.org/locket v0.0.0-20221110203340-76a930295e59 // indirect
1819
code.cloudfoundry.org/tlsconfig v0.0.0-20230225100352-b3e9427a4d77 // indirect
1920
github.com/bmizerany/pat v0.0.0-20160217103242-c068ca2f0aac // indirect
21+
github.com/go-logr/logr v1.2.4 // indirect
2022
github.com/go-sql-driver/mysql v1.6.0 // indirect
23+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
2124
github.com/go-test/deep v1.1.0 // indirect
2225
github.com/gogo/protobuf v1.3.2 // indirect
23-
github.com/golang/glog v1.0.0 // indirect
24-
github.com/golang/protobuf v1.3.2 // indirect
25-
github.com/hpcloud/tail v1.0.0 // indirect
26+
github.com/golang/protobuf v1.5.3 // indirect
27+
github.com/google/go-cmp v0.6.0 // indirect
28+
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
2629
github.com/jackc/pgx v3.6.2+incompatible // indirect
2730
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
31+
github.com/openzipkin/zipkin-go v0.4.1 // indirect
2832
github.com/tedsuo/ifrit v0.0.0-20160623190214-6711154296c2 // indirect
2933
github.com/tedsuo/rata v1.0.0 // indirect
3034
github.com/vito/go-sse v0.0.0-20160212001227-fd69d275caac // indirect
31-
golang.org/x/net v0.1.0 // indirect
32-
golang.org/x/sys v0.1.0 // indirect
33-
golang.org/x/text v0.4.0 // indirect
34-
google.golang.org/genproto v0.0.0-20180403170831-35de2414665f // indirect
35-
google.golang.org/grpc v1.11.1 // indirect
35+
golang.org/x/net v0.17.0 // indirect
36+
golang.org/x/sys v0.13.0 // indirect
37+
golang.org/x/text v0.13.0 // indirect
38+
golang.org/x/tools v0.12.0 // indirect
39+
google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e // indirect
40+
google.golang.org/grpc v1.50.0 // indirect
41+
google.golang.org/protobuf v1.28.1 // indirect
3642
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
37-
gopkg.in/fsnotify.v1 v1.4.7 // indirect
38-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
39-
gopkg.in/yaml.v2 v2.2.5 // indirect
43+
gopkg.in/yaml.v3 v3.0.1 // indirect
4044
)

0 commit comments

Comments
 (0)