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.

Sign up for GitHub

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

Jump to bottom

Add support for appsync MERGED api type #39159

Merged
merged 5 commits into from
Sep 5, 2024
Merged

Add support for appsync MERGED api type #39159

merged 5 commits into from
Sep 5, 2024

Conversation

drewtul
Copy link
Contributor

@drewtul drewtul commented Sep 5, 2024 •
edited
Loading

Description

Add the api_type and merged_api_execution_role_arn to support MERGED apis

Relations

Relates #33148

References

Output from Acceptance Testing

%  make testacc TESTS=TestAccAppSync_serial/GraphQLAPI PKG=appsync
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.23.0 test ./internal/service/appsync/... -v -count 1 -parallel 20 -run='TestAccAppSync_serial/GraphQLAPI'  -timeout 360m
=== RUN   TestAccAppSync_serial
=== PAUSE TestAccAppSync_serial
=== CONT  TestAccAppSync_serial
=== RUN   TestAccAppSync_serial/GraphQLAPI
=== RUN   TestAccAppSync_serial/GraphQLAPI/basic
=== RUN   TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_issuer
=== RUN   TestAccAppSync_serial/GraphQLAPI/UserPool_awsRegion
=== RUN   TestAccAppSync_serial/GraphQLAPI/xrayEnabled
=== RUN   TestAccAppSync_serial/GraphQLAPI/name
=== RUN   TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_openIDConnect
=== RUN   TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_multiple
=== RUN   TestAccAppSync_serial/GraphQLAPI/visibility
=== RUN   TestAccAppSync_serial/GraphQLAPI/disappears
=== RUN   TestAccAppSync_serial/GraphQLAPI/apiType
=== RUN   TestAccAppSync_serial/GraphQLAPI/enhancedMetricsConfig
=== RUN   TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_clientID
=== RUN   TestAccAppSync_serial/GraphQLAPI/queryDepthLimit
=== RUN   TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_iatTTL
=== RUN   TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_awsIAM
=== RUN   TestAccAppSync_serial/GraphQLAPI/schema
=== RUN   TestAccAppSync_serial/GraphQLAPI/authenticationType
=== RUN   TestAccAppSync_serial/GraphQLAPI/AuthenticationType_apiKey
=== RUN   TestAccAppSync_serial/GraphQLAPI/AuthenticationType_awsIAM
=== RUN   TestAccAppSync_serial/GraphQLAPI/AuthenticationType_awsLambda
=== RUN   TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_cognitoUserPools
=== RUN   TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_awsLambda
=== RUN   TestAccAppSync_serial/GraphQLAPI/introspectionConfig
=== RUN   TestAccAppSync_serial/GraphQLAPI/resolverCountLimit
=== RUN   TestAccAppSync_serial/GraphQLAPI/AuthenticationType_amazonCognitoUserPools
=== RUN   TestAccAppSync_serial/GraphQLAPI/Log_fieldLogLevel
=== RUN   TestAccAppSync_serial/GraphQLAPI/LambdaAuthorizerConfig_authorizerUri
=== RUN   TestAccAppSync_serial/GraphQLAPI/LambdaAuthorizerConfig_authorizerResultTtlInSeconds
=== RUN   TestAccAppSync_serial/GraphQLAPI/tags
=== RUN   TestAccAppSync_serial/GraphQLAPI/Log_excludeVerboseContent
=== RUN   TestAccAppSync_serial/GraphQLAPI/LambdaAuthorizerConfig_identityValidationExpression
=== RUN   TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_apiKey
=== RUN   TestAccAppSync_serial/GraphQLAPI/AuthenticationType_openIDConnect
=== RUN   TestAccAppSync_serial/GraphQLAPI/log
=== RUN   TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_authTTL
=== RUN   TestAccAppSync_serial/GraphQLAPI/UserPool_defaultAction
--- PASS: TestAccAppSync_serial (1117.38s)
    --- PASS: TestAccAppSync_serial/GraphQLAPI (1117.38s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/basic (20.92s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_issuer (31.60s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/UserPool_awsRegion (32.84s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/xrayEnabled (27.47s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/name (28.37s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_openIDConnect (19.53s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_multiple (39.91s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/visibility (19.49s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/disappears (17.18s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/apiType (22.08s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/enhancedMetricsConfig (34.26s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_clientID (28.91s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/queryDepthLimit (19.79s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_iatTTL (31.36s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_awsIAM (18.87s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/schema (41.21s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/authenticationType (28.77s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AuthenticationType_apiKey (19.52s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AuthenticationType_awsIAM (19.88s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AuthenticationType_awsLambda (40.71s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_cognitoUserPools (22.71s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_awsLambda (40.77s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/introspectionConfig (19.52s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/resolverCountLimit (20.57s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AuthenticationType_amazonCognitoUserPools (23.62s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/Log_fieldLogLevel (46.46s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/LambdaAuthorizerConfig_authorizerUri (57.22s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/LambdaAuthorizerConfig_authorizerResultTtlInSeconds (85.62s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/tags (44.61s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/Log_excludeVerboseContent (33.16s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/LambdaAuthorizerConfig_identityValidationExpression (56.33s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_apiKey (18.65s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AuthenticationType_openIDConnect (19.24s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/log (19.99s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_authTTL (30.09s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/UserPool_defaultAction (36.11s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/appsync    1121.319s

@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 5, 2024

Community Note

Voting for Prioritization

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

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/appsync Issues and PRs that pertain to the appsync service. needs-triage Waiting for first response or review from a maintainer. partner Contribution from a partner. labels Sep 5, 2024
@drewtul drewtul marked this pull request as ready for review September 5, 2024 12:25
@drewtul drewtul requested a review from a team as a code owner September 5, 2024 12:25
@jar-b jar-b removed the needs-triage Waiting for first response or review from a maintainer. label Sep 5, 2024
@jar-b jar-b self-assigned this Sep 5, 2024
@github-actions github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Sep 5, 2024
@jar-b
r/aws_appsync_graphql_api(test): use aws types
a3173db 
```console
% make testacc PKG=appsync TESTS=TestAccAppSync_serial/GraphQLAPI/apiType
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.23.0 test ./internal/service/appsync/... -v -count 1 -parallel 20 -run='TestAccAppSync_serial/GraphQLAPI/apiType'  -timeout 360m

--- PASS: TestAccAppSync_serial (16.03s)
    --- PASS: TestAccAppSync_serial/GraphQLAPI (16.03s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/apiType (16.03s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/appsync    22.083s
```
@jar-b
r/aws_appsync_graphql_api(doc): re-word, spelling cleanup
7c5ecbc
jar-b
jar-b approved these changes Sep 5, 2024
View reviewed changes
Copy link
Member

@jar-b jar-b left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🎉

% make testacc PKG=appsync TESTS=TestAccAppSync_serial/GraphQLAPI
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.23.0 test ./internal/service/appsync/... -v -count 1 -parallel 20 -run='TestAccAppSync_serial/GraphQLAPI'  -timeout 360m

--- PASS: TestAccAppSync_serial (807.10s)
    --- PASS: TestAccAppSync_serial/GraphQLAPI (807.10s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_issuer (22.70s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/UserPool_awsRegion (23.72s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/apiType (15.03s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/Log_excludeVerboseContent (23.36s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_multiple (31.12s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AuthenticationType_awsIAM (13.99s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_clientID (21.95s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_iatTTL (22.18s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_awsIAM (13.87s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AuthenticationType_amazonCognitoUserPools (16.01s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AuthenticationType_awsLambda (31.15s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/name (19.66s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_apiKey (14.09s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/visibility (14.05s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/queryDepthLimit (14.18s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/resolverCountLimit (14.23s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/schema (27.30s)                                                                                                                              --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_awsLambda (31.59s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AuthenticationType_apiKey (13.76s)                                                                                                           --- PASS: TestAccAppSync_serial/GraphQLAPI/log (14.84s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/LambdaAuthorizerConfig_authorizerResultTtlInSeconds (61.01s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_cognitoUserPools (16.19s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AdditionalAuthentication_openIDConnect (14.40s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/introspectionConfig (14.23s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/basic (14.17s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/tags (31.00s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/AuthenticationType_openIDConnect (14.15s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/LambdaAuthorizerConfig_authorizerUri (41.47s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/xrayEnabled (19.92s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/disappears (12.33s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/enhancedMetricsConfig (25.21s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/Log_fieldLogLevel (32.35s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/OpenIDConnect_authTTL (22.27s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/UserPool_defaultAction (25.90s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/LambdaAuthorizerConfig_identityValidationExpression (41.55s)
        --- PASS: TestAccAppSync_serial/GraphQLAPI/authenticationType (22.16s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/appsync    813.100s

@jar-b
Copy link
Member

jar-b commented Sep 5, 2024

Thanks for your contribution, @drewtul! 👍

@jar-b jar-b merged commit 6a28717 into hashicorp:main Sep 5, 2024
40 checks passed
@github-actions github-actions bot added this to the v5.66.0 milestone Sep 5, 2024
@drewtul drewtul deleted the f-appsync-api-type branch September 5, 2024 14:45
@drewtul drewtul mentioned this pull request Sep 5, 2024
Closed
@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 5, 2024

This functionality has been released in v5.66.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@github-actions github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Sep 5, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 7, 2024

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jar-b jar-b jar-b approved these changes

Assignees

@jar-b jar-b

Labels
documentation Introduces or discusses updates to documentation. partner Contribution from a partner. service/appsync Issues and PRs that pertain to the appsync service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v5.66.0
Development

Successfully merging this pull request may close these issues.
2 participants
@drewtul @jar-b