feat: make flatten filter generic and use for device and app

Signed-off-by: Brendan Thompson <github@blt.is>

internal/services/conditionalaccess/conditionalaccess.go

@@ -4,6 +4,8 @@
 package conditionalaccess
 
 import (
+	"log"
+
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
 	"github.com/hashicorp/terraform-provider-azuread/internal/tf"
 	"github.com/manicminer/hamilton/msgraph"
@@ -40,6 +42,7 @@ func flattenConditionalAccessApplications(in *msgraph.ConditionalAccessApplicati
 			"included_applications": tf.FlattenStringSlicePtr(in.IncludeApplications),
 			"excluded_applications": tf.FlattenStringSlicePtr(in.ExcludeApplications),
 			"included_user_actions": tf.FlattenStringSlicePtr(in.IncludeUserActions),
+			"filter":                flattenConditionalAccessFilter(in.ApplicationFilter),
 		},
 	}
 }
@@ -83,7 +86,7 @@ func flattenConditionalAccessDevices(in *msgraph.ConditionalAccessDevices) []int
 
 	return []interface{}{
 		map[string]interface{}{
-			"filter": flattenConditionalAccessDeviceFilter(in.DeviceFilter),
+			"filter": flattenConditionalAccessFilter(in.DeviceFilter),
 		},
 	}
 }
@@ -188,11 +191,14 @@ func flattenConditionalAccessSessionControls(in *msgraph.ConditionalAccessSessio
 	}
 }
 
-func flattenConditionalAccessDeviceFilter(in *msgraph.ConditionalAccessFilter) []interface{} {
+func flattenConditionalAccessFilter(in *msgraph.ConditionalAccessFilter) []interface{} {
 	if in == nil {
+		log.Print("=== no access filters to flatten")
 		return []interface{}{}
 	}
 
+	log.Printf("=== access filters are being flattened: %s", *in.Rule)
+
 	return []interface{}{
 		map[string]interface{}{
 			"mode": in.Mode,
@@ -345,7 +351,10 @@ func expandConditionalAccessApplications(in []interface{}) *msgraph.ConditionalA
 	result.ExcludeApplications = tf.ExpandStringSlicePtr(excludeApplications)
 	result.IncludeUserActions = tf.ExpandStringSlicePtr(includeUserActions)
 	if len(filter) > 0 {
+		log.Printf("=== appliction filter being expanded %+v \n", filter...)
 		result.ApplicationFilter = expandConditionalAccessFilter(filter)
+	} else {
+		log.Println("=== no application filter to expand")
 	}
 
 	return &result