diff --git a/provider/cmd/pulumi-resource-azuread/bridge-metadata.json b/provider/cmd/pulumi-resource-azuread/bridge-metadata.json index 2758185d3..c2137e53b 100644 --- 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 index 1f1a97707..935ab48e4 100644 --- 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 index ddef8f122..cf0febc6e 100644 --- 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 index cd85ee34e..6ddd9b0f3 100644 --- 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 index e711b497f..1e0072478 100644 --- 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 index 9ceac9444..d330876a9 100644 --- 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= diff --git a/sdk/dotnet/AdministrativeUnit.cs b/sdk/dotnet/AdministrativeUnit.cs index ce3eb200f..bae8689f8 100644 --- a/sdk/dotnet/AdministrativeUnit.cs +++ b/sdk/dotnet/AdministrativeUnit.cs @@ -72,6 +72,8 @@ public partial class AdministrativeUnit : global::Pulumi.CustomResource /// /// A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. /// + /// > **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. + /// /// !> **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. /// [Output("members")] @@ -159,6 +161,8 @@ public sealed class AdministrativeUnitArgs : global::Pulumi.ResourceArgs /// /// A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. /// + /// > **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. + /// /// !> **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. /// public InputList Members @@ -205,6 +209,8 @@ public sealed class AdministrativeUnitState : global::Pulumi.ResourceArgs /// /// A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. /// + /// > **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. + /// /// !> **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. /// public InputList Members diff --git a/sdk/dotnet/AdministrativeUnitMember.cs b/sdk/dotnet/AdministrativeUnitMember.cs index b6dd5175a..c80e0f68e 100644 --- a/sdk/dotnet/AdministrativeUnitMember.cs +++ b/sdk/dotnet/AdministrativeUnitMember.cs @@ -72,6 +72,8 @@ public partial class AdministrativeUnitMember : global::Pulumi.CustomResource /// /// 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. + /// + /// > **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. /// [Output("memberObjectId")] public Output MemberObjectId { get; private set; } = null!; @@ -130,6 +132,8 @@ public sealed class AdministrativeUnitMemberArgs : global::Pulumi.ResourceArgs /// /// 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. + /// + /// > **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. /// [Input("memberObjectId")] public Input? MemberObjectId { get; set; } @@ -150,6 +154,8 @@ public sealed class AdministrativeUnitMemberState : global::Pulumi.ResourceArgs /// /// 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. + /// + /// > **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. /// [Input("memberObjectId")] public Input? MemberObjectId { get; set; } diff --git a/sdk/dotnet/GetUsers.cs b/sdk/dotnet/GetUsers.cs index be38e3058..ab84853ea 100644 --- a/sdk/dotnet/GetUsers.cs +++ b/sdk/dotnet/GetUsers.cs @@ -117,6 +117,18 @@ public List MailNicknames set => _mailNicknames = value; } + [Input("mails")] + private List? _mails; + + /// + /// The SMTP email addresses of the users. + /// + public List Mails + { + get => _mails ?? (_mails = new List()); + set => _mails = value; + } + [Input("objectIds")] private List? _objectIds; @@ -141,7 +153,7 @@ public List ObjectIds /// /// The user principal names (UPNs) of the users. /// - /// > 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. + /// > 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. /// public List UserPrincipalNames { @@ -187,6 +199,18 @@ public InputList MailNicknames set => _mailNicknames = value; } + [Input("mails")] + private InputList? _mails; + + /// + /// The SMTP email addresses of the users. + /// + public InputList Mails + { + get => _mails ?? (_mails = new InputList()); + set => _mails = value; + } + [Input("objectIds")] private InputList? _objectIds; @@ -211,7 +235,7 @@ public InputList ObjectIds /// /// The user principal names (UPNs) of the users. /// - /// > 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. + /// > 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. /// public InputList UserPrincipalNames { @@ -243,6 +267,10 @@ public sealed class GetUsersResult /// public readonly ImmutableArray MailNicknames; /// + /// The SMTP email addresses of the users. + /// + public readonly ImmutableArray Mails; + /// /// The object IDs of the users. /// public readonly ImmutableArray ObjectIds; @@ -266,6 +294,8 @@ private GetUsersResult( ImmutableArray mailNicknames, + ImmutableArray mails, + ImmutableArray objectIds, bool? returnAll, @@ -278,6 +308,7 @@ private GetUsersResult( Id = id; IgnoreMissing = ignoreMissing; MailNicknames = mailNicknames; + Mails = mails; ObjectIds = objectIds; ReturnAll = returnAll; UserPrincipalNames = userPrincipalNames; diff --git a/sdk/dotnet/Group.cs b/sdk/dotnet/Group.cs index a54223c7b..f5da1b114 100644 --- a/sdk/dotnet/Group.cs +++ b/sdk/dotnet/Group.cs @@ -113,7 +113,7 @@ public partial class Group : global::Pulumi.CustomResource /// /// 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. /// - /// !> **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. + /// > **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. /// [Output("administrativeUnitIds")] public Output> AdministrativeUnitIds { get; private set; } = null!; @@ -364,7 +364,7 @@ public sealed class GroupArgs : global::Pulumi.ResourceArgs /// /// 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. /// - /// !> **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. + /// > **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. /// public InputList AdministrativeUnitIds { @@ -556,7 +556,7 @@ public sealed class GroupState : global::Pulumi.ResourceArgs /// /// 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. /// - /// !> **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. + /// > **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. /// public InputList AdministrativeUnitIds { diff --git a/sdk/dotnet/Outputs/GetUsersUserResult.cs b/sdk/dotnet/Outputs/GetUsersUserResult.cs index 35e52c8de..e61ec56af 100644 --- a/sdk/dotnet/Outputs/GetUsersUserResult.cs +++ b/sdk/dotnet/Outputs/GetUsersUserResult.cs @@ -14,7 +14,7 @@ namespace Pulumi.AzureAD.Outputs public sealed class GetUsersUserResult { /// - /// Whether or not the account is enabled. + /// Whether the account is enabled. /// public readonly bool AccountEnabled; /// @@ -26,7 +26,7 @@ public sealed class GetUsersUserResult /// public readonly string EmployeeId; /// - /// The primary email address of the user. + /// The SMTP email address of the user. /// public readonly string Mail; /// diff --git a/sdk/go/azuread/administrativeUnit.go b/sdk/go/azuread/administrativeUnit.go index 5e118b147..92b7aaee9 100644 --- a/sdk/go/azuread/administrativeUnit.go +++ b/sdk/go/azuread/administrativeUnit.go @@ -68,6 +68,8 @@ type AdministrativeUnit struct { HiddenMembershipEnabled pulumi.BoolPtrOutput `pulumi:"hiddenMembershipEnabled"` // A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. // + // > **Caution** When using the `members` property of the AdministrativeUnit resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. + // // !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. Members pulumi.StringArrayOutput `pulumi:"members"` // The object ID of the administrative unit. @@ -117,6 +119,8 @@ type administrativeUnitState struct { HiddenMembershipEnabled *bool `pulumi:"hiddenMembershipEnabled"` // A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. // + // > **Caution** When using the `members` property of the AdministrativeUnit resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. + // // !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. Members []string `pulumi:"members"` // The object ID of the administrative unit. @@ -134,6 +138,8 @@ type AdministrativeUnitState struct { HiddenMembershipEnabled pulumi.BoolPtrInput // A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. // + // > **Caution** When using the `members` property of the AdministrativeUnit resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. + // // !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. Members pulumi.StringArrayInput // The object ID of the administrative unit. @@ -155,6 +161,8 @@ type administrativeUnitArgs struct { HiddenMembershipEnabled *bool `pulumi:"hiddenMembershipEnabled"` // A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. // + // > **Caution** When using the `members` property of the AdministrativeUnit resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. + // // !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. Members []string `pulumi:"members"` // If `true`, will return an error if an existing administrative unit is found with the same name @@ -171,6 +179,8 @@ type AdministrativeUnitArgs struct { HiddenMembershipEnabled pulumi.BoolPtrInput // A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. // + // > **Caution** When using the `members` property of the AdministrativeUnit resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. + // // !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. Members pulumi.StringArrayInput // If `true`, will return an error if an existing administrative unit is found with the same name @@ -281,6 +291,8 @@ func (o AdministrativeUnitOutput) HiddenMembershipEnabled() pulumi.BoolPtrOutput // A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. // +// > **Caution** When using the `members` property of the AdministrativeUnit resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. +// // !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. func (o AdministrativeUnitOutput) Members() pulumi.StringArrayOutput { return o.ApplyT(func(v *AdministrativeUnit) pulumi.StringArrayOutput { return v.Members }).(pulumi.StringArrayOutput) diff --git a/sdk/go/azuread/administrativeUnitMember.go b/sdk/go/azuread/administrativeUnitMember.go index b78c9cd7f..a860774eb 100644 --- a/sdk/go/azuread/administrativeUnitMember.go +++ b/sdk/go/azuread/administrativeUnitMember.go @@ -77,6 +77,8 @@ type AdministrativeUnitMember struct { // The object ID of the administrative unit you want to add the member to. Changing this forces a new resource to be created. AdministrativeUnitObjectId pulumi.StringPtrOutput `pulumi:"administrativeUnitObjectId"` // 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. + // + // > **Caution** When using the AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. MemberObjectId pulumi.StringPtrOutput `pulumi:"memberObjectId"` } @@ -113,6 +115,8 @@ type administrativeUnitMemberState struct { // The object ID of the administrative unit you want to add the member to. Changing this forces a new resource to be created. AdministrativeUnitObjectId *string `pulumi:"administrativeUnitObjectId"` // 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. + // + // > **Caution** When using the AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. MemberObjectId *string `pulumi:"memberObjectId"` } @@ -120,6 +124,8 @@ type AdministrativeUnitMemberState struct { // The object ID of the administrative unit you want to add the member to. Changing this forces a new resource to be created. AdministrativeUnitObjectId pulumi.StringPtrInput // 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. + // + // > **Caution** When using the AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. MemberObjectId pulumi.StringPtrInput } @@ -131,6 +137,8 @@ type administrativeUnitMemberArgs struct { // The object ID of the administrative unit you want to add the member to. Changing this forces a new resource to be created. AdministrativeUnitObjectId *string `pulumi:"administrativeUnitObjectId"` // 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. + // + // > **Caution** When using the AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. MemberObjectId *string `pulumi:"memberObjectId"` } @@ -139,6 +147,8 @@ type AdministrativeUnitMemberArgs struct { // The object ID of the administrative unit you want to add the member to. Changing this forces a new resource to be created. AdministrativeUnitObjectId pulumi.StringPtrInput // 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. + // + // > **Caution** When using the AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. MemberObjectId pulumi.StringPtrInput } @@ -235,6 +245,8 @@ func (o AdministrativeUnitMemberOutput) AdministrativeUnitObjectId() pulumi.Stri } // 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. +// +// > **Caution** When using the AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. func (o AdministrativeUnitMemberOutput) MemberObjectId() pulumi.StringPtrOutput { return o.ApplyT(func(v *AdministrativeUnitMember) pulumi.StringPtrOutput { return v.MemberObjectId }).(pulumi.StringPtrOutput) } diff --git a/sdk/go/azuread/getUsers.go b/sdk/go/azuread/getUsers.go index b9dd438d8..e46ff52ca 100644 --- a/sdk/go/azuread/getUsers.go +++ b/sdk/go/azuread/getUsers.go @@ -67,13 +67,15 @@ type GetUsersArgs struct { IgnoreMissing *bool `pulumi:"ignoreMissing"` // The email aliases of the users. MailNicknames []string `pulumi:"mailNicknames"` + // The SMTP email addresses of the users. + Mails []string `pulumi:"mails"` // The object IDs of the users. ObjectIds []string `pulumi:"objectIds"` // When `true`, the data source will return all users. Cannot be used with `ignoreMissing`. Defaults to `false`. ReturnAll *bool `pulumi:"returnAll"` // The user principal names (UPNs) of the users. // - // > Either `returnAll`, or one of `userPrincipalNames`, `objectIds`, `mailNicknames` or `employeeIds` must be specified. These _may_ be specified as an empty list, in which case no results will be returned. + // > Either `returnAll`, or one of `userPrincipalNames`, `objectIds`, `mailNicknames`, `mails`, or `employeeIds` must be specified. These _may_ be specified as an empty list, in which case no results will be returned. UserPrincipalNames []string `pulumi:"userPrincipalNames"` } @@ -86,6 +88,8 @@ type GetUsersResult struct { IgnoreMissing *bool `pulumi:"ignoreMissing"` // The email aliases of the users. MailNicknames []string `pulumi:"mailNicknames"` + // The SMTP email addresses of the users. + Mails []string `pulumi:"mails"` // The object IDs of the users. ObjectIds []string `pulumi:"objectIds"` ReturnAll *bool `pulumi:"returnAll"` @@ -116,13 +120,15 @@ type GetUsersOutputArgs struct { IgnoreMissing pulumi.BoolPtrInput `pulumi:"ignoreMissing"` // The email aliases of the users. MailNicknames pulumi.StringArrayInput `pulumi:"mailNicknames"` + // The SMTP email addresses of the users. + Mails pulumi.StringArrayInput `pulumi:"mails"` // The object IDs of the users. ObjectIds pulumi.StringArrayInput `pulumi:"objectIds"` // When `true`, the data source will return all users. Cannot be used with `ignoreMissing`. Defaults to `false`. ReturnAll pulumi.BoolPtrInput `pulumi:"returnAll"` // The user principal names (UPNs) of the users. // - // > Either `returnAll`, or one of `userPrincipalNames`, `objectIds`, `mailNicknames` or `employeeIds` must be specified. These _may_ be specified as an empty list, in which case no results will be returned. + // > Either `returnAll`, or one of `userPrincipalNames`, `objectIds`, `mailNicknames`, `mails`, or `employeeIds` must be specified. These _may_ be specified as an empty list, in which case no results will be returned. UserPrincipalNames pulumi.StringArrayInput `pulumi:"userPrincipalNames"` } @@ -164,6 +170,11 @@ func (o GetUsersResultOutput) MailNicknames() pulumi.StringArrayOutput { return o.ApplyT(func(v GetUsersResult) []string { return v.MailNicknames }).(pulumi.StringArrayOutput) } +// The SMTP email addresses of the users. +func (o GetUsersResultOutput) Mails() pulumi.StringArrayOutput { + return o.ApplyT(func(v GetUsersResult) []string { return v.Mails }).(pulumi.StringArrayOutput) +} + // The object IDs of the users. func (o GetUsersResultOutput) ObjectIds() pulumi.StringArrayOutput { return o.ApplyT(func(v GetUsersResult) []string { return v.ObjectIds }).(pulumi.StringArrayOutput) diff --git a/sdk/go/azuread/group.go b/sdk/go/azuread/group.go index 621aad586..a7ab503f0 100644 --- a/sdk/go/azuread/group.go +++ b/sdk/go/azuread/group.go @@ -131,7 +131,7 @@ type Group struct { // 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. // - // !> **Warning** Do not use the `administrativeUnitIds` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + // > **Caution** When using the AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. AdministrativeUnitIds pulumi.StringArrayOutput `pulumi:"administrativeUnitIds"` // Indicates whether this group can be assigned to an Azure Active Directory role. Defaults to `false`. Can only be set to `true` for security-enabled groups. Changing this forces a new resource to be created. AssignableToRole pulumi.BoolPtrOutput `pulumi:"assignableToRole"` @@ -244,7 +244,7 @@ func GetGroup(ctx *pulumi.Context, type groupState struct { // 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. // - // !> **Warning** Do not use the `administrativeUnitIds` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + // > **Caution** When using the AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. AdministrativeUnitIds []string `pulumi:"administrativeUnitIds"` // Indicates whether this group can be assigned to an Azure Active Directory role. Defaults to `false`. Can only be set to `true` for security-enabled groups. Changing this forces a new resource to be created. AssignableToRole *bool `pulumi:"assignableToRole"` @@ -325,7 +325,7 @@ type groupState struct { type GroupState struct { // 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. // - // !> **Warning** Do not use the `administrativeUnitIds` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + // > **Caution** When using the AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. AdministrativeUnitIds pulumi.StringArrayInput // Indicates whether this group can be assigned to an Azure Active Directory role. Defaults to `false`. Can only be set to `true` for security-enabled groups. Changing this forces a new resource to be created. AssignableToRole pulumi.BoolPtrInput @@ -410,7 +410,7 @@ func (GroupState) ElementType() reflect.Type { type groupArgs struct { // 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. // - // !> **Warning** Do not use the `administrativeUnitIds` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + // > **Caution** When using the AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. AdministrativeUnitIds []string `pulumi:"administrativeUnitIds"` // Indicates whether this group can be assigned to an Azure Active Directory role. Defaults to `false`. Can only be set to `true` for security-enabled groups. Changing this forces a new resource to be created. AssignableToRole *bool `pulumi:"assignableToRole"` @@ -474,7 +474,7 @@ type groupArgs struct { type GroupArgs struct { // 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. // - // !> **Warning** Do not use the `administrativeUnitIds` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + // > **Caution** When using the AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. AdministrativeUnitIds pulumi.StringArrayInput // Indicates whether this group can be assigned to an Azure Active Directory role. Defaults to `false`. Can only be set to `true` for security-enabled groups. Changing this forces a new resource to be created. AssignableToRole pulumi.BoolPtrInput @@ -623,7 +623,7 @@ func (o GroupOutput) ToGroupOutputWithContext(ctx context.Context) GroupOutput { // 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. // -// !> **Warning** Do not use the `administrativeUnitIds` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. +// > **Caution** When using the AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `Group` resource, in order to avoid a persistent diff. func (o GroupOutput) AdministrativeUnitIds() pulumi.StringArrayOutput { return o.ApplyT(func(v *Group) pulumi.StringArrayOutput { return v.AdministrativeUnitIds }).(pulumi.StringArrayOutput) } diff --git a/sdk/go/azuread/pulumiTypes.go b/sdk/go/azuread/pulumiTypes.go index a7743be9b..63b4f8bbb 100644 --- a/sdk/go/azuread/pulumiTypes.go +++ b/sdk/go/azuread/pulumiTypes.go @@ -14728,13 +14728,13 @@ func (o GetServicePrincipalsServicePrincipalArrayOutput) Index(i pulumi.IntInput } type GetUsersUser struct { - // Whether or not the account is enabled. + // Whether the account is enabled. AccountEnabled bool `pulumi:"accountEnabled"` // The display name of the user. DisplayName string `pulumi:"displayName"` // The employee identifier assigned to the user by the organisation. EmployeeId string `pulumi:"employeeId"` - // The primary email address of the user. + // The SMTP email address of the user. Mail string `pulumi:"mail"` // The email alias of the user. MailNickname string `pulumi:"mailNickname"` @@ -14764,13 +14764,13 @@ type GetUsersUserInput interface { } type GetUsersUserArgs struct { - // Whether or not the account is enabled. + // Whether the account is enabled. AccountEnabled pulumi.BoolInput `pulumi:"accountEnabled"` // The display name of the user. DisplayName pulumi.StringInput `pulumi:"displayName"` // The employee identifier assigned to the user by the organisation. EmployeeId pulumi.StringInput `pulumi:"employeeId"` - // The primary email address of the user. + // The SMTP email address of the user. Mail pulumi.StringInput `pulumi:"mail"` // The email alias of the user. MailNickname pulumi.StringInput `pulumi:"mailNickname"` @@ -14839,7 +14839,7 @@ func (o GetUsersUserOutput) ToGetUsersUserOutputWithContext(ctx context.Context) return o } -// Whether or not the account is enabled. +// Whether the account is enabled. func (o GetUsersUserOutput) AccountEnabled() pulumi.BoolOutput { return o.ApplyT(func(v GetUsersUser) bool { return v.AccountEnabled }).(pulumi.BoolOutput) } @@ -14854,7 +14854,7 @@ func (o GetUsersUserOutput) EmployeeId() pulumi.StringOutput { return o.ApplyT(func(v GetUsersUser) string { return v.EmployeeId }).(pulumi.StringOutput) } -// The primary email address of the user. +// The SMTP email address of the user. func (o GetUsersUserOutput) Mail() pulumi.StringOutput { return o.ApplyT(func(v GetUsersUser) string { return v.Mail }).(pulumi.StringOutput) } diff --git a/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnit.java b/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnit.java index 50446cd22..b7f32018f 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnit.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnit.java @@ -120,6 +120,8 @@ public Output> hiddenMembershipEnabled() { /** * A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * */ @@ -129,6 +131,8 @@ public Output> hiddenMembershipEnabled() { /** * @return A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * */ diff --git a/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitArgs.java b/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitArgs.java index ca781ddf5..9282ffa8b 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitArgs.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitArgs.java @@ -66,6 +66,8 @@ public Optional> hiddenMembershipEnabled() { /** * A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * */ @@ -75,6 +77,8 @@ public Optional> hiddenMembershipEnabled() { /** * @return A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * */ @@ -191,6 +195,8 @@ public Builder hiddenMembershipEnabled(Boolean hiddenMembershipEnabled) { /** * @param members A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * * @return builder @@ -204,6 +210,8 @@ public Builder members(@Nullable Output> members) { /** * @param members A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * * @return builder @@ -216,6 +224,8 @@ public Builder members(List members) { /** * @param members A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * * @return builder diff --git a/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitMember.java b/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitMember.java index 3a25f5d9b..572e5b3d2 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitMember.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitMember.java @@ -105,6 +105,8 @@ public Output> administrativeUnitObjectId() { /** * 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. * + * > **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. + * */ @Export(name="memberObjectId", refs={String.class}, tree="[0]") private Output memberObjectId; @@ -112,6 +114,8 @@ public Output> administrativeUnitObjectId() { /** * @return 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. * + * > **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. + * */ public Output> memberObjectId() { return Codegen.optional(this.memberObjectId); diff --git a/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitMemberArgs.java b/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitMemberArgs.java index 6b900b1d5..5235213f7 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitMemberArgs.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/AdministrativeUnitMemberArgs.java @@ -33,6 +33,8 @@ public Optional> administrativeUnitObjectId() { /** * 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. * + * > **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. + * */ @Import(name="memberObjectId") private @Nullable Output memberObjectId; @@ -40,6 +42,8 @@ public Optional> administrativeUnitObjectId() { /** * @return 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. * + * > **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. + * */ public Optional> memberObjectId() { return Optional.ofNullable(this.memberObjectId); @@ -94,6 +98,8 @@ public Builder administrativeUnitObjectId(String administrativeUnitObjectId) { /** * @param memberObjectId 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. * + * > **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. + * * @return builder * */ @@ -105,6 +111,8 @@ public Builder memberObjectId(@Nullable Output memberObjectId) { /** * @param memberObjectId 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. * + * > **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. + * * @return builder * */ diff --git a/sdk/java/src/main/java/com/pulumi/azuread/Group.java b/sdk/java/src/main/java/com/pulumi/azuread/Group.java index 58b822dbc..1f197e1bb 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/Group.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/Group.java @@ -199,7 +199,7 @@ public class Group extends com.pulumi.resources.CustomResource { /** * 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. * - * !> **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. + * > **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. * */ @Export(name="administrativeUnitIds", refs={List.class,String.class}, tree="[0,1]") @@ -208,7 +208,7 @@ public class Group extends com.pulumi.resources.CustomResource { /** * @return 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. * - * !> **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. + * > **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. * */ public Output>> administrativeUnitIds() { diff --git a/sdk/java/src/main/java/com/pulumi/azuread/GroupArgs.java b/sdk/java/src/main/java/com/pulumi/azuread/GroupArgs.java index d0da1a23c..11f4ce1f9 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/GroupArgs.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/GroupArgs.java @@ -22,7 +22,7 @@ public final class GroupArgs extends com.pulumi.resources.ResourceArgs { /** * 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. * - * !> **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. + * > **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. * */ @Import(name="administrativeUnitIds") @@ -31,7 +31,7 @@ public final class GroupArgs extends com.pulumi.resources.ResourceArgs { /** * @return 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. * - * !> **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. + * > **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. * */ public Optional>> administrativeUnitIds() { @@ -429,7 +429,7 @@ public Builder(GroupArgs defaults) { /** * @param administrativeUnitIds 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. * - * !> **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. + * > **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. * * @return builder * @@ -442,7 +442,7 @@ public Builder administrativeUnitIds(@Nullable Output> administrati /** * @param administrativeUnitIds 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. * - * !> **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. + * > **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. * * @return builder * @@ -454,7 +454,7 @@ public Builder administrativeUnitIds(List administrativeUnitIds) { /** * @param administrativeUnitIds 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. * - * !> **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. + * > **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. * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/azuread/inputs/AdministrativeUnitMemberState.java b/sdk/java/src/main/java/com/pulumi/azuread/inputs/AdministrativeUnitMemberState.java index e442f63f3..755315d87 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/inputs/AdministrativeUnitMemberState.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/inputs/AdministrativeUnitMemberState.java @@ -33,6 +33,8 @@ public Optional> administrativeUnitObjectId() { /** * 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. * + * > **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. + * */ @Import(name="memberObjectId") private @Nullable Output memberObjectId; @@ -40,6 +42,8 @@ public Optional> administrativeUnitObjectId() { /** * @return 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. * + * > **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. + * */ public Optional> memberObjectId() { return Optional.ofNullable(this.memberObjectId); @@ -94,6 +98,8 @@ public Builder administrativeUnitObjectId(String administrativeUnitObjectId) { /** * @param memberObjectId 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. * + * > **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. + * * @return builder * */ @@ -105,6 +111,8 @@ public Builder memberObjectId(@Nullable Output memberObjectId) { /** * @param memberObjectId 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. * + * > **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. + * * @return builder * */ diff --git a/sdk/java/src/main/java/com/pulumi/azuread/inputs/AdministrativeUnitState.java b/sdk/java/src/main/java/com/pulumi/azuread/inputs/AdministrativeUnitState.java index 54f373dd5..2cc4772f6 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/inputs/AdministrativeUnitState.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/inputs/AdministrativeUnitState.java @@ -65,6 +65,8 @@ public Optional> hiddenMembershipEnabled() { /** * A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * */ @@ -74,6 +76,8 @@ public Optional> hiddenMembershipEnabled() { /** * @return A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * */ @@ -206,6 +210,8 @@ public Builder hiddenMembershipEnabled(Boolean hiddenMembershipEnabled) { /** * @param members A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * * @return builder @@ -219,6 +225,8 @@ public Builder members(@Nullable Output> members) { /** * @param members A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * * @return builder @@ -231,6 +239,8 @@ public Builder members(List members) { /** * @param members A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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. + * * !> **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. * * @return builder diff --git a/sdk/java/src/main/java/com/pulumi/azuread/inputs/GetUsersArgs.java b/sdk/java/src/main/java/com/pulumi/azuread/inputs/GetUsersArgs.java index 252a3b6d8..c44e5751f 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/inputs/GetUsersArgs.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/inputs/GetUsersArgs.java @@ -62,6 +62,21 @@ public Optional>> mailNicknames() { return Optional.ofNullable(this.mailNicknames); } + /** + * The SMTP email addresses of the users. + * + */ + @Import(name="mails") + private @Nullable Output> mails; + + /** + * @return The SMTP email addresses of the users. + * + */ + public Optional>> mails() { + return Optional.ofNullable(this.mails); + } + /** * The object IDs of the users. * @@ -95,7 +110,7 @@ public Optional> returnAll() { /** * The user principal names (UPNs) of the users. * - * > 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. + * > 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. * */ @Import(name="userPrincipalNames") @@ -104,7 +119,7 @@ public Optional> returnAll() { /** * @return The user principal names (UPNs) of the users. * - * > 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. + * > 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. * */ public Optional>> userPrincipalNames() { @@ -117,6 +132,7 @@ private GetUsersArgs(GetUsersArgs $) { this.employeeIds = $.employeeIds; this.ignoreMissing = $.ignoreMissing; this.mailNicknames = $.mailNicknames; + this.mails = $.mails; this.objectIds = $.objectIds; this.returnAll = $.returnAll; this.userPrincipalNames = $.userPrincipalNames; @@ -223,6 +239,37 @@ public Builder mailNicknames(String... mailNicknames) { return mailNicknames(List.of(mailNicknames)); } + /** + * @param mails The SMTP email addresses of the users. + * + * @return builder + * + */ + public Builder mails(@Nullable Output> mails) { + $.mails = mails; + return this; + } + + /** + * @param mails The SMTP email addresses of the users. + * + * @return builder + * + */ + public Builder mails(List mails) { + return mails(Output.of(mails)); + } + + /** + * @param mails The SMTP email addresses of the users. + * + * @return builder + * + */ + public Builder mails(String... mails) { + return mails(List.of(mails)); + } + /** * @param objectIds The object IDs of the users. * @@ -278,7 +325,7 @@ public Builder returnAll(Boolean returnAll) { /** * @param userPrincipalNames The user principal names (UPNs) of the users. * - * > 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. + * > 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. * * @return builder * @@ -291,7 +338,7 @@ public Builder userPrincipalNames(@Nullable Output> userPrincipalNa /** * @param userPrincipalNames The user principal names (UPNs) of the users. * - * > 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. + * > 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. * * @return builder * @@ -303,7 +350,7 @@ public Builder userPrincipalNames(List userPrincipalNames) { /** * @param userPrincipalNames The user principal names (UPNs) of the users. * - * > 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. + * > 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. * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/azuread/inputs/GetUsersPlainArgs.java b/sdk/java/src/main/java/com/pulumi/azuread/inputs/GetUsersPlainArgs.java index a9de88e08..f49aa0d90 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/inputs/GetUsersPlainArgs.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/inputs/GetUsersPlainArgs.java @@ -61,6 +61,21 @@ public Optional> mailNicknames() { return Optional.ofNullable(this.mailNicknames); } + /** + * The SMTP email addresses of the users. + * + */ + @Import(name="mails") + private @Nullable List mails; + + /** + * @return The SMTP email addresses of the users. + * + */ + public Optional> mails() { + return Optional.ofNullable(this.mails); + } + /** * The object IDs of the users. * @@ -94,7 +109,7 @@ public Optional returnAll() { /** * The user principal names (UPNs) of the users. * - * > 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. + * > 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. * */ @Import(name="userPrincipalNames") @@ -103,7 +118,7 @@ public Optional returnAll() { /** * @return The user principal names (UPNs) of the users. * - * > 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. + * > 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. * */ public Optional> userPrincipalNames() { @@ -116,6 +131,7 @@ private GetUsersPlainArgs(GetUsersPlainArgs $) { this.employeeIds = $.employeeIds; this.ignoreMissing = $.ignoreMissing; this.mailNicknames = $.mailNicknames; + this.mails = $.mails; this.objectIds = $.objectIds; this.returnAll = $.returnAll; this.userPrincipalNames = $.userPrincipalNames; @@ -192,6 +208,27 @@ public Builder mailNicknames(String... mailNicknames) { return mailNicknames(List.of(mailNicknames)); } + /** + * @param mails The SMTP email addresses of the users. + * + * @return builder + * + */ + public Builder mails(@Nullable List mails) { + $.mails = mails; + return this; + } + + /** + * @param mails The SMTP email addresses of the users. + * + * @return builder + * + */ + public Builder mails(String... mails) { + return mails(List.of(mails)); + } + /** * @param objectIds The object IDs of the users. * @@ -227,7 +264,7 @@ public Builder returnAll(@Nullable Boolean returnAll) { /** * @param userPrincipalNames The user principal names (UPNs) of the users. * - * > 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. + * > 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. * * @return builder * @@ -240,7 +277,7 @@ public Builder userPrincipalNames(@Nullable List userPrincipalNames) { /** * @param userPrincipalNames The user principal names (UPNs) of the users. * - * > 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. + * > 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. * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/azuread/inputs/GroupState.java b/sdk/java/src/main/java/com/pulumi/azuread/inputs/GroupState.java index ec2b19e5d..263ac789a 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/inputs/GroupState.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/inputs/GroupState.java @@ -21,7 +21,7 @@ public final class GroupState extends com.pulumi.resources.ResourceArgs { /** * 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. * - * !> **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. + * > **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. * */ @Import(name="administrativeUnitIds") @@ -30,7 +30,7 @@ public final class GroupState extends com.pulumi.resources.ResourceArgs { /** * @return 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. * - * !> **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. + * > **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. * */ public Optional>> administrativeUnitIds() { @@ -572,7 +572,7 @@ public Builder(GroupState defaults) { /** * @param administrativeUnitIds 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. * - * !> **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. + * > **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. * * @return builder * @@ -585,7 +585,7 @@ public Builder administrativeUnitIds(@Nullable Output> administrati /** * @param administrativeUnitIds 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. * - * !> **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. + * > **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. * * @return builder * @@ -597,7 +597,7 @@ public Builder administrativeUnitIds(List administrativeUnitIds) { /** * @param administrativeUnitIds 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. * - * !> **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. + * > **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. * * @return builder * diff --git a/sdk/java/src/main/java/com/pulumi/azuread/outputs/GetUsersResult.java b/sdk/java/src/main/java/com/pulumi/azuread/outputs/GetUsersResult.java index 2671e8938..260053c64 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/outputs/GetUsersResult.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/outputs/GetUsersResult.java @@ -31,6 +31,11 @@ public final class GetUsersResult { * */ private List mailNicknames; + /** + * @return The SMTP email addresses of the users. + * + */ + private List mails; /** * @return The object IDs of the users. * @@ -73,6 +78,13 @@ public Optional ignoreMissing() { public List mailNicknames() { return this.mailNicknames; } + /** + * @return The SMTP email addresses of the users. + * + */ + public List mails() { + return this.mails; + } /** * @return The object IDs of the users. * @@ -111,6 +123,7 @@ public static final class Builder { private String id; private @Nullable Boolean ignoreMissing; private List mailNicknames; + private List mails; private List objectIds; private @Nullable Boolean returnAll; private List userPrincipalNames; @@ -122,6 +135,7 @@ public Builder(GetUsersResult defaults) { this.id = defaults.id; this.ignoreMissing = defaults.ignoreMissing; this.mailNicknames = defaults.mailNicknames; + this.mails = defaults.mails; this.objectIds = defaults.objectIds; this.returnAll = defaults.returnAll; this.userPrincipalNames = defaults.userPrincipalNames; @@ -165,6 +179,17 @@ public Builder mailNicknames(String... mailNicknames) { return mailNicknames(List.of(mailNicknames)); } @CustomType.Setter + public Builder mails(List mails) { + if (mails == null) { + throw new MissingRequiredPropertyException("GetUsersResult", "mails"); + } + this.mails = mails; + return this; + } + public Builder mails(String... mails) { + return mails(List.of(mails)); + } + @CustomType.Setter public Builder objectIds(List objectIds) { if (objectIds == null) { throw new MissingRequiredPropertyException("GetUsersResult", "objectIds"); @@ -209,6 +234,7 @@ public GetUsersResult build() { _resultValue.id = id; _resultValue.ignoreMissing = ignoreMissing; _resultValue.mailNicknames = mailNicknames; + _resultValue.mails = mails; _resultValue.objectIds = objectIds; _resultValue.returnAll = returnAll; _resultValue.userPrincipalNames = userPrincipalNames; diff --git a/sdk/java/src/main/java/com/pulumi/azuread/outputs/GetUsersUser.java b/sdk/java/src/main/java/com/pulumi/azuread/outputs/GetUsersUser.java index d631f1bd6..06b940763 100644 --- a/sdk/java/src/main/java/com/pulumi/azuread/outputs/GetUsersUser.java +++ b/sdk/java/src/main/java/com/pulumi/azuread/outputs/GetUsersUser.java @@ -12,7 +12,7 @@ @CustomType public final class GetUsersUser { /** - * @return Whether or not the account is enabled. + * @return Whether the account is enabled. * */ private Boolean accountEnabled; @@ -27,7 +27,7 @@ public final class GetUsersUser { */ private String employeeId; /** - * @return The primary email address of the user. + * @return The SMTP email address of the user. * */ private String mail; @@ -69,7 +69,7 @@ public final class GetUsersUser { private GetUsersUser() {} /** - * @return Whether or not the account is enabled. + * @return Whether the account is enabled. * */ public Boolean accountEnabled() { @@ -90,7 +90,7 @@ public String employeeId() { return this.employeeId; } /** - * @return The primary email address of the user. + * @return The SMTP email address of the user. * */ public String mail() { diff --git a/sdk/nodejs/administrativeUnit.ts b/sdk/nodejs/administrativeUnit.ts index aba03f451..debeab7a4 100644 --- a/sdk/nodejs/administrativeUnit.ts +++ b/sdk/nodejs/administrativeUnit.ts @@ -79,6 +79,8 @@ export class AdministrativeUnit extends pulumi.CustomResource { /** * A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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 `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff. + * * !> **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. */ public readonly members!: pulumi.Output; @@ -146,6 +148,8 @@ export interface AdministrativeUnitState { /** * A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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 `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff. + * * !> **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. */ members?: pulumi.Input[]>; @@ -178,6 +182,8 @@ export interface AdministrativeUnitArgs { /** * A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. * + * > **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 `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff. + * * !> **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. */ members?: pulumi.Input[]>; diff --git a/sdk/nodejs/administrativeUnitMember.ts b/sdk/nodejs/administrativeUnitMember.ts index c88bc9b99..8b706b6f7 100644 --- a/sdk/nodejs/administrativeUnitMember.ts +++ b/sdk/nodejs/administrativeUnitMember.ts @@ -77,6 +77,8 @@ export class AdministrativeUnitMember extends pulumi.CustomResource { public readonly administrativeUnitObjectId!: pulumi.Output; /** * 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. + * + * > **Caution** When using the azuread.AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff. */ public readonly memberObjectId!: pulumi.Output; @@ -115,6 +117,8 @@ export interface AdministrativeUnitMemberState { administrativeUnitObjectId?: pulumi.Input; /** * 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. + * + * > **Caution** When using the azuread.AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff. */ memberObjectId?: pulumi.Input; } @@ -129,6 +133,8 @@ export interface AdministrativeUnitMemberArgs { administrativeUnitObjectId?: pulumi.Input; /** * 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. + * + * > **Caution** When using the azuread.AdministrativeUnitMember resource to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff. */ memberObjectId?: pulumi.Input; } diff --git a/sdk/nodejs/getUsers.ts b/sdk/nodejs/getUsers.ts index f775ceb83..d4c0c9d65 100644 --- a/sdk/nodejs/getUsers.ts +++ b/sdk/nodejs/getUsers.ts @@ -39,6 +39,7 @@ export function getUsers(args?: GetUsersArgs, opts?: pulumi.InvokeOptions): Prom "employeeIds": args.employeeIds, "ignoreMissing": args.ignoreMissing, "mailNicknames": args.mailNicknames, + "mails": args.mails, "objectIds": args.objectIds, "returnAll": args.returnAll, "userPrincipalNames": args.userPrincipalNames, @@ -61,6 +62,10 @@ export interface GetUsersArgs { * The email aliases of the users. */ mailNicknames?: string[]; + /** + * The SMTP email addresses of the users. + */ + mails?: string[]; /** * The object IDs of the users. */ @@ -72,7 +77,7 @@ export interface GetUsersArgs { /** * The user principal names (UPNs) of the users. * - * > Either `returnAll`, or one of `userPrincipalNames`, `objectIds`, `mailNicknames` or `employeeIds` must be specified. These _may_ be specified as an empty list, in which case no results will be returned. + * > Either `returnAll`, or one of `userPrincipalNames`, `objectIds`, `mailNicknames`, `mails`, or `employeeIds` must be specified. These _may_ be specified as an empty list, in which case no results will be returned. */ userPrincipalNames?: string[]; } @@ -94,6 +99,10 @@ export interface GetUsersResult { * The email aliases of the users. */ readonly mailNicknames: string[]; + /** + * The SMTP email addresses of the users. + */ + readonly mails: string[]; /** * The object IDs of the users. */ @@ -153,6 +162,10 @@ export interface GetUsersOutputArgs { * The email aliases of the users. */ mailNicknames?: pulumi.Input[]>; + /** + * The SMTP email addresses of the users. + */ + mails?: pulumi.Input[]>; /** * The object IDs of the users. */ @@ -164,7 +177,7 @@ export interface GetUsersOutputArgs { /** * The user principal names (UPNs) of the users. * - * > Either `returnAll`, or one of `userPrincipalNames`, `objectIds`, `mailNicknames` or `employeeIds` must be specified. These _may_ be specified as an empty list, in which case no results will be returned. + * > Either `returnAll`, or one of `userPrincipalNames`, `objectIds`, `mailNicknames`, `mails`, or `employeeIds` must be specified. These _may_ be specified as an empty list, in which case no results will be returned. */ userPrincipalNames?: pulumi.Input[]>; } diff --git a/sdk/nodejs/group.ts b/sdk/nodejs/group.ts index 7b69367f9..fe661059c 100644 --- a/sdk/nodejs/group.ts +++ b/sdk/nodejs/group.ts @@ -110,7 +110,7 @@ export class Group extends pulumi.CustomResource { /** * 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. * - * !> **Warning** Do not use the `administrativeUnitIds` 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. + * > **Caution** When using the azuread.AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff. */ public readonly administrativeUnitIds!: pulumi.Output; /** @@ -341,7 +341,7 @@ export interface GroupState { /** * 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. * - * !> **Warning** Do not use the `administrativeUnitIds` 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. + * > **Caution** When using the azuread.AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff. */ administrativeUnitIds?: pulumi.Input[]>; /** @@ -487,7 +487,7 @@ export interface GroupArgs { /** * 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. * - * !> **Warning** Do not use the `administrativeUnitIds` 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. + * > **Caution** When using the azuread.AdministrativeUnitMember resource, to manage Administrative Unit membership for a group, you will need to use an `ignoreChanges = [administrativeUnitIds]` lifecycle meta argument for the `azuread.Group` resource, in order to avoid a persistent diff. */ administrativeUnitIds?: pulumi.Input[]>; /** diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts index b62522e61..daa9697f9 100644 --- a/sdk/nodejs/types/output.ts +++ b/sdk/nodejs/types/output.ts @@ -1224,7 +1224,7 @@ export interface GetServicePrincipalsServicePrincipal { export interface GetUsersUser { /** - * Whether or not the account is enabled. + * Whether the account is enabled. */ accountEnabled: boolean; /** @@ -1236,7 +1236,7 @@ export interface GetUsersUser { */ employeeId: string; /** - * The primary email address of the user. + * The SMTP email address of the user. */ mail: string; /** diff --git a/sdk/python/pulumi_azuread/administrative_unit.py b/sdk/python/pulumi_azuread/administrative_unit.py index 941a2f0eb..36bc0974f 100644 --- a/sdk/python/pulumi_azuread/administrative_unit.py +++ b/sdk/python/pulumi_azuread/administrative_unit.py @@ -26,6 +26,8 @@ def __init__(__self__, *, :param pulumi.Input[bool] hidden_membership_enabled: Whether the administrative unit and its members are hidden or publicly viewable in the directory. :param pulumi.Input[Sequence[pulumi.Input[str]]] members: A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. + > **Caution** When using the `members` property of the 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 `Group` resource, in order to avoid a persistent diff. + !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. :param pulumi.Input[bool] prevent_duplicate_names: If `true`, will return an error if an existing administrative unit is found with the same name """ @@ -81,6 +83,8 @@ def members(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]: """ A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. + > **Caution** When using the `members` property of the 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 `Group` resource, in order to avoid a persistent diff. + !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. """ return pulumi.get(self, "members") @@ -118,6 +122,8 @@ def __init__(__self__, *, :param pulumi.Input[bool] hidden_membership_enabled: Whether the administrative unit and its members are hidden or publicly viewable in the directory. :param pulumi.Input[Sequence[pulumi.Input[str]]] members: A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. + > **Caution** When using the `members` property of the 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 `Group` resource, in order to avoid a persistent diff. + !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. :param pulumi.Input[str] object_id: The object ID of the administrative unit. :param pulumi.Input[bool] prevent_duplicate_names: If `true`, will return an error if an existing administrative unit is found with the same name @@ -177,6 +183,8 @@ def members(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]: """ A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. + > **Caution** When using the `members` property of the 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 `Group` resource, in order to avoid a persistent diff. + !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. """ return pulumi.get(self, "members") @@ -259,6 +267,8 @@ def __init__(__self__, :param pulumi.Input[bool] hidden_membership_enabled: Whether the administrative unit and its members are hidden or publicly viewable in the directory. :param pulumi.Input[Sequence[pulumi.Input[str]]] members: A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. + > **Caution** When using the `members` property of the 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 `Group` resource, in order to avoid a persistent diff. + !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. :param pulumi.Input[bool] prevent_duplicate_names: If `true`, will return an error if an existing administrative unit is found with the same name """ @@ -364,6 +374,8 @@ def get(resource_name: str, :param pulumi.Input[bool] hidden_membership_enabled: Whether the administrative unit and its members are hidden or publicly viewable in the directory. :param pulumi.Input[Sequence[pulumi.Input[str]]] members: A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. + > **Caution** When using the `members` property of the 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 `Group` resource, in order to avoid a persistent diff. + !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. :param pulumi.Input[str] object_id: The object ID of the administrative unit. :param pulumi.Input[bool] prevent_duplicate_names: If `true`, will return an error if an existing administrative unit is found with the same name @@ -410,6 +422,8 @@ def members(self) -> pulumi.Output[Sequence[str]]: """ A set of object IDs of members who should be present in this administrative unit. Supported object types are Users or Groups. + > **Caution** When using the `members` property of the 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 `Group` resource, in order to avoid a persistent diff. + !> **Warning** Do not use the `members` property at the same time as the AdministrativeUnitMember resource for the same administrative unit. Doing so will cause a conflict and administrative unit members will be removed. """ return pulumi.get(self, "members") diff --git a/sdk/python/pulumi_azuread/administrative_unit_member.py b/sdk/python/pulumi_azuread/administrative_unit_member.py index ace2c8da4..ac077bff7 100644 --- a/sdk/python/pulumi_azuread/administrative_unit_member.py +++ b/sdk/python/pulumi_azuread/administrative_unit_member.py @@ -20,6 +20,8 @@ def __init__(__self__, *, The set of arguments for constructing a AdministrativeUnitMember resource. :param pulumi.Input[str] administrative_unit_object_id: The object ID of the administrative unit you want to add the member to. Changing this forces a new resource to be created. :param pulumi.Input[str] member_object_id: 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. + + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. """ if administrative_unit_object_id is not None: pulumi.set(__self__, "administrative_unit_object_id", administrative_unit_object_id) @@ -43,6 +45,8 @@ def administrative_unit_object_id(self, value: Optional[pulumi.Input[str]]): def member_object_id(self) -> Optional[pulumi.Input[str]]: """ 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. + + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. """ return pulumi.get(self, "member_object_id") @@ -60,6 +64,8 @@ def __init__(__self__, *, Input properties used for looking up and filtering AdministrativeUnitMember resources. :param pulumi.Input[str] administrative_unit_object_id: The object ID of the administrative unit you want to add the member to. Changing this forces a new resource to be created. :param pulumi.Input[str] member_object_id: 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. + + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. """ if administrative_unit_object_id is not None: pulumi.set(__self__, "administrative_unit_object_id", administrative_unit_object_id) @@ -83,6 +89,8 @@ def administrative_unit_object_id(self, value: Optional[pulumi.Input[str]]): def member_object_id(self) -> Optional[pulumi.Input[str]]: """ 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. + + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. """ return pulumi.get(self, "member_object_id") @@ -139,6 +147,8 @@ def __init__(__self__, :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[str] administrative_unit_object_id: The object ID of the administrative unit you want to add the member to. Changing this forces a new resource to be created. :param pulumi.Input[str] member_object_id: 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. + + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. """ ... @overload @@ -231,6 +241,8 @@ def get(resource_name: str, :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[str] administrative_unit_object_id: The object ID of the administrative unit you want to add the member to. Changing this forces a new resource to be created. :param pulumi.Input[str] member_object_id: 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. + + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. """ opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id)) @@ -253,6 +265,8 @@ def administrative_unit_object_id(self) -> pulumi.Output[Optional[str]]: def member_object_id(self) -> pulumi.Output[Optional[str]]: """ 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. + + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. """ return pulumi.get(self, "member_object_id") diff --git a/sdk/python/pulumi_azuread/get_users.py b/sdk/python/pulumi_azuread/get_users.py index fa7ae47c9..9304a8e9a 100644 --- a/sdk/python/pulumi_azuread/get_users.py +++ b/sdk/python/pulumi_azuread/get_users.py @@ -22,7 +22,7 @@ class GetUsersResult: """ A collection of values returned by getUsers. """ - def __init__(__self__, employee_ids=None, id=None, ignore_missing=None, mail_nicknames=None, object_ids=None, return_all=None, user_principal_names=None, users=None): + def __init__(__self__, employee_ids=None, id=None, ignore_missing=None, mail_nicknames=None, mails=None, object_ids=None, return_all=None, user_principal_names=None, users=None): if employee_ids and not isinstance(employee_ids, list): raise TypeError("Expected argument 'employee_ids' to be a list") pulumi.set(__self__, "employee_ids", employee_ids) @@ -35,6 +35,9 @@ def __init__(__self__, employee_ids=None, id=None, ignore_missing=None, mail_nic if mail_nicknames and not isinstance(mail_nicknames, list): raise TypeError("Expected argument 'mail_nicknames' to be a list") pulumi.set(__self__, "mail_nicknames", mail_nicknames) + if mails and not isinstance(mails, list): + raise TypeError("Expected argument 'mails' to be a list") + pulumi.set(__self__, "mails", mails) if object_ids and not isinstance(object_ids, list): raise TypeError("Expected argument 'object_ids' to be a list") pulumi.set(__self__, "object_ids", object_ids) @@ -77,6 +80,14 @@ def mail_nicknames(self) -> Sequence[str]: """ return pulumi.get(self, "mail_nicknames") + @property + @pulumi.getter + def mails(self) -> Sequence[str]: + """ + The SMTP email addresses of the users. + """ + return pulumi.get(self, "mails") + @property @pulumi.getter(name="objectIds") def object_ids(self) -> Sequence[str]: @@ -117,6 +128,7 @@ def __await__(self): id=self.id, ignore_missing=self.ignore_missing, mail_nicknames=self.mail_nicknames, + mails=self.mails, object_ids=self.object_ids, return_all=self.return_all, user_principal_names=self.user_principal_names, @@ -126,6 +138,7 @@ def __await__(self): def get_users(employee_ids: Optional[Sequence[str]] = None, ignore_missing: Optional[bool] = None, mail_nicknames: Optional[Sequence[str]] = None, + mails: Optional[Sequence[str]] = None, object_ids: Optional[Sequence[str]] = None, return_all: Optional[bool] = None, user_principal_names: Optional[Sequence[str]] = None, @@ -157,16 +170,18 @@ def get_users(employee_ids: Optional[Sequence[str]] = None, :param Sequence[str] employee_ids: The employee identifiers assigned to the users by the organisation. :param bool ignore_missing: Ignore missing users and return users that were found. The data source will still fail if no users are found. Cannot be specified with `return_all`. Defaults to `false`. :param Sequence[str] mail_nicknames: The email aliases of the users. + :param Sequence[str] mails: The SMTP email addresses of the users. :param Sequence[str] object_ids: The object IDs of the users. :param bool return_all: When `true`, the data source will return all users. Cannot be used with `ignore_missing`. Defaults to `false`. :param Sequence[str] user_principal_names: The user principal names (UPNs) of the users. - > 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. + > 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. """ __args__ = dict() __args__['employeeIds'] = employee_ids __args__['ignoreMissing'] = ignore_missing __args__['mailNicknames'] = mail_nicknames + __args__['mails'] = mails __args__['objectIds'] = object_ids __args__['returnAll'] = return_all __args__['userPrincipalNames'] = user_principal_names @@ -178,6 +193,7 @@ def get_users(employee_ids: Optional[Sequence[str]] = None, id=pulumi.get(__ret__, 'id'), ignore_missing=pulumi.get(__ret__, 'ignore_missing'), mail_nicknames=pulumi.get(__ret__, 'mail_nicknames'), + mails=pulumi.get(__ret__, 'mails'), object_ids=pulumi.get(__ret__, 'object_ids'), return_all=pulumi.get(__ret__, 'return_all'), user_principal_names=pulumi.get(__ret__, 'user_principal_names'), @@ -188,6 +204,7 @@ def get_users(employee_ids: Optional[Sequence[str]] = None, def get_users_output(employee_ids: Optional[pulumi.Input[Optional[Sequence[str]]]] = None, ignore_missing: Optional[pulumi.Input[Optional[bool]]] = None, mail_nicknames: Optional[pulumi.Input[Optional[Sequence[str]]]] = None, + mails: Optional[pulumi.Input[Optional[Sequence[str]]]] = None, object_ids: Optional[pulumi.Input[Optional[Sequence[str]]]] = None, return_all: Optional[pulumi.Input[Optional[bool]]] = None, user_principal_names: Optional[pulumi.Input[Optional[Sequence[str]]]] = None, @@ -219,10 +236,11 @@ def get_users_output(employee_ids: Optional[pulumi.Input[Optional[Sequence[str]] :param Sequence[str] employee_ids: The employee identifiers assigned to the users by the organisation. :param bool ignore_missing: Ignore missing users and return users that were found. The data source will still fail if no users are found. Cannot be specified with `return_all`. Defaults to `false`. :param Sequence[str] mail_nicknames: The email aliases of the users. + :param Sequence[str] mails: The SMTP email addresses of the users. :param Sequence[str] object_ids: The object IDs of the users. :param bool return_all: When `true`, the data source will return all users. Cannot be used with `ignore_missing`. Defaults to `false`. :param Sequence[str] user_principal_names: The user principal names (UPNs) of the users. - > 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. + > 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. """ ... diff --git a/sdk/python/pulumi_azuread/group.py b/sdk/python/pulumi_azuread/group.py index afda570c4..2e31da403 100644 --- a/sdk/python/pulumi_azuread/group.py +++ b/sdk/python/pulumi_azuread/group.py @@ -43,7 +43,7 @@ def __init__(__self__, *, :param pulumi.Input[str] display_name: The display name for the group. :param pulumi.Input[Sequence[pulumi.Input[str]]] administrative_unit_ids: 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. - !> **Warning** Do not use the `administrative_unit_ids` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. :param pulumi.Input[bool] assignable_to_role: Indicates whether this group can be assigned to an Azure Active Directory role. Defaults to `false`. Can only be set to `true` for security-enabled groups. Changing this forces a new resource to be created. :param pulumi.Input[bool] auto_subscribe_new_members: Indicates whether new members added to the group will be auto-subscribed to receive email notifications. Can only be set for Unified groups. @@ -141,7 +141,7 @@ def administrative_unit_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input """ 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. - !> **Warning** Do not use the `administrative_unit_ids` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. """ return pulumi.get(self, "administrative_unit_ids") @@ -442,7 +442,7 @@ def __init__(__self__, *, Input properties used for looking up and filtering Group resources. :param pulumi.Input[Sequence[pulumi.Input[str]]] administrative_unit_ids: 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. - !> **Warning** Do not use the `administrative_unit_ids` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. :param pulumi.Input[bool] assignable_to_role: Indicates whether this group can be assigned to an Azure Active Directory role. Defaults to `false`. Can only be set to `true` for security-enabled groups. Changing this forces a new resource to be created. :param pulumi.Input[bool] auto_subscribe_new_members: Indicates whether new members added to the group will be auto-subscribed to receive email notifications. Can only be set for Unified groups. @@ -557,7 +557,7 @@ def administrative_unit_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input """ 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. - !> **Warning** Do not use the `administrative_unit_ids` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. """ return pulumi.get(self, "administrative_unit_ids") @@ -1042,7 +1042,7 @@ def __init__(__self__, :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[Sequence[pulumi.Input[str]]] administrative_unit_ids: 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. - !> **Warning** Do not use the `administrative_unit_ids` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. :param pulumi.Input[bool] assignable_to_role: Indicates whether this group can be assigned to an Azure Active Directory role. Defaults to `false`. Can only be set to `true` for security-enabled groups. Changing this forces a new resource to be created. :param pulumi.Input[bool] auto_subscribe_new_members: Indicates whether new members added to the group will be auto-subscribed to receive email notifications. Can only be set for Unified groups. @@ -1284,7 +1284,7 @@ def get(resource_name: str, :param pulumi.ResourceOptions opts: Options for the resource. :param pulumi.Input[Sequence[pulumi.Input[str]]] administrative_unit_ids: 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. - !> **Warning** Do not use the `administrative_unit_ids` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. :param pulumi.Input[bool] assignable_to_role: Indicates whether this group can be assigned to an Azure Active Directory role. Defaults to `false`. Can only be set to `true` for security-enabled groups. Changing this forces a new resource to be created. :param pulumi.Input[bool] auto_subscribe_new_members: Indicates whether new members added to the group will be auto-subscribed to receive email notifications. Can only be set for Unified groups. @@ -1373,7 +1373,7 @@ def administrative_unit_ids(self) -> pulumi.Output[Optional[Sequence[str]]]: """ 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. - !> **Warning** Do not use the `administrative_unit_ids` property at the same time as the AdministrativeUnitMember resource, _for the same group_. Doing so will cause a conflict and administrative unit members will be removed. + > **Caution** When using the 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 `Group` resource, in order to avoid a persistent diff. """ return pulumi.get(self, "administrative_unit_ids") diff --git a/sdk/python/pulumi_azuread/outputs.py b/sdk/python/pulumi_azuread/outputs.py index 381397a16..0a85fb98e 100644 --- a/sdk/python/pulumi_azuread/outputs.py +++ b/sdk/python/pulumi_azuread/outputs.py @@ -6256,10 +6256,10 @@ def __init__(__self__, *, usage_location: str, user_principal_name: str): """ - :param bool account_enabled: Whether or not the account is enabled. + :param bool account_enabled: Whether the account is enabled. :param str display_name: The display name of the user. :param str employee_id: The employee identifier assigned to the user by the organisation. - :param str mail: The primary email address of the user. + :param str mail: The SMTP email address of the user. :param str mail_nickname: The email alias of the user. :param str object_id: The object ID of the user. :param str onpremises_immutable_id: The value used to associate an on-premises Active Directory user account with their Azure AD user object. @@ -6284,7 +6284,7 @@ def __init__(__self__, *, @pulumi.getter(name="accountEnabled") def account_enabled(self) -> bool: """ - Whether or not the account is enabled. + Whether the account is enabled. """ return pulumi.get(self, "account_enabled") @@ -6308,7 +6308,7 @@ def employee_id(self) -> str: @pulumi.getter def mail(self) -> str: """ - The primary email address of the user. + The SMTP email address of the user. """ return pulumi.get(self, "mail")