Add object_id to named_location

docs/data-sources/named_location.md

@@ -35,7 +35,8 @@ The following attributes are exported:
 * `country` - A `country` block as documented below, which describes a country-based named location.
 * `id` - The ID of the named location.
 * `ip` - An `ip` block as documented below, which describes an IP-based named location.
-* 
+* `object_id` - The object ID of the named location.
+
 ---
 
 `country` block exports the following:

docs/resources/named_location.md

@@ -75,6 +75,7 @@ The following arguments are supported:
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - The ID of the named location.
+* `object_id` - The object ID of the named location.
 
 ## Timeouts
 

internal/services/conditionalaccess/conditional_access_policy_resource_test.go

@@ -463,6 +463,24 @@ func (r ConditionalAccessPolicyResource) Exists(ctx context.Context, clients *cl
 	return pointer.To(true), nil
 }
 
+func TestAccConditionalAccessPolicy_namedLocation(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azuread_conditional_access_policy", "test")
+	r := ConditionalAccessPolicyResource{}
+
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.namedLocation(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+				check.That(data.ResourceName).Key("id").Exists(),
+				check.That(data.ResourceName).Key("display_name").HasValue(fmt.Sprintf("acctest-CONPOLICY-%d", data.RandomInteger)),
+				check.That(data.ResourceName).Key("state").HasValue("disabled"),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func (ConditionalAccessPolicyResource) basic(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 provider "azuread" {}
@@ -1222,3 +1240,41 @@ resource "azuread_conditional_access_policy" "test" {
 }
 `, data.RandomInteger)
 }
+
+func (ConditionalAccessPolicyResource) namedLocation(data acceptance.TestData) string {
+	location := NamedLocationResource{}.basicIP(data)
+
+	return fmt.Sprintf(`
+provider "azuread" {}
+
+resource "azuread_conditional_access_policy" "test" {
+  display_name = "acctest-CONPOLICY-%[1]d"
+  state        = "disabled"
+
+  conditions {
+    client_app_types = ["browser"]
+
+    applications {
+      included_applications = ["None"]
+    }
+
+    users {
+      included_users = ["All"]
+      excluded_users = ["GuestsOrExternalUsers"]
+    }
+
+    locations {
+      included_locations = ["All"]
+      excluded_locations = [azuread_named_location.test.object_id]
+    }
+  }
+
+  grant_controls {
+    operator          = "OR"
+    built_in_controls = ["block"]
+  }
+}
+
+%s
+`, data.RandomInteger, location)
+}

internal/services/conditionalaccess/named_location_data_source.go

@@ -81,6 +81,12 @@ func namedLocationDataSource() *pluginsdk.Resource {
 					},
 				},
 			},
+
+			"object_id": {
+				Description: "The object ID of the named location",
+				Type:        pluginsdk.TypeString,
+				Computed:    true,
+			},
 		},
 	}
 }
@@ -123,6 +129,7 @@ func namedLocationDataSourceRead(ctx context.Context, d *pluginsdk.ResourceData,
 		}
 
 		tf.Set(d, "display_name", pointer.From(namedLocation.DisplayName))
+		tf.Set(d, "object_id", pointer.From(namedLocation.Id))
 		tf.Set(d, "ip", flattenIPNamedLocation(&namedLocation))
 
 	case stable.CountryNamedLocation:
@@ -131,6 +138,7 @@ func namedLocationDataSourceRead(ctx context.Context, d *pluginsdk.ResourceData,
 		}
 
 		tf.Set(d, "display_name", pointer.From(namedLocation.DisplayName))
+		tf.Set(d, "object_id", pointer.From(namedLocation.Id))
 		tf.Set(d, "country", flattenCountryNamedLocation(&namedLocation))
 	}
 

internal/services/conditionalaccess/named_location_resource.go

@@ -119,6 +119,12 @@ func namedLocationResource() *pluginsdk.Resource {
 					},
 				},
 			},
+
+			"object_id": {
+				Description: "The object ID of the named location",
+				Type:        pluginsdk.TypeString,
+				Computed:    true,
+			},
 		},
 	}
 }
@@ -261,6 +267,7 @@ func namedLocationResourceRead(ctx context.Context, d *pluginsdk.ResourceData, m
 		}
 
 		tf.Set(d, "display_name", pointer.From(namedLocation.DisplayName))
+		tf.Set(d, "object_id", pointer.From(namedLocation.Id))
 		tf.Set(d, "ip", flattenIPNamedLocation(&namedLocation))
 
 	case stable.CountryNamedLocation:
@@ -269,6 +276,7 @@ func namedLocationResourceRead(ctx context.Context, d *pluginsdk.ResourceData, m
 		}
 
 		tf.Set(d, "display_name", pointer.From(namedLocation.DisplayName))
+		tf.Set(d, "object_id", pointer.From(namedLocation.Id))
 		tf.Set(d, "country", flattenCountryNamedLocation(&namedLocation))
 	}