Skip to content

Commit

Permalink
Merge pull request #248 from DontShaveTheYak/develop
Browse files Browse the repository at this point in the history
Release 0.9.1
  • Loading branch information
shadycuz authored Jul 18, 2023
2 parents 7cc6b5a + 572d854 commit 460d2cd
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 67 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fetch-depth: 0

- name: Setup Python 3.9
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
python-version: '3.9'
architecture: x64
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
uses: actions/[email protected]

- name: Setup Python 3.9
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
python-version: '3.9'
architecture: x64
Expand All @@ -101,7 +101,7 @@ jobs:
pull-requests: read
steps:
- name: Create Draft Release
uses: release-drafter/release-drafter@v5.23.0
uses: release-drafter/release-drafter@v5.24.0
if: github.base_ref == 'develop'
with:
tag: ${{needs.tag.outputs.tag}}
Expand All @@ -111,7 +111,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Create Release
uses: release-drafter/release-drafter@v5.23.0
uses: release-drafter/release-drafter@v5.24.0
if: github.base_ref == 'master'
with:
tag: ${{needs.tag.outputs.tag}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/[email protected]

- name: Setup Latest Python
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
python-version: 3.9
architecture: x64
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
uses: actions/[email protected]

- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v4.6.1
uses: actions/setup-python@v4.7.0
with:
python-version: ${{ matrix.python-version }}
architecture: x64
Expand Down
119 changes: 58 additions & 61 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/cloud_radar/cf/unit/_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ def render_all_sections(self, template: Dict[str, Any]) -> Dict[str, Any]:
continue

for r_name, r_value in get_section_items(template, section):
if section == "Resources" and "Properties" not in r_value:
# While the Properties key is technically optional,
# our processing requires it to be there to distinguish
# this as a Resource when we perform further rendering
r_value["Properties"] = {}

if is_conditional(r_value):
condition_value = get_condition_value(
r_value["Condition"], template["Conditions"]
Expand Down
4 changes: 4 additions & 0 deletions tests/templates/log_bucket/log_bucket.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ Resources:
BucketName:
!Sub ${BucketPrefix}-logs-${AWS::Region}

DeadLetterQueue:
Condition: AlwaysTrue
Type: AWS::SQS::Queue

# Used for testng
TestBucket:
Condition: AlwaysFalse
Expand Down

0 comments on commit 460d2cd

Please sign in to comment.