Merge pull request #7222 from neil-yechenwei/fixeventgridsubs

Fix nil pointer refernce for subject_filter of eventgrid event subs
hashicorp · Jun 5, 2020 · e3aaaa6 · e3aaaa6
2 parents a5a35ad + 9c4a4de
commit e3aaaa6
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/azurerm/internal/services/eventgrid/eventgrid_event_subscription_resource.go b/azurerm/internal/services/eventgrid/eventgrid_event_subscription_resource.go
@@ -859,15 +859,17 @@ func expandEventGridEventSubscriptionFilter(d *schema.ResourceData) (*eventgrid.
 		filter.IncludedEventTypes = utils.ExpandStringSlice(includedEvents.([]interface{}))
 	}
 
-	if subjectFilter, ok := d.GetOk("subject_filter"); ok {
-		config := subjectFilter.([]interface{})[0].(map[string]interface{})
-		subjectBeginsWith := config["subject_begins_with"].(string)
-		subjectEndsWith := config["subject_ends_with"].(string)
-		caseSensitive := config["case_sensitive"].(bool)
-
-		filter.SubjectBeginsWith = &subjectBeginsWith
-		filter.SubjectEndsWith = &subjectEndsWith
-		filter.IsSubjectCaseSensitive = &caseSensitive
+	if v, ok := d.GetOk("subject_filter"); ok {
+		if v.([]interface{})[0] != nil {
+			config := v.([]interface{})[0].(map[string]interface{})
+			subjectBeginsWith := config["subject_begins_with"].(string)
+			subjectEndsWith := config["subject_ends_with"].(string)
+			caseSensitive := config["case_sensitive"].(bool)
+
+			filter.SubjectBeginsWith = &subjectBeginsWith
+			filter.SubjectEndsWith = &subjectEndsWith
+			filter.IsSubjectCaseSensitive = &caseSensitive
+		}
 	}
 
 	if advancedFilter, ok := d.GetOk("advanced_filter"); ok {