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

Jump to bottom

adds conditions to outputs for inlined conditionals #198

Merged
merged 2 commits into from
Apr 16, 2024
Merged

adds conditions to outputs for inlined conditionals #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e4541b
adds conditions to outputs for inlined conditionals
aaronwalker Apr 16, 2024
6c0373b
fixes docker image build
aaronwalker Apr 16, 2024
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ruby:3-alpine

ARG CFNDSL_SPEC_VERSION=${CFNDSL_SPEC_VERSION:-111.0.0}
ARG CFNDSL_SPEC_VERSION=${CFNDSL_SPEC_VERSION:-169.0.0}

COPY . /src

Expand All @@ -14,7 +14,7 @@ RUN rm cfhighlander-*.gem ; \
RUN adduser -u 1000 -D cfhighlander && \
apk add --update python3 py3-pip git openssh-client bash make gcc python3-dev musl-dev && \
ln $(which pip3) /bin/pip && \
pip install awscli
python -m pip install --break-system-packages awscli

WORKDIR /work

Expand Down
2 changes: 1 addition & 1 deletion lib/cfhighlander.version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Cfhighlander
VERSION="0.13.4".freeze
VERSION="0.13.5".freeze
end
2 changes: 1 addition & 1 deletion lib/util/cloudformation.util.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def self.inline_elements(element_name, component, template)
value = { "Fn::And" => [{"Condition" => sub_component.condition}, value]}
end
# Adds the condition to the inlined resource if it doesn't already have a condition
if element_name == 'Resources'
if element_name == 'Resources' || element_name == 'Outputs'
value['Condition'] = sub_component.condition unless value.has_key?('Condition')
end
end
Expand Down
Loading