Skip to content
Merged
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions cloudfront.cfndsl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

export = external_parameters.fetch(:export_name, external_parameters[:component_name])

Condition('WebACLEnabled', FnNot(FnEquals(Ref('WebACL'), ''))) # WebACL issue part, works well without this condition
Condition('OverrideAliases', FnNot(FnEquals(Ref('OverrideAliases'), '')))

tags = []
Expand Down Expand Up @@ -108,7 +107,7 @@
distribution_config[:Enabled] = external_parameters[:enabled]
distribution_config[:IPV6Enabled] = ipv6 unless ipv6.nil?
distribution_config[:PriceClass] = Ref('PriceClass')
distribution_config[:WebACLId] = FnIf('WebACLEnabled', Ref('WebACL'), Ref('AWS::NoValue')) # WebACL issue part
distribution_config[:WebACLId] = Ref('WebACL')
distribution_config[:CustomErrorResponses] = custom_error_responses unless custom_error_responses.nil?

logs = external_parameters.fetch(:logs, {})
Expand Down Expand Up @@ -392,4 +391,4 @@

end

end
end