Fix issues introduce when updating zap

Author: MarcPaquette

config/config.go

@@ -152,7 +152,7 @@ type RoutingApiConfig struct {
 
 type OAuthConfig struct {
 	TokenEndpoint     string `yaml:"token_endpoint"`
-	Port              int    `yaml:"port"`
+	Port              uint16 `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(int(8443)))
+			Expect(config.OAuth.Port).To(Equal(uint16(8443)))
 			Expect(config.OAuth.SkipSSLValidation).To(Equal(true))
 			Expect(config.OAuth.ClientName).To(Equal("client-name"))
 			Expect(config.OAuth.ClientSecret).To(Equal("client-secret"))

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 = -1
+				cfg.OAuth.Port = 0
 				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, int) {
+func hostnameAndPort(url string) (string, uint16) {
 	parts := strings.Split(url, ":")
 	hostname := parts[0]
 	port, err := strconv.ParseUint(parts[1], 10, 16)
 	Expect(err).ToNot(HaveOccurred())
-	return hostname, int(port)
+	return hostname, uint16(port)
 }
 
 func newMessageBus(c *config.Config) (*nats.Conn, error) {