Bump to ginkgo/v2 && lager/v3 (#7)

winkingturtle-vmw · web-flow · commit f3dfda90a529 · 2023-04-06T15:33:28.000Z
* Bump to ginkgo/v2 &amp;&amp; lager/v3

* fix `go vet` failures
diff --git a/cmd/file-server/config/config.go b/cmd/file-server/config/config.go
@@ -6,7 +6,7 @@ import (
 
 	"code.cloudfoundry.org/debugserver"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 )
 
 type FileServerConfig struct {
diff --git a/cmd/file-server/config/config_suite_test.go b/cmd/file-server/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/file-server/config/config_test.go b/cmd/file-server/config/config_test.go
@@ -6,9 +6,9 @@ import (
 
 	"code.cloudfoundry.org/debugserver"
 	"code.cloudfoundry.org/fileserver/cmd/file-server/config"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/cmd/file-server/main.go b/cmd/file-server/main.go
@@ -13,8 +13,8 @@ import (
 	"code.cloudfoundry.org/fileserver/cmd/file-server/config"
 	"code.cloudfoundry.org/fileserver/handlers"
 	"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/tlsconfig"
 	"github.com/tedsuo/ifrit"
 	"github.com/tedsuo/ifrit/grouper"
@@ -60,12 +60,12 @@ func main() {
 		}
 	}
 	members := grouper.Members{
-		{"file server", initializeServer(logger, cfg.StaticDirectory, cfg.ServerAddress, cfg.HTTPSListenAddr, tlsConfig)},
+		{Name: "file server", Runner: initializeServer(logger, cfg.StaticDirectory, cfg.ServerAddress, cfg.HTTPSListenAddr, tlsConfig)},
 	}
 
 	if dbgAddr := debugserver.DebugAddress(flag.CommandLine); dbgAddr != "" {
 		members = append(grouper.Members{
-			{"debug-server", debugserver.Runner(dbgAddr, reconfigurableSink)},
+			{Name: "debug-server", Runner: debugserver.Runner(dbgAddr, reconfigurableSink)},
 		}, members...)
 	}
 
diff --git a/cmd/file-server/main_suite_test.go b/cmd/file-server/main_suite_test.go
@@ -1,7 +1,7 @@
 package main_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 
diff --git a/cmd/file-server/main_test.go b/cmd/file-server/main_test.go
@@ -13,10 +13,10 @@ import (
 	"path/filepath"
 
 	"code.cloudfoundry.org/fileserver/cmd/file-server/config"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 	"code.cloudfoundry.org/tlsconfig"
 	"code.cloudfoundry.org/tlsconfig/certtest"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
diff --git a/handlers/handlers.go b/handlers/handlers.go
@@ -5,7 +5,7 @@ import (
 
 	"code.cloudfoundry.org/fileserver"
 	"code.cloudfoundry.org/fileserver/handlers/static"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/tedsuo/rata"
 )
 
diff --git a/handlers/static/fileserver_test.go b/handlers/static/fileserver_test.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/fileserver/handlers/static"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/handlers/static/logging_handler.go b/handlers/static/logging_handler.go
@@ -3,7 +3,7 @@ package static
 import (
 	"net/http"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 )
 
 type loggingHandler struct {
diff --git a/handlers/static/static.go b/handlers/static/static.go
@@ -3,7 +3,7 @@ package static
 import (
 	"net/http"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 )
 
 func New(dir, pathPrefix string, logger lager.Logger) http.Handler {
diff --git a/handlers/static/static_suite_test.go b/handlers/static/static_suite_test.go
@@ -3,7 +3,7 @@ package static_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"code.cloudfoundry.org/debugserver"`
`8`	`8`	`loggingclient "code.cloudfoundry.org/diego-logging-client"`
`9`		`- "code.cloudfoundry.org/lager/lagerflags"`
	`9`	`+ "code.cloudfoundry.org/lager/v3/lagerflags"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type FileServerConfig struct {`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ import (`
`6`	`6`
`7`	`7`	`"code.cloudfoundry.org/debugserver"`
`8`	`8`	`"code.cloudfoundry.org/fileserver/cmd/file-server/config"`
`9`		`- "code.cloudfoundry.org/lager/lagerflags"`
	`9`	`+ "code.cloudfoundry.org/lager/v3/lagerflags"`
`10`	`10`
`11`		`- . "github.com/onsi/ginkgo"`
	`11`	`+ . "github.com/onsi/ginkgo/v2"`
`12`	`12`	`. "github.com/onsi/gomega"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ import (`
`13`	`13`	`"code.cloudfoundry.org/fileserver/cmd/file-server/config"`
`14`	`14`	`"code.cloudfoundry.org/fileserver/handlers"`
`15`	`15`	`"code.cloudfoundry.org/go-loggregator/v8/runtimeemitter"`
`16`		`- "code.cloudfoundry.org/lager"`
`17`		`- "code.cloudfoundry.org/lager/lagerflags"`
	`16`	`+ "code.cloudfoundry.org/lager/v3"`
	`17`	`+ "code.cloudfoundry.org/lager/v3/lagerflags"`
`18`	`18`	`"code.cloudfoundry.org/tlsconfig"`
`19`	`19`	`"github.com/tedsuo/ifrit"`
`20`	`20`	`"github.com/tedsuo/ifrit/grouper"`
`@@ -60,12 +60,12 @@ func main() {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`members := grouper.Members{`
`63`		`- {"file server", initializeServer(logger, cfg.StaticDirectory, cfg.ServerAddress, cfg.HTTPSListenAddr, tlsConfig)},`
	`63`	`+ {Name: "file server", Runner: initializeServer(logger, cfg.StaticDirectory, cfg.ServerAddress, cfg.HTTPSListenAddr, tlsConfig)},`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if dbgAddr := debugserver.DebugAddress(flag.CommandLine); dbgAddr != "" {`
`67`	`67`	`members = append(grouper.Members{`
`68`		`- {"debug-server", debugserver.Runner(dbgAddr, reconfigurableSink)},`
	`68`	`+ {Name: "debug-server", Runner: debugserver.Runner(dbgAddr, reconfigurableSink)},`
`69`	`69`	`}, members...)`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"code.cloudfoundry.org/fileserver"`
`7`	`7`	`"code.cloudfoundry.org/fileserver/handlers/static"`
`8`		`- "code.cloudfoundry.org/lager"`
	`8`	`+ "code.cloudfoundry.org/lager/v3"`
`9`	`9`	`"github.com/tedsuo/rata"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"time"`
`13`	`13`
`14`	`14`	`"code.cloudfoundry.org/fileserver/handlers/static"`
`15`		`- . "github.com/onsi/ginkgo"`
	`15`	`+ . "github.com/onsi/ginkgo/v2"`
`16`	`16`	`. "github.com/onsi/gomega"`
`17`	`17`	`)`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package static`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`
`5`	`5`
`6`		`- "code.cloudfoundry.org/lager"`
	`6`	`+ "code.cloudfoundry.org/lager/v3"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type loggingHandler struct {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package static_test`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- . "github.com/onsi/ginkgo"`
	`6`	`+ . "github.com/onsi/ginkgo/v2"`
`7`	`7`	`. "github.com/onsi/gomega"`
`8`	`8`	`)`
`9`	`9`