GCLOUD2-3228 health monitor expected_codes support

Author: intiluha

gcore/data_source_gcore_lbpool.go

@@ -109,6 +109,10 @@ func dataSourceLBPool() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"expected_codes": &schema.Schema{
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 					},
 				},
 			},
@@ -203,6 +207,7 @@ func dataSourceLBPoolRead(ctx context.Context, d *schema.ResourceData, m interfa
 			"max_retries":      lb.HealthMonitor.MaxRetries,
 			"max_retries_down": lb.HealthMonitor.MaxRetriesDown,
 			"url_path":         lb.HealthMonitor.URLPath,
+			"expected_codes":   lb.HealthMonitor.ExpectedCodes,
 		}
 		if lb.HealthMonitor.HTTPMethod != nil {
 			healthMonitor["http_method"] = lb.HealthMonitor.HTTPMethod.String()

gcore/data_source_gcore_lbpool_test.go

@@ -72,6 +72,7 @@ func TestAccLBPoolDataSource(t *testing.T) {
 			MaxRetriesDown: 10,
 			HTTPMethod:     types.HTTPMethodPointer(types.HTTPMethodGET),
 			URLPath:        "/",
+			ExpectedCodes:  "123,321",
 		},
 	}
 	res, err := lbpools.Create(clientPools, optsPool).Extract()

gcore/provider_test.go

@@ -143,14 +143,14 @@ func testAccPreCheckInstance(t *testing.T) {
 func checkNameAndID(resourceType string, t *testing.T) {
 	// resourceType is a word in capital letters
 	keyID := fmt.Sprintf("TEST_%s_ID", resourceType)
-	keyNane := fmt.Sprintf("TEST_%s_NAME", resourceType)
+	keyName := fmt.Sprintf("TEST_%s_NAME", resourceType)
 	_, haveID := os.LookupEnv(keyID)
-	_, haveName := os.LookupEnv(keyNane)
+	_, haveName := os.LookupEnv(keyName)
 	if !haveID && !haveName {
-		t.Fatalf("%s or %s must be set for acceptance tests", keyID, keyNane)
+		t.Fatalf("%s or %s must be set for acceptance tests", keyID, keyName)
 	}
 	if haveID && haveName {
-		t.Fatalf("Use only one from environment variables: %s or %s", keyID, keyNane)
+		t.Fatalf("Use only one from environment variables: %s or %s", keyID, keyName)
 	}
 }
 
@@ -165,11 +165,11 @@ func projectInfo() string {
 func objectInfo(resourceType string) string {
 	// resourceType is a word in capital letters
 	keyID := fmt.Sprintf("TEST_%s_ID", resourceType)
-	keyNane := fmt.Sprintf("TEST_%s_NAME", resourceType)
+	keyName := fmt.Sprintf("TEST_%s_NAME", resourceType)
 	if regionID, exists := os.LookupEnv(keyID); exists {
 		return fmt.Sprintf(`%s_id = %s`, strings.ToLower(resourceType), regionID)
 	}
-	return fmt.Sprintf(`%s_name = "%s"`, strings.ToLower(resourceType), os.Getenv(keyNane))
+	return fmt.Sprintf(`%s_name = "%s"`, strings.ToLower(resourceType), os.Getenv(keyName))
 }
 
 func CreateTestClient(provider *gcorecloud.ProviderClient, endpoint, version string) (*gcorecloud.ServiceClient, error) {

gcore/resource_gcore_lbpool.go

@@ -159,6 +159,11 @@ func resourceLBPool() *schema.Resource {
 							Optional: true,
 							Computed: true,
 						},
+						"expected_codes": &schema.Schema{
+							Type:     schema.TypeString,
+							Optional: true,
+							Computed: true,
+						},
 					},
 				},
 			},
@@ -288,6 +293,7 @@ func resourceLBPoolRead(ctx context.Context, d *schema.ResourceData, m interface
 			"max_retries":      lb.HealthMonitor.MaxRetries,
 			"max_retries_down": lb.HealthMonitor.MaxRetriesDown,
 			"url_path":         lb.HealthMonitor.URLPath,
+			"expected_codes":   lb.HealthMonitor.ExpectedCodes,
 		}
 		if lb.HealthMonitor.HTTPMethod != nil {
 			healthMonitor["http_method"] = lb.HealthMonitor.HTTPMethod.String()

gcore/utils.go

@@ -463,8 +463,14 @@ func extractHealthMonitorMap(d *schema.ResourceData) *lbpools.CreateHealthMonito
 			healthOpts.URLPath = urlPath
 		}
 
-		if hm["id"].(string) != "" {
-			healthOpts.ID = hm["id"].(string)
+		expectedCodes := hm["expected_codes"].(string)
+		if expectedCodes != "" {
+			healthOpts.ExpectedCodes = expectedCodes
+		}
+
+		id := hm["id"].(string)
+		if id != "" {
+			healthOpts.ID = id
 		}
 	}
 	return healthOpts