diff --git a/docs/data-sources/access_package.md b/docs/data-sources/access_package.md index 6e59ac817..05c1d3450 100644 --- a/docs/data-sources/access_package.md +++ b/docs/data-sources/access_package.md @@ -51,3 +51,9 @@ In addition to the above arguments, the following attributes are exported: * `id` - The ID of this resource. * `description` - The description of the access package. * `hidden` - Whether the access package is hidden from the requestor. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/access_package_catalog.md b/docs/data-sources/access_package_catalog.md index ba90a3f57..6c2bd67ad 100644 --- a/docs/data-sources/access_package_catalog.md +++ b/docs/data-sources/access_package_catalog.md @@ -50,3 +50,8 @@ In additional to the arguments, the following attributes are exported: * `externally_visible` - Whether the access packages in this catalog can be requested by users outside the tenant. * `published` - Whether the access packages in this catalog are available for management. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/access_package_catalog_role.md b/docs/data-sources/access_package_catalog_role.md index 5d1ee1d53..1f1412e67 100644 --- a/docs/data-sources/access_package_catalog_role.md +++ b/docs/data-sources/access_package_catalog_role.md @@ -47,3 +47,9 @@ The following attributes are exported: * `display_name` - The display name of the role. * `object_id` - The object ID of the role. * `template_id` - The object ID of the role. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/administrative_unit.md b/docs/data-sources/administrative_unit.md index 2763aed7b..2a9b01d0c 100644 --- a/docs/data-sources/administrative_unit.md +++ b/docs/data-sources/administrative_unit.md @@ -48,3 +48,9 @@ The following attributes are exported: * `members` - A list of object IDs of members who are present in this administrative unit. * `object_id` - The object ID of the administrative unit. * `visibility` - Whether the administrative unit _and_ its members are hidden or publicly viewable in the directory. One of: `Hiddenmembership` or `Public`. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/application.md b/docs/data-sources/application.md index 21868e99a..5eb1634e7 100644 --- a/docs/data-sources/application.md +++ b/docs/data-sources/application.md @@ -174,3 +174,9 @@ The following attributes are exported: * `access_token_issuance_enabled` - Whether this web application can request an access token using OAuth 2.0 implicit flow. * `id_token_issuance_enabled` - Whether this web application can request an ID token using OAuth 2.0 implicit flow. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/application_published_app_ids.md b/docs/data-sources/application_published_app_ids.md index ad65b6537..b26b2348e 100644 --- a/docs/data-sources/application_published_app_ids.md +++ b/docs/data-sources/application_published_app_ids.md @@ -60,3 +60,9 @@ This data source does not have any arguments. The following attributes are exported: * `result` - A map of application names to application IDs. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/application_template.md b/docs/data-sources/application_template.md index 30410f4e8..565f69342 100644 --- a/docs/data-sources/application_template.md +++ b/docs/data-sources/application_template.md @@ -43,3 +43,9 @@ The following attributes are exported: * `supported_provisioning_types` - List of provisioning modes supported by this templated application. * `supported_single_sign_on_modes` - List of single sign on modes supported by this templated application. * `template_id` - The ID of the templated application. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/client_config.md b/docs/data-sources/client_config.md index 150208099..5c404f699 100644 --- a/docs/data-sources/client_config.md +++ b/docs/data-sources/client_config.md @@ -31,3 +31,9 @@ The following attributes are exported: * `client_id` - The client ID (application ID) linked to the authenticated principal, or the application used for delegated authentication. * `object_id` - The object ID of the authenticated principal. * `tenant_id` - The tenant ID of the authenticated principal. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/directory_object.md b/docs/data-sources/directory_object.md index 82b766211..527003e36 100644 --- a/docs/data-sources/directory_object.md +++ b/docs/data-sources/directory_object.md @@ -39,3 +39,9 @@ The following attributes are exported: *`object_id` - The object ID of the directory object. *`type` - The shortened OData type of the directory object. Possible values include: `Group`, `User` or `ServicePrincipal`. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/directory_role_templates.md b/docs/data-sources/directory_role_templates.md index 8c50a627a..4cc821c21 100644 --- a/docs/data-sources/directory_role_templates.md +++ b/docs/data-sources/directory_role_templates.md @@ -42,3 +42,9 @@ The following attributes are exported: * `description` - The description of the directory role template. * `display_name` - The display name of the directory role template. * `object_id` - The object ID of the directory role template. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/directory_roles.md b/docs/data-sources/directory_roles.md index 7e47e9a1a..cc73bca6f 100644 --- a/docs/data-sources/directory_roles.md +++ b/docs/data-sources/directory_roles.md @@ -44,3 +44,9 @@ The following attributes are exported: * `template_id` - The template ID of the directory role. * `description` - The description of the directory role. * `object_id` - The object ID of the directory role. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/domains.md b/docs/data-sources/domains.md index 9b2816141..d8065e6bd 100644 --- a/docs/data-sources/domains.md +++ b/docs/data-sources/domains.md @@ -55,3 +55,9 @@ In addition to all arguments above, the following attributes are exported: * `root` - Whether the domain is a verified root domain (not a subdomain). * `verified` - Whether the domain has completed domain ownership verification. * `supported_services` - A list of capabilities / services supported by the domain. Possible values include `Email`, `Sharepoint`, `EmailInternalRelayOnly`, `OfficeCommunicationsOnline`, `SharePointDefaultDomain`, `FullRedelegation`, `SharePointPublic`, `OrgIdAuthentication`, `Yammer` and `Intune`. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/group.md b/docs/data-sources/group.md index 34e8b3a6e..7032033c2 100644 --- a/docs/data-sources/group.md +++ b/docs/data-sources/group.md @@ -76,3 +76,9 @@ The following attributes are exported: * `enabled` - Whether rule processing is "On" (true) or "Paused" (false). * `rule` - The rule that determines membership of this group. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/group_role_management_policy.md b/docs/data-sources/group_role_management_policy.md index c92da0d70..654b07b4e 100644 --- a/docs/data-sources/group_role_management_policy.md +++ b/docs/data-sources/group_role_management_policy.md @@ -40,3 +40,9 @@ In addition to all arguments above, the following attributes are exported: * `description` - (String) The description of this policy. * `display_name` - (String) The display name of this policy. * `id` - (String) The ID of this policy. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/groups.md b/docs/data-sources/groups.md index 528167d72..16da72f85 100644 --- a/docs/data-sources/groups.md +++ b/docs/data-sources/groups.md @@ -74,3 +74,9 @@ The following attributes are exported: * `display_names` - The display names of the groups. * `object_ids` - The object IDs of the groups. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/named_location.md b/docs/data-sources/named_location.md index 0c774f953..ef696f868 100644 --- a/docs/data-sources/named_location.md +++ b/docs/data-sources/named_location.md @@ -49,3 +49,9 @@ The following attributes are exported: * `ip_ranges` - List of IP address ranges in IPv4 CIDR format (e.g. `1.2.3.4/32`) or any allowable IPv6 format from IETF RFC596. * `trusted` - Whether the named location is trusted. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/service_principal.md b/docs/data-sources/service_principal.md index 8ad0655a5..c63fa1086 100644 --- a/docs/data-sources/service_principal.md +++ b/docs/data-sources/service_principal.md @@ -119,3 +119,9 @@ The following attributes are exported: `saml_single_sign_on` exports the following: * `relay_state` - The relative URI the service provider would redirect to after completion of the single sign-on flow. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/service_principals.md b/docs/data-sources/service_principals.md index ae104bc64..ac4c68bfd 100644 --- a/docs/data-sources/service_principals.md +++ b/docs/data-sources/service_principals.md @@ -90,3 +90,8 @@ The following attributes are exported: * `tags` - A list of tags applied to the service principal. * `type` - Identifies whether the service principal represents an application or a managed identity. Possible values include `Application` or `ManagedIdentity`. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/user.md b/docs/data-sources/user.md index 1e8ba4e63..850339baf 100644 --- a/docs/data-sources/user.md +++ b/docs/data-sources/user.md @@ -81,3 +81,9 @@ The following attributes are exported: * `usage_location` - The usage location of the user. * `user_principal_name` - The user principal name (UPN) of the user. * `user_type` - The user type in the directory. Possible values are `Guest` or `Member`. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/data-sources/users.md b/docs/data-sources/users.md index 0f6f83c77..0ce19e149 100644 --- a/docs/data-sources/users.md +++ b/docs/data-sources/users.md @@ -62,3 +62,9 @@ The following attributes are exported: * `onpremises_user_principal_name` - The on-premise user principal name of the user. * `usage_location` - The usage location of the user. * `user_principal_name` - The user principal name (UPN) of the user. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. diff --git a/docs/resources/access_package.md b/docs/resources/access_package.md index 35a3e8115..6a085fe4f 100644 --- a/docs/resources/access_package.md +++ b/docs/resources/access_package.md @@ -43,6 +43,15 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of this resource. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Access Packages can be imported using the `id`, e.g. diff --git a/docs/resources/access_package_assignment_policy.md b/docs/resources/access_package_assignment_policy.md index bf77fb121..9a77118f5 100644 --- a/docs/resources/access_package_assignment_policy.md +++ b/docs/resources/access_package_assignment_policy.md @@ -200,6 +200,15 @@ In addition to all arguments above, the following attributes are exported: - `id` (String) The ID of this resource. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import An access package assignment policy can be imported using the ID, e.g. diff --git a/docs/resources/access_package_catalog.md b/docs/resources/access_package_catalog.md index 8e5ae32b5..b57431c15 100644 --- a/docs/resources/access_package_catalog.md +++ b/docs/resources/access_package_catalog.md @@ -37,6 +37,15 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of this resource. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import An Access Package Catalog can be imported using the `id`, e.g. diff --git a/docs/resources/access_package_catalog_role_assignment.md b/docs/resources/access_package_catalog_role_assignment.md index e56d0355f..2fe1e598c 100644 --- a/docs/resources/access_package_catalog_role_assignment.md +++ b/docs/resources/access_package_catalog_role_assignment.md @@ -52,6 +52,15 @@ In addition to all arguments above, the following attributes are exported: *No additional attributes are exported* +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Catalog role assignments can be imported using the ID of the assignment, e.g. diff --git a/docs/resources/access_package_resource_catalog_association.md b/docs/resources/access_package_resource_catalog_association.md index 13d15df12..2297771aa 100644 --- a/docs/resources/access_package_resource_catalog_association.md +++ b/docs/resources/access_package_resource_catalog_association.md @@ -47,6 +47,14 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of this resource, the ID is the concatenation of `catalog_id` and `resource_origin_id` with colon in between. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import The resource and catalog association can be imported using the catalog ID and the resource origin ID, e.g. diff --git a/docs/resources/access_package_resource_package_association.md b/docs/resources/access_package_resource_package_association.md index b7b296236..9571892b2 100644 --- a/docs/resources/access_package_resource_package_association.md +++ b/docs/resources/access_package_resource_package_association.md @@ -57,6 +57,14 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of this resource. The ID is combined by four fields with colon in between, the four fields are `access_package_id`, this package association id, `resource_origin_id` and `access_type`. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import The resource and catalog association can be imported using the access package ID, the access package ResourceRoleScope, the resource origin ID, and the access type, e.g. diff --git a/docs/resources/administrative_unit.md b/docs/resources/administrative_unit.md index b11fadfde..3829af884 100644 --- a/docs/resources/administrative_unit.md +++ b/docs/resources/administrative_unit.md @@ -44,6 +44,15 @@ In addition to all arguments above, the following attributes are exported: * `object_id` - The object ID of the administrative unit. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Administrative units can be imported using their object ID, e.g. diff --git a/docs/resources/administrative_unit_member.md b/docs/resources/administrative_unit_member.md index df3dd4e07..a96c91bd6 100644 --- a/docs/resources/administrative_unit_member.md +++ b/docs/resources/administrative_unit_member.md @@ -49,6 +49,14 @@ In addition to all arguments above, the following attributes are exported: *No additional attributes are exported* +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Administrative unit members can be imported using the object ID of the administrative unit and the object ID of the member, e.g. diff --git a/docs/resources/administrative_unit_role_member.md b/docs/resources/administrative_unit_role_member.md index e076c5da9..a5628791e 100644 --- a/docs/resources/administrative_unit_role_member.md +++ b/docs/resources/administrative_unit_role_member.md @@ -51,6 +51,14 @@ In addition to all arguments above, the following attributes are exported: *No additional attributes are exported* +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Administrative unit role members can be imported using the object ID of the administrative unit and the unique ID of the role assignment, e.g. diff --git a/docs/resources/app_role_assignment.md b/docs/resources/app_role_assignment.md index fc3689add..5bbc4fc65 100644 --- a/docs/resources/app_role_assignment.md +++ b/docs/resources/app_role_assignment.md @@ -22,8 +22,8 @@ When authenticated with a user principal, this resource requires one of the foll data "azuread_application_published_app_ids" "well_known" {} resource "azuread_service_principal" "msgraph" { - application_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph - use_existing = true + client_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph + use_existing = true } resource "azuread_application" "example" { @@ -45,7 +45,7 @@ resource "azuread_application" "example" { } resource "azuread_service_principal" "example" { - application_id = azuread_application.example.application_id + client_id = azuread_application.example.application_id } resource "azuread_app_role_assignment" "example" { @@ -72,7 +72,7 @@ resource "azuread_application" "internal" { } resource "azuread_service_principal" "internal" { - application_id = azuread_application.internal.application_id + client_id = azuread_application.internal.application_id } resource "azuread_application" "example" { @@ -89,7 +89,7 @@ resource "azuread_application" "example" { } resource "azuread_service_principal" "example" { - application_id = azuread_application.example.application_id + client_id = azuread_application.example.application_id } resource "azuread_app_role_assignment" "example" { @@ -120,7 +120,7 @@ resource "azuread_application" "internal" { } resource "azuread_service_principal" "internal" { - application_id = azuread_application.internal.application_id + client_id = azuread_application.internal.application_id } resource "azuread_group" "example" { @@ -155,7 +155,7 @@ resource "azuread_application" "internal" { } resource "azuread_service_principal" "internal" { - application_id = azuread_application.internal.application_id + client_id = azuread_application.internal.application_id } resource "azuread_group" "example" { @@ -186,6 +186,14 @@ In addition to all arguments above, the following attributes are exported: * `principal_type` - The object type of the principal to which the app role is assigned. * `resource_display_name` - The display name of the application representing the resource. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import App role assignments can be imported using the object ID of the service principal representing the resource and the ID of the app role assignment (note: _not_ the ID of the app role), e.g. diff --git a/docs/resources/application.md b/docs/resources/application.md index 9a0fb4936..414d624a5 100644 --- a/docs/resources/application.md +++ b/docs/resources/application.md @@ -389,6 +389,14 @@ In addition to all arguments above, the following attributes are exported: * `key_id` - (Required) The unique key ID for the generated password. * `value` - (Required) The generated password for the application. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. ## Import diff --git a/docs/resources/application_api_access.md b/docs/resources/application_api_access.md index 0741cf5cf..0d47da31b 100644 --- a/docs/resources/application_api_access.md +++ b/docs/resources/application_api_access.md @@ -83,6 +83,15 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Application API Access can be imported using the object ID of the application and the client ID of the API, in the following format. diff --git a/docs/resources/application_app_role.md b/docs/resources/application_app_role.md index 3e5aa5cc5..c4ead9871 100644 --- a/docs/resources/application_app_role.md +++ b/docs/resources/application_app_role.md @@ -80,6 +80,15 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Application App Roles can be imported using the object ID of the application and the ID of the app role, in the following format. diff --git a/docs/resources/application_certificate.md b/docs/resources/application_certificate.md index 6cb1288f3..c660788a0 100644 --- a/docs/resources/application_certificate.md +++ b/docs/resources/application_certificate.md @@ -139,6 +139,15 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Certificates can be imported using the object ID of the associated application and the key ID of the certificate credential, e.g. diff --git a/docs/resources/application_fallback_public_client.md b/docs/resources/application_fallback_public_client.md index 6d904080a..43e94483d 100644 --- a/docs/resources/application_fallback_public_client.md +++ b/docs/resources/application_fallback_public_client.md @@ -44,6 +44,14 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import The Application Fallback Public Client setting can be imported using the object ID of the application, in the following format. diff --git a/docs/resources/application_federated_identity_credential.md b/docs/resources/application_federated_identity_credential.md index c3576173b..390c37122 100644 --- a/docs/resources/application_federated_identity_credential.md +++ b/docs/resources/application_federated_identity_credential.md @@ -50,6 +50,15 @@ In addition to all arguments above, the following attributes are exported: * `credential_id` - A UUID used to uniquely identify this federated identity credential. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 15 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Federated Identity Credentials can be imported using the object ID of the associated application and the ID of the federated identity credential, e.g. diff --git a/docs/resources/application_from_template.md b/docs/resources/application_from_template.md index 75f96a931..d2dc7f247 100644 --- a/docs/resources/application_from_template.md +++ b/docs/resources/application_from_template.md @@ -53,6 +53,15 @@ In addition to all arguments above, the following attributes are exported: * `service_principal_id` - The resource ID for the service principal. * `service_principal_object_id` - The object ID for the service principal. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Templated Applications can be imported using the template ID, the object ID of the application, and the object ID of the service principal, in the following format. diff --git a/docs/resources/application_identifier_uri.md b/docs/resources/application_identifier_uri.md index f846ed0c2..d0221861b 100644 --- a/docs/resources/application_identifier_uri.md +++ b/docs/resources/application_identifier_uri.md @@ -64,6 +64,14 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Application Identifier URIs can be imported using the object ID of the application and the base64-encoded identifier URI, in the following format. diff --git a/docs/resources/application_known_clients.md b/docs/resources/application_known_clients.md index 8402f4499..024d3e406 100644 --- a/docs/resources/application_known_clients.md +++ b/docs/resources/application_known_clients.md @@ -48,6 +48,15 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Application Known Clients can be imported using the object ID of the application in the following format. diff --git a/docs/resources/application_optional_claims.md b/docs/resources/application_optional_claims.md index 9cf13f888..277d600d9 100644 --- a/docs/resources/application_optional_claims.md +++ b/docs/resources/application_optional_claims.md @@ -73,6 +73,15 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Application Optional Claims can be imported using the object ID of the application, in the following format. diff --git a/docs/resources/application_owner.md b/docs/resources/application_owner.md index d8c5cd215..58e7bf34e 100644 --- a/docs/resources/application_owner.md +++ b/docs/resources/application_owner.md @@ -50,6 +50,14 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Application Owners can be imported using the object ID of the application and the object ID of the owner, in the following format. diff --git a/docs/resources/application_password.md b/docs/resources/application_password.md index 8f518c1c7..26aa90f80 100644 --- a/docs/resources/application_password.md +++ b/docs/resources/application_password.md @@ -67,6 +67,15 @@ In addition to all arguments above, the following attributes are exported: * `key_id` - A UUID used to uniquely identify this password credential. * `value` - The password for this application, which is generated by Azure Active Directory. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 15 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import This resource does not support importing. diff --git a/docs/resources/application_permission_scope.md b/docs/resources/application_permission_scope.md index 987853021..6f3460134 100644 --- a/docs/resources/application_permission_scope.md +++ b/docs/resources/application_permission_scope.md @@ -81,6 +81,15 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Application App Roles can be imported using the object ID of the application and the ID of the permission scope, in the following format. diff --git a/docs/resources/application_pre_authorized.md b/docs/resources/application_pre_authorized.md index 3aa008c12..b9dfa3e9e 100644 --- a/docs/resources/application_pre_authorized.md +++ b/docs/resources/application_pre_authorized.md @@ -72,6 +72,15 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Pre-authorized applications can be imported using the object ID of the authorizing application and the application ID of the application being authorized, e.g. diff --git a/docs/resources/application_redirect_uris.md b/docs/resources/application_redirect_uris.md index 2fa5ff957..b6b9635c1 100644 --- a/docs/resources/application_redirect_uris.md +++ b/docs/resources/application_redirect_uris.md @@ -73,6 +73,15 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Application API Access can be imported using the object ID of the application and the URI type, in the following format. diff --git a/docs/resources/application_registration.md b/docs/resources/application_registration.md index 53bce02d2..4c37375ed 100644 --- a/docs/resources/application_registration.md +++ b/docs/resources/application_registration.md @@ -63,6 +63,15 @@ In addition to all arguments above, the following attributes are exported: * `object_id` - The object ID of the application within the tenant. * `publisher_domain` - The verified publisher domain for the application. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Application Registrations can be imported using the object ID of the application, in the following format. diff --git a/docs/resources/authentication_strength_policy.md b/docs/resources/authentication_strength_policy.md index d62fe6cba..d6d1c41fb 100644 --- a/docs/resources/authentication_strength_policy.md +++ b/docs/resources/authentication_strength_policy.md @@ -69,6 +69,15 @@ In addition to all arguments above, the following attributes are exported: - `id` - The ID of the authentication strength policy. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Authentication Strength Policies can be imported using the `id`, e.g. diff --git a/docs/resources/claims_mapping_policy.md b/docs/resources/claims_mapping_policy.md index 2549fc3c2..7179abb47 100644 --- a/docs/resources/claims_mapping_policy.md +++ b/docs/resources/claims_mapping_policy.md @@ -59,6 +59,15 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of the Claims Mapping Policy. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Claims Mapping Policy can be imported using the `id`, e.g. diff --git a/docs/resources/conditional_access_policy.md b/docs/resources/conditional_access_policy.md index 19b0dd78c..1e3dba260 100644 --- a/docs/resources/conditional_access_policy.md +++ b/docs/resources/conditional_access_policy.md @@ -8,6 +8,8 @@ Manages a Conditional Access Policy within Azure Active Directory. -> **Licensing Requirements** Specifying `client_applications` property requires the activation of Microsoft Entra on your tenant and the availability of sufficient Workload Identities Premium licences (one per service principal managed by a conditional access). +-> **API Limits** This resource is subject to a restrictive API request limit of 1 request/second. Whilst Terraform will automatically back-off and retry throttled requests, if you have a large number of resource changes to make, you may wish to [reduce parallelism](https://developer.hashicorp.com/terraform/cli/commands/apply#apply-options) or specify extended [custom resource timeouts](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts). + ## API Permissions The following API permissions are required in order to use this resource. @@ -275,6 +277,15 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of the Conditional Access Policy. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 15 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Conditional Access Policies can be imported using the `id`, e.g. diff --git a/docs/resources/custom_directory_role.md b/docs/resources/custom_directory_role.md index 3bd15376e..28408a1c0 100644 --- a/docs/resources/custom_directory_role.md +++ b/docs/resources/custom_directory_role.md @@ -68,6 +68,15 @@ In addition to all arguments above, the following attributes are exported: * `object_id` - The object ID of the custom directory role. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import This resource does not support importing. diff --git a/docs/resources/directory_role.md b/docs/resources/directory_role.md index 0611c5600..8efdead28 100644 --- a/docs/resources/directory_role.md +++ b/docs/resources/directory_role.md @@ -52,6 +52,14 @@ In addition to all arguments above, the following attributes are exported: * `description` - The description of the directory role. * `object_id` - The object ID of the directory role. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import This resource does not support importing. diff --git a/docs/resources/directory_role_assignment.md b/docs/resources/directory_role_assignment.md index 629c5a81e..a6e418c4b 100644 --- a/docs/resources/directory_role_assignment.md +++ b/docs/resources/directory_role_assignment.md @@ -100,6 +100,14 @@ In addition to all arguments above, the following attributes are exported: *No additional attributes are exported* +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Directory role assignments can be imported using the ID of the assignment, e.g. diff --git a/docs/resources/directory_role_eligibility_schedule_request.md b/docs/resources/directory_role_eligibility_schedule_request.md index 7d8971090..9719a984d 100644 --- a/docs/resources/directory_role_eligibility_schedule_request.md +++ b/docs/resources/directory_role_eligibility_schedule_request.md @@ -50,6 +50,14 @@ In addition to all arguments above, the following attributes are exported: *No additional attributes are exported* +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Directory role eligibility schedule requests can be imported using the ID of the assignment, e.g. diff --git a/docs/resources/directory_role_member.md b/docs/resources/directory_role_member.md index a5e73eee2..7c82f65f4 100644 --- a/docs/resources/directory_role_member.md +++ b/docs/resources/directory_role_member.md @@ -47,6 +47,14 @@ In addition to all arguments above, the following attributes are exported: *No additional attributes are exported* +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Directory role members can be imported using the object ID of the role and the object ID of the member, e.g. diff --git a/docs/resources/group.md b/docs/resources/group.md index bae7bb102..7021491bc 100644 --- a/docs/resources/group.md +++ b/docs/resources/group.md @@ -183,6 +183,15 @@ In addition to all arguments above, the following attributes are exported: * `preferred_language` - The preferred language for a Microsoft 365 group, in ISO 639-1 notation. * `proxy_addresses` - List of email addresses for the group that direct to the same group mailbox. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 20 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 20 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Groups can be imported using their object ID, e.g. diff --git a/docs/resources/group_member.md b/docs/resources/group_member.md index 6da1c8318..5d03c02ad 100644 --- a/docs/resources/group_member.md +++ b/docs/resources/group_member.md @@ -50,6 +50,14 @@ In addition to all arguments above, the following attributes are exported: *No additional attributes are exported* +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Group members can be imported using the object ID of the group and the object ID of the member, e.g. diff --git a/docs/resources/group_role_management_policy.md b/docs/resources/group_role_management_policy.md index be238998b..17cc003bd 100644 --- a/docs/resources/group_role_management_policy.md +++ b/docs/resources/group_role_management_policy.md @@ -58,34 +58,34 @@ resource "azuread_group_role_management_policy" "example" { ## Argument Reference -- `activation_rules` - (Optional) An `activation_rules` block as defined below. -- `active_assignment_rules` - (Optional) An `active_assignment_rules` block as defined below. -- `eligible_assignment_rules` - (Optional) An `eligible_assignment_rules` block as defined below. -- `group_id` - (Required) The ID of the Azure AD group for which the policy applies. -- `notification_rules` - (Optional) A `notification_rules` block as defined below. -- `role_id` - (Required) The type of assignment this policy coveres. Can be either `member` or `owner`. +* `activation_rules` - (Optional) An `activation_rules` block as defined below. +* `active_assignment_rules` - (Optional) An `active_assignment_rules` block as defined below. +* `eligible_assignment_rules` - (Optional) An `eligible_assignment_rules` block as defined below. +* `group_id` - (Required) The ID of the Azure AD group for which the policy applies. +* `notification_rules` - (Optional) A `notification_rules` block as defined below. +* `role_id` - (Required) The type of assignment this policy coveres. Can be either `member` or `owner`. --- An `activation_rules` block supports the following: -- `approval_stage` - (Optional) An `approval_stage` block as defined below. -- `maximum_duration` - (Optional) The maximum length of time an activated role can be valid, in an ISO8601 Duration format (e.g. `PT8H`). Valid range is `PT30M` to `PT23H30M`, in 30 minute increments, or `PT1D`. -- `require_approval` - (Optional) Is approval required for activation. If `true` an `approval_stage` block must be provided. -- `require_justification` - (Optional) Is a justification required during activation of the role. -- `require_multifactor_authentication` - (Optional) Is multi-factor authentication required to activate the role. Conflicts with `required_conditional_access_authentication_context`. -- `require_ticket_info` - (Optional) Is ticket information requrired during activation of the role. -- `required_conditional_access_authentication_context` - (Optional) The Entra ID Conditional Access context that must be present for activation (e.g `c1`). Conflicts with `require_multifactor_authentication`. +* `approval_stage` - (Optional) An `approval_stage` block as defined below. +* `maximum_duration` - (Optional) The maximum length of time an activated role can be valid, in an ISO8601 Duration format (e.g. `PT8H`). Valid range is `PT30M` to `PT23H30M`, in 30 minute increments, or `PT1D`. +* `require_approval` - (Optional) Is approval required for activation. If `true` an `approval_stage` block must be provided. +* `require_justification` - (Optional) Is a justification required during activation of the role. +* `require_multifactor_authentication` - (Optional) Is multi-factor authentication required to activate the role. Conflicts with `required_conditional_access_authentication_context`. +* `require_ticket_info` - (Optional) Is ticket information requrired during activation of the role. +* `required_conditional_access_authentication_context` - (Optional) The Entra ID Conditional Access context that must be present for activation (e.g `c1`). Conflicts with `require_multifactor_authentication`. --- An `active_assignment_rules` block supports the following: -- `expiration_required` - (Optional) Must an assignment have an expiry date. `false` allows permanent assignment. -- `expire_after` - (Optional) The maximum length of time an assignment can be valid, as an ISO8601 duration. Permitted values: `P15D`, `P30D`, `P90D`, `P180D`, or `P365D`. -- `require_justification` - (Optional) Is a justification required to create new assignments. -- `require_multifactor_authentication` - (Optional) Is multi-factor authentication required to create new assignments. -- `require_ticket_info` - (Optional) Is ticket information required to create new assignments. +* `expiration_required` - (Optional) Must an assignment have an expiry date. `false` allows permanent assignment. +* `expire_after` - (Optional) The maximum length of time an assignment can be valid, as an ISO8601 duration. Permitted values: `P15D`, `P30D`, `P90D`, `P180D`, or `P365D`. +* `require_justification` - (Optional) Is a justification required to create new assignments. +* `require_multifactor_authentication` - (Optional) Is multi-factor authentication required to create new assignments. +* `require_ticket_info` - (Optional) Is ticket information required to create new assignments. One of `expiration_required` or `expire_after` must be provided. @@ -93,14 +93,14 @@ One of `expiration_required` or `expire_after` must be provided. An `approval_stage` block supports the following: -- One or more `primary_approver` blocks as defined below. +* One or more `primary_approver` blocks as defined below. --- An `eligible_assignment_rules` block supports the following: -- `expiration_required`- Must an assignment have an expiry date. `false` allows permanent assignment. -- `expire_after` - The maximum length of time an assignment can be valid, as an ISO8601 duration. Permitted values: `P15D`, `P30D`, `P90D`, `P180D`, or `P365D`. +* `expiration_required`- Must an assignment have an expiry date. `false` allows permanent assignment. +* `expire_after` - The maximum length of time an assignment can be valid, as an ISO8601 duration. Permitted values: `P15D`, `P30D`, `P90D`, `P180D`, or `P365D`. One of `expiration_required` or `expire_after` must be provided. @@ -108,9 +108,9 @@ One of `expiration_required` or `expire_after` must be provided. A `notification_rules` block supports the following: -- `active_assignments` - (Optional) A `notification_target` block as defined below to configure notfications on active role assignments. -- `eligible_activations` - (Optional) A `notification_target` block as defined below for configuring notifications on activation of eligible role. -- `eligible_assignments` - (Optional) A `notification_target` block as defined below to configure notification on eligible role assignments. +* `active_assignments` - (Optional) A `notification_target` block as defined below to configure notfications on active role assignments. +* `eligible_activations` - (Optional) A `notification_target` block as defined below for configuring notifications on activation of eligible role. +* `eligible_assignments` - (Optional) A `notification_target` block as defined below to configure notification on eligible role assignments. At least one `notification_target` block must be provided. @@ -118,17 +118,17 @@ At least one `notification_target` block must be provided. A `notification_settings` block supports the following: -- `additional_recipients` - (Optional) A list of additional email addresses that will receive these notifications. -- `default_recipients` - (Required) Should the default recipients receive these notifications. -- `notification_level` - (Required) What level of notifications should be sent. Options are `All` or `Critical`. +* `additional_recipients` - (Optional) A list of additional email addresses that will receive these notifications. +* `default_recipients` - (Required) Should the default recipients receive these notifications. +* `notification_level` - (Required) What level of notifications should be sent. Options are `All` or `Critical`. --- A `notification_target` block supports the following: -- `admin_notifications` - (Optional) A `notification_settings` block as defined above. -- `approver_notifications` - (Optional) A `notification_settings` block as defined above. -- `assignee_notifications` - (Optional) A `notification_settings` block as defined above. +* `admin_notifications` - (Optional) A `notification_settings` block as defined above. +* `approver_notifications` - (Optional) A `notification_settings` block as defined above. +* `assignee_notifications` - (Optional) A `notification_settings` block as defined above. At least one `notification_settings` block must be provided. @@ -136,16 +136,25 @@ At least one `notification_settings` block must be provided. A `primary_approver` block supports the following: -- `object_id` - (Required) The ID of the object which will act as an approver. -- `type` - (Required) The type of object acting as an approver. Possible options are `singleUser` and `groupMembers`. +* `object_id` - (Required) The ID of the object which will act as an approver. +* `type` - (Required) The type of object acting as an approver. Possible options are `singleUser` and `groupMembers`. ## Attributes Reference In addition to all arguments above, the following attributes are exported: -- `description` - (String) The description of this policy. -- `display_name` - (String) The display name of this policy. -- `id` - (String) The ID of this policy. +* `description` - (String) The description of this policy. +* `display_name` - (String) The display name of this policy. +* `id` - (String) The ID of this policy. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. ## Import diff --git a/docs/resources/invitation.md b/docs/resources/invitation.md index 0ee21cb05..e57d5b456 100644 --- a/docs/resources/invitation.md +++ b/docs/resources/invitation.md @@ -71,7 +71,6 @@ The following arguments are supported: * `body` - (Optional) Customized message body you want to send if you don't want to send the default message. Cannot be specified with `language`. * `language` - (Optional) The language you want to send the default message in. The value specified must be in ISO 639 format. Defaults to `en-US`. Cannot be specified with `body`. - ## Attributes Reference In addition to all arguments above, the following attributes are exported: @@ -79,6 +78,14 @@ In addition to all arguments above, the following attributes are exported: * `redeem_url` - The URL the user can use to redeem their invitation. * `user_id` - Object ID of the invited user. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import This resource does not support importing. diff --git a/docs/resources/named_location.md b/docs/resources/named_location.md index 8822d7e25..5700811a0 100644 --- a/docs/resources/named_location.md +++ b/docs/resources/named_location.md @@ -6,6 +6,8 @@ subcategory: "Conditional Access" Manages a Named Location within Azure Active Directory. +-> **API Limits** This resource is subject to a restrictive API request limit of 1 request/second. Whilst Terraform will automatically back-off and retry throttled requests, if you have a large number of resource changes to make, you may wish to [reduce parallelism](https://developer.hashicorp.com/terraform/cli/commands/apply#apply-options) or specify extended [custom resource timeouts](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts). + ## API Permissions The following API permissions are required in order to use this resource. @@ -73,6 +75,15 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of the named location. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Named Locations can be imported using the `id`, e.g. diff --git a/docs/resources/privileged_access_group_assignment_schedule.md b/docs/resources/privileged_access_group_assignment_schedule.md index 42edec736..09a445539 100644 --- a/docs/resources/privileged_access_group_assignment_schedule.md +++ b/docs/resources/privileged_access_group_assignment_schedule.md @@ -40,16 +40,16 @@ resource "azuread_privileged_access_group_assignment_schedule" "example" { ## Argument Reference -- `group_id` (Required) The Object ID of the Azure AD group to which the principal will be assigned. -- `principal_id` (Required) The Object ID of the principal to be assigned to the above group. Can be either a user or a group. -- `assignment_type` (Required) The type of assignment to the group. Can be either `member` or `owner`. -- `justification` (Optional) The justification for this assignment. May be required by the role policy. -- `ticket_number` (Optional) The ticket number in the ticket system approving this assignment. May be required by the role policy. -- `ticket_system` (Optional) The ticket system containing the ticket number approving this assignment. May be required by the role policy. -- `start_date` (Optional) The date from which this assignment is valid, formatted as an RFC3339 date string (e.g. 2018-01-01T01:02:03Z). If not provided, the assignment is immediately valid. -- `expiration_date` (Optional) The date that this assignment expires, formatted as an RFC3339 date string (e.g. 2018-01-01T01:02:03Z). -- `duration` (Optional) The duration that this assignment is valid for, formatted as an ISO8601 duration (e.g. P30D for 30 days, PT3H for three hours). -- `permanent_assignment` (Optional) Is this assigment permanently valid. +* `group_id` (Required) The Object ID of the Azure AD group to which the principal will be assigned. +* `principal_id` (Required) The Object ID of the principal to be assigned to the above group. Can be either a user or a group. +* `assignment_type` (Required) The type of assignment to the group. Can be either `member` or `owner`. +* `justification` (Optional) The justification for this assignment. May be required by the role policy. +* `ticket_number` (Optional) The ticket number in the ticket system approving this assignment. May be required by the role policy. +* `ticket_system` (Optional) The ticket system containing the ticket number approving this assignment. May be required by the role policy. +* `start_date` (Optional) The date from which this assignment is valid, formatted as an RFC3339 date string (e.g. 2018-01-01T01:02:03Z). If not provided, the assignment is immediately valid. +* `expiration_date` (Optional) The date that this assignment expires, formatted as an RFC3339 date string (e.g. 2018-01-01T01:02:03Z). +* `duration` (Optional) The duration that this assignment is valid for, formatted as an ISO8601 duration (e.g. P30D for 30 days, PT3H for three hours). +* `permanent_assignment` (Optional) Is this assigment permanently valid. At least one of `expiration_date`, `duration`, or `permanent_assignment` must be supplied. The role policy may limit the maximum duration which can be supplied. @@ -57,9 +57,18 @@ At least one of `expiration_date`, `duration`, or `permanent_assignment` must be In addition to all arguments above, the following attributes are exported: -- `id` - (String) The ID of this request. -- `status` - (String) The provisioning status of this request. -- `target_schedule_id` - (String) The ID of this schedule created by this request. +* `id` - (String) The ID of this request. +* `status` - (String) The provisioning status of this request. +* `target_schedule_id` - (String) The ID of this schedule created by this request. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. ## Import diff --git a/docs/resources/privileged_access_group_eligibility_schedule.md b/docs/resources/privileged_access_group_eligibility_schedule.md index 2eb5ab27b..fe3fd4064 100644 --- a/docs/resources/privileged_access_group_eligibility_schedule.md +++ b/docs/resources/privileged_access_group_eligibility_schedule.md @@ -40,16 +40,16 @@ resource "azuread_privileged_access_group_eligibility_schedule" "example" { ## Argument Reference -- `group_id` (Required) The Object ID of the Azure AD group to which the principal will be assigned. -- `principal_id` (Required) The Object ID of the principal to be assigned to the above group. Can be either a user or a group. -- `assignment_type` (Required) The type of assignment to the group. Can be either `member` or `owner`. -- `justification` (Optional) The justification for this assignment. May be required by the role policy. -- `ticket_number` (Optional) The ticket number in the ticket system approving this assignment. May be required by the role policy. -- `ticket_system` (Optional) The ticket system containing the ticket number approving this assignment. May be required by the role policy. -- `start_date` (Optional) The date from which this assignment is valid, formatted as an RFC3339 date string (e.g. 2018-01-01T01:02:03Z). If not provided, the assignment is immediately valid. -- `expiration_date` (Optional) The date that this assignment expires, formatted as an RFC3339 date string (e.g. 2018-01-01T01:02:03Z). -- `duration` (Optional) The duration that this assignment is valid for, formatted as an ISO8601 duration (e.g. P30D for 30 days, PT3H for three hours). -- `permanent_assignment` (Optional) Is this assigment permanently valid. +* `group_id` (Required) The Object ID of the Azure AD group to which the principal will be assigned. +* `principal_id` (Required) The Object ID of the principal to be assigned to the above group. Can be either a user or a group. +* `assignment_type` (Required) The type of assignment to the group. Can be either `member` or `owner`. +* `justification` (Optional) The justification for this assignment. May be required by the role policy. +* `ticket_number` (Optional) The ticket number in the ticket system approving this assignment. May be required by the role policy. +* `ticket_system` (Optional) The ticket system containing the ticket number approving this assignment. May be required by the role policy. +* `start_date` (Optional) The date from which this assignment is valid, formatted as an RFC3339 date string (e.g. 2018-01-01T01:02:03Z). If not provided, the assignment is immediately valid. +* `expiration_date` (Optional) The date that this assignment expires, formatted as an RFC3339 date string (e.g. 2018-01-01T01:02:03Z). +* `duration` (Optional) The duration that this assignment is valid for, formatted as an ISO8601 duration (e.g. P30D for 30 days, PT3H for three hours). +* `permanent_assignment` (Optional) Is this assigment permanently valid. At least one of `expiration_date`, `duration`, or `permanent_assignment` must be supplied. The role policy may limit the maximum duration which can be supplied. @@ -57,9 +57,18 @@ At least one of `expiration_date`, `duration`, or `permanent_assignment` must be In addition to all arguments above, the following attributes are exported: -- `id` - (String) The ID of this request. -- `status` - (String) The provisioning status of this request. -- `target_schedule_id` - (String) The ID of this schedule created by this request. +* `id` - (String) The ID of this request. +* `status` - (String) The provisioning status of this request. +* `target_schedule_id` - (String) The ID of this schedule created by this request. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. ## Import diff --git a/docs/resources/service_principal.md b/docs/resources/service_principal.md index f8ad9f55a..3a84aa03a 100644 --- a/docs/resources/service_principal.md +++ b/docs/resources/service_principal.md @@ -174,6 +174,15 @@ In addition to all arguments above, the following attributes are exported: * `user_consent_display_name` - Display name for the delegated permission that appears in the end user consent experience. * `value` - The value that is used for the `scp` claim in OAuth 2.0 access tokens. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 10 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 10 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Service principals can be imported using their object ID, e.g. diff --git a/docs/resources/service_principal_certificate.md b/docs/resources/service_principal_certificate.md index 18974a35d..80f36ea31 100644 --- a/docs/resources/service_principal_certificate.md +++ b/docs/resources/service_principal_certificate.md @@ -80,6 +80,14 @@ The following arguments are supported: No additional attributes are exported. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Certificates can be imported using the object ID of the associated service principal and the key ID of the certificate credential, e.g. diff --git a/docs/resources/service_principal_claims_mapping_policy_assignment.md b/docs/resources/service_principal_claims_mapping_policy_assignment.md index b6917c720..542f6ed0d 100644 --- a/docs/resources/service_principal_claims_mapping_policy_assignment.md +++ b/docs/resources/service_principal_claims_mapping_policy_assignment.md @@ -36,6 +36,14 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of the Claims Mapping Policy Assignment. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Claims Mapping Policy can be imported using the `id`, in the form `service-principal-uuid/claimsMappingPolicy/claims-mapping-policy-uuid`, e.g: diff --git a/docs/resources/service_principal_delegated_permission_grant.md b/docs/resources/service_principal_delegated_permission_grant.md index e612a620b..28cf06727 100644 --- a/docs/resources/service_principal_delegated_permission_grant.md +++ b/docs/resources/service_principal_delegated_permission_grant.md @@ -22,8 +22,8 @@ When authenticated with a user principal, this resource requires one the followi data "azuread_application_published_app_ids" "well_known" {} resource "azuread_service_principal" "msgraph" { - application_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph - use_existing = true + client_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph + use_existing = true } resource "azuread_application" "example" { @@ -45,7 +45,7 @@ resource "azuread_application" "example" { } resource "azuread_service_principal" "example" { - application_id = azuread_application.example.application_id + client_id = azuread_application.example.application_id } resource "azuread_service_principal_delegated_permission_grant" "example" { @@ -61,8 +61,8 @@ resource "azuread_service_principal_delegated_permission_grant" "example" { data "azuread_application_published_app_ids" "well_known" {} resource "azuread_service_principal" "msgraph" { - application_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph - use_existing = true + client_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph + use_existing = true } resource "azuread_application" "example" { @@ -84,7 +84,7 @@ resource "azuread_application" "example" { } resource "azuread_service_principal" "example" { - application_id = azuread_application.example.application_id + client_id = azuread_application.example.application_id } resource "azuread_user" "example" { @@ -119,6 +119,15 @@ In addition to all arguments above, the following attributes are exported: * `id` - The ID of the delegated permission grant. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Delegated permission grants can be imported using their ID, e.g. diff --git a/docs/resources/service_principal_password.md b/docs/resources/service_principal_password.md index 9f4c8b9b2..502aa8a11 100644 --- a/docs/resources/service_principal_password.md +++ b/docs/resources/service_principal_password.md @@ -76,6 +76,14 @@ In addition to all arguments above, the following attributes are exported: * `key_id` - A UUID used to uniquely identify this password credential. * `value` - The password for this service principal, which is generated by Azure Active Directory. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import This resource does not support importing. diff --git a/docs/resources/service_principal_token_signing_certificate.md b/docs/resources/service_principal_token_signing_certificate.md index 943d50a54..52787dc4e 100644 --- a/docs/resources/service_principal_token_signing_certificate.md +++ b/docs/resources/service_principal_token_signing_certificate.md @@ -26,7 +26,7 @@ resource "azuread_application" "example" { } resource "azuread_service_principal" "example" { - application_id = azuread_application.example.application_id + client_id = azuread_application.example.application_id } resource "azuread_service_principal_token_signing_certificate" "example" { @@ -42,7 +42,7 @@ resource "azuread_application" "example" { } resource "azuread_service_principal" "example" { - application_id = azuread_application.example.application_id + client_id = azuread_application.example.application_id } resource "azuread_service_principal_token_signing_certificate" "example" { @@ -56,13 +56,11 @@ resource "azuread_service_principal_token_signing_certificate" "example" { The following arguments are supported: -* `display_name` - (Optional) Specifies a friendly name for the certificate. - Must start with `CN=`. Changing this field forces a new resource to be created. +* `display_name` - (Optional) Specifies a friendly name for the certificate. Must start with `CN=`. Changing this field forces a new resource to be created. ~> If not specified, it will default to `CN=Microsoft Azure Federated SSO Certificate`. * `end_date` - (Optional) The end date until which the token signing certificate is valid, formatted as an RFC3339 date string (e.g. `2018-01-01T01:02:03Z`). Changing this field forces a new resource to be created. - * `service_principal_id` - (Required) The object ID of the service principal for which this certificate should be created. Changing this field forces a new resource to be created. ## Attributes Reference @@ -70,13 +68,17 @@ The following arguments are supported: In addition to all arguments above, the following attributes are exported: * `key_id` - A UUID used to uniquely identify the verify certificate. - -* `thumbprint` - A SHA-1 generated thumbprint of the token signing certificate, which can be used to set the preferred signing certificate for a service principal. - * `start_date` - The start date from which the certificate is valid, formatted as an RFC3339 date string (e.g. `2018-01-01T01:02:03Z`). - -* `value` - The certificate data, which is PEM encoded but does not include the -header `-----BEGIN CERTIFICATE-----\n` or the footer `\n-----END CERTIFICATE-----`. +* `thumbprint` - A SHA-1 generated thumbprint of the token signing certificate, which can be used to set the preferred signing certificate for a service principal. +* `value` - The certificate data, which is PEM encoded but does not include the header `-----BEGIN CERTIFICATE-----\n` or the footer `\n-----END CERTIFICATE-----`. + +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. ## Import diff --git a/docs/resources/synchronization_job.md b/docs/resources/synchronization_job.md index 1117f28a9..0b3b79d39 100644 --- a/docs/resources/synchronization_job.md +++ b/docs/resources/synchronization_job.md @@ -31,8 +31,8 @@ resource "azuread_application" "example" { } resource "azuread_service_principal" "example" { - application_id = azuread_application.example.application_id - use_existing = true + client_id = azuread_application.example.application_id + use_existing = true } resource "azuread_synchronization_secret" "example" { @@ -79,6 +79,15 @@ In addition to all arguments above, the following attributes are exported: * `interval` - The interval between synchronization iterations ISO8601. E.g. PT40M run every 40 minutes. * `state` - State of the job. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 15 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Synchronization jobs can be imported using the `id`, e.g. diff --git a/docs/resources/synchronization_job_provision_on_demand.md b/docs/resources/synchronization_job_provision_on_demand.md index 828bbc1ac..64c48bf0b 100644 --- a/docs/resources/synchronization_job_provision_on_demand.md +++ b/docs/resources/synchronization_job_provision_on_demand.md @@ -82,10 +82,10 @@ resource "azuread_synchronization_job_provision_on_demand" "example" { The following arguments are supported: -- `synchronization_job_id` (Required) Identifier of the synchronization template this job is based on. -- `parameter` (Required) One or more `parameter` blocks as documented below. -- `service_principal_id` (Required) The object ID of the service principal for the synchronization job. -- `triggers` (Optional) Map of arbitrary keys and values that, when changed, will trigger a re-invocation. To force a re-invocation without changing these keys/values, use the [`terraform taint` command](https://www.terraform.io/docs/commands/taint.html). +* `synchronization_job_id` (Required) Identifier of the synchronization template this job is based on. +* `parameter` (Required) One or more `parameter` blocks as documented below. +* `service_principal_id` (Required) The object ID of the service principal for the synchronization job. +* `triggers` (Optional) Map of arbitrary keys and values that, when changed, will trigger a re-invocation. To force a re-invocation without changing these keys/values, use the [`terraform taint` command](https://www.terraform.io/docs/commands/taint.html). --- @@ -101,6 +101,12 @@ The following arguments are supported: * `object_id` (String) The identifier of an object to which a synchronization job is to be applied. Can be one of the following: (1) An onPremisesDistinguishedName for synchronization from Active Directory to Azure AD. (2) The user ID for synchronization from Azure AD to a third-party. (3) The Worker ID of the Workday worker for synchronization from Workday to either Active Directory or Azure AD. * `object_type_name` (String) The type of the object to which a synchronization job is to be applied. Can be one of the following: `user` for synchronizing between Active Directory and Azure AD, `User` for synchronizing a user between Azure AD and a third-party application, `Worker` for synchronization a user between Workday and either Active Directory or Azure AD, `Group` for synchronizing a group between Azure AD and a third-party application. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 15 minutes) Used when creating the resource. + ## Attributes Reference No additional attributes are exported. diff --git a/docs/resources/synchronization_secret.md b/docs/resources/synchronization_secret.md index bdd8b6d62..2388bb42b 100644 --- a/docs/resources/synchronization_secret.md +++ b/docs/resources/synchronization_secret.md @@ -31,8 +31,8 @@ resource "azuread_application" "example" { } resource "azuread_service_principal" "example" { - application_id = azuread_application.example.application_id - use_existing = true + client_id = azuread_application.example.application_id + use_existing = true } resource "azuread_synchronization_secret" "example" { @@ -70,6 +70,15 @@ In addition to all arguments above, the following attributes are exported: * `id` - An ID used to uniquely identify this synchronization sec. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import This resource does not support importing. diff --git a/docs/resources/user.md b/docs/resources/user.md index 662de9e0d..9abf36258 100644 --- a/docs/resources/user.md +++ b/docs/resources/user.md @@ -85,6 +85,15 @@ In addition to all arguments above, the following attributes are exported: * `proxy_addresses` - List of email addresses for the user that direct to the same mailbox. * `user_type` - The user type in the directory. Possible values are `Guest` or `Member`. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import Users can be imported using their object ID, e.g. diff --git a/docs/resources/user_flow_attribute.md b/docs/resources/user_flow_attribute.md index faa91be9c..8cb19c7d3 100644 --- a/docs/resources/user_flow_attribute.md +++ b/docs/resources/user_flow_attribute.md @@ -40,6 +40,15 @@ In addition to all arguments above, the following attributes are exported: * `attribute_type` - The type of the user flow attribute. Values include `builtIn`, `custom` or `required`. * `id` - An ID used to uniquely identify this user flow attribute. +## Timeouts + +The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: + +* `create` - (Defaults to 5 minutes) Used when creating the resource. +* `read` - (Defaults to 5 minutes) Used when retrieving the resource. +* `update` - (Defaults to 5 minutes) Used when updating the resource. +* `delete` - (Defaults to 5 minutes) Used when deleting the resource. + ## Import User flow attributes can be imported using the `id`, e.g. diff --git a/internal/services/administrativeunits/administrative_unit_member_resource.go b/internal/services/administrativeunits/administrative_unit_member_resource.go index a87feec1b..e0f2b58a0 100644 --- a/internal/services/administrativeunits/administrative_unit_member_resource.go +++ b/internal/services/administrativeunits/administrative_unit_member_resource.go @@ -31,7 +31,6 @@ func administrativeUnitMemberResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), Read: pluginsdk.DefaultTimeout(5 * time.Minute), - Update: pluginsdk.DefaultTimeout(5 * time.Minute), Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/administrativeunits/administrative_unit_role_member_resource.go b/internal/services/administrativeunits/administrative_unit_role_member_resource.go index 534a3a2cb..5a2f6ba23 100644 --- a/internal/services/administrativeunits/administrative_unit_role_member_resource.go +++ b/internal/services/administrativeunits/administrative_unit_role_member_resource.go @@ -28,7 +28,6 @@ func administrativeUnitRoleMemberResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), Read: pluginsdk.DefaultTimeout(5 * time.Minute), - Update: pluginsdk.DefaultTimeout(5 * time.Minute), Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/applications/application_api_access_resource.go b/internal/services/applications/application_api_access_resource.go index aa3035e53..655595f29 100644 --- a/internal/services/applications/application_api_access_resource.go +++ b/internal/services/applications/application_api_access_resource.go @@ -27,14 +27,14 @@ type ApplicationApiAccessModel struct { ScopeIds []string `tfschema:"scope_ids"` } +var _ sdk.ResourceWithUpdate = ApplicationApiAccessResource{} + type ApplicationApiAccessResource struct{} func (r ApplicationApiAccessResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateApiAccessID } -var _ sdk.ResourceWithUpdate = ApplicationApiAccessResource{} - func (r ApplicationApiAccessResource) ResourceType() string { return "azuread_application_api_access" } diff --git a/internal/services/applications/application_app_role_resource.go b/internal/services/applications/application_app_role_resource.go index 139293dde..775d1ec34 100644 --- a/internal/services/applications/application_app_role_resource.go +++ b/internal/services/applications/application_app_role_resource.go @@ -30,14 +30,14 @@ type ApplicationAppRoleModel struct { Value string `tfschema:"value"` } +var _ sdk.ResourceWithUpdate = ApplicationAppRoleResource{} + type ApplicationAppRoleResource struct{} func (r ApplicationAppRoleResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateAppRoleID } -var _ sdk.ResourceWithUpdate = ApplicationAppRoleResource{} - func (r ApplicationAppRoleResource) ResourceType() string { return "azuread_application_app_role" } diff --git a/internal/services/applications/application_fallback_public_client_resource.go b/internal/services/applications/application_fallback_public_client_resource.go index b252fdaf0..1ecf6a111 100644 --- a/internal/services/applications/application_fallback_public_client_resource.go +++ b/internal/services/applications/application_fallback_public_client_resource.go @@ -22,14 +22,14 @@ type ApplicationFallbackPublicClientModel struct { Enabled bool `tfschema:"enabled"` } +var _ sdk.Resource = ApplicationFallbackPublicClientResource{} + type ApplicationFallbackPublicClientResource struct{} func (r ApplicationFallbackPublicClientResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateFallbackPublicClientID } -var _ sdk.Resource = ApplicationFallbackPublicClientResource{} - func (r ApplicationFallbackPublicClientResource) ResourceType() string { return "azuread_application_fallback_public_client" } diff --git a/internal/services/applications/application_from_template_resource.go b/internal/services/applications/application_from_template_resource.go index 1a3d7ca95..b38bdca58 100644 --- a/internal/services/applications/application_from_template_resource.go +++ b/internal/services/applications/application_from_template_resource.go @@ -30,14 +30,14 @@ type ApplicationFromTemplateModel struct { ServicePrincipalObjectId string `tfschema:"service_principal_object_id"` } +var _ sdk.ResourceWithUpdate = ApplicationFromTemplateResource{} + type ApplicationFromTemplateResource struct{} func (r ApplicationFromTemplateResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateFromTemplateID } -var _ sdk.ResourceWithUpdate = ApplicationFromTemplateResource{} - func (r ApplicationFromTemplateResource) ResourceType() string { return "azuread_application_from_template" } diff --git a/internal/services/applications/application_identifier_uri_resource.go b/internal/services/applications/application_identifier_uri_resource.go index bd2f61143..bf45feeaf 100644 --- a/internal/services/applications/application_identifier_uri_resource.go +++ b/internal/services/applications/application_identifier_uri_resource.go @@ -24,14 +24,14 @@ type ApplicationIdentifierUriModel struct { IdentifierUri string `tfschema:"identifier_uri"` } +var _ sdk.Resource = ApplicationIdentifierUriResource{} + type ApplicationIdentifierUriResource struct{} func (r ApplicationIdentifierUriResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateIdentifierUriID } -var _ sdk.Resource = ApplicationIdentifierUriResource{} - func (r ApplicationIdentifierUriResource) ResourceType() string { return "azuread_application_identifier_uri" } diff --git a/internal/services/applications/application_known_clients_resource.go b/internal/services/applications/application_known_clients_resource.go index f977bd0fe..63cbf0647 100644 --- a/internal/services/applications/application_known_clients_resource.go +++ b/internal/services/applications/application_known_clients_resource.go @@ -24,14 +24,14 @@ type ApplicationKnownClientsModel struct { KnownClientIds []string `tfschema:"known_client_ids"` } +var _ sdk.ResourceWithUpdate = ApplicationKnownClientsResource{} + type ApplicationKnownClientsResource struct{} func (r ApplicationKnownClientsResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateKnownClientsID } -var _ sdk.ResourceWithUpdate = ApplicationKnownClientsResource{} - func (r ApplicationKnownClientsResource) ResourceType() string { return "azuread_application_known_clients" } diff --git a/internal/services/applications/application_optional_claims_resource.go b/internal/services/applications/application_optional_claims_resource.go index a95ce7238..6d145d5ae 100644 --- a/internal/services/applications/application_optional_claims_resource.go +++ b/internal/services/applications/application_optional_claims_resource.go @@ -32,14 +32,14 @@ type OptionalClaim struct { AdditionalProperties []string `tfschema:"additional_properties"` } +var _ sdk.ResourceWithUpdate = ApplicationOptionalClaimsResource{} + type ApplicationOptionalClaimsResource struct{} func (r ApplicationOptionalClaimsResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateOptionalClaimsID } -var _ sdk.ResourceWithUpdate = ApplicationOptionalClaimsResource{} - func (r ApplicationOptionalClaimsResource) ResourceType() string { return "azuread_application_optional_claims" } diff --git a/internal/services/applications/application_owner_resource.go b/internal/services/applications/application_owner_resource.go index b6128d583..ac6cd19ac 100644 --- a/internal/services/applications/application_owner_resource.go +++ b/internal/services/applications/application_owner_resource.go @@ -23,14 +23,14 @@ type ApplicationOwnerModel struct { OwnerObjectId string `tfschema:"owner_object_id"` } +var _ sdk.Resource = ApplicationOwnerResource{} + type ApplicationOwnerResource struct{} func (r ApplicationOwnerResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateOwnerID } -var _ sdk.Resource = ApplicationOwnerResource{} - func (r ApplicationOwnerResource) ResourceType() string { return "azuread_application_owner" } diff --git a/internal/services/applications/application_permission_scope_resource.go b/internal/services/applications/application_permission_scope_resource.go index a8af66b58..25df56a3a 100644 --- a/internal/services/applications/application_permission_scope_resource.go +++ b/internal/services/applications/application_permission_scope_resource.go @@ -32,14 +32,14 @@ type ApplicationPermissionScopeModel struct { Value string `tfschema:"value"` } +var _ sdk.ResourceWithUpdate = ApplicationPermissionScopeResource{} + type ApplicationPermissionScopeResource struct{} func (r ApplicationPermissionScopeResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidatePermissionScopeID } -var _ sdk.ResourceWithUpdate = ApplicationPermissionScopeResource{} - func (r ApplicationPermissionScopeResource) ResourceType() string { return "azuread_application_permission_scope" } diff --git a/internal/services/applications/application_redirect_uris_resource.go b/internal/services/applications/application_redirect_uris_resource.go index 4d1a79f11..eb499dc1c 100644 --- a/internal/services/applications/application_redirect_uris_resource.go +++ b/internal/services/applications/application_redirect_uris_resource.go @@ -31,14 +31,14 @@ type ApplicationRedirectUrisModel struct { RedirectUris []string `tfschema:"redirect_uris"` } +var _ sdk.ResourceWithUpdate = ApplicationRedirectUrisResource{} + type ApplicationRedirectUrisResource struct{} func (r ApplicationRedirectUrisResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateRedirectUrisID } -var _ sdk.ResourceWithUpdate = ApplicationRedirectUrisResource{} - func (r ApplicationRedirectUrisResource) ResourceType() string { return "azuread_application_redirect_uris" } diff --git a/internal/services/applications/application_registration_resource.go b/internal/services/applications/application_registration_resource.go index e2e5e12a7..9a311ab65 100644 --- a/internal/services/applications/application_registration_resource.go +++ b/internal/services/applications/application_registration_resource.go @@ -42,14 +42,14 @@ type ApplicationRegistrationModel struct { TermsOfServiceUrl string `tfschema:"terms_of_service_url"` } +var _ sdk.ResourceWithUpdate = ApplicationRegistrationResource{} + type ApplicationRegistrationResource struct{} func (r ApplicationRegistrationResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateApplicationID } -var _ sdk.ResourceWithUpdate = ApplicationRegistrationResource{} - func (r ApplicationRegistrationResource) ResourceType() string { return "azuread_application_registration" } diff --git a/internal/services/conditionalaccess/named_location_resource.go b/internal/services/conditionalaccess/named_location_resource.go index d8048c458..1bedf73ba 100644 --- a/internal/services/conditionalaccess/named_location_resource.go +++ b/internal/services/conditionalaccess/named_location_resource.go @@ -45,7 +45,6 @@ func namedLocationResource() *pluginsdk.Resource { }), Schema: map[string]*pluginsdk.Schema{ - "display_name": { Type: pluginsdk.TypeString, Required: true, diff --git a/internal/services/directoryroles/directory_role_assignment_resource.go b/internal/services/directoryroles/directory_role_assignment_resource.go index ff6b089dd..c6ad28179 100644 --- a/internal/services/directoryroles/directory_role_assignment_resource.go +++ b/internal/services/directoryroles/directory_role_assignment_resource.go @@ -29,7 +29,6 @@ func directoryRoleAssignmentResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), Read: pluginsdk.DefaultTimeout(5 * time.Minute), - Update: pluginsdk.DefaultTimeout(5 * time.Minute), Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/directoryroles/directory_role_eligibility_schedule_request_resource.go b/internal/services/directoryroles/directory_role_eligibility_schedule_request_resource.go index 36538ad5b..7c67ff15a 100644 --- a/internal/services/directoryroles/directory_role_eligibility_schedule_request_resource.go +++ b/internal/services/directoryroles/directory_role_eligibility_schedule_request_resource.go @@ -31,7 +31,6 @@ func directoryRoleEligibilityScheduleRequestResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), Read: pluginsdk.DefaultTimeout(5 * time.Minute), - Update: pluginsdk.DefaultTimeout(5 * time.Minute), Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/directoryroles/directory_role_member_resource.go b/internal/services/directoryroles/directory_role_member_resource.go index d1d145c02..b6b2e89fb 100644 --- a/internal/services/directoryroles/directory_role_member_resource.go +++ b/internal/services/directoryroles/directory_role_member_resource.go @@ -33,7 +33,6 @@ func directoryRoleMemberResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), Read: pluginsdk.DefaultTimeout(5 * time.Minute), - Update: pluginsdk.DefaultTimeout(5 * time.Minute), Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/directoryroles/directory_role_resource.go b/internal/services/directoryroles/directory_role_resource.go index cc045ddb6..ea39495fb 100644 --- a/internal/services/directoryroles/directory_role_resource.go +++ b/internal/services/directoryroles/directory_role_resource.go @@ -26,14 +26,14 @@ type DirectoryRoleModel struct { TemplateId string `tfschema:"template_id"` } +var _ sdk.Resource = DirectoryRoleResource{} + type DirectoryRoleResource struct{} func (r DirectoryRoleResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return validation.IsUUID } -var _ sdk.Resource = DirectoryRoleResource{} - func (r DirectoryRoleResource) ResourceType() string { return "azuread_directory_role" } diff --git a/internal/services/groups/group_member_resource.go b/internal/services/groups/group_member_resource.go index 329618240..d41d34219 100644 --- a/internal/services/groups/group_member_resource.go +++ b/internal/services/groups/group_member_resource.go @@ -32,7 +32,6 @@ func groupMemberResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), Read: pluginsdk.DefaultTimeout(5 * time.Minute), - Update: pluginsdk.DefaultTimeout(5 * time.Minute), Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/identitygovernance/privileged_access_group_assignment_schedule_resource.go b/internal/services/identitygovernance/privileged_access_group_assignment_schedule_resource.go index bf2e35d15..eb801c945 100644 --- a/internal/services/identitygovernance/privileged_access_group_assignment_schedule_resource.go +++ b/internal/services/identitygovernance/privileged_access_group_assignment_schedule_resource.go @@ -17,14 +17,14 @@ import ( "github.com/manicminer/hamilton/msgraph" ) +var _ sdk.ResourceWithUpdate = PrivilegedAccessGroupAssignmentScheduleResource{} + type PrivilegedAccessGroupAssignmentScheduleResource struct{} func (r PrivilegedAccessGroupAssignmentScheduleResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidatePrivilegedAccessGroupScheduleID } -var _ sdk.Resource = PrivilegedAccessGroupAssignmentScheduleResource{} - func (r PrivilegedAccessGroupAssignmentScheduleResource) ResourceType() string { return "azuread_privileged_access_group_assignment_schedule" } diff --git a/internal/services/identitygovernance/privileged_access_group_eligiblity_schedule_resource.go b/internal/services/identitygovernance/privileged_access_group_eligiblity_schedule_resource.go index 6cb446513..18bba1d5a 100644 --- a/internal/services/identitygovernance/privileged_access_group_eligiblity_schedule_resource.go +++ b/internal/services/identitygovernance/privileged_access_group_eligiblity_schedule_resource.go @@ -17,14 +17,14 @@ import ( "github.com/manicminer/hamilton/msgraph" ) +var _ sdk.ResourceWithUpdate = PrivilegedAccessGroupEligibilityScheduleResource{} + type PrivilegedAccessGroupEligibilityScheduleResource struct{} func (r PrivilegedAccessGroupEligibilityScheduleResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidatePrivilegedAccessGroupScheduleID } -var _ sdk.Resource = PrivilegedAccessGroupEligibilityScheduleResource{} - func (r PrivilegedAccessGroupEligibilityScheduleResource) ResourceType() string { return "azuread_privileged_access_group_eligibility_schedule" } diff --git a/internal/services/invitations/invitation_resource.go b/internal/services/invitations/invitation_resource.go index 57f1d379a..901ecb7ee 100644 --- a/internal/services/invitations/invitation_resource.go +++ b/internal/services/invitations/invitation_resource.go @@ -30,7 +30,6 @@ func invitationResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), Read: pluginsdk.DefaultTimeout(5 * time.Minute), - Update: pluginsdk.DefaultTimeout(5 * time.Minute), Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/policies/claims_mapping_policy_resource.go b/internal/services/policies/claims_mapping_policy_resource.go index cc736cf37..c74c5a569 100644 --- a/internal/services/policies/claims_mapping_policy_resource.go +++ b/internal/services/policies/claims_mapping_policy_resource.go @@ -8,6 +8,7 @@ import ( "fmt" "log" "net/http" + "time" "github.com/hashicorp/go-azure-helpers/lang/pointer" "github.com/hashicorp/go-azure-sdk/sdk/odata" @@ -25,6 +26,13 @@ func claimsMappingPolicyResource() *pluginsdk.Resource { UpdateContext: claimsMappingPolicyResourceUpdate, DeleteContext: claimsMappingPolicyResourceDelete, + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(5 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(5 * time.Minute), + Delete: pluginsdk.DefaultTimeout(5 * time.Minute), + }, + Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { if _, err := uuid.ParseUUID(id); err != nil { return fmt.Errorf("specified ID (%q) is not valid: %s", id, err) diff --git a/internal/services/policies/group_role_management_policy_resource.go b/internal/services/policies/group_role_management_policy_resource.go index 1c05c93ef..dd8148e5a 100644 --- a/internal/services/policies/group_role_management_policy_resource.go +++ b/internal/services/policies/group_role_management_policy_resource.go @@ -78,14 +78,14 @@ type GroupRoleManagementPolicyNotificationSettings struct { AdditionalRecipients []string `tfschema:"additional_recipients"` } +var _ sdk.ResourceWithUpdate = GroupRoleManagementPolicyResource{} + type GroupRoleManagementPolicyResource struct{} func (r GroupRoleManagementPolicyResource) IDValidationFunc() pluginsdk.SchemaValidateFunc { return parse.ValidateRoleManagementPolicyID } -var _ sdk.Resource = GroupRoleManagementPolicyResource{} - func (r GroupRoleManagementPolicyResource) ResourceType() string { return "azuread_group_role_management_policy" } diff --git a/internal/services/serviceprincipals/service_principal_certificate_resource.go b/internal/services/serviceprincipals/service_principal_certificate_resource.go index b77e3352d..4dfed941e 100644 --- a/internal/services/serviceprincipals/service_principal_certificate_resource.go +++ b/internal/services/serviceprincipals/service_principal_certificate_resource.go @@ -32,7 +32,6 @@ func servicePrincipalCertificateResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), Read: pluginsdk.DefaultTimeout(5 * time.Minute), - Update: pluginsdk.DefaultTimeout(5 * time.Minute), Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/serviceprincipals/service_principal_claims_mapping_policy_assignment_resource.go b/internal/services/serviceprincipals/service_principal_claims_mapping_policy_assignment_resource.go index 2e07da854..e99176ddc 100644 --- a/internal/services/serviceprincipals/service_principal_claims_mapping_policy_assignment_resource.go +++ b/internal/services/serviceprincipals/service_principal_claims_mapping_policy_assignment_resource.go @@ -8,6 +8,7 @@ import ( "fmt" "log" "net/http" + "time" "github.com/hashicorp/go-azure-helpers/lang/pointer" "github.com/hashicorp/go-azure-sdk/sdk/odata" @@ -24,6 +25,12 @@ func servicePrincipalClaimsMappingPolicyAssignmentResource() *pluginsdk.Resource ReadContext: servicePrincipalClaimsMappingPolicyAssignmentResourceRead, DeleteContext: servicePrincipalClaimsMappingPolicyAssignmentResourceDelete, + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(5 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Delete: pluginsdk.DefaultTimeout(5 * time.Minute), + }, + Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := parse.ObjectSubResourceID(id, "claimsMappingPolicy") return err diff --git a/internal/services/serviceprincipals/service_principal_password_resource.go b/internal/services/serviceprincipals/service_principal_password_resource.go index 9994a9170..c494a69b8 100644 --- a/internal/services/serviceprincipals/service_principal_password_resource.go +++ b/internal/services/serviceprincipals/service_principal_password_resource.go @@ -32,7 +32,6 @@ func servicePrincipalPasswordResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), Read: pluginsdk.DefaultTimeout(5 * time.Minute), - Update: pluginsdk.DefaultTimeout(5 * time.Minute), Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/serviceprincipals/service_principal_token_signing_certificate_resource.go b/internal/services/serviceprincipals/service_principal_token_signing_certificate_resource.go index e3abb4a99..798f335b4 100644 --- a/internal/services/serviceprincipals/service_principal_token_signing_certificate_resource.go +++ b/internal/services/serviceprincipals/service_principal_token_signing_certificate_resource.go @@ -33,7 +33,6 @@ func servicePrincipalTokenSigningCertificateResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), Read: pluginsdk.DefaultTimeout(5 * time.Minute), - Update: pluginsdk.DefaultTimeout(5 * time.Minute), Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/synchronization/synchronization_secret_resource.go b/internal/services/synchronization/synchronization_secret_resource.go index 831f8ca4f..5041c1ace 100644 --- a/internal/services/synchronization/synchronization_secret_resource.go +++ b/internal/services/synchronization/synchronization_secret_resource.go @@ -31,13 +31,11 @@ func synchronizationSecretResource() *pluginsdk.Resource { Timeouts: &pluginsdk.ResourceTimeout{ Create: pluginsdk.DefaultTimeout(5 * time.Minute), - Read: pluginsdk.DefaultTimeout(4 * time.Minute), - Update: pluginsdk.DefaultTimeout(3 * time.Minute), - Delete: pluginsdk.DefaultTimeout(3 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(5 * time.Minute), + Delete: pluginsdk.DefaultTimeout(5 * time.Minute), }, - SchemaVersion: 0, - Schema: map[string]*pluginsdk.Schema{ "service_principal_id": { Description: "The object ID of the service principal for which this synchronization secret should be created",