Merge branch 'master' of github.com:bryantbiggs/terraform-aws-apigateway-v2 into chore/updates-for-websocket-support

Author: bryantbiggs

CHANGELOG.md

@@ -7,6 +7,19 @@ All notable changes to this project will be documented in this file.
 
 
 
+<a name="v1.4.0"></a>
+## [v1.4.0] - 2021-09-23
+
+- Feat: Add create_before_destroy lifecycle to integration resources ([#55](https://github.com/terraform-aws-modules/terraform-aws-apigateway-v2/issues/55))
+
+
+<a name="v1.3.0"></a>
+## [v1.3.0] - 2021-09-16
+
+- fix: Fixed output when create_api_domain_name is false ([#44](https://github.com/terraform-aws-modules/terraform-aws-apigateway-v2/issues/44))
+- chore: Fixed GH Action with terraform-docs
+
+
 <a name="v1.2.0"></a>
 ## [v1.2.0] - 2021-08-26
 
@@ -131,7 +144,9 @@ All notable changes to this project will be documented in this file.
 - Adding API Gateway module
 
 
-[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-apigateway-v2/compare/v1.2.0...HEAD
+[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-apigateway-v2/compare/v1.4.0...HEAD
+[v1.4.0]: https://github.com/terraform-aws-modules/terraform-aws-apigateway-v2/compare/v1.3.0...v1.4.0
+[v1.3.0]: https://github.com/terraform-aws-modules/terraform-aws-apigateway-v2/compare/v1.2.0...v1.3.0
 [v1.2.0]: https://github.com/terraform-aws-modules/terraform-aws-apigateway-v2/compare/v1.1.0...v1.2.0
 [v1.1.0]: https://github.com/terraform-aws-modules/terraform-aws-apigateway-v2/compare/v1.0.0...v1.1.0
 [v1.0.0]: https://github.com/terraform-aws-modules/terraform-aws-apigateway-v2/compare/v0.16.0...v1.0.0

main.tf

@@ -172,6 +172,10 @@ resource "aws_apigatewayv2_integration" "this" {
       server_name_to_verify = tls_config.value["server_name_to_verify"]
     }
   }
+
+  lifecycle {
+    create_before_destroy = true
+  }
 }
 
 # VPC Link (Private API)

outputs.tf

@@ -67,12 +67,12 @@ output "apigatewayv2_domain_name_configuration" {
 
 output "apigatewayv2_domain_name_target_domain_name" {
   description = "The target domain name"
-  value       = var.create_api_domain_name ? lookup(tomap(element(element(concat(aws_apigatewayv2_domain_name.this.*.domain_name_configuration, [""]), 0), 0)), "target_domain_name", "") : ""
+  value       = try(aws_apigatewayv2_domain_name.this[0].domain_name_configuration[0].target_domain_name, "")
 }
 
 output "apigatewayv2_domain_name_hosted_zone_id" {
   description = "The Amazon Route 53 Hosted Zone ID of the endpoint"
-  value       = var.create_api_domain_name ? lookup(tomap(element(element(concat(aws_apigatewayv2_domain_name.this.*.domain_name_configuration, [""]), 0), 0)), "hosted_zone_id", "") : ""
+  value       = try(aws_apigatewayv2_domain_name.this[0].domain_name_configuration[0].hosted_zone_id, "")
 }
 
 # api mapping