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.

Sign up for GitHub

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

Make hosted_zone_id optional, code update #812

Merged
merged 3 commits into from
Oct 27, 2023
Merged

Make hosted_zone_id optional, code update #812

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66fa5a7
Make hosted_zone_id optional
Oct 17, 2023
5faed02
Add validation
Oct 24, 2023
07640f3
Typo
Oct 24, 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
55 changes: 45 additions & 10 deletions deploy/stacks/albfront_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
aws_elasticloadbalancing as elb,
aws_s3 as s3,
Stack,
CfnOutput,
Duration,
RemovalPolicy,
Fn,
Expand Down Expand Up @@ -131,27 +132,33 @@ def __init__(
logs_bucket.grant_put(iam.ServicePrincipal('delivery.logs.amazonaws.com'))
logs_bucket.grant_read(iam.ServicePrincipal('delivery.logs.amazonaws.com'))

frontend_alternate_domain = custom_domain['hosted_zone_name']
userguide_alternate_domain = 'userguide.' + custom_domain['hosted_zone_name']

hosted_zone = route53.HostedZone.from_hosted_zone_attributes(
self,
'CustomDomainHostedZone',
hosted_zone_id=custom_domain['hosted_zone_id'],
zone_name=custom_domain['hosted_zone_name'],
)
if custom_domain and custom_domain.get('hosted_zone_id'):
hosted_zone = route53.HostedZone.from_hosted_zone_attributes(
self,
'CustomDomainHostedZone',
hosted_zone_id=custom_domain['hosted_zone_id'],
zone_name=custom_domain['hosted_zone_name'],
)
frontend_alternate_domain = custom_domain['hosted_zone_name']
userguide_alternate_domain = 'userguide.' + custom_domain['hosted_zone_name']
else:
hosted_zone = None
frontend_alternate_domain = None
userguide_alternate_domain = None

if custom_domain and custom_domain.get('certificate_arn'):
certificate = acm.Certificate.from_certificate_arn(self, "CustomDomainCertificate",
custom_domain.get('certificate_arn'))
else:
elif custom_domain and custom_domain.get('hosted_zone_name'):
certificate = acm.Certificate(
self,
'CustomDomainCertificate',
domain_name=custom_domain['hosted_zone_name'],
subject_alternative_names=[f'*.{custom_domain["hosted_zone_name"]}'],
validation=acm.CertificateValidation.from_dns(hosted_zone=hosted_zone),
)
else:
raise ValueError("Configuration parameter custom_domain['hosted_zone_name'] in cdk.json is REQUIRED when internet_facing=false")

frontend_sg = ec2.SecurityGroup(
self,
Expand Down Expand Up @@ -273,6 +280,34 @@ def __init__(
)
self.allow_alb_access(userguide_alb, ip_ranges, vpc)

CfnOutput(
self,
f'FrontEndService{envname}Arn',
export_name=f'frontend-{envname}-arn',
value=frontend_alb.load_balancer.load_balancer_arn,
)

CfnOutput(
self,
f'FrontEndService{envname}HostedZoneId',
export_name=f'frontend-{envname}-hostedzoneid',
value=frontend_alb.load_balancer.load_balancer_canonical_hosted_zone_id,
)

CfnOutput(
self,
f'UserGuideService{envname}Arn',
export_name=f'userguide-{envname}-arn',
value=userguide_alb.load_balancer.load_balancer_arn,
)

CfnOutput(
self,
f'UserGuideService{envname}HostedZoneId',
export_name=f'userguide-{envname}-hostedzoneid',
value=userguide_alb.load_balancer.load_balancer_canonical_hosted_zone_id,
)

def create_log_group(self, envname, resource_prefix, log_group_name):
log_group = logs.LogGroup(
self,
Expand Down
Loading