Upgrade terraform-provider-azuread to v2.51.0 (#1111)

This PR was generated via `$ upgrade-provider pulumi/pulumi-azuread --kind=all --target-bridge-version=latest`. --- - Upgrading terraform-provider-azuread from 2.50.0 to 2.51.0. Fixes #1110
pulumi · Jun 7, 2024 · 8fc8831 · 8fc8831
1 parent 4687d02
commit 8fc8831
Show file tree

Hide file tree

Showing 39 changed files with 412 additions and 91 deletions.
diff --git a/provider/cmd/pulumi-resource-azuread/bridge-metadata.json b/provider/cmd/pulumi-resource-azuread/bridge-metadata.json
@@ -1277,6 +1277,9 @@
                     "mail_nicknames": {
                         "maxItemsOne": false
                     },
+                    "mails": {
+                        "maxItemsOne": false
+                    },
                     "object_ids": {
                         "maxItemsOne": false
                     },

diff --git a/provider/cmd/pulumi-resource-azuread/schema.json b/provider/cmd/pulumi-resource-azuread/schema.json
@@ -2939,7 +2939,7 @@
             "properties": {
                 "accountEnabled": {
                     "type": "boolean",
-                    "description": "Whether or not the account is enabled.\n"
+                    "description": "Whether the account is enabled.\n"
                 },
                 "displayName": {
                     "type": "string",
@@ -2951,7 +2951,7 @@
                 },
                 "mail": {
                     "type": "string",
-                    "description": "The primary email address of the user.\n"
+                    "description": "The SMTP email address of the user.\n"
                 },
                 "mailNickname": {
                     "type": "string",
@@ -3707,7 +3707,7 @@
                     "items": {
                         "type": "string"
                     },
-                    "description": "A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups.\n\n!\u003e **Warning** Do not use the `members` property at the same time as the azuread.AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed.\n"
+                    "description": "A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups.\n\n\u003e **Caution** When using the `members` property of the azuread.AdministrativeUnit resource, to manage Administrative Unit membership for a group, you will need to use an `ignore_changes = [administrative_unit_ids]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff.\n\n!\u003e **Warning** Do not use the `members` property at the same time as the azuread.AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed.\n"
                 },
                 "objectId": {
                     "type": "string",
@@ -3741,7 +3741,7 @@
                     "items": {
                         "type": "string"
                     },
-                    "description": "A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups.\n\n!\u003e **Warning** Do not use the `members` property at the same time as the azuread.AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed.\n"
+                    "description": "A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups.\n\n\u003e **Caution** When using the `members` property of the azuread.AdministrativeUnit resource, to manage Administrative Unit membership for a group, you will need to use an `ignore_changes = [administrative_unit_ids]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff.\n\n!\u003e **Warning** Do not use the `members` property at the same time as the azuread.AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed.\n"
                 },
                 "preventDuplicateNames": {
                     "type": "boolean",
@@ -3771,7 +3771,7 @@
                         "items": {
                             "type": "string"
                         },
-                        "description": "A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups.\n\n!\u003e **Warning** Do not use the `members` property at the same time as the azuread.AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed.\n"
+                        "description": "A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups.\n\n\u003e **Caution** When using the `members` property of the azuread.AdministrativeUnit resource, to manage Administrative Unit membership for a group, you will need to use an `ignore_changes = [administrative_unit_ids]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff.\n\n!\u003e **Warning** Do not use the `members` property at the same time as the azuread.AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed.\n"
                     },
                     "objectId": {
                         "type": "string",
@@ -3794,7 +3794,7 @@
                 },
                 "memberObjectId": {
                     "type": "string",
-                    "description": "The object ID of the user or group you want to add as a member of the administrative unit. Changing this forces a new resource to be created.\n"
+                    "description": "The object ID of the user or group you want to add as a member of the administrative unit. Changing this forces a new resource to be created.\n\n\u003e **Caution** When using the azuread.AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignore_changes = [administrative_unit_ids]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff.\n"
                 }
             },
             "inputProperties": {
@@ -3805,7 +3805,7 @@
                 },
                 "memberObjectId": {
                     "type": "string",
-                    "description": "The object ID of the user or group you want to add as a member of the administrative unit. Changing this forces a new resource to be created.\n",
+                    "description": "The object ID of the user or group you want to add as a member of the administrative unit. Changing this forces a new resource to be created.\n\n\u003e **Caution** When using the azuread.AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignore_changes = [administrative_unit_ids]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff.\n",
                     "willReplaceOnChanges": true
                 }
             },
@@ -3819,7 +3819,7 @@
                     },
                     "memberObjectId": {
                         "type": "string",
-                        "description": "The object ID of the user or group you want to add as a member of the administrative unit. Changing this forces a new resource to be created.\n",
+                        "description": "The object ID of the user or group you want to add as a member of the administrative unit. Changing this forces a new resource to be created.\n\n\u003e **Caution** When using the azuread.AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignore_changes = [administrative_unit_ids]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff.\n",
                         "willReplaceOnChanges": true
                     }
                 },
