diff --git a/dss_deployment/__init__.py b/dss_deployment/__init__.py index eb2c29f0d8..f2e8cf37f7 100644 --- a/dss_deployment/__init__.py +++ b/dss_deployment/__init__.py @@ -160,7 +160,7 @@ def write(self): shutil.copy(src, dst) self._write_config('providers.tf', self.provider_config) - self._write_config('providers-east1.tf', self.provider_config) + self._write_config('providers-east1.tf', self.provider_config_east1) for k, v in self.vars.items(): self.tf['variable'][k]['default'] = v self._write_config('dss_variables.tf', self.tf) diff --git a/dss_deployment/stage_template/domain/domain.tf b/dss_deployment/stage_template/domain/domain.tf index c1d204343c..2da056026d 100644 --- a/dss_deployment/stage_template/domain/domain.tf +++ b/dss_deployment/stage_template/domain/domain.tf @@ -4,15 +4,21 @@ data aws_route53_zone dss_route53_zone { resource aws_acm_certificate dss_domain_cert { count = "${length(var.API_DOMAIN_NAME) > 0 ? 1 : 0}" - provider = "aws.us-east-1" domain_name = "${var.API_DOMAIN_NAME}" validation_method = "DNS" + provider = "aws.us-east-1" +} + +resource aws_acm_certificate_validation cert { + certificate_arn = "${aws_acm_certificate.dss_domain_cert.arn}" + provider = "aws.us-east-1" } resource aws_api_gateway_domain_name dss_domain { domain_name = "${var.API_DOMAIN_NAME}" certificate_arn = "${aws_acm_certificate.dss_domain_cert.arn}" depends_on = ["aws_acm_certificate.dss_domain_cert"] + provider = "aws.us-east-1" } resource aws_route53_record dss_route53_record { @@ -27,4 +33,5 @@ resource aws_route53_record dss_route53_record { } depends_on = ["aws_acm_certificate.dss_domain_cert"] + provider = "aws.us-east-1" }