Bump to ginkgo/v2 and lager/v3 (#11)

winkingturtle-vmw · web-flow · commit 6757f6637685 · 2023-04-06T14:52:14.000Z
* Bump to ginkgo/v2

* Bump to lager/v3

* fix `go vet` failures
diff --git a/auctioneer_suite_test.go b/auctioneer_suite_test.go
@@ -1,7 +1,7 @@
 package auctioneer_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/auctioneerfakes/fake_client.go b/auctioneerfakes/fake_client.go
diff --git a/auctionmetricemitterdelegate/auctionmetricemitterdelegate_suite_test.go b/auctionmetricemitterdelegate/auctionmetricemitterdelegate_suite_test.go
@@ -1,7 +1,7 @@
 package auctionmetricemitterdelegate_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/auctionmetricemitterdelegate/auctionmetricemitterdelegate_test.go b/auctionmetricemitterdelegate/auctionmetricemitterdelegate_test.go
@@ -9,7 +9,7 @@ import (
 	mfakes "code.cloudfoundry.org/diego-logging-client/testhelpers"
 	"code.cloudfoundry.org/rep"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/auctionrunnerdelegate/auction_runner_delegate.go b/auctionrunnerdelegate/auction_runner_delegate.go
@@ -5,7 +5,7 @@ import (
 	"code.cloudfoundry.org/rep"
 
 	"code.cloudfoundry.org/auction/auctiontypes"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 )
 
 type AuctionRunnerDelegate struct {
diff --git a/auctionrunnerdelegate/auctionrunnerdelegate_suite_test.go b/auctionrunnerdelegate/auctionrunnerdelegate_suite_test.go
@@ -1,7 +1,7 @@
 package auctionrunnerdelegate_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/auctionrunnerdelegate/auctionrunnerdelegate_test.go b/auctionrunnerdelegate/auctionrunnerdelegate_test.go
@@ -7,12 +7,12 @@ import (
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/repfakes"
 
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 
 	"code.cloudfoundry.org/auctioneer/auctionrunnerdelegate"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/client.go b/client.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	cfhttp "code.cloudfoundry.org/cfhttp/v2"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/tlsconfig"
 	"github.com/tedsuo/rata"
 )
diff --git a/client_test.go b/client_test.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/auctioneer"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/tlsconfig"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/ghttp"
 )
diff --git a/cmd/auctioneer/config/config.go b/cmd/auctioneer/config/config.go
@@ -7,7 +7,7 @@ import (
 	"code.cloudfoundry.org/debugserver"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/durationjson"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 	"code.cloudfoundry.org/locket"
 )
 
diff --git a/cmd/auctioneer/config/config_suite_test.go b/cmd/auctioneer/config/config_suite_test.go
@@ -1,7 +1,7 @@
 package config_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/cmd/auctioneer/config/config_test.go b/cmd/auctioneer/config/config_test.go
@@ -9,10 +9,10 @@ import (
 	"code.cloudfoundry.org/debugserver"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/durationjson"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 	"code.cloudfoundry.org/locket"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/cmd/auctioneer/main.go b/cmd/auctioneer/main.go
@@ -15,8 +15,8 @@ import (
 	"code.cloudfoundry.org/debugserver"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/go-loggregator/v8/runtimeemitter"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 	"code.cloudfoundry.org/locket"
 	"code.cloudfoundry.org/locket/jointlock"
 	"code.cloudfoundry.org/locket/lock"
@@ -83,7 +83,7 @@ func main() {
 	}
 
 	clock := clock.NewClock()
-	locks = append(locks, grouper.Member{"sql-lock", lock.NewLockRunner(
+	locks = append(locks, grouper.Member{Name: "sql-lock", Runner: lock.NewLockRunner(
 		logger,
 		locketClient,
 		lockIdentifier,
@@ -122,16 +122,16 @@ func main() {
 	lockHeldMetronNotifier := lockheldmetrics.NewLockHeldMetronNotifier(logger, metricsTicker, metronClient)
 
 	members := grouper.Members{
-		{"lock-held-metrics", lockHeldMetronNotifier},
-		{"lock", lock},
-		{"set-lock-held-metrics", lockheldmetrics.SetLockHeldRunner(logger, *lockHeldMetronNotifier)},
-		{"auction-runner", auctionRunner},
-		{"auction-server", auctionServer},
+		{Name: "lock-held-metrics", Runner: lockHeldMetronNotifier},
+		{Name: "lock", Runner: lock},
+		{Name: "set-lock-held-metrics", Runner: lockheldmetrics.SetLockHeldRunner(logger, *lockHeldMetronNotifier)},
+		{Name: "auction-runner", Runner: auctionRunner},
+		{Name: "auction-server", Runner: auctionServer},
 	}
 
 	if cfg.DebugAddress != "" {
 		members = append(grouper.Members{
-			{"debug-server", debugserver.Runner(cfg.DebugAddress, reconfigurableSink)},
+			{Name: "debug-server", Runner: debugserver.Runner(cfg.DebugAddress, reconfigurableSink)},
 		}, members...)
 	}
 
diff --git a/cmd/auctioneer/main_suite_test.go b/cmd/auctioneer/main_suite_test.go
@@ -20,17 +20,17 @@ import (
 	"code.cloudfoundry.org/bbs/test_helpers/sqlrunner"
 	"code.cloudfoundry.org/durationjson"
 	"code.cloudfoundry.org/inigo/helpers/portauthority"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagerflags"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/locket"
 	locketconfig "code.cloudfoundry.org/locket/cmd/locket/config"
 	locketrunner "code.cloudfoundry.org/locket/cmd/locket/testrunner"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	"github.com/tedsuo/ifrit"
-	"github.com/tedsuo/ifrit/ginkgomon"
+	ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
 	"google.golang.org/grpc/grpclog"
 )
 
diff --git a/cmd/auctioneer/main_test.go b/cmd/auctioneer/main_test.go
@@ -21,18 +21,18 @@ import (
 	"code.cloudfoundry.org/diego-logging-client/testhelpers"
 	"code.cloudfoundry.org/durationjson"
 	"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 	"code.cloudfoundry.org/locket"
 	locketrunner "code.cloudfoundry.org/locket/cmd/locket/testrunner"
 	"code.cloudfoundry.org/locket/lock"
 	locketmodels "code.cloudfoundry.org/locket/models"
 	"code.cloudfoundry.org/rep"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	. "github.com/onsi/gomega/gexec"
 	"github.com/tedsuo/ifrit"
-	"github.com/tedsuo/ifrit/ginkgomon"
+	ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
 )
 
 const (
@@ -234,7 +234,7 @@ var _ = Describe("Auctioneer", func() {
 		It("acquires the lock and becomes active", func() {
 			Eventually(func() error {
 				return auctioneerClient.RequestTaskAuctions(logger, []*auctioneer.TaskStartRequest{
-					&auctioneer.TaskStartRequest{*task},
+					&auctioneer.TaskStartRequest{Task: *task},
 				})
 			}).ShouldNot(HaveOccurred())
 		})
@@ -257,7 +257,7 @@ var _ = Describe("Auctioneer", func() {
 		It("emits metric about holding lock", func() {
 			Eventually(func() error {
 				return auctioneerClient.RequestTaskAuctions(logger, []*auctioneer.TaskStartRequest{
-					&auctioneer.TaskStartRequest{*task},
+					&auctioneer.TaskStartRequest{Task: *task},
 				})
 			}).ShouldNot(HaveOccurred())
 
@@ -307,7 +307,7 @@ var _ = Describe("Auctioneer", func() {
 			It("starts but does not accept auctions", func() {
 				Consistently(func() error {
 					return auctioneerClient.RequestTaskAuctions(logger, []*auctioneer.TaskStartRequest{
-						&auctioneer.TaskStartRequest{*task},
+						&auctioneer.TaskStartRequest{Task: *task},
 					})
 				}).Should(HaveOccurred())
 			})
@@ -337,7 +337,7 @@ var _ = Describe("Auctioneer", func() {
 				It("acquires the lock and becomes active", func() {
 					Eventually(func() error {
 						return auctioneerClient.RequestTaskAuctions(logger, []*auctioneer.TaskStartRequest{
-							&auctioneer.TaskStartRequest{*task},
+							&auctioneer.TaskStartRequest{Task: *task},
 						})
 					}, 2*time.Second).ShouldNot(HaveOccurred())
 				})
diff --git a/handlers/handlers.go b/handlers/handlers.go
@@ -8,7 +8,7 @@ import (
 	"code.cloudfoundry.org/auctioneer"
 	"code.cloudfoundry.org/bbs/handlers/middleware"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/tedsuo/rata"
 )
 
diff --git a/handlers/handlers_suite_test.go b/handlers/handlers_suite_test.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/handlers/handlers_test.go b/handlers/handlers_test.go
@@ -10,12 +10,12 @@ import (
 	"code.cloudfoundry.org/auctioneer"
 	"code.cloudfoundry.org/auctioneer/handlers"
 	mfakes "code.cloudfoundry.org/diego-logging-client/testhelpers"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"github.com/tedsuo/rata"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
@@ -46,7 +46,7 @@ var _ = Describe("Auction Handlers", func() {
 				pc := rep.NewPlacementConstraint("rootfs", []string{}, []string{})
 				task := rep.NewTask("the-task-guid", "test", resource, pc)
 
-				tasks := []auctioneer.TaskStartRequest{auctioneer.TaskStartRequest{task}}
+				tasks := []auctioneer.TaskStartRequest{auctioneer.TaskStartRequest{Task: task}}
 				reqGen := rata.NewRequestGenerator("http://localhost", auctioneer.Routes)
 
 				payload, err := json.Marshal(tasks)
diff --git a/handlers/lrp_auction_handler.go b/handlers/lrp_auction_handler.go
@@ -7,7 +7,7 @@ import (
 
 	"code.cloudfoundry.org/auction/auctiontypes"
 	"code.cloudfoundry.org/auctioneer"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 )
 
 type LRPAuctionHandler struct {
diff --git a/handlers/lrp_auction_handler_test.go b/handlers/lrp_auction_handler_test.go
@@ -8,11 +8,11 @@ import (
 	fake_auction_runner "code.cloudfoundry.org/auction/auctiontypes/fakes"
 	"code.cloudfoundry.org/auctioneer"
 	"code.cloudfoundry.org/auctioneer/handlers"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 )
diff --git a/handlers/task_auction_handler.go b/handlers/task_auction_handler.go
@@ -7,7 +7,7 @@ import (
 
 	"code.cloudfoundry.org/auction/auctiontypes"
 	"code.cloudfoundry.org/auctioneer"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 )
 
 type TaskAuctionHandler struct {
diff --git a/handlers/task_auction_handler_test.go b/handlers/task_auction_handler_test.go
@@ -8,11 +8,11 @@ import (
 	fake_auction_runner "code.cloudfoundry.org/auction/auctiontypes/fakes"
 	"code.cloudfoundry.org/auctioneer"
 	"code.cloudfoundry.org/auctioneer/handlers"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gbytes"
 )
@@ -41,7 +41,7 @@ var _ = Describe("TaskAuctionHandler", func() {
 				resource := rep.NewResource(1, 2, 3)
 				pc := rep.NewPlacementConstraint("rootfs", []string{}, []string{})
 				task := rep.NewTask("the-task-guid", "test", resource, pc)
-				tasks = []auctioneer.TaskStartRequest{auctioneer.TaskStartRequest{task}}
+				tasks = []auctioneer.TaskStartRequest{auctioneer.TaskStartRequest{Task: task}}
 				handler.Create(responseRecorder, newTestRequest(tasks), logger)
 			})
 
@@ -66,7 +66,7 @@ var _ = Describe("TaskAuctionHandler", func() {
 
 			BeforeEach(func() {
 				task := rep.Task{}
-				tasks = []auctioneer.TaskStartRequest{auctioneer.TaskStartRequest{task}}
+				tasks = []auctioneer.TaskStartRequest{auctioneer.TaskStartRequest{Task: task}}
 
 				handler.Create(responseRecorder, newTestRequest(tasks), logger)
 			})

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`mfakes "code.cloudfoundry.org/diego-logging-client/testhelpers"`
`10`	`10`	`"code.cloudfoundry.org/rep"`
`11`	`11`
`12`		`- . "github.com/onsi/ginkgo"`
	`12`	`+ . "github.com/onsi/ginkgo/v2"`
`13`	`13`	`. "github.com/onsi/gomega"`
`14`	`14`	`)`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"code.cloudfoundry.org/rep"`
`6`	`6`
`7`	`7`	`"code.cloudfoundry.org/auction/auctiontypes"`
`8`		`- "code.cloudfoundry.org/lager"`
	`8`	`+ "code.cloudfoundry.org/lager/v3"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type AuctionRunnerDelegate struct {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"time"`
`9`	`9`
`10`	`10`	`cfhttp "code.cloudfoundry.org/cfhttp/v2"`
`11`		`- "code.cloudfoundry.org/lager"`
	`11`	`+ "code.cloudfoundry.org/lager/v3"`
`12`	`12`	`"code.cloudfoundry.org/tlsconfig"`
`13`	`13`	`"github.com/tedsuo/rata"`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"code.cloudfoundry.org/debugserver"`
`8`	`8`	`loggingclient "code.cloudfoundry.org/diego-logging-client"`
`9`	`9`	`"code.cloudfoundry.org/durationjson"`
`10`		`- "code.cloudfoundry.org/lager/lagerflags"`
	`10`	`+ "code.cloudfoundry.org/lager/v3/lagerflags"`
`11`	`11`	`"code.cloudfoundry.org/locket"`
`12`	`12`	`)`
`13`	`13`