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

Add cloudfront_distribution_zone_id to aws_cognito_user_pool_domain #27790

Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
60f8fe2
Add cloudfront_distribution_zone_id parameter to aws_cognito_user_poo…
larstobi Nov 14, 2022
e2cb013
Update CHANGELOG.md
larstobi Nov 14, 2022
7770c8b
Fix formatting
larstobi Nov 14, 2022
e86eb6b
Revert "Fix formatting"
larstobi Nov 14, 2022
2b6ab2f
Revert "Update CHANGELOG.md"
larstobi Nov 14, 2022
d693401
Revert "Revert "Update CHANGELOG.md""
ewbankkit Mar 10, 2023
1c60824
Revert "Revert "Fix formatting""
ewbankkit Mar 10, 2023
e2e25b9
Revert "Fix formatting"
ewbankkit Mar 10, 2023
1a8f503
Revert "Update CHANGELOG.md"
ewbankkit Mar 10, 2023
25a95cf
Revert "Add cloudfront_distribution_zone_id parameter to aws_cognito_…
ewbankkit Mar 10, 2023
2915747
r/aws_cognito_user_pool_domain: Tidy up non-custom domain acceptance …
ewbankkit Mar 10, 2023
35ddb86
Merge branch 'main' into HEAD
ewbankkit Mar 10, 2023
836db02
r/aws_cognito_user_pool_domain: Add 'FindUserPoolDomain'.
ewbankkit Mar 10, 2023
3bb63b3
r/aws_cognito_user_pool_domain: Add 'cloudfront_distribution' attribute.
ewbankkit Mar 10, 2023
bd4df04
Add 'verify.CloudFrontDistributionHostedZoneIDForPartition'.
ewbankkit Mar 10, 2023
4f5dea0
Add 'AWSClient.CloudFrontDistributionHostedZoneID'.
ewbankkit Mar 10, 2023
497fb60
r/aws_cognito_user_pool_domain: Add 'cloudfront_distribution_zone_id'…
ewbankkit Mar 10, 2023
7170189
r/aws_cognito_user_pool_domain: Simplify 'TestAccCognitoIDPUserPoolDo…
ewbankkit Mar 10, 2023
2f5961a
CloudFront Distribution: Use 'AWSClient.CloudFrontDistributionHostedZ…
ewbankkit Mar 10, 2023
511fa87
r/aws_api_gateway_domain_name: Add 'FindDomainName'.
ewbankkit Mar 11, 2023
a751b9d
d/aws_api_gateway_domain_name: Use` 'FindDomainName'.
ewbankkit Mar 11, 2023
6311399
Fix terrafmt error.
ewbankkit Mar 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/27790.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_cognito_user_pool_domain: Add `cloudfront_distribution` and `cloudfront_distribution_zone_id` attributes
```
10 changes: 10 additions & 0 deletions internal/conns/awsclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"net/http"

"github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/aws/aws-sdk-go/service/s3"
)

Expand Down Expand Up @@ -43,3 +44,12 @@ func (client *AWSClient) SetHTTPClient(httpClient *http.Client) {
func (client *AWSClient) HTTPClient() *http.Client {
return client.httpClient
}

// CloudFrontDistributionHostedZoneIDForPartition returns for the Route 53 hosted zone ID
// for Amazon CloudFront distributions in the configured AWS partition.
func (client *AWSClient) CloudFrontDistributionHostedZoneID() string {
if client.Partition == endpoints.AwsCnPartitionID {
return "Z3RFFRIM2A3IF5" // See https://docs.amazonaws.cn/en_us/aws/latest/userguide/route53.html
}
return "Z2FDTNDATAQYW2" // See https://docs.aws.amazon.com/Route53/latest/APIReference/API_AliasTarget.html#Route53-Type-AliasTarget-HostedZoneId
}
125 changes: 0 additions & 125 deletions internal/service/apigateway/acc_test.go

This file was deleted.

Loading