@@ -6682,7 +6682,7 @@
                     "items": {
                         "type": "string"
                     },
-                    "description": "The object IDs of administrative units in which the group is a member. If specified, new groups will be created in the scope of the first administrative unit and added to the others. If empty, new groups will be created at the tenant level.\n\n!\u003e **Warning** Do not use the `administrative_unit_ids` property at the same time as the azuread.AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed.\n"
+                    "description": "The object IDs of administrative units in which the group is a member. If specified, new groups will be created in the scope of the first administrative unit and added to the others. If empty, new groups will be created at the tenant level.\n\n\u003e **Caution** When using the azuread.AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignore_changes = [administrative_unit_ids]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff.\n"
                 },
                 "assignableToRole": {
                     "type": "boolean",
@@ -6850,7 +6850,7 @@
                     "items": {
                         "type": "string"
                     },
-                    "description": "The object IDs of administrative units in which the group is a member. If specified, new groups will be created in the scope of the first administrative unit and added to the others. If empty, new groups will be created at the tenant level.\n\n!\u003e **Warning** Do not use the `administrative_unit_ids` property at the same time as the azuread.AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed.\n"
+                    "description": "The object IDs of administrative units in which the group is a member. If specified, new groups will be created in the scope of the first administrative unit and added to the others. If empty, new groups will be created at the tenant level.\n\n\u003e **Caution** When using the azuread.AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignore_changes = [administrative_unit_ids]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff.\n"
                 },
                 "assignableToRole": {
                     "type": "boolean",
@@ -6968,7 +6968,7 @@
                         "items": {
                             "type": "string"
                         },
-                        "description": "The object IDs of administrative units in which the group is a member. If specified, new groups will be created in the scope of the first administrative unit and added to the others. If empty, new groups will be created at the tenant level.\n\n!\u003e **Warning** Do not use the `administrative_unit_ids` property at the same time as the azuread.AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed.\n"
+                        "description": "The object IDs of administrative units in which the group is a member. If specified, new groups will be created in the scope of the first administrative unit and added to the others. If empty, new groups will be created at the tenant level.\n\n\u003e **Caution** When using the azuread.AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignore_changes = [administrative_unit_ids]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff.\n"
                     },
                     "assignableToRole": {
                         "type": "boolean",
@@ -11421,6 +11421,13 @@
                         },
                         "description": "The email aliases of the users.\n"
                     },
+                    "mails": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        },
+                        "description": "The SMTP email addresses of the users.\n"
+                    },
                     "objectIds": {
                         "type": "array",
                         "items": {
@@ -11437,7 +11444,7 @@
                         "items": {
                             "type": "string"
                         },
-                        "description": "The user principal names (UPNs) of the users.\n\n\u003e Either `return_all`, or one of `user_principal_names`, `object_ids`, `mail_nicknames` or `employee_ids` must be specified. These _may_ be specified as an empty list, in which case no results will be returned.\n"
+                        "description": "The user principal names (UPNs) of the users.\n\n\u003e Either `return_all`, or one of `user_principal_names`, `object_ids`, `mail_nicknames`, `mails`, or `employee_ids` must be specified. These _may_ be specified as an empty list, in which case no results will be returned.\n"
                     }
                 },
                 "type": "object"
@@ -11466,6 +11473,13 @@
                         },
                         "type": "array"
                     },
