fix: tell CloudFront to use our certificate

Opetushallitus · Sep 16, 2024 · ac4927c · ac4927c
1 parent 8be15d8
commit ac4927c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/infra/bin/infra.ts b/infra/bin/infra.ts
@@ -69,16 +69,18 @@ const dnsStack = new DnsStack(app, "DnsStack", {
   terminationProtection: true,
 })
 
-new CertificateStack(app, "CertificateStack", {
+const certificateStack = new CertificateStack(app, "CertificateStack", {
   crossRegionReferences: true,
   env: { ...env, region: "us-east-1" },
   hostedZone: dnsStack.hostedZone,
   domainName: env.domainName,
 })
 
 new InfraStack(app, "InfraStack", {
+  crossRegionReferences: true,
   env,
   cidrBlock: env.network.cidr,
   maxAzs: env.network.maxAzs,
   domainName: env.domainName,
+  certificate: certificateStack.certificate,
 })
diff --git a/infra/lib/infra-stack.ts b/infra/lib/infra-stack.ts
@@ -1,17 +1,18 @@
 import * as cdk from "aws-cdk-lib"
-import { Construct } from "constructs"
-import * as ec2 from "aws-cdk-lib/aws-ec2"
-import * as ecsPatterns from "aws-cdk-lib/aws-ecs-patterns"
-import * as ecs from "aws-cdk-lib/aws-ecs"
-import { GithubActionsStack } from "./github-actions-stack"
 import {
   aws_certificatemanager,
   aws_cloudfront,
   aws_cloudfront_origins,
 } from "aws-cdk-lib"
+import { Construct } from "constructs"
+import * as ec2 from "aws-cdk-lib/aws-ec2"
+import * as ecsPatterns from "aws-cdk-lib/aws-ecs-patterns"
+import * as ecs from "aws-cdk-lib/aws-ecs"
+import { GithubActionsStack } from "./github-actions-stack"
 import { Platform } from "aws-cdk-lib/aws-ecr-assets"
 
 export interface InfraStackProps extends cdk.StackProps {
+  certificate: aws_certificatemanager.ICertificate
   domainName: string
   cidrBlock: string
   maxAzs: number
@@ -64,6 +65,7 @@ export class InfraStack extends cdk.Stack {
         ),
       },
       domainNames: [props.domainName],
+      certificate: props.certificate,
     })
   }
 }