fix(lb): IgnoreSslServerVerify was not properly set

Author: nox-404

scaleway/loadbalancers.go

@@ -1437,17 +1437,18 @@ func (l *loadbalancers) createBackend(service *v1.Service, loadbalancer *scwlb.L
 		Name:                     backend.Name,
 		ForwardProtocol:          backend.ForwardProtocol,
 		SslBridging:              backend.SslBridging,
+		IgnoreSslServerVerify:    backend.IgnoreSslServerVerify,
 		ForwardPort:              backend.ForwardPort,
 		ForwardPortAlgorithm:     backend.ForwardPortAlgorithm,
 		StickySessions:           backend.StickySessions,
 		StickySessionsCookieName: backend.StickySessionsCookieName,
 		HealthCheck:              backend.HealthCheck,
 		ServerIP:                 backend.Pool,
+		ProxyProtocol:            backend.ProxyProtocol,
 		TimeoutServer:            backend.TimeoutServer,
 		TimeoutConnect:           backend.TimeoutConnect,
 		TimeoutTunnel:            backend.TimeoutTunnel,
 		OnMarkedDownAction:       backend.OnMarkedDownAction,
-		ProxyProtocol:            backend.ProxyProtocol,
 		RedispatchAttemptCount:   backend.RedispatchAttemptCount,
 		MaxRetries:               backend.MaxRetries,
 	})
@@ -1466,15 +1467,16 @@ func (l *loadbalancers) updateBackend(service *v1.Service, loadbalancer *scwlb.L
 		Name:                     backend.Name,
 		ForwardProtocol:          backend.ForwardProtocol,
 		SslBridging:              backend.SslBridging,
+		IgnoreSslServerVerify:    backend.IgnoreSslServerVerify,
 		ForwardPort:              backend.ForwardPort,
 		ForwardPortAlgorithm:     backend.ForwardPortAlgorithm,
 		StickySessions:           backend.StickySessions,
 		StickySessionsCookieName: backend.StickySessionsCookieName,
+		ProxyProtocol:            backend.ProxyProtocol,
 		TimeoutServer:            backend.TimeoutServer,
 		TimeoutConnect:           backend.TimeoutConnect,
 		TimeoutTunnel:            backend.TimeoutTunnel,
 		OnMarkedDownAction:       backend.OnMarkedDownAction,
-		ProxyProtocol:            backend.ProxyProtocol,
 		RedispatchAttemptCount:   backend.RedispatchAttemptCount,
 		MaxRetries:               backend.MaxRetries,
 	})

scaleway/loadbalancers_test.go

@@ -732,7 +732,7 @@ func TestFrontendEquals(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := frontendEquals(tt.a, tt.b)
 			if got != tt.want {
-				t.Errorf("want: %v, got: %v", got, tt.want)
+				t.Errorf("want: %v, got: %v", tt.want, got)
 			}
 		})
 	}
@@ -774,6 +774,8 @@ func TestBackendEquals(t *testing.T) {
 		},
 		Pool:                   []string{"1.2.3.4", "2.3.4.5"},
 		SendProxyV2:            &boolTrue,
+		SslBridging:            &boolFalse,
+		IgnoreSslServerVerify:  &boolFalse,
 		TimeoutServer:          &defaultTimeoutServer,
 		TimeoutConnect:         &defaultTimeoutConnect,
 		TimeoutTunnel:          &defaultTimeoutTunnel,
@@ -963,13 +965,13 @@ func TestBackendEquals(t *testing.T) {
 		a    *scwlb.Backend
 		b    *scwlb.Backend
 		want bool
-	}{"with same HTTP healthchecks", httpRef, httpDiff, false})
+	}{"with different HTTP healthchecks", httpRef, httpDiff, false})
 
 	for _, tt := range matrix {
 		t.Run(tt.Name, func(t *testing.T) {
 			got := backendEquals(tt.a, tt.b)
 			if got != tt.want {
-				t.Errorf("want: %v, got: %v", got, tt.want)
+				t.Errorf("want: %v, got: %v", tt.want, got)
 			}
 		})
 	}
@@ -996,7 +998,7 @@ func TestStringArrayEqual(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := stringArrayEqual(tt.a, tt.b)
 			if got != tt.want {
-				t.Errorf("want: %v, got: %v", got, tt.want)
+				t.Errorf("want: %v, got: %v", tt.want, got)
 			}
 		})
 	}
@@ -1022,7 +1024,7 @@ func TestStringPtrArrayEqual(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := stringPtrArrayEqual(tt.a, tt.b)
 			if got != tt.want {
-				t.Errorf("want: %v, got: %v", got, tt.want)
+				t.Errorf("want: %v, got: %v", tt.want, got)
 			}
 		})
 	}
@@ -1050,7 +1052,7 @@ func TestDurationPtrEqual(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := durationPtrEqual(tt.a, tt.b)
 			if got != tt.want {
-				t.Errorf("want: %v, got: %v", got, tt.want)
+				t.Errorf("want: %v, got: %v", tt.want, got)
 			}
 		})
 	}
@@ -1078,7 +1080,7 @@ func TestScwDurationPtrEqual(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := scwDurationPtrEqual(tt.a, tt.b)
 			if got != tt.want {
-				t.Errorf("want: %v, got: %v", got, tt.want)
+				t.Errorf("want: %v, got: %v", tt.want, got)
 			}
 		})
 	}
@@ -1135,7 +1137,7 @@ func TestChunkArray(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := chunkArray(tt.array, 3)
 			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("want: %v, got: %v", got, tt.want)
+				t.Errorf("want: %v, got: %v", tt.want, got)
 			}
 		})
 	}
@@ -1155,7 +1157,7 @@ func TestMakeACLPrefix(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := makeACLPrefix(tt.frontend)
 			if got != tt.want {
-				t.Errorf("want: %v, got: %v", got, tt.want)
+				t.Errorf("want: %v, got: %v", tt.want, got)
 			}
 		})
 	}