fix iplb*http_farm|tcp_farm probe without match issue

ovh · Dec 3, 2020 · 75e32d6 · 75e32d6
1 parent bceed58
commit 75e32d6
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 6 deletions.
diff --git a/ovh/resource_ovh_iploadbalancing_http_farm.go b/ovh/resource_ovh_iploadbalancing_http_farm.go
@@ -105,8 +105,10 @@ func resourceIpLoadbalancingHttpFarm() *schema.Resource {
 							},
 						},
 						"negate": {
-							Type:     schema.TypeBool,
-							Optional: true,
+							Type:         schema.TypeBool,
+							Default:      false,
+							RequiredWith: []string{"probe.0.match"},
+							Optional:     true,
 						},
 						"pattern": {
 							Type:     schema.TypeString,

diff --git a/ovh/resource_ovh_iploadbalancing_http_farm_test.go b/ovh/resource_ovh_iploadbalancing_http_farm_test.go
@@ -17,6 +17,7 @@ const (
 data "ovh_iploadbalancing" "iplb" {
   service_name = "%s"
 }
+
 resource "ovh_iploadbalancing_http_farm" "testfarm" {
   service_name     = data.ovh_iploadbalancing.iplb.id
   display_name     = "%s"
@@ -28,6 +29,25 @@ resource "ovh_iploadbalancing_http_farm" "testfarm" {
         type = "oco"
   }
 }
+`
+	testAccIpLoadbalancingHttpFarmProbeMatchConfig = `
+data "ovh_iploadbalancing" "iplb" {
+  service_name = "%s"
+}
+
+resource "ovh_iploadbalancing_http_farm" "testfarm" {
+  service_name     = data.ovh_iploadbalancing.iplb.id
+  display_name     = "%s"
+  port             = "%d"
+  zone             = "%s"
+  balance 		   = "roundrobin"
+
+  probe {
+        interval = 30
+        type     = "oco"
+        match    = "default"
+  }
+}
 `
 )
 
@@ -106,6 +126,13 @@ func TestAccIpLoadbalancingHttpFarmBasicCreate(t *testing.T) {
 		12346,
 		"all",
 	)
+	config3 := fmt.Sprintf(
+		testAccIpLoadbalancingHttpFarmProbeMatchConfig,
+		os.Getenv("OVH_IPLB_SERVICE_TEST"),
+		displayName2,
+		12346,
+		"all",
+	)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheckIpLoadbalancing(t) },
@@ -129,6 +156,16 @@ func TestAccIpLoadbalancingHttpFarmBasicCreate(t *testing.T) {
 					resource.TestCheckResourceAttr("ovh_iploadbalancing_http_farm.testfarm", "probe.0.interval", "30"),
 				),
 			},
+			{
+				Config: config3,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("ovh_iploadbalancing_http_farm.testfarm", "display_name", displayName2),
+					resource.TestCheckResourceAttr("ovh_iploadbalancing_http_farm.testfarm", "zone", "all"),
+					resource.TestCheckResourceAttr("ovh_iploadbalancing_http_farm.testfarm", "port", "12346"),
+					resource.TestCheckResourceAttr("ovh_iploadbalancing_http_farm.testfarm", "probe.0.interval", "30"),
+					resource.TestCheckResourceAttr("ovh_iploadbalancing_http_farm.testfarm", "probe.0.match", "default"),
+				),
+			},
 		},
 	})
 }
diff --git a/ovh/resource_ovh_iploadbalancing_tcp_farm.go b/ovh/resource_ovh_iploadbalancing_tcp_farm.go
@@ -78,7 +78,7 @@ func resourceIpLoadbalancingTcpFarm() *schema.Resource {
 						"match": {
 							Type:     schema.TypeString,
 							Optional: true,
-							Default:  "default",
+							Computed: true,
 							ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
 								err := helpers.ValidateStringEnum(v.(string), []string{"contains", "default", "internal", "matches", "status"})
 								if err != nil {
@@ -104,9 +104,10 @@ func resourceIpLoadbalancingTcpFarm() *schema.Resource {
 							},
 						},
 						"negate": {
-							Type:     schema.TypeBool,
-							Optional: true,
-							Default:  false,
+							Type:         schema.TypeBool,
+							Default:      false,
+							RequiredWith: []string{"probe.0.match"},
+							Optional:     true,
 						},
 						"pattern": {
 							Type:     schema.TypeString,

diff --git a/ovh/resource_ovh_iploadbalancing_tcp_farm_test.go b/ovh/resource_ovh_iploadbalancing_tcp_farm_test.go
@@ -17,17 +17,39 @@ const (
 data "ovh_iploadbalancing" "iplb" {
   service_name = "%s"
 }
+
 resource "ovh_iploadbalancing_tcp_farm" "testfarm" {
   service_name     = data.ovh_iploadbalancing.iplb.id
   display_name     = "%s"
   port             = "%d"
   zone             = "%s"
   balance 		   = "roundrobin"
+
   probe {
         interval = 30
         type = "oco"
   }
 }
+`
+
+	testAccIpLoadbalancingTcpFarmProbeMatchConfig = `
+data "ovh_iploadbalancing" "iplb" {
+  service_name = "%s"
+}
+
+resource "ovh_iploadbalancing_tcp_farm" "testfarm" {
+  service_name     = data.ovh_iploadbalancing.iplb.id
+  display_name     = "%s"
+  port             = "%d"
+  zone             = "%s"
+  balance 		   = "roundrobin"
+
+  probe {
+        interval = 30
+        type     = "oco"
+        match    = "default"
+  }
+}
 `
 )
 
@@ -106,6 +128,13 @@ func TestAccIpLoadbalancingTcpFarmBasicCreate(t *testing.T) {
 		12346,
 		"all",
 	)
+	config3 := fmt.Sprintf(
+		testAccIpLoadbalancingTcpFarmProbeMatchConfig,
+		os.Getenv("OVH_IPLB_SERVICE_TEST"),
+		displayName2,
+		12346,
+		"all",
+	)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheckIpLoadbalancing(t) },
@@ -129,6 +158,16 @@ func TestAccIpLoadbalancingTcpFarmBasicCreate(t *testing.T) {
 					resource.TestCheckResourceAttr("ovh_iploadbalancing_tcp_farm.testfarm", "probe.0.interval", "30"),
 				),
 			},
