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

Master #1

Merged
merged 7,429 commits into from
Apr 22, 2021
Merged

Master #1

merged 7,429 commits into from
Apr 22, 2021

Conversation

shedimon
Copy link
Owner

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Relates OR Closes #0000

Release note for CHANGELOG:


Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccXXX'

...

gdavison and others added 30 commits January 12, 2021 10:48
resource/aws_elasticache_parameter_group: acceptance test fixes
…ion-attr

resource/dms_endpoint: add support for extraConnectionAttributes in create/read ops and handle diffs
test/resource/elasticache_cluster: Fix lint issue
…source path attribute for deeply nested resources (#5427)

* Update api_gateway_method_settings.html.markdown

As per AWS documentation, the method_path parameter must be the full method path relative to the API base URL, without the first forward slash.

Current Terraform documentation only includes the last method path part, which fails to update settings on methods with deeper paths.

* Update website/docs/r/api_gateway_method_settings.html.markdown

Co-authored-by: Brian Flad <bflad@dramafever.com>
Co-authored-by: Brian Flad <bflad417@gmail.com>
…ers argument

Output from acceptance testing in AWS Commercial:

```
--- PASS: TestAccAWSAPIGatewayRestApi_api_key_source (254.55s)
--- PASS: TestAccAWSAPIGatewayRestApi_basic (55.86s)
--- PASS: TestAccAWSAPIGatewayRestApi_disappears (11.43s)
--- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration (211.19s)
--- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_Private (20.20s)
--- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VPCEndpoint (438.68s)
--- PASS: TestAccAWSAPIGatewayRestApi_openapi (433.40s)
--- PASS: TestAccAWSAPIGatewayRestApi_Parameters (135.48s)
--- PASS: TestAccAWSAPIGatewayRestApi_policy (46.59s)
--- PASS: TestAccAWSAPIGatewayRestApi_tags (32.33s)
```

Output from acceptance testing in AWS GovCloud (US):

```
--- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_Private (20.81s)
--- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VPCEndpoint (347.68s)
--- SKIP: TestAccAWSAPIGatewayRestApi_api_key_source (1.26s)
--- SKIP: TestAccAWSAPIGatewayRestApi_basic (1.26s)
--- SKIP: TestAccAWSAPIGatewayRestApi_disappears (1.26s)
--- SKIP: TestAccAWSAPIGatewayRestApi_EndpointConfiguration (35.10s)
--- SKIP: TestAccAWSAPIGatewayRestApi_openapi (0.00s)
--- SKIP: TestAccAWSAPIGatewayRestApi_Parameters (1.26s)
--- SKIP: TestAccAWSAPIGatewayRestApi_policy (0.00s)
--- SKIP: TestAccAWSAPIGatewayRestApi_tags (0.00s)
```
…/terraform-provider-aws into hieven-fix/usage-plan-key-conflict
… of client retries

Output from acceptance testing:

```
--- PASS: TestAccAWSAPIGatewayUsagePlanKey_basic (49.70s)
--- PASS: TestAccAWSAPIGatewayUsagePlanKey_KeyId_Concurrency (81.01s)
--- PASS: TestAccAWSAPIGatewayUsagePlanKey_disappears (112.89s)
```
…esponse template (#12820)

Strings in JSON must be enclosed in double quotes. Update the example
response template to be valid JSON.
Output from acceptance testing:

```
--- PASS: TestAccAWSAPIGatewayMethod_customrequestvalidator (27.83s)
--- PASS: TestAccAWSAPIGatewayMethod_OperationName (27.86s)
--- PASS: TestAccAWSAPIGatewayMethod_customauthorizer (89.63s)
--- PASS: TestAccAWSAPIGatewayMethod_basic (119.56s)
--- PASS: TestAccAWSAPIGatewayMethod_disappears (218.21s)
--- PASS: TestAccAWSAPIGatewayMethod_cognitoauthorizer (394.87s)
```
dependabot bot and others added 29 commits January 21, 2021 09:24
Bumps [github.com/hashicorp/terraform-plugin-sdk/v2](https://github.com/hashicorp/terraform-plugin-sdk) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/hashicorp/terraform-plugin-sdk/releases)
- [Changelog](https://github.com/hashicorp/terraform-plugin-sdk/blob/master/CHANGELOG.md)
- [Commits](hashicorp/terraform-plugin-sdk@v2.4.0...v2.4.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…e-container-img

d/aws_lambda_function: prevent read error when fetching code signing config for "Image" package type
…nd endpoint_configuration vpc_endpoint_ids handling with OpenAPI specification import (body argument) (#17209)

Reference: #13841

Before code updates, these new acceptance tests show how the Terraform configuration value would not be applied if an OpenAPI specification was imported:

```
=== CONT  TestAccAWSAPIGatewayRestApi_DisableExecuteApiEndpoint_OverrideBody
    resource_aws_api_gateway_rest_api_test.go:847: Step 1/4 error: Check failed: 1 error occurred:
        	* Check 2/2 error: aws_api_gateway_rest_api.test: Attribute 'disable_execute_api_endpoint' expected "false", got "true"

--- FAIL: TestAccAWSAPIGatewayRestApi_DisableExecuteApiEndpoint_OverrideBody (10.30s)

=== CONT  TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VpcEndpointIds_OverrideBody
    resource_aws_api_gateway_rest_api_test.go:369: Step 1/2 error: After applying this test step and performing a `terraform refresh`, the plan was not empty.
        stdout

        An execution plan has been generated and is shown below.
        Resource actions are indicated with the following symbols:
          ~ update in-place

        Terraform will perform the following actions:

          # aws_api_gateway_rest_api.test will be updated in-place
          ~ resource "aws_api_gateway_rest_api" "test" {
                id                           = "m9ajz6izjl"
                name                         = "tf-acc-test-6139822644948363723"
                tags                         = {}
                # (9 unchanged attributes hidden)

              ~ endpoint_configuration {
                  ~ vpc_endpoint_ids = [
                      + "vpce-0ba0b61be45886a6f",
                      - "vpce-0ee1a2ccd6af8f011",
                    ]
                    # (1 unchanged attribute hidden)
                }
            }

        Plan: 0 to add, 1 to change, 0 to destroy.
--- FAIL: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VpcEndpointIds_OverrideBody (190.95s)
```

Before code updates, these new acceptance tests show how the Terraform resource would report an unexpected difference for missing configurations that were imported by the OpenAPI specification:

```
=== CONT  TestAccAWSAPIGatewayRestApi_DisableExecuteApiEndpoint_SetByBody
    resource_aws_api_gateway_rest_api_test.go:890: Step 1/2 error: After applying this test step, the plan was not empty.
        stdout:

        An execution plan has been generated and is shown below.
        Resource actions are indicated with the following symbols:
          ~ update in-place

        Terraform will perform the following actions:

          # aws_api_gateway_rest_api.test will be updated in-place
          ~ resource "aws_api_gateway_rest_api" "test" {
              ~ disable_execute_api_endpoint = true -> false
                id                           = "c2t6iky152"
                name                         = "tf-acc-test-8877194198775672292"
                # (8 unchanged attributes hidden)

                # (1 unchanged block hidden)
            }

        Plan: 0 to add, 1 to change, 0 to destroy.
--- FAIL: TestAccAWSAPIGatewayRestApi_DisableExecuteApiEndpoint_SetByBody (11.03s)

=== CONT  TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VpcEndpointIds_SetByBody
    resource_aws_api_gateway_rest_api_test.go:415: Step 1/2 error: After applying this test step, the plan was not empty.
        stdout:

        An execution plan has been generated and is shown below.
        Resource actions are indicated with the following symbols:
          ~ update in-place

        Terraform will perform the following actions:

          # aws_api_gateway_rest_api.test will be updated in-place
          ~ resource "aws_api_gateway_rest_api" "test" {
                id                           = "adeg2zcky2"
                name                         = "tf-acc-test-7848512816247428885"
                # (9 unchanged attributes hidden)

              ~ endpoint_configuration {
                  ~ vpc_endpoint_ids = [
                      - "vpce-0653ca468e4c6ba4a",
                    ]
                    # (1 unchanged attribute hidden)
                }
            }

        Plan: 0 to add, 1 to change, 0 to destroy.
--- FAIL: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VpcEndpointIds_SetByBody (150.67s)
```

Output from acceptance testing:

```
--- PASS: TestAccAWSAPIGatewayRestApi_ApiKeySource (30.53s)
--- PASS: TestAccAWSAPIGatewayRestApi_ApiKeySource_OverrideBody (37.78s)
--- PASS: TestAccAWSAPIGatewayRestApi_ApiKeySource_SetByBody (15.25s)
--- PASS: TestAccAWSAPIGatewayRestApi_basic (669.92s)
--- PASS: TestAccAWSAPIGatewayRestApi_BinaryMediaTypes (34.56s)
--- PASS: TestAccAWSAPIGatewayRestApi_BinaryMediaTypes_OverrideBody (34.23s)
--- PASS: TestAccAWSAPIGatewayRestApi_BinaryMediaTypes_SetByBody (514.96s)
--- PASS: TestAccAWSAPIGatewayRestApi_Body (38.01s)
--- PASS: TestAccAWSAPIGatewayRestApi_Description (23.87s)
--- PASS: TestAccAWSAPIGatewayRestApi_Description_OverrideBody (60.58s)
--- PASS: TestAccAWSAPIGatewayRestApi_Description_SetByBody (92.79s)
--- PASS: TestAccAWSAPIGatewayRestApi_DisableExecuteApiEndpoint (3442.94s)
--- PASS: TestAccAWSAPIGatewayRestApi_DisableExecuteApiEndpoint_OverrideBody (2292.47s)
--- PASS: TestAccAWSAPIGatewayRestApi_DisableExecuteApiEndpoint_SetByBody (1083.96s)
--- PASS: TestAccAWSAPIGatewayRestApi_disappears (529.45s)
--- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration (1034.47s)
--- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_Private (15.42s)
--- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VpcEndpointIds (330.11s)
--- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VpcEndpointIds_OverrideBody (205.73s)
--- PASS: TestAccAWSAPIGatewayRestApi_EndpointConfiguration_VpcEndpointIds_SetByBody (159.85s)
--- PASS: TestAccAWSAPIGatewayRestApi_MinimumCompressionSize (39.32s)
--- PASS: TestAccAWSAPIGatewayRestApi_MinimumCompressionSize_OverrideBody (1278.64s)
--- PASS: TestAccAWSAPIGatewayRestApi_MinimumCompressionSize_SetByBody (753.00s)
--- PASS: TestAccAWSAPIGatewayRestApi_Name_OverrideBody (2212.45s)
--- PASS: TestAccAWSAPIGatewayRestApi_Parameters (948.67s)
--- PASS: TestAccAWSAPIGatewayRestApi_Policy (28.00s)
--- PASS: TestAccAWSAPIGatewayRestApi_Policy_OverrideBody (80.78s)
--- PASS: TestAccAWSAPIGatewayRestApi_Policy_SetByBody (1967.74s)
--- PASS: TestAccAWSAPIGatewayRestApi_tags (1413.12s)
```
…ion pattern documentation (#17212)

Reference: #10222
Reference: #14204
Reference: #16950

API Gateway now expects the selection pattern to not be configured to set the default mapping. The current AWS documentation makes no mention of the "-" value. Verified in the AWS Console and with the AWS CLI that the API response is empty with no selectionPattern or no value for the default mapping.
Updated aws_db_proxy_target documentation per issue #17172
resource/lakeformation permissions: Fix multiple permissions bug
Update elasticsearch argument reference
ElastiCache documentation fixes and bringing some validations in line with documentation
* add-changelog-automation
…ibute (#15091)

* Add protocol to api_endpoint attribute

* Update website/docs/r/apigatewayv2_api.html.markdown

Co-authored-by: Brian Flad <bflad417@gmail.com>
…oup-member-nodes

Adds CustomizeDiff to update computed member_clusters
@shedimon shedimon merged commit 5b4cd61 into shedimon:master Apr 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.