Assume port 80 if no port is set in address

Author: Rulox

client/nginx.go

@@ -18,6 +18,7 @@ const pathNotFoundCode = "PathNotFound"
 
 const streamContext = true
 const httpContext = false
+const defaultServerPort = "80"
 
 // NginxClient lets you access NGINX Plus API.
 type NginxClient struct {
@@ -504,6 +505,7 @@ func (client *NginxClient) GetHTTPServers(upstream string) ([]UpstreamServer, er
 
 // AddHTTPServer adds the server to the upstream.
 func (client *NginxClient) AddHTTPServer(upstream string, server UpstreamServer) error {
+	server.Server = addPortToServer(server.Server)
 	id, err := client.getIDOfHTTPServer(upstream, server.Server)
 	if err != nil {
 		return fmt.Errorf("failed to add %v server to %v upstream: %v", server.Server, upstream, err)
@@ -523,6 +525,7 @@ func (client *NginxClient) AddHTTPServer(upstream string, server UpstreamServer)
 
 // DeleteHTTPServer the server from the upstream.
 func (client *NginxClient) DeleteHTTPServer(upstream string, server string) error {
+	server = addPortToServer(server)
 	id, err := client.getIDOfHTTPServer(upstream, server)
 	if err != nil {
 		return fmt.Errorf("failed to remove %v server from  %v upstream: %v", server, upstream, err)
@@ -752,6 +755,7 @@ func (client *NginxClient) GetStreamServers(upstream string) ([]StreamUpstreamSe
 
 // AddStreamServer adds the stream server to the upstream.
 func (client *NginxClient) AddStreamServer(upstream string, server StreamUpstreamServer) error {
+	server.Server = addPortToServer(server.Server)
 	id, err := client.getIDOfStreamServer(upstream, server.Server)
 	if err != nil {
 		return fmt.Errorf("failed to add %v stream server to %v upstream: %v", server.Server, upstream, err)
@@ -770,6 +774,7 @@ func (client *NginxClient) AddStreamServer(upstream string, server StreamUpstrea
 
 // DeleteStreamServer the server from the upstream.
 func (client *NginxClient) DeleteStreamServer(upstream string, server string) error {
+	server = addPortToServer(server)
 	id, err := client.getIDOfStreamServer(upstream, server)
 	if err != nil {
 		return fmt.Errorf("failed to remove %v stream server from  %v upstream: %v", server, upstream, err)
@@ -1249,10 +1254,7 @@ func (client *NginxClient) deleteKeyValPairs(zone string, stream bool) error {
 
 // UpdateHTTPServer updates the server of the upstream.
 func (client *NginxClient) UpdateHTTPServer(upstream string, server UpstreamServer) error {
-	if !isValidAddress(server.Server) {
-		return fmt.Errorf("failed to update %v server to %v upstream: server must include address and port or be a unix socket", server.Server, upstream)
-	}
-
+	server.Server = addPortToServer(server.Server)
 	path := fmt.Sprintf("http/upstreams/%v/servers/%v", upstream, server.ID)
 	server.ID = 0
 	err := client.patch(path, &server, http.StatusOK)
@@ -1265,10 +1267,7 @@ func (client *NginxClient) UpdateHTTPServer(upstream string, server UpstreamServ
 
 // UpdateStreamServer updates the stream server of the upstream.
 func (client *NginxClient) UpdateStreamServer(upstream string, server StreamUpstreamServer) error {
-	if !isValidAddress(server.Server) {
-		return fmt.Errorf("failed to update %v stream server to %v upstream: server must include address and port or be a unix socket", server.Server, upstream)
-	}
-
+	server.Server = addPortToServer(server.Server)
 	path := fmt.Sprintf("stream/upstreams/%v/servers/%v", upstream, server.ID)
 	server.ID = 0
 	err := client.patch(path, &server, http.StatusOK)
@@ -1279,21 +1278,18 @@ func (client *NginxClient) UpdateStreamServer(upstream string, server StreamUpst
 	return nil
 }
 
-func isValidAddress(server string) bool {
-	// ipv4 and port
+func addPortToServer(server string) string {
 	if len(strings.Split(server, ":")) == 2 {
-		return true
+		return server
 	}
 
-	// ipv6 and port
 	if len(strings.Split(server, "]:")) == 2 {
-		return true
+		return server
 	}
 
-	// unix socket
 	if strings.HasPrefix(server, "unix:") {
-		return true
+		return server
 	}
 
-	return false
+	return fmt.Sprintf("%v:%v", server, defaultServerPort)
 }

client/nginx_test.go

@@ -408,64 +408,54 @@ func TestFillStreamUpstreamServerWithDefaultValues(t *testing.T) {
 	}
 }
 
-func TestIsValidAddress(t *testing.T) {
+func TestAddPortToServer(t *testing.T) {
 	// More info about addresses http://nginx.org/en/docs/http/ngx_http_upstream_module.html#server
 	var tests = []struct {
 		address  string
-		expected bool
+		expected string
 		msg      string
 	}{
 		{
-			address:  "example.com:80",
-			expected: true,
+			address:  "example.com:8080",
+			expected: "example.com:8080",
 			msg:      "host and port",
 		},
 		{
-			address:  "127.0.0.1:80",
-			expected: true,
+			address:  "127.0.0.1:8080",
+			expected: "127.0.0.1:8080",
 			msg:      "ipv4 and port",
 		},
 		{
-			address:  "[::]:80",
-			expected: true,
+			address:  "[::]:8080",
+			expected: "[::]:8080",
 			msg:      "ipv6 and port",
 		},
 		{
 			address:  "unix:/path/to/socket",
-			expected: true,
+			expected: "unix:/path/to/socket",
 			msg:      "unix socket",
 		},
-		{
-			address:  "",
-			expected: false,
-			msg:      "empty string",
-		},
 		{
 			address:  "example.com",
-			expected: false,
+			expected: "example.com:80",
 			msg:      "host without port",
 		},
 		{
 			address:  "127.0.0.1",
-			expected: false,
+			expected: "127.0.0.1:80",
 			msg:      "ipv4 without port",
 		},
 		{
 			address:  "[::]",
-			expected: false,
+			expected: "[::]:80",
 			msg:      "ipv6 without port",
 		},
-		{
-			address:  "invalid",
-			expected: false,
-			msg:      "invalid address",
-		},
 	}
 
 	for _, test := range tests {
-		result := isValidAddress(test.address)
+		result := addPortToServer(test.address)
 		if result != test.expected {
-			t.Errorf("isValidAddress(%v) returned %v but expected %v for %v", test.address, result, test.expected, test.msg)
+			t.Errorf("addPortToServer(%v) returned %v but expected %v for %v", test.address, result, test.expected, test.msg)
 		}
 	}
 }