fix(workloads): Add validation on required fields (#2605)

Co-authored-by: pranav-new-relic <[email protected]>

newrelic/resource_newrelic_workload.go

@@ -58,7 +58,12 @@ func resourceNewRelicWorkload() *schema.Resource {
 						"query": {
 							Type:        schema.TypeString,
 							Required:    true,
-							Description: "The query.",
+							Description: "A valid entity search query; empty, and null values are considered invalid.",
+							ValidateFunc: validation.All(
+								validation.StringIsNotEmpty,
+								validation.StringIsNotWhiteSpace,
+								validation.NoZeroValues,
+							),
 						},
 					},
 				},
@@ -122,6 +127,11 @@ func resourceNewRelicWorkload() *schema.Resource {
 													Type:        schema.TypeString,
 													Required:    true,
 													Description: "The entity search query that is used to perform the search of a group of entities.",
+													ValidateFunc: validation.All(
+														validation.StringIsNotEmpty,
+														validation.StringIsNotWhiteSpace,
+														validation.NoZeroValues,
+													),
 												},
 											},
 										},

newrelic/resource_newrelic_workload_test.go

@@ -88,6 +88,14 @@ func TestAccNewRelicWorkload_EntitySearchQueriesOnly(t *testing.T) {
 					testAccCheckNewRelicWorkloadExists(resourceName),
 				),
 			},
+			{
+				Config:      testAccNewRelicWorkloadConfigWrongEntitySearchQueriesOnly(rName, ""),
+				ExpectError: regexp.MustCompile("Invalid value for \"query\""),
+			},
+			{
+				Config:      testAccNewRelicWorkloadConfigWrongEntitySearchQueriesOnly(rName, "    "),
+				ExpectError: regexp.MustCompile("Invalid value for \"query\""),
+			},
 		},
 	})
 }
@@ -548,6 +556,19 @@ resource "newrelic_workload" "foo" {
 `, testAccountID, name)
 }
 
+func testAccNewRelicWorkloadConfigWrongEntitySearchQueriesOnly(name string, esq string) string {
+	return fmt.Sprintf(`
+resource "newrelic_workload" "foo" {
+	name = "%[2]s"
+	account_id = %[1]d
+
+	entity_search_query {
+		query = %[3]s
+	}
+}
+`, testAccountID, name, esq)
+}
+
 func testAccNewRelicWorkloadConfigEntityMultiSearchQueriesOnly(name string) string {
 	return fmt.Sprintf(`
 resource "newrelic_workload" "foo" {

website/docs/r/workload.html.markdown

@@ -154,7 +154,7 @@ The following arguments are supported:
 
 All nested `entity_search_query` blocks support the following common arguments:
 
-  * `query` - (Required) The query.
+  * `query` - (Required) A valid entity search query; empty, and null values are considered invalid.
 
 ### Nested `status_config_automatic` blocks