Merge pull request #14 from szilveszter/api-gateway-change-workaround

Introduce lifecycle configuration to allow proper resource recreation
rackerlabs · Nov 9, 2017 · eebfc4a · eebfc4a
2 parents f3574d8 + 6637c65
commit eebfc4a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/modules/apigateway/main.tf b/modules/apigateway/main.tf
@@ -70,15 +70,16 @@ resource "aws_api_gateway_rest_api" "api" {
 }
 
 resource "aws_api_gateway_deployment" "stage" {
-  depends_on = ["aws_api_gateway_rest_api.api"]
-
   rest_api_id = "${aws_api_gateway_rest_api.api.id}"
   stage_name  = "${var.stage}"
 
   variables = {
     "version" = "${md5(data.template_file.swagger_file.rendered)}"
   }
 
+  lifecycle {
+    create_before_destroy = true
+  }
 }
 
 data "aws_acm_certificate" "ssl_cert" {

diff --git a/modules/apigateway/outputs.tf b/modules/apigateway/outputs.tf
@@ -2,5 +2,8 @@ output "api_id" {
   value = "${aws_api_gateway_rest_api.api.id}"
 }
 output "invoke_url" {
-  value = "${aws_api_gateway_deployment.stage.invoke_url}"
+  # If we have a custom domain set up, we should point the endpoint to that.
+  # Otherwise take the deployment's invoke URL, and strip the intermediary
+  # stage suffix from the URL.
+  value = "${var.enable_custom_domain ? format("https://%s", var.custom_domain) : aws_api_gateway_deployment.stage.invoke_url}"
 }