Skip to content

Commit 5309174

Browse files
authored
Merge pull request #198 from theonestack/hotfix/conditonal-outputs
adds conditions to outputs for inlined conditionals
2 parents 11a766f + 6c0373b commit 5309174

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ruby:3-alpine
22

3-
ARG CFNDSL_SPEC_VERSION=${CFNDSL_SPEC_VERSION:-111.0.0}
3+
ARG CFNDSL_SPEC_VERSION=${CFNDSL_SPEC_VERSION:-169.0.0}
44

55
COPY . /src
66

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

1919
WORKDIR /work
2020

lib/cfhighlander.version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Cfhighlander
2-
VERSION="0.13.4".freeze
2+
VERSION="0.13.5".freeze
33
end

lib/util/cloudformation.util.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def self.inline_elements(element_name, component, template)
115115
value = { "Fn::And" => [{"Condition" => sub_component.condition}, value]}
116116
end
117117
# Adds the condition to the inlined resource if it doesn't already have a condition
118-
if element_name == 'Resources'
118+
if element_name == 'Resources' || element_name == 'Outputs'
119119
value['Condition'] = sub_component.condition unless value.has_key?('Condition')
120120
end
121121
end

0 commit comments

Comments
 (0)