Refactor for Zap 0.3 update

Author: MarcPaquette

config/config.go

@@ -152,7 +152,7 @@ type RoutingApiConfig struct {
 
 type OAuthConfig struct {
 	TokenEndpoint     string `yaml:"token_endpoint"`
-	Port              uint16 `yaml:"port"`
+	Port              int    `yaml:"port"`
 	SkipSSLValidation bool   `yaml:"skip_ssl_validation"`
 	ClientName        string `yaml:"client_name"`
 	ClientSecret      string `yaml:"client_secret"`

config/config_test.go

@@ -654,7 +654,7 @@ oauth:
 			Expect(err).ToNot(HaveOccurred())
 
 			Expect(config.OAuth.TokenEndpoint).To(Equal("uaa.internal"))
-			Expect(config.OAuth.Port).To(Equal(uint16(8443)))
+			Expect(config.OAuth.Port).To(Equal(int(8443)))
 			Expect(config.OAuth.SkipSSLValidation).To(Equal(true))
 			Expect(config.OAuth.ClientName).To(Equal("client-name"))
 			Expect(config.OAuth.ClientSecret).To(Equal("client-secret"))

handlers/clientcert_test.go

@@ -64,7 +64,7 @@ var _ = Describe("Clientcert", func() {
 		switch errorCase {
 		case "forceDeleteError":
 			Expect(logger.TestSink.Lines()[0]).To(MatchRegexp(
-				`{"log_level":[0-9]*,"timestamp":[0-9]+[.][0-9]+,"message":"signature-validation-failed","data":{"error":"forceDelete error"}}`,
+				`{"log_level":[0-9]*,"timestamp":[0-9]+[.][0-9]+,"message":"signature-validation-failed","data":{"error":"forceDelete error"}`,
 			))
 			Expect(rw.Code).To(Equal(http.StatusBadGateway))
 		case "routeServiceTimeout":

integration/main_test.go

@@ -1115,7 +1115,7 @@ var _ = Describe("Router Integration", func() {
 
 		Context("when tls for uaa is disabled", func() {
 			It("fails fast", func() {
-				cfg.OAuth.Port = 0
+				cfg.OAuth.Port = -1
 				writeConfig(cfg, cfgFile)
 
 				gorouterCmd := exec.Command(gorouterPath, "-c", cfgFile)
@@ -1433,12 +1433,12 @@ func uriAndPort(url string) (string, int) {
 	return uri, port
 }
 
-func hostnameAndPort(url string) (string, uint16) {
+func hostnameAndPort(url string) (string, int) {
 	parts := strings.Split(url, ":")
 	hostname := parts[0]
 	port, err := strconv.ParseUint(parts[1], 10, 16)
 	Expect(err).ToNot(HaveOccurred())
-	return hostname, uint16(port)
+	return hostname, int(port)
 }
 
 func newMessageBus(c *config.Config) (*nats.Conn, error) {

logger/lager_adapter_test.go

@@ -55,7 +55,7 @@ var _ = Describe("LagerAdapter", func() {
 				lagerLogger.Info(message)
 				Expect(testSink.Lines()).To(HaveLen(1))
 				Expect(testSink.Lines()[0]).To(MatchRegexp(
-					`{"log_level":[0-9]*,"timestamp":[0-9]+[.][0-9]+,"message":"%s","source":"%s.%s","data":{}}`,
+					`{"log_level":[0-9]*,"timestamp":[0-9]+[.][0-9]+,"message":"%s","source":"%s.%s"}`,
 					message,
 					prefix,
 					component,
@@ -70,7 +70,7 @@ var _ = Describe("LagerAdapter", func() {
 				lagerLogger.Info(message)
 				Expect(testSink.Lines()).To(HaveLen(1))
 				Expect(testSink.Lines()[0]).To(MatchRegexp(
-					`{"log_level":[0-9]*,"timestamp":[0-9]+[.][0-9]+,"message":"%s","source":"%s.%s.%s","data":{}}`,
+					`{"log_level":[0-9]*,"timestamp":[0-9]+[.][0-9]+,"message":"%s","source":"%s.%s.%s"}`,
 					message,
 					prefix,
 					component,

logger/logger.go

@@ -126,7 +126,7 @@ func initializeLogger() *slog.Logger {
 		conf.level,
 	)
 
-	zapHandler := zapslog.NewHandler(zapCore, &zapslog.HandlerOptions{AddSource: true})
+	zapHandler := zapslog.NewHandler(zapCore, zapslog.WithCaller(true))
 	slogFrontend := slog.New(zapHandler)
 	return slogFrontend
 }

logger/logger_test.go

@@ -178,7 +178,7 @@ var _ = Describe("Logger", func() {
 
 				Expect(testSink.Lines()).To(HaveLen(1))
 				Expect(testSink.Lines()[0]).To(MatchRegexp(
-					`{"log_level":3,"timestamp":[0-9]+[.][0-9]+,"message":"%s","data":{"error":"%s"}}`, action, err.Error(),
+					`{"log_level":3,"timestamp":[0-9]+[.][0-9]+,"message":"%s","data":{"error":"%s"}`, action, err.Error(),
 				))
 			})
 		})