Skip to content

Allow the use of custom value instead of globally defined #21

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

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Allow the use of custom value instead of globally defined #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions cloudfront.cfhighlander.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
ComponentParam 'EnvironmentName', 'dev', isGlobal: true
ComponentParam 'EnvironmentType', 'development', allowedValues: ['development','production'], isGlobal: true
ComponentParam 'DnsDomain', isGlobal: true
ComponentParam 'EnableLambdaFunctionAssociations', 'false', allowedValues: ['true', 'false']

origins.each do |id,config|
ComponentParam "#{id}OriginDomainName"
ComponentParam "#{id}OriginAccessIdentityInput", '' if config['source'] == 's3'
end if (defined? origins) && (origins.any?)

case ssl['type']
Expand All @@ -32,5 +30,4 @@

end


end
35 changes: 17 additions & 18 deletions cloudfront.cfndsl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@

Condition('WebACLEnabled', FnNot(FnEquals(Ref('WebACL'), '')))
Condition('OverrideAliases', FnNot(FnEquals(Ref('OverrideAliases'), '')))
Condition('EnableLambdaFunctionAssociations', FnEquals(Ref('EnableLambdaFunctionAssociations'), 'true'))

tags = []
tags << { Key: 'Environment', Value: Ref('EnvironmentName') }
tags << { Key: 'EnvironmentType', Value: Ref('EnvironmentType') }

distribution_config = {}
distribution_config[:Comment] = FnSub(comment)
if (comment.to_s.start_with?('{"Fn::'))
distribution_config[:Comment] = comment
else
distribution_config[:Comment] = FnSub(comment)
end
distribution_config[:Origins] = []

origins = external_parameters.fetch(:origins, {})
Expand All @@ -30,23 +33,14 @@
origin[:CustomOriginConfig][:OriginSSLProtocols] = config['ssl_policy'] if config.has_key?('ssl_policy')
origin[:CustomOriginConfig][:OriginProtocolPolicy] = config['protocol_policy']
when 's3'
Condition("#{id}CreateOriginAccessIdentity", FnEquals(Ref("#{id}OriginAccessIdentityInput"), ''))

CloudFront_CloudFrontOriginAccessIdentity("#{id}OriginAccessIdentity") {
Condition("#{id}CreateOriginAccessIdentity")
CloudFrontOriginAccessIdentityConfig({
Comment: FnSub("${EnvironmentName}-#{id}-CloudFrontOriginAccessIdentity")
Comment: FnJoin("-", [Ref("EnvironmentName"), id, "CloudFrontOriginAccessIdentity"])
})
}
origin[:S3OriginConfig] = { OriginAccessIdentity:
FnIf("#{id}CreateOriginAccessIdentity",
FnSub("origin-access-identity/cloudfront/${#{id}OriginAccessIdentity}"),
FnSub("origin-access-identity/cloudfront/${#{id}OriginAccessIdentityInput}")
)
}
origin[:S3OriginConfig] = origin[:S3OriginConfig] = { OriginAccessIdentity: FnSub("origin-access-identity/cloudfront/${#{id}OriginAccessIdentity}") }

Output("#{id}OriginAccessIdentity") do
Condition("#{id}CreateOriginAccessIdentity")
Value(FnGetAtt("#{id}OriginAccessIdentity", 'S3CanonicalUserId'))
end

Expand Down Expand Up @@ -140,10 +134,15 @@

dns_records = external_parameters.fetch(:dns_records, {})
dns_records.each_with_index do |record, index|
name = (['apex',''].include? record) ? dns_format : "#{record}.#{dns_format}."
name = (['apex',''].include? record) ? dns_format : FnJoin('.', [record, dns_format, ''])
Route53_RecordSet("CloudfrontDns#{index}") do
HostedZoneName FnSub("#{dns_format}.")
Name FnSub(name)
if (dns_format.to_s.start_with?('{"Fn::'))
HostedZoneName FnJoin('', [dns_format, '.'])
Name name
else
HostedZoneName FnSub("#{dns_format}.")
Name FnSub(name)
end
Type 'A'
AliasTarget ({
DNSName: FnGetAtt(:Distribution, :DomainName),
Expand All @@ -154,12 +153,12 @@

Output('DomainName') do
Value(FnGetAtt('Distribution', 'DomainName'))
Export FnSub("${EnvironmentName}-#{export}-DomainName")
Export FnJoin("-", [Ref("EnvironmentName"), export, "DomainName"])
end

Output('DistributionId') do
Value(FnGetAtt('Distribution', 'Id'))
Export FnSub("${EnvironmentName}-#{export}-DistributionId")
Export FnJoin("-", [Ref("EnvironmentName"), export, "DistributionId"])
end

end