Fix update

Author: Rulox

client/nginx.go

@@ -44,42 +44,6 @@ type UpstreamServer struct {
 	Service     string `json:"service,omitempty"`
 }
 
-func fillUpstreamServerWithDefaultValues(u UpstreamServer) UpstreamServer {
-	if u.MaxConns == nil {
-		defaultMaxConns := 0
-		u.MaxConns = &defaultMaxConns
-	}
-
-	if u.MaxFails == nil {
-		defaultMaxFails := 1
-		u.MaxFails = &defaultMaxFails
-	}
-
-	if u.FailTimeout == "" {
-		u.FailTimeout = "10s"
-	}
-
-	if u.SlowStart == "" {
-		u.SlowStart = "0s"
-	}
-
-	if u.Backup == nil {
-		defaultBackup := false
-		u.Backup = &defaultBackup
-	}
-
-	if u.Down == nil {
-		defaultDown := false
-		u.Down = &defaultDown
-	}
-
-	if u.Weight == nil {
-		defaultWeight := 1
-		u.Weight = &defaultWeight
-	}
-	return u
-}
-
 // StreamUpstreamServer lets you configure Stream upstreams.
 type StreamUpstreamServer struct {
 	ID          int    `json:"id,omitempty"`
@@ -94,42 +58,6 @@ type StreamUpstreamServer struct {
 	Service     string `json:"service,omitempty"`
 }
 
-func fillStreamUpstreamServerWithDefaultValues(u StreamUpstreamServer) StreamUpstreamServer {
-	if u.MaxConns == nil {
-		defaultMaxConns := 0
-		u.MaxConns = &defaultMaxConns
-	}
-
-	if u.MaxFails == nil {
-		defaultMaxFails := 1
-		u.MaxFails = &defaultMaxFails
-	}
-
-	if u.FailTimeout == "" {
-		u.FailTimeout = "10s"
-	}
-
-	if u.SlowStart == "" {
-		u.SlowStart = "0s"
-	}
-
-	if u.Backup == nil {
-		defaultBackup := false
-		u.Backup = &defaultBackup
-	}
-
-	if u.Down == nil {
-		defaultDown := false
-		u.Down = &defaultDown
-	}
-
-	if u.Weight == nil {
-		defaultWeight := 1
-		u.Weight = &defaultWeight
-	}
-	return u
-}
-
 type apiErrorResponse struct {
 	Error     apiError
 	RequestID string `json:"request_id"`
@@ -579,13 +507,50 @@ func (client *NginxClient) UpdateHTTPServers(upstream string, servers []Upstream
 	return toAdd, toDelete, toUpdate, nil
 }
 
+func haveSameParameters(newServer UpstreamServer, serverNGX UpstreamServer) bool {
+	newServer.ID = serverNGX.ID
+
+	if serverNGX.MaxConns != nil && newServer.MaxConns == nil {
+		defaultMaxConns := 0
+		newServer.MaxConns = &defaultMaxConns
+	}
+
+	if serverNGX.MaxFails != nil && newServer.MaxFails == nil {
+		defaultMaxFails := 1
+		newServer.MaxFails = &defaultMaxFails
+	}
+
+	if serverNGX.FailTimeout != "" && newServer.FailTimeout == "" {
+		newServer.FailTimeout = "10s"
+	}
+
+	if serverNGX.SlowStart != "" && newServer.SlowStart == "" {
+		newServer.SlowStart = "0s"
+	}
+
+	if serverNGX.Backup != nil && newServer.Backup == nil {
+		defaultBackup := false
+		newServer.Backup = &defaultBackup
+	}
+
+	if serverNGX.Down != nil && newServer.Down == nil {
+		defaultDown := false
+		newServer.Down = &defaultDown
+	}
+
+	if serverNGX.Weight != nil && newServer.Weight == nil {
+		defaultWeight := 1
+		newServer.Weight = &defaultWeight
+	}
+
+	return reflect.DeepEqual(newServer, serverNGX)
+}
+
 func determineUpdates(updatedServers []UpstreamServer, nginxServers []UpstreamServer) (toAdd []UpstreamServer, toRemove []UpstreamServer, toUpdate []UpstreamServer) {
 	for _, server := range updatedServers {
 		updateFound := false
 		for _, serverNGX := range nginxServers {
-			server.ID = serverNGX.ID
-			newServer := fillUpstreamServerWithDefaultValues(server)
-			if newServer.Server == serverNGX.Server && !reflect.DeepEqual(newServer, serverNGX) {
+			if server.Server == serverNGX.Server && !haveSameParameters(server, serverNGX) {
 				updateFound = true
 				break
 			}
@@ -842,14 +807,49 @@ func (client *NginxClient) getIDOfStreamServer(upstream string, name string) (in
 	return -1, nil
 }
 
+func haveStreamSameParameters(newServer StreamUpstreamServer, serverNGX StreamUpstreamServer) bool {
+	newServer.ID = serverNGX.ID
+	if serverNGX.MaxConns != nil && newServer.MaxConns == nil {
+		defaultMaxConns := 0
+		newServer.MaxConns = &defaultMaxConns
+	}
+
+	if serverNGX.MaxFails != nil && newServer.MaxFails == nil {
+		defaultMaxFails := 1
+		newServer.MaxFails = &defaultMaxFails
+	}
+
+	if serverNGX.FailTimeout != "" && newServer.FailTimeout == "" {
+		newServer.FailTimeout = "10s"
+	}
+
+	if serverNGX.SlowStart != "" && newServer.SlowStart == "" {
+		newServer.SlowStart = "0s"
+	}
+
+	if serverNGX.Backup != nil && newServer.Backup == nil {
+		defaultBackup := false
+		newServer.Backup = &defaultBackup
+	}
+
+	if serverNGX.Down != nil && newServer.Down == nil {
+		defaultDown := false
+		newServer.Down = &defaultDown
+	}
+
+	if serverNGX.Weight != nil && newServer.Weight == nil {
+		defaultWeight := 1
+		newServer.Weight = &defaultWeight
+	}
+
+	return reflect.DeepEqual(newServer, serverNGX)
+}
+
 func determineStreamUpdates(updatedServers []StreamUpstreamServer, nginxServers []StreamUpstreamServer) (toAdd []StreamUpstreamServer, toRemove []StreamUpstreamServer, toUpdate []StreamUpstreamServer) {
 	for _, server := range updatedServers {
 		updateFound := false
 		for _, serverNGX := range nginxServers {
-			server.ID = serverNGX.ID
-			newServer := fillStreamUpstreamServerWithDefaultValues(server)
-
-			if server.Server == serverNGX.Server && !reflect.DeepEqual(newServer, serverNGX) {
+			if server.Server == serverNGX.Server && !haveStreamSameParameters(server, serverNGX) {
 				updateFound = true
 				break
 			}