Merge pull request #11 from cliedeman/fix/update-node-filter

Fix update node balancer filtering
linode · Dec 4, 2018 · 911501f · 911501f
2 parents 304e45e + 854bdf5
commit 911501f
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 20 deletions.
diff --git a/cloud/linode/fake_linode_test.go b/cloud/linode/fake_linode_test.go
@@ -327,6 +327,49 @@ func (f *fakeAPI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	case "DELETE":
 		id := filepath.Base(r.URL.Path)
 		delete(f.nb, id)
+	case "PUT":
+		if strings.Contains(r.URL.Path, "configs") {
+			parts := strings.Split(r.URL.Path[1:], "/")
+			nbcco := new(linodego.NodeBalancerConfigUpdateOptions)
+			if err := json.NewDecoder(r.Body).Decode(nbcco); err != nil {
+				f.t.Fatal(err)
+			}
+			nbcid, err := strconv.Atoi(parts[3])
+			if err != nil {
+				f.t.Fatal(err)
+			}
+			nbid, err := strconv.Atoi(parts[1])
+			if err != nil {
+				f.t.Fatal(err)
+			}
+			nbcc := linodego.NodeBalancerConfig{
+				ID:             nbcid,
+				Port:           nbcco.Port,
+				Protocol:       nbcco.Protocol,
+				Algorithm:      nbcco.Algorithm,
+				Stickiness:     nbcco.Stickiness,
+				Check:          nbcco.Check,
+				CheckInterval:  nbcco.CheckInterval,
+				CheckAttempts:  nbcco.CheckAttempts,
+				CheckPath:      nbcco.CheckPath,
+				CheckBody:      nbcco.CheckBody,
+				CheckPassive:   *nbcco.CheckPassive,
+				CheckTimeout:   nbcco.CheckTimeout,
+				CipherSuite:    nbcco.CipherSuite,
+				NodeBalancerID: nbid,
+				SSLCommonName:  "",
+				SSLFingerprint: "",
+				SSLCert:        nbcco.SSLCert,
+				SSLKey:         nbcco.SSLKey,
+			}
+			f.nbc[strconv.Itoa(nbcc.ID)] = &nbcc
+			resp, err := json.Marshal(nbcc)
+			if err != nil {
+				f.t.Fatal(err)
+			}
+			_, _ = w.Write(resp)
+			return
+		}
 	}
 }
 

diff --git a/cloud/linode/loadbalancers.go b/cloud/linode/loadbalancers.go
@@ -136,15 +136,7 @@ func (l *loadbalancers) UpdateLoadBalancer(ctx context.Context, clusterName stri
 		return err
 	}
 
-	nb, err := l.lbByName(ctx, l.client, lbName)
-	if err != nil {
-		return err
-	}
-	jsonFilter, err := json.Marshal(map[string]string{"nodebalancer_id": strconv.Itoa(nb.ID)})
-	if err != nil {
-		return err
-	}
-	nbConfigs, err := l.client.ListNodeBalancerConfigs(ctx, lb.ID, linodego.NewListOptions(0, string(jsonFilter)))
+	nbConfigs, err := l.client.ListNodeBalancerConfigs(ctx, lb.ID, nil)
 	if err != nil {
 		return err
 	}
@@ -194,18 +186,10 @@ func (l *loadbalancers) UpdateLoadBalancer(ctx context.Context, clusterName stri
 
 				_, err = l.client.UpdateNodeBalancerConfig(ctx, lb.ID, nbc.ID, opt.GetUpdateOptions())
 				if err != nil {
-					return err
-				}
-
-				jsonFilter, err := json.Marshal(map[string]string{
-					"nodebalancer_id": strconv.Itoa(nb.ID),
-					"config_id":       strconv.Itoa(nbc.ID),
-				})
-				if err != nil {
-					return err
+					return fmt.Errorf("Error updating NodeBalancer config: %v", err)
 				}
 
-				nodeList, err := l.client.ListNodeBalancerNodes(ctx, lb.ID, nbc.ID, linodego.NewListOptions(0, string(jsonFilter)))
+				nodeList, err := l.client.ListNodeBalancerNodes(ctx, lb.ID, nbc.ID, nil)
 				if err != nil {
 					return err
 				}

diff --git a/cloud/linode/loadbalancers_test.go b/cloud/linode/loadbalancers_test.go
@@ -655,7 +655,6 @@ func testEnsureLoadBalancer(t *testing.T, client *linodego.Client) {
 	if !exists {
 		t.Fatal("Node balancer not found")
 	}
-	fmt.Println(nb.Ingress, "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
 
 	testcases := []struct {
 		name        string
@@ -718,6 +717,9 @@ func testEnsureLoadBalancer(t *testing.T, client *linodego.Client) {
 	for _, test := range testcases {
 		t.Run(test.name, func(t *testing.T) {
 			lbStatus, err := lb.EnsureLoadBalancer(context.TODO(), test.clusterName, test.service, test.nodes)
+			if err != nil {
+				t.Fatal(err)
+			}
 			if lbStatus.Ingress[0].IP != test.nbIP {
 				t.Error("unexpected error")
 				t.Logf("expected: %v", test.nbIP)