Fix flattenwebhook filter bug

Author: qdegraaf

amplience/provider.go

@@ -46,6 +46,7 @@ func Provider() *schema.Provider {
 				Description:      "ID of the Hub to manage",
 				Type:             schema.TypeString,
 				Required:         true,
+				DefaultFunc:      schema.EnvDefaultFunc("AMPLIENCE_HUB_ID", nil),
 				ValidateDiagFunc: ValidateDiagWrapper(validation.StringDoesNotContainAny(" ")),
 			},
 		},

amplience/resource_content_repository_test.go

@@ -48,8 +48,6 @@ func TestAccContentRepository_CreateAndUpdate(t *testing.T) {
 func testAccContentRepositoryConfig(name, label string) string {
 	return fmt.Sprintf(`
 	resource "amplience_content_repository" "testrepo" {
-      hub_id = "foobar"
-
       name = "%[1]s"
       label = "%[2]s"
     }

amplience/resource_webhook.go

@@ -237,7 +237,7 @@ func resourceWebhookSaveState(data *schema.ResourceData, webhook content.Webhook
 	data.Set("active", webhook.Active)
 	data.Set("secret", webhook.Secret)
 	data.Set("method", webhook.Method)
-	data.Set("filter", flattenWebhookFilters(webhook.Filters))
+	data.Set("filter", flattenWebhookFilters(&webhook.Filters))
 	data.Set("custom_payload", convertCustomPayloadToMap(webhook.CustomPayload))
 }
 
@@ -440,30 +440,47 @@ func resourceWebhookGetCustomPayloadAndValidate(input interface{}) (*content.Web
 	return &payload, nil
 }
 
-func flattenWebhookFilters(filters []content.WebhookFilter) []interface{} {
-	result := make([]interface{}, len(filters))
-
-	for _, filter := range filters {
-		item := make(map[string]interface{})
-		arguments := make(map[string]interface{})
-
-		switch v := filter.(type) {
-		case content.WebhookFilterEqual:
-			item["type"] = "equal"
-			arguments["json_path"] = v.JSONPath
-			arguments["values"] = []string{v.Value}
-			item["arguments"] = arguments
-
-		case content.WebhookFilterIn:
-			item["type"] = "in"
-			arguments["json_path"] = v.JSONPath
-			arguments["values"] = v.Values
-			item["arguments"] = arguments
-		}
+func flattenWebhookFilters(filters *[]content.WebhookFilter) []interface{} {
+	if filters != nil {
+		fs := make([]interface{}, len(*filters), len(*filters))
+
+		for i, filter := range *filters {
+			f := make(map[string]interface{})
+
+			switch v := filter.(type) {
+			case content.WebhookFilterEqual:
+				f["type"] = "equal"
+				f["arguments"] = flattenWebhookFilterEqualArguments(v.Value, v.JSONPath)
+				fs[i] = f
 
+			case content.WebhookFilterIn:
+				f["type"] = "in"
+				f["arguments"] = flattenWebhookFilterInArguments(v.Values, v.JSONPath)
+				fs[i] = f
+			}
+		}
+		return fs
 	}
 
-	return result
+	return make([]interface{}, 0)
+}
+
+func flattenWebhookFilterEqualArguments(Value string, JSONPath string) interface{} {
+	args := make([]interface{}, 1, 1)
+	argMap := make(map[string]interface{})
+	argMap["json_path"] = JSONPath
+	argMap["value"] = []string{Value}
+	args[0] = argMap
+	return args
+}
+
+func flattenWebhookFilterInArguments(Values []string, JSONPath string) interface{} {
+	args := make([]interface{}, 1, 1)
+	argMap := make(map[string]interface{})
+	argMap["json_path"] = JSONPath
+	argMap["value"] = Values
+	args[0] = argMap
+	return args
 }
 
 func convertCustomPayloadToMap(payload *content.WebhookCustomPayload) map[string]string {

amplience/resource_webhook_test.go

@@ -156,7 +156,6 @@ func testAccWebhooksConfig(label string) string {
 	return fmt.Sprintf(`
 	resource "amplience_webhook" "standard" {
       label = "%[1]s"
-	  hub_id = "foobar"
 
       events = [
 		"dynamic-content.content-item.created",