Skip to content

Commit 4a5d291

Browse files
jackofallopsjackofallops
authored
dependencies: go-azure-sdk to version v0.20250618.1093309 (#1723)
* dependencies: go-azure-sdk to version v0.20250618.1093309 * fixup flakey test by fixing delete prerequisits * fixup groups test
1 parent bbf6979 commit 4a5d291

File tree

2,450 files changed

+116079
-22910
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,450 files changed

+116079
-22910
lines changed

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ module github.com/hashicorp/terraform-provider-azuread
33
require (
44
github.com/google/go-cmp v0.7.0
55
github.com/hashicorp/go-azure-helpers v0.73.0
6-
github.com/hashicorp/go-azure-sdk/microsoft-graph v0.20250513.1112057
7-
github.com/hashicorp/go-azure-sdk/sdk v0.20250513.1112057
6+
github.com/hashicorp/go-azure-sdk/microsoft-graph v0.20250618.1093309
7+
github.com/hashicorp/go-azure-sdk/sdk v0.20250618.1093309
88
github.com/hashicorp/go-cty v1.5.0
99
github.com/hashicorp/go-multierror v1.1.1
1010
github.com/hashicorp/go-uuid v1.0.3
1111
github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
1212
github.com/hashicorp/terraform-plugin-testing v1.12.0
13-
golang.org/x/text v0.25.0
13+
golang.org/x/text v0.26.0
1414
)
1515

1616
require (
@@ -49,11 +49,11 @@ require (
4949
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
5050
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
5151
github.com/zclconf/go-cty v1.16.2 // indirect
52-
golang.org/x/crypto v0.38.0 // indirect
53-
golang.org/x/mod v0.24.0 // indirect
52+
golang.org/x/crypto v0.39.0 // indirect
53+
golang.org/x/mod v0.25.0 // indirect
5454
golang.org/x/net v0.40.0 // indirect
5555
golang.org/x/oauth2 v0.30.0 // indirect
56-
golang.org/x/sync v0.14.0 // indirect
56+
golang.org/x/sync v0.15.0 // indirect
5757
golang.org/x/sys v0.33.0 // indirect
5858
golang.org/x/tools v0.33.0 // indirect
5959
google.golang.org/appengine v1.6.8 // indirect

‎go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
5555
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
5656
github.com/hashicorp/go-azure-helpers v0.73.0 h1:J++NBrLzwv6U/hSXeC29pWOr+5S+xnoQWVT2r1XAexw=
5757
github.com/hashicorp/go-azure-helpers v0.73.0/go.mod h1:tAUWC+kwZQsuNAHEIlnbojMMcC6SWQb6W1HfIeluv1E=
58-
github.com/hashicorp/go-azure-sdk/microsoft-graph v0.20250513.1112057 h1:V6fG/+FkmIWqlLyTr8zkYxuGa1rshHfU7VbWPM6/zNQ=
59-
github.com/hashicorp/go-azure-sdk/microsoft-graph v0.20250513.1112057/go.mod h1:6kecvS+zhzvq+MY4XsVvTr9mWf0rWyxcBpxWkGZj9Xo=
60-
github.com/hashicorp/go-azure-sdk/sdk v0.20250513.1112057 h1:J5QEwqbMVV5qPl6uO/she/jX2zXqMD9IJ9VPywHlzKw=
61-
github.com/hashicorp/go-azure-sdk/sdk v0.20250513.1112057/go.mod h1:/LiVkre6Py4M8+xkSHgJieWkHWv03USdwg5x/zeX9Rc=
58+
github.com/hashicorp/go-azure-sdk/microsoft-graph v0.20250618.1093309 h1:giIJVkamQZN/28JQdCpJCsnYmNp1I+vN8zlmRTXuUmc=
59+
github.com/hashicorp/go-azure-sdk/microsoft-graph v0.20250618.1093309/go.mod h1:ty40K81T+JuCzG/9hOfB0rqCg/1iXSY3OudKwcZKgf8=
60+
github.com/hashicorp/go-azure-sdk/sdk v0.20250618.1093309 h1:EZLtbwBWk3/WYGQAvae5rHezjVlIPoUwoRk9lVTMc68=
61+
github.com/hashicorp/go-azure-sdk/sdk v0.20250618.1093309/go.mod h1:eyNClZwQsa4Go51ScU9OYCE2EQvbNt8EjZ4eMxpQ1H8=
6262
github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
6363
github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
6464
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
@@ -174,11 +174,11 @@ go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC
174174
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
175175
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
176176
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
177-
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
178-
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
177+
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
178+
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
179179
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
180-
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
181-
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
180+
golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
181+
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
182182
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
183183
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
184184
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -190,8 +190,8 @@ golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKl
190190
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
191191
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
192192
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
193-
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
194-
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
193+
golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
194+
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
195195
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
196196
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
197197
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -213,8 +213,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
213213
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
214214
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
215215
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
216-
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
217-
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
216+
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
217+
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
218218
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
219219
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
220220
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

‎internal/services/conditionalaccess/named_location_resource.go‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,10 @@ func namedLocationResourceDelete(ctx context.Context, d *pluginsdk.ResourceData,
295295

296296
return tf.ErrorDiagF(err, "updating %s prior to deletion", id)
297297
}
298+
299+
if err = consistency.WaitForUpdate(ctx, ipNamedLocationTrustedDeleteWait(client, id)); err != nil {
300+
return tf.ErrorDiagF(err, "waiting for removal of trusted status on %s", id)
301+
}
298302
}
299303

300304
resp, err := client.DeleteConditionalAccessNamedLocation(ctx, *id, conditionalaccessnamedlocation.DefaultDeleteConditionalAccessNamedLocationOperationOptions())
@@ -358,6 +362,30 @@ func ipNamedLocationWait(client *conditionalaccessnamedlocation.ConditionalAcces
358362
}
359363
}
360364

365+
func ipNamedLocationTrustedDeleteWait(client *conditionalaccessnamedlocation.ConditionalAccessNamedLocationClient, id *stable.IdentityConditionalAccessNamedLocationId) consistency.ChangeFunc {
366+
return func(ctx context.Context) (*bool, error) {
367+
resp, err := client.GetConditionalAccessNamedLocation(ctx, *id, conditionalaccessnamedlocation.DefaultGetConditionalAccessNamedLocationOperationOptions())
368+
if err != nil {
369+
return nil, err
370+
}
371+
372+
if resp.Model == nil {
373+
return nil, errors.New("returned model was nil")
374+
}
375+
376+
namedLocation, ok := resp.Model.(stable.IPNamedLocation)
377+
if !ok {
378+
return nil, errors.New("returned model was not an IPNamedLocation")
379+
}
380+
381+
if pointer.From(namedLocation.IsTrusted) {
382+
return pointer.To(false), nil
383+
}
384+
385+
return pointer.To(true), nil
386+
}
387+
}
388+
361389
func countryNamedLocationWait(client *conditionalaccessnamedlocation.ConditionalAccessNamedLocationClient, id *stable.IdentityConditionalAccessNamedLocationId, v interface{}) consistency.ChangeFunc {
362390
return func(ctx context.Context) (*bool, error) {
363391
resp, err := client.GetConditionalAccessNamedLocation(ctx, *id, conditionalaccessnamedlocation.DefaultGetConditionalAccessNamedLocationOperationOptions())

‎internal/services/groups/group_without_members_resource_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ resource "azuread_group_without_members" "test" {
537537
display_name = "acctestGroup-%[1]d"
538538
types = ["Unified"]
539539
mail_enabled = true
540-
mail_nickname = "acctestGroup-%[1]d"
540+
mail_nickname = "acctest.Group-%[1]d"
541541
security_enabled = false
542542
}
543543
`, data.RandomInteger)

‎internal/services/serviceprincipals/service_principal_delegated_permission_grant_resource.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func servicePrincipalDelegatedPermissionGrantResourceCreate(ctx context.Context,
120120
}
121121

122122
properties := stable.OAuth2PermissionGrant{
123-
ClientId: servicePrincipalId.ServicePrincipalId,
123+
ClientId: pointer.To(servicePrincipalId.ServicePrincipalId),
124124
ResourceId: pointer.To(resourcePrincipalId.ServicePrincipalId),
125125
Scope: nullable.NoZero(strings.Join(tf.ExpandStringSlice(d.Get("claim_values").(*pluginsdk.Set).List()), " ")),
126126
}

‎vendor/github.com/hashicorp/go-azure-sdk/microsoft-graph/administrativeunits/beta/administrativeunit/README.md‎

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/hashicorp/go-azure-sdk/microsoft-graph/administrativeunits/beta/administrativeunit/method_checkmembergroups.go‎

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/hashicorp/go-azure-sdk/microsoft-graph/administrativeunits/beta/administrativeunit/method_createadministrativeunit.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/hashicorp/go-azure-sdk/microsoft-graph/administrativeunits/beta/administrativeunit/method_createvalidatesproperty.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/hashicorp/go-azure-sdk/microsoft-graph/administrativeunits/beta/administrativeunit/method_restore.go‎

Lines changed: 8 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)