Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

b/fix constant drift when nested required attributes have no defaults #2022

Merged
merged 21 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 3 additions & 6 deletions docs/resources/accessanalyzer_analyzer.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,31 +81,28 @@ Optional:
<a id="nestedatt--archive_rules"></a>
### Nested Schema for `archive_rules`

Required:
Optional:

- `filter` (Attributes List) (see [below for nested schema](#nestedatt--archive_rules--filter))
- `rule_name` (String) The archive rule name

<a id="nestedatt--archive_rules--filter"></a>
### Nested Schema for `archive_rules.filter`

Required:

- `property` (String)

Optional:

- `contains` (List of String)
- `eq` (List of String)
- `exists` (Boolean)
- `neq` (List of String)
- `property` (String)



<a id="nestedatt--tags"></a>
### Nested Schema for `tags`

Required:
Optional:

- `key` (String) The key name of the tag. You can specify a value that is 1 to 127 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.
- `value` (String) The value for the tag. You can specify a value that is 1 to 255 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.
Expand Down
26 changes: 10 additions & 16 deletions docs/resources/acmpca_certificate.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,26 +103,23 @@ Optional:
<a id="nestedatt--api_passthrough--extensions--certificate_policies"></a>
### Nested Schema for `api_passthrough.extensions.certificate_policies`

Required:

- `cert_policy_id` (String) Specifies the object identifier (OID) of the certificate policy under which the certificate was issued. For more information, see NIST's definition of [Object Identifier (OID)](https://docs.aws.amazon.com/https://csrc.nist.gov/glossary/term/Object_Identifier).

Optional:

- `cert_policy_id` (String) Specifies the object identifier (OID) of the certificate policy under which the certificate was issued. For more information, see NIST's definition of [Object Identifier (OID)](https://docs.aws.amazon.com/https://csrc.nist.gov/glossary/term/Object_Identifier).
- `policy_qualifiers` (Attributes List) Modifies the given ``CertPolicyId`` with a qualifier. AWS Private CA supports the certification practice statement (CPS) qualifier. (see [below for nested schema](#nestedatt--api_passthrough--extensions--certificate_policies--policy_qualifiers))

<a id="nestedatt--api_passthrough--extensions--certificate_policies--policy_qualifiers"></a>
### Nested Schema for `api_passthrough.extensions.certificate_policies.policy_qualifiers`

Required:
Optional:

- `policy_qualifier_id` (String) Identifies the qualifier modifying a ``CertPolicyId``.
- `qualifier` (Attributes) Defines the qualifier type. AWS Private CA supports the use of a URI for a CPS qualifier in this field. (see [below for nested schema](#nestedatt--api_passthrough--extensions--certificate_policies--policy_qualifiers--qualifier))

<a id="nestedatt--api_passthrough--extensions--certificate_policies--policy_qualifiers--qualifier"></a>
### Nested Schema for `api_passthrough.extensions.certificate_policies.policy_qualifiers.qualifier`

Required:
Optional:

- `cps_uri` (String) Contains a pointer to a certification practice statement (CPS) published by the CA.

Expand All @@ -132,14 +129,11 @@ Required:
<a id="nestedatt--api_passthrough--extensions--custom_extensions"></a>
### Nested Schema for `api_passthrough.extensions.custom_extensions`

Required:

- `object_identifier` (String) Specifies the object identifier (OID) of the X.509 extension. For more information, see the [Global OID reference database.](https://docs.aws.amazon.com/https://oidref.com/2.5.29)
- `value` (String) Specifies the base64-encoded value of the X.509 extension.

Optional:

- `critical` (Boolean) Specifies the critical flag of the X.509 extension.
- `object_identifier` (String) Specifies the object identifier (OID) of the X.509 extension. For more information, see the [Global OID reference database.](https://docs.aws.amazon.com/https://oidref.com/2.5.29)
- `value` (String) Specifies the base64-encoded value of the X.509 extension.


<a id="nestedatt--api_passthrough--extensions--extended_key_usage"></a>
Expand Down Expand Up @@ -207,7 +201,7 @@ Optional:
<a id="nestedatt--api_passthrough--extensions--subject_alternative_names--directory_name--custom_attributes"></a>
### Nested Schema for `api_passthrough.extensions.subject_alternative_names.directory_name.custom_attributes`

Required:
Optional:

- `object_identifier` (String) Specifies the object identifier (OID) of the attribute type of the relative distinguished name (RDN).
- `value` (String) Specifies the attribute value of relative distinguished name (RDN).
Expand All @@ -217,7 +211,7 @@ Required:
<a id="nestedatt--api_passthrough--extensions--subject_alternative_names--edi_party_name"></a>
### Nested Schema for `api_passthrough.extensions.subject_alternative_names.edi_party_name`

Required:
Optional:

- `name_assigner` (String) Specifies the name assigner.
- `party_name` (String) Specifies the party name.
Expand All @@ -226,7 +220,7 @@ Required:
<a id="nestedatt--api_passthrough--extensions--subject_alternative_names--other_name"></a>
### Nested Schema for `api_passthrough.extensions.subject_alternative_names.other_name`

Required:
Optional:

- `type_id` (String) Specifies an OID.
- `value` (String) Specifies an OID value.
Expand Down Expand Up @@ -260,7 +254,7 @@ Optional:
<a id="nestedatt--api_passthrough--subject--custom_attributes"></a>
### Nested Schema for `api_passthrough.subject.custom_attributes`

Required:
Optional:

- `object_identifier` (String) Specifies the object identifier (OID) of the attribute type of the relative distinguished name (RDN).
- `value` (String) Specifies the attribute value of relative distinguished name (RDN).
Expand All @@ -271,7 +265,7 @@ Required:
<a id="nestedatt--validity_not_before"></a>
### Nested Schema for `validity_not_before`

Required:
Optional:

- `type` (String) Specifies whether the ``Value`` parameter represents days, months, or years.
- `value` (Number) A long integer interpreted according to the value of ``Type``, below.
Expand Down
30 changes: 9 additions & 21 deletions docs/resources/acmpca_certificate_authority.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Optional:
<a id="nestedatt--subject--custom_attributes"></a>
### Nested Schema for `subject.custom_attributes`

Required:
Optional:

- `object_identifier` (String) String that contains X.509 ObjectIdentifier information.
- `value` (String)
Expand Down Expand Up @@ -183,7 +183,7 @@ Optional:
<a id="nestedatt--csr_extensions--subject_information_access"></a>
### Nested Schema for `csr_extensions.subject_information_access`

Required:
Optional:

- `access_location` (Attributes) Structure that contains X.509 GeneralName information. Assign one and ONLY one field. (see [below for nested schema](#nestedatt--csr_extensions--subject_information_access--access_location))
- `access_method` (Attributes) Structure that contains X.509 AccessMethod information. Assign one and ONLY one field. (see [below for nested schema](#nestedatt--csr_extensions--subject_information_access--access_method))
Expand Down Expand Up @@ -226,7 +226,7 @@ Optional:
<a id="nestedatt--csr_extensions--subject_information_access--access_location--directory_name--custom_attributes"></a>
### Nested Schema for `csr_extensions.subject_information_access.access_location.directory_name.custom_attributes`

Required:
Optional:

- `object_identifier` (String) String that contains X.509 ObjectIdentifier information.
- `value` (String)
Expand All @@ -236,19 +236,16 @@ Required:
<a id="nestedatt--csr_extensions--subject_information_access--access_location--edi_party_name"></a>
### Nested Schema for `csr_extensions.subject_information_access.access_location.edi_party_name`

Required:

- `party_name` (String)

Optional:

- `name_assigner` (String)
- `party_name` (String)


<a id="nestedatt--csr_extensions--subject_information_access--access_location--other_name"></a>
### Nested Schema for `csr_extensions.subject_information_access.access_location.other_name`

Required:
Optional:

- `type_id` (String) String that contains X.509 ObjectIdentifier information.
- `value` (String)
Expand Down Expand Up @@ -277,22 +274,19 @@ Optional:
<a id="nestedatt--revocation_configuration--crl_configuration"></a>
### Nested Schema for `revocation_configuration.crl_configuration`

Required:

- `enabled` (Boolean)

Optional:

- `crl_distribution_point_extension_configuration` (Attributes) Configures the default behavior of the CRL Distribution Point extension for certificates issued by your certificate authority (see [below for nested schema](#nestedatt--revocation_configuration--crl_configuration--crl_distribution_point_extension_configuration))
- `custom_cname` (String)
- `enabled` (Boolean)
- `expiration_in_days` (Number)
- `s3_bucket_name` (String)
- `s3_object_acl` (String)

<a id="nestedatt--revocation_configuration--crl_configuration--crl_distribution_point_extension_configuration"></a>
### Nested Schema for `revocation_configuration.crl_configuration.crl_distribution_point_extension_configuration`

Required:
Optional:

- `omit_extension` (Boolean)

Expand All @@ -301,25 +295,19 @@ Required:
<a id="nestedatt--revocation_configuration--ocsp_configuration"></a>
### Nested Schema for `revocation_configuration.ocsp_configuration`

Required:

- `enabled` (Boolean)

Optional:

- `enabled` (Boolean)
- `ocsp_custom_cname` (String)



<a id="nestedatt--tags"></a>
### Nested Schema for `tags`

Required:

- `key` (String)

Optional:

- `key` (String)
- `value` (String)

## Import
Expand Down
13 changes: 5 additions & 8 deletions docs/resources/amplify_app.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ Optional:
<a id="nestedatt--auto_branch_creation_config--environment_variables"></a>
### Nested Schema for `auto_branch_creation_config.environment_variables`

Required:
Optional:

- `name` (String)
- `value` (String)
Expand Down Expand Up @@ -254,21 +254,18 @@ Optional:
<a id="nestedatt--custom_rules"></a>
### Nested Schema for `custom_rules`

Required:

- `source` (String)
- `target` (String)

Optional:

- `condition` (String)
- `source` (String)
- `status` (String)
- `target` (String)


<a id="nestedatt--environment_variables"></a>
### Nested Schema for `environment_variables`

Required:
Optional:

- `name` (String)
- `value` (String)
Expand All @@ -277,7 +274,7 @@ Required:
<a id="nestedatt--tags"></a>
### Nested Schema for `tags`

Required:
Optional:

- `key` (String)
- `value` (String)
Expand Down
11 changes: 4 additions & 7 deletions docs/resources/amplify_branch.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,20 +142,17 @@ Optional:
<a id="nestedatt--basic_auth_config"></a>
### Nested Schema for `basic_auth_config`

Required:

- `password` (String)
- `username` (String)

Optional:

- `enable_basic_auth` (Boolean)
- `password` (String)
- `username` (String)


<a id="nestedatt--environment_variables"></a>
### Nested Schema for `environment_variables`

Required:
Optional:

- `name` (String)
- `value` (String)
Expand All @@ -164,7 +161,7 @@ Required:
<a id="nestedatt--tags"></a>
### Nested Schema for `tags`

Required:
Optional:

- `key` (String)
- `value` (String)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/apigateway_api_key.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Optional:
<a id="nestedatt--tags"></a>
### Nested Schema for `tags`

Required:
Optional:

- `key` (String) The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.
- `value` (String) The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/apigateway_client_certificate.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ resource "awscc_apigateway_client_certificate" "example" {
<a id="nestedatt--tags"></a>
### Nested Schema for `tags`

Required:
Optional:

- `key` (String)
- `value` (String)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/apigateway_deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Optional:
<a id="nestedatt--stage_description--tags"></a>
### Nested Schema for `stage_description.tags`

Required:
Optional:

- `key` (String) The key name of the tag
- `value` (String) The value for the tag
Expand Down
17 changes: 4 additions & 13 deletions docs/resources/apigateway_method.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,6 @@ resource "awscc_apigateway_method" "terraform_apigateway_method" {
<a id="nestedatt--integration"></a>
### Nested Schema for `integration`

Required:

- `type` (String) Specifies an API method integration type. The valid value is one of the following:
For the HTTP and HTTP proxy integrations, each integration can specify a protocol (``http/https``), port and path. Standard 80 and 443 ports are supported as well as custom ports above 1024. An HTTP or HTTP proxy integration with a ``connectionType`` of ``VPC_LINK`` is referred to as a private integration and uses a VpcLink to connect API Gateway to a network load balancer of a VPC.

Optional:

- `cache_key_parameters` (List of String) A list of request parameters whose values API Gateway caches. To be valid values for ``cacheKeyParameters``, these parameters must also be specified for Method ``requestParameters``.
Expand All @@ -169,37 +164,33 @@ Optional:
- `request_parameters` (Map of String) A key-value map specifying request parameters that are passed from the method request to the back end. The key is an integration request parameter name and the associated value is a method request parameter value or static value that must be enclosed within single quotes and pre-encoded as required by the back end. The method request parameter value must match the pattern of ``method.request.{location}.{name}``, where ``location`` is ``querystring``, ``path``, or ``header`` and ``name`` must be a valid and unique method request parameter name.
- `request_templates` (Map of String) Represents a map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. The content type value is the key in this map, and the template (as a String) is the value.
- `timeout_in_millis` (Number) Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000 milliseconds or 29 seconds.
- `type` (String) Specifies an API method integration type. The valid value is one of the following:
For the HTTP and HTTP proxy integrations, each integration can specify a protocol (``http/https``), port and path. Standard 80 and 443 ports are supported as well as custom ports above 1024. An HTTP or HTTP proxy integration with a ``connectionType`` of ``VPC_LINK`` is referred to as a private integration and uses a VpcLink to connect API Gateway to a network load balancer of a VPC.
- `uri` (String) Specifies Uniform Resource Identifier (URI) of the integration endpoint.
For ``HTTP`` or ``HTTP_PROXY`` integrations, the URI must be a fully formed, encoded HTTP(S) URL according to the RFC-3986 specification for standard integrations. If ``connectionType`` is ``VPC_LINK`` specify the Network Load Balancer DNS name. For ``AWS`` or ``AWS_PROXY`` integrations, the URI is of the form ``arn:aws:apigateway:{region}:{subdomain.service|service}:path|action/{service_api}``. Here, {Region} is the API Gateway region (e.g., us-east-1); {service} is the name of the integrated AWS service (e.g., s3); and {subdomain} is a designated subdomain supported by certain AWS service for fast host-name lookup. action can be used for an AWS service action-based API, using an Action={name}&{p1}={v1}&p2={v2}... query string. The ensuing {service_api} refers to a supported action {name} plus any required input parameters. Alternatively, path can be used for an AWS service path-based API. The ensuing service_api refers to the path to an AWS service resource, including the region of the integrated AWS service, if applicable. For example, for integration with the S3 API of GetObject, the uri can be either ``arn:aws:apigateway:us-west-2:s3:action/GetObject&Bucket={bucket}&Key={key}`` or ``arn:aws:apigateway:us-west-2:s3:path/{bucket}/{key}``

<a id="nestedatt--integration--integration_responses"></a>
### Nested Schema for `integration.integration_responses`

Required:

- `status_code` (String) Specifies the status code that is used to map the integration response to an existing MethodResponse.

Optional:

- `content_handling` (String) Specifies how to handle response payload content type conversions. Supported values are ``CONVERT_TO_BINARY`` and ``CONVERT_TO_TEXT``, with the following behaviors:
If this property is not defined, the response payload will be passed through from the integration response to the method response without modification.
- `response_parameters` (Map of String) A key-value map specifying response parameters that are passed to the method response from the back end. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of ``method.response.header.{name}``, where ``name`` is a valid and unique header name. The mapped non-static value must match the pattern of ``integration.response.header.{name}`` or ``integration.response.body.{JSON-expression}``, where ``name`` is a valid and unique response header name and ``JSON-expression`` is a valid JSON expression without the ``$`` prefix.
- `response_templates` (Map of String) Specifies the templates used to transform the integration response body. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.
- `selection_pattern` (String) Specifies the regular expression (regex) pattern used to choose an integration response based on the response from the back end. For example, if the success response returns nothing and the error response returns some string, you could use the ``.+`` regex to match error response. However, make sure that the error response does not contain any newline (``\n``) character in such cases. If the back end is an LAMlong function, the LAMlong function error header is matched. For all other HTTP and AWS back ends, the HTTP status code is matched.
- `status_code` (String) Specifies the status code that is used to map the integration response to an existing MethodResponse.



<a id="nestedatt--method_responses"></a>
### Nested Schema for `method_responses`

Required:

- `status_code` (String) The method response's status code.

Optional:

- `response_models` (Map of String) Specifies the Model resources used for the response's content-type. Response models are represented as a key/value map, with a content-type as the key and a Model name as the value.
- `response_parameters` (Map of Boolean) A key-value map specifying required or optional response parameters that API Gateway can send back to the caller. A key defines a method response header and the value specifies whether the associated method response header is required or not. The expression of the key must match the pattern ``method.response.header.{name}``, where ``name`` is a valid and unique header name. API Gateway passes certain integration response data to the method response headers specified here according to the mapping you prescribe in the API's IntegrationResponse. The integration response data that can be mapped include an integration response header expressed in ``integration.response.header.{name}``, a static value enclosed within a pair of single quotes (e.g., ``'application/json'``), or a JSON expression from the back-end response payload in the form of ``integration.response.body.{JSON-expression}``, where ``JSON-expression`` is a valid JSON expression without the ``$`` prefix.)
- `status_code` (String) The method response's status code.

## Import

Expand Down
2 changes: 1 addition & 1 deletion docs/resources/apigateway_rest_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Optional:
<a id="nestedatt--tags"></a>
### Nested Schema for `tags`

Required:
Optional:

- `key` (String)
- `value` (String)
Expand Down
Loading
Loading