Skip to content

Commit

Permalink
Merge pull request #198 from theonestack/hotfix/conditonal-outputs
Browse files Browse the repository at this point in the history
adds conditions to outputs for inlined conditionals
  • Loading branch information
aaronwalker committed Apr 16, 2024
2 parents 11a766f + 6c0373b commit 5309174
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
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
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
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

0 comments on commit 5309174

Please sign in to comment.