Bump to ginkgo/v2 && lager/v3

auctioncellrep/auction_cell_rep.go

@@ -9,7 +9,7 @@ import (
 
 	"code.cloudfoundry.org/bbs/models"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
 )

auctioncellrep/auction_cell_rep_suite_test.go

@@ -1,7 +1,7 @@
 package auctioncellrep_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

auctioncellrep/auction_cell_rep_test.go

@@ -7,12 +7,12 @@ import (
 	"code.cloudfoundry.org/executor"
 	"code.cloudfoundry.org/executor/containermetrics"
 	fake_client "code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/auctioncellrep"
 	fakes "code.cloudfoundry.org/rep/auctioncellrep/auctioncellrepfakes"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context/fake_evacuation_context"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

auctioncellrep/batch_container_allocator.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 )
 

auctioncellrep/batch_container_allocator_test.go

@@ -9,10 +9,10 @@ import (
 	"code.cloudfoundry.org/bbs/models"
 	"code.cloudfoundry.org/executor"
 	fake_client "code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/auctioncellrep"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 )

auctioncellrep/helpers_test.go

@@ -2,7 +2,7 @@ package auctioncellrep_test
 
 import (
 	"code.cloudfoundry.org/rep/auctioncellrep"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

client.go

@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/bbs/models"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/tlsconfig"
 	"github.com/tedsuo/rata"
 )

client_test.go

@@ -9,11 +9,11 @@ import (
 
 	"code.cloudfoundry.org/bbs/models"
 	cfhttp "code.cloudfoundry.org/cfhttp/v2"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/routing-info/internalroutes"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/ghttp"

cmd/gocurl/main_suite_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	"github.com/onsi/gomega/ghttp"

cmd/gocurl/main_test.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/tlsconfig"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/ghttp"
 )

cmd/rep/config/config.go

@@ -11,7 +11,7 @@ import (
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/durationjson"
 	executorinit "code.cloudfoundry.org/executor/initializer"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 	"code.cloudfoundry.org/locket"
 	"code.cloudfoundry.org/rep"
 )

cmd/rep/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"

cmd/rep/config/config_test.go