+			{
+				Config: config3,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("ovh_iploadbalancing_tcp_farm.testfarm", "display_name", displayName2),
+					resource.TestCheckResourceAttr("ovh_iploadbalancing_tcp_farm.testfarm", "zone", "all"),
+					resource.TestCheckResourceAttr("ovh_iploadbalancing_tcp_farm.testfarm", "port", "12346"),
+					resource.TestCheckResourceAttr("ovh_iploadbalancing_tcp_farm.testfarm", "probe.0.interval", "30"),
+					resource.TestCheckResourceAttr("ovh_iploadbalancing_tcp_farm.testfarm", "probe.0.match", "default"),
+				),
+			},
 		},
 	})
 }
diff --git a/ovh/types_iploadbalancing.go b/ovh/types_iploadbalancing.go
@@ -104,6 +104,12 @@ func (opts *IpLoadbalancingFarmBackendProbe) FromResource(d *schema.ResourceData
 	opts.URL = helpers.GetNilStringPointerFromData(d, fmt.Sprintf("%s.url", parent))
 	opts.Method = helpers.GetNilStringPointerFromData(d, fmt.Sprintf("%s.method", parent))
 	opts.Type = helpers.GetNilStringPointerFromData(d, fmt.Sprintf("%s.type", parent))
+
+	// Error 400: "A probe can not negate without a match"
+	if opts.Match == nil {
+		opts.Negate = nil
+	}
+
 	return opts
 }