+                    "mails": {
+                        "description": "The SMTP email addresses of the users.\n",
+                        "items": {
+                            "type": "string"
+                        },
+                        "type": "array"
+                    },
                     "objectIds": {
                         "description": "The object IDs of the users.\n",
                         "items": {
@@ -11494,6 +11508,7 @@
                 "required": [
                     "employeeIds",
                     "mailNicknames",
+                    "mails",
                     "objectIds",
                     "userPrincipalNames",
                     "users",

diff --git a/provider/go.mod b/provider/go.mod
@@ -130,7 +130,7 @@ require (
 	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 // indirect
 	github.com/hashicorp/terraform-plugin-testing v1.5.1 // indirect
-	github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240516193447-8a724fef33b3 // indirect
+	github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240606225257-7baae5fa5958 // indirect
 	github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/vault/api v1.12.0 // indirect
@@ -146,7 +146,7 @@ require (
 	github.com/klauspost/compress v1.15.11 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/manicminer/hamilton v0.68.0 // indirect
+	github.com/manicminer/hamilton v0.70.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect

diff --git a/provider/go.sum b/provider/go.sum
@@ -1670,8 +1670,8 @@ github.com/hashicorp/terraform-plugin-sdk v1.7.0/go.mod h1:OjgQmey5VxnPej/buEhe+
 github.com/hashicorp/terraform-plugin-test v1.2.0/go.mod h1:QIJHYz8j+xJtdtLrFTlzQVC0ocr3rf/OjIpgZLK56Hs=
 github.com/hashicorp/terraform-plugin-testing v1.5.1 h1:T4aQh9JAhmWo4+t1A7x+rnxAJHCDIYW9kXyo4sVO92c=
 github.com/hashicorp/terraform-plugin-testing v1.5.1/go.mod h1:dg8clO6K59rZ8w9EshBmDp1CxTIPu3yA4iaDpX1h5u0=
-github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240516193447-8a724fef33b3 h1:B2xueoOGmRPPcQxSASWt/LmWMGXF3PTaS4YIpLogMkA=
-github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240516193447-8a724fef33b3/go.mod h1:vtT/YIyyisf1WPWi1sMT5Wzu6wYFXk2VIdAbsY4Sj/Q=
+github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240606225257-7baae5fa5958 h1:sn7k6jHhXT95dXP+OFoTgYeet8s73JtMySf6qQR+jjE=
+github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240606225257-7baae5fa5958/go.mod h1:SnPG4t/tKlf4ci/QBq46JSxNyMOz7bTln34+v8Ur03w=
 github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI=
 github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM=
 github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg=
@@ -1756,8 +1756,8 @@ github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuz
 github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
 github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk=
-github.com/manicminer/hamilton v0.68.0 h1:2ZKQRTegktxJIoLBWxI43HczpTiwXl6brvwTXy75gPk=
-github.com/manicminer/hamilton v0.68.0/go.mod h1:u80g9rPtJpCG7EC0iayttt8UfeAp6jknClixgZGE950=
+github.com/manicminer/hamilton v0.70.0 h1:XMgVcwVtUGq2aBXqVAynaUDZdPXCXC8/rd7D5Zsg3UM=
+github.com/manicminer/hamilton v0.70.0/go.mod h1:u80g9rPtJpCG7EC0iayttt8UfeAp6jknClixgZGE950=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=

diff --git a/provider/shim/go.mod b/provider/shim/go.mod
@@ -4,7 +4,7 @@ go 1.21.3
 
 require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0
-	github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240516193447-8a724fef33b3
+	github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240606225257-7baae5fa5958
 )
 
 require (
@@ -38,7 +38,7 @@ require (
 	github.com/hashicorp/terraform-registry-address v0.2.2 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/manicminer/hamilton v0.68.0 // indirect
+	github.com/manicminer/hamilton v0.70.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect

diff --git a/provider/shim/go.sum b/provider/shim/go.sum
@@ -90,8 +90,8 @@ github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9T
 github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow=
 github.com/hashicorp/terraform-plugin-testing v1.5.1 h1:T4aQh9JAhmWo4+t1A7x+rnxAJHCDIYW9kXyo4sVO92c=
 github.com/hashicorp/terraform-plugin-testing v1.5.1/go.mod h1:dg8clO6K59rZ8w9EshBmDp1CxTIPu3yA4iaDpX1h5u0=
-github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240516193447-8a724fef33b3 h1:B2xueoOGmRPPcQxSASWt/LmWMGXF3PTaS4YIpLogMkA=
-github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240516193447-8a724fef33b3/go.mod h1:vtT/YIyyisf1WPWi1sMT5Wzu6wYFXk2VIdAbsY4Sj/Q=
+github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240606225257-7baae5fa5958 h1:sn7k6jHhXT95dXP+OFoTgYeet8s73JtMySf6qQR+jjE=
+github.com/hashicorp/terraform-provider-azuread v1.6.1-0.20240606225257-7baae5fa5958/go.mod h1:SnPG4t/tKlf4ci/QBq46JSxNyMOz7bTln34+v8Ur03w=
 github.com/hashicorp/terraform-registry-address v0.2.2 h1:lPQBg403El8PPicg/qONZJDC6YlgCVbWDtNmmZKtBno=
 github.com/hashicorp/terraform-registry-address v0.2.2/go.mod h1:LtwNbCihUoUZ3RYriyS2wF/lGPB6gF9ICLRtuDk7hSo=
 github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=
@@ -111,8 +111,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/manicminer/hamilton v0.68.0 h1:2ZKQRTegktxJIoLBWxI43HczpTiwXl6brvwTXy75gPk=
-github.com/manicminer/hamilton v0.68.0/go.mod h1:u80g9rPtJpCG7EC0iayttt8UfeAp6jknClixgZGE950=
+github.com/manicminer/hamilton v0.70.0 h1:XMgVcwVtUGq2aBXqVAynaUDZdPXCXC8/rd7D5Zsg3UM=
+github.com/manicminer/hamilton v0.70.0/go.mod h1:u80g9rPtJpCG7EC0iayttt8UfeAp6jknClixgZGE950=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=