@@ -10,10 +10,10 @@ import (
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/durationjson"
 	executorinit "code.cloudfoundry.org/executor/initializer"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 	"code.cloudfoundry.org/locket"
 	"code.cloudfoundry.org/rep/cmd/rep/config"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

cmd/rep/main.go

@@ -24,8 +24,8 @@ import (
 	"code.cloudfoundry.org/executor"
 	executorinit "code.cloudfoundry.org/executor/initializer"
 	"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/localip"
 	"code.cloudfoundry.org/locket"
 	"code.cloudfoundry.org/locket/lock"
@@ -179,21 +179,21 @@ func main() {
 	)
 
 	members := grouper.Members{
-		{"presence", cellPresence},
-		{"http_server", httpServer},
-		{"https_server", httpsServer},
-		{"evacuation-cleanup", cleanup},
-		{"bulker", bulker},
-		{"event-consumer", harmonizer.NewEventConsumer(logger, opGenerator, queue)},
-		{"evacuator", evacuator},
-		{"request-metrics-notifier", requestMetrics},
+		{Name: "presence", Runner: cellPresence},
+		{Name: "http_server", Runner: httpServer},
+		{Name: "https_server", Runner: httpsServer},
+		{Name: "evacuation-cleanup", Runner: cleanup},
+		{Name: "bulker", Runner: bulker},
+		{Name: "event-consumer", Runner: harmonizer.NewEventConsumer(logger, opGenerator, queue)},
+		{Name: "evacuator", Runner: evacuator},
+		{Name: "request-metrics-notifier", Runner: requestMetrics},
 	}
 
 	members = append(executorMembers, members...)
 
 	if repConfig.DebugAddress != "" {
 		members = append(grouper.Members{
-			{"debug-server", debugserver.Runner(repConfig.DebugAddress, reconfigurableSink)},
+			{Name: "debug-server", Runner: debugserver.Runner(repConfig.DebugAddress, reconfigurableSink)},
 		}, members...)
 	}
 

cmd/rep/main_suite_test.go

@@ -23,17 +23,17 @@ import (
 	"code.cloudfoundry.org/durationjson"
 	"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
 	"code.cloudfoundry.org/inigo/helpers/portauthority"
-	"code.cloudfoundry.org/lager/lagerflags"
-	"code.cloudfoundry.org/lager/lagertest"
+	"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/onsi/gomega/ghttp"
 	"github.com/tedsuo/ifrit"
-	"github.com/tedsuo/ifrit/ginkgomon"
+	ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
 	"google.golang.org/grpc/grpclog"
 )
 

cmd/rep/main_test.go

@@ -27,22 +27,22 @@ import (
 	"code.cloudfoundry.org/executor/initializer/configuration"
 	"code.cloudfoundry.org/garden"
 	"code.cloudfoundry.org/garden/transport"
-	"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"
 	locketrunner "code.cloudfoundry.org/locket/cmd/locket/testrunner"
 	locketmodels "code.cloudfoundry.org/locket/models"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/cmd/rep/config"
 	"code.cloudfoundry.org/rep/cmd/rep/testrunner"
 	"code.cloudfoundry.org/tlsconfig"
-	. "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/onsi/gomega/ghttp"
-	"github.com/tedsuo/ifrit/ginkgomon"
+	ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
 )
 
 var runner *testrunner.Runner
@@ -232,12 +232,16 @@ var _ = Describe("The Rep", func() {
 		runner.Start()
 	})
 
-	AfterEach(func(done Done) {
-		close(flushEvents)
-		runner.KillWithFire()
-		fakeGarden.Close()
-		close(done)
-		// ginkgomon.Kill(locketProcess)
+	AfterEach(func() {
+		done := make(chan interface{})
+		go func() {
+			close(flushEvents)
+			runner.KillWithFire()
+			fakeGarden.Close()
+			close(done)
+			ginkgomon.Kill(locketProcess)
+		}()
+		Eventually(done).Should(BeClosed())
 	})
 
 	Context("the rep doesn't start", func() {

cmd/rep/testrunner/runner.go

@@ -9,7 +9,7 @@ import (
 
 	"code.cloudfoundry.org/rep/cmd/rep/config"
 
-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )

conversion_helpers_test.go

@@ -14,7 +14,7 @@ import (
 	"code.cloudfoundry.org/executor"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/routing-info/internalroutes"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

evacuation/cleanup.go

@@ -12,7 +12,7 @@ import (
 	"code.cloudfoundry.org/clock"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 )
 
 const (

evacuation/cleanup_test.go

@@ -14,14 +14,14 @@ import (
 	mfakes "code.cloudfoundry.org/diego-logging-client/testhelpers"
 	"code.cloudfoundry.org/executor"
 	"code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep/evacuation"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/tedsuo/ifrit"
-	"github.com/tedsuo/ifrit/ginkgomon"
+	ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
 )
 
 var _ = Describe("EvacuationCleanup", func() {
@@ -163,36 +163,37 @@ var _ = Describe("EvacuationCleanup", func() {
 		})
 
 		Describe("deleting running containers", func() {
-			It("should delete all of the containers that are still running", func() {
-				fakeExecutorClient.ListContainersReturnsOnCall(1,
-					[]executor.Container{
-						{
-							Guid:    "container1",
-							State:   executor.StateRunning,
-							RunInfo: executor.RunInfo{LogConfig: executor.LogConfig{Guid: "log-guid-1", SourceName: "source-name-1", Index: 0}},
-						},
-						{Guid: "container2",
-							State:   executor.StateCompleted,
-							RunInfo: executor.RunInfo{LogConfig: executor.LogConfig{Guid: "log-guid-2", SourceName: "source-name-2", Index: 1}},
+			Context("When containers fail to exit initially", func() {
+				BeforeEach(func() {
+					fakeExecutorClient.ListContainersReturnsOnCall(1,
+						[]executor.Container{
+							{
+								Guid:    "container1",
+								State:   executor.StateRunning,
+								RunInfo: executor.RunInfo{LogConfig: executor.LogConfig{Guid: "log-guid-1", SourceName: "source-name-1", Index: 0}},
+							},
+							{Guid: "container2",
+								State:   executor.StateCompleted,
+								RunInfo: executor.RunInfo{LogConfig: executor.LogConfig{Guid: "log-guid-2", SourceName: "source-name-2", Index: 1}},
+							},
 						},
-					},
-					nil,
-				)
-				fakeExecutorClient.ListContainersReturnsOnCall(2, []executor.Container{}, nil)
-
-				Consistently(errCh).ShouldNot(Receive())
-				fakeClock.Increment(time.Second * 1)
+						nil,
+					)
+				})
+				It("should delete all of the containers that are still running", func() {
+					Consistently(errCh).ShouldNot(Receive())
+					fakeClock.Increment(time.Second * 1)
 
-				Eventually(errCh).Should(Receive(nil))
-				Expect(fakeExecutorClient.ListContainersCallCount()).To(Equal(3))
-				Expect(fakeExecutorClient.DeleteContainerCallCount()).To(Equal(2))
+					Eventually(errCh).Should(Receive(nil))
+					Expect(fakeExecutorClient.ListContainersCallCount()).To(Equal(3))
+					Expect(fakeExecutorClient.DeleteContainerCallCount()).To(Equal(2))
 
-				_, c1 := fakeExecutorClient.DeleteContainerArgsForCall(0)
-				_, c2 := fakeExecutorClient.DeleteContainerArgsForCall(1)
-				containers := []string{c1, c2}
-				Expect(containers).To(ConsistOf("container1", "container2"))
+					_, c1 := fakeExecutorClient.DeleteContainerArgsForCall(0)
+					_, c2 := fakeExecutorClient.DeleteContainerArgsForCall(1)
+					containers := []string{c1, c2}
+					Expect(containers).To(ConsistOf("container1", "container2"))
+				})
 			})
-
 			It("emits app logs indicating evacuation timeout", func() {
 				Eventually(fakeMetronClient.SendAppLogCallCount).Should(Equal(2))
 				msg, containerSource, tags := fakeMetronClient.SendAppLogArgsForCall(0)

evacuation/evacuation.go

@@ -6,7 +6,7 @@ import (
 
 	"code.cloudfoundry.org/clock"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
 )
 
@@ -74,8 +74,6 @@ func (e *Evacuator) Run(signals <-chan os.Signal, ready chan<- struct{}) error {
 		logger.Info("signaled", lager.Data{"signal": signal.String()})
 		return nil
 	}
-
-	return nil
 }
 
 func (e *Evacuator) evacuate(logger lager.Logger, doneCh chan<- struct{}) {