Skip to content

Commit 4707db7

Browse files
committed
revert accidentally pulled in files
1 parent f931f31 commit 4707db7

File tree

4 files changed

+0
-17
lines changed

4 files changed

+0
-17
lines changed

internal/services/conditionalaccess/named_location_data_source.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@ func namedLocationDataSource() *pluginsdk.Resource {
8181
},
8282
},
8383
},
84-
85-
"uuid": {
86-
Type: pluginsdk.TypeString,
87-
Computed: true,
88-
},
8984
},
9085
}
9186
}
@@ -141,7 +136,6 @@ func namedLocationDataSourceRead(ctx context.Context, d *pluginsdk.ResourceData,
141136

142137
id := stable.NewIdentityConditionalAccessNamedLocationID(pointer.From(item.NamedLocation().Id))
143138
d.SetId(id.ID())
144-
d.Set("uuid", id.NamedLocationId)
145139

146140
return nil
147141
}

internal/services/conditionalaccess/named_location_data_source_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ func TestAccNamedLocationDataSource_countryByGps(t *testing.T) {
4040
check.That(data.ResourceName).Key("country.0.countries_and_regions.#").HasValue("3"),
4141
check.That(data.ResourceName).Key("country.0.include_unknown_countries_and_regions").HasValue("true"),
4242
check.That(data.ResourceName).Key("country.0.country_lookup_method").HasValue("authenticatorAppGps"),
43-
check.That(data.ResourceName).Key("uuid").IsUuid(),
4443
),
4544
},
4645
})
@@ -56,7 +55,6 @@ func TestAccNamedLocationDataSource_ip(t *testing.T) {
5655
check.That(data.ResourceName).Key("ip.#").HasValue("1"),
5756
check.That(data.ResourceName).Key("ip.0.ip_ranges.#").HasValue("4"),
5857
check.That(data.ResourceName).Key("ip.0.trusted").HasValue("true"),
59-
check.That(data.ResourceName).Key("uuid").IsUuid(),
6058
),
6159
},
6260
})

internal/services/conditionalaccess/named_location_resource.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,6 @@ func namedLocationResource() *pluginsdk.Resource {
119119
},
120120
},
121121
},
122-
123-
"uuid": {
124-
Type: pluginsdk.TypeString,
125-
Computed: true,
126-
},
127122
},
128123
}
129124
}
@@ -160,7 +155,6 @@ func namedLocationResourceCreate(ctx context.Context, d *pluginsdk.ResourceData,
160155
}
161156

162157
d.SetId(id.ID())
163-
d.Set("uuid", id.NamedLocationId)
164158

165159
} else if v, ok = d.GetOk("country"); ok {
166160
properties := expandCountryNamedLocation(v.([]interface{}))
@@ -186,7 +180,6 @@ func namedLocationResourceCreate(ctx context.Context, d *pluginsdk.ResourceData,
186180

187181
id := stable.NewIdentityConditionalAccessNamedLocationID(*namedLocation.Id)
188182
d.SetId(id.ID())
189-
d.Set("uuid", id.NamedLocationId)
190183
if err := consistency.WaitForUpdateDelayStart(ctx, time.Second*15, countryNamedLocationWait(client, &id, v)); err != nil {
191184
return tf.ErrorDiagF(err, "waiting for creation of %s", id)
192185
}
@@ -244,7 +237,6 @@ func namedLocationResourceRead(ctx context.Context, d *pluginsdk.ResourceData, m
244237
client := meta.(*clients.Client).ConditionalAccess.NamedLocationClient
245238

246239
id, err := stable.ParseIdentityConditionalAccessNamedLocationID(d.Id())
247-
d.Set("uuid", id.NamedLocationId)
248240
if err != nil {
249241
return tf.ErrorDiagPathF(err, "id", "Parsing Named Location ID")
250242
}

internal/services/conditionalaccess/named_location_resource_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ func TestAccNamedLocation_basicIP(t *testing.T) {
2929
Config: r.basicIP(data),
3030
Check: acceptance.ComposeTestCheckFunc(
3131
check.That(data.ResourceName).ExistsInAzure(r),
32-
check.That(data.ResourceName).Key("uuid").IsUuid(),
3332
),
3433
},
3534
data.ImportStep(),

0 commit comments

Comments
 (0)