cloud-radar 0.14.0a0__tar.gz → 0.14.0a2__tar.gz

{cloud_radar-0.14.0a0 → cloud_radar-0.14.0a2}/PKG-INFO

@@ -1,13 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: cloud-radar
-Version: 0.14.0a0
+Version: 0.14.0a2
 Summary: Run functional tests on cloudformation stacks.
-Home-page: https://github.com/DontShaveTheYak/cloud-radar
 License: Apache-2.0
 Keywords: aws,cloudformation,cloud-radar,testing,taskcat,cloud,radar
 Author: Levi Blaney
-Author-email: shadycuz@gmail.com
-Requires-Python: >=3.9,<3.14
+Author-email: shadycuz+dev@gmail.com
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
@@ -15,17 +14,15 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Testing
-Requires-Dist: botocore (>=1.35.36) ; python_version >= "3.13"
+Requires-Dist: botocore (>=1.35.36,<2.0.0)
 Requires-Dist: cfn-flip (>=1.3.0,<2.0.0)
-Requires-Dist: taskcat (>=0.9.41,<0.10.0)
+Requires-Dist: taskcat (>=0.9.41,<1.0.0)
+Project-URL: Changelog, https://github.com/DontShaveTheYak/cloud-radar/releases
+Project-URL: Issues, https://github.com/DontShaveTheYak/cloud-radar/issues
 Project-URL: Repository, https://github.com/DontShaveTheYak/cloud-radar
 Description-Content-Type: text/markdown
 
@@ -37,7 +34,7 @@ Description-Content-Type: text/markdown
 *** for contributors-url, forks-url, etc. This is an optional, concise syntax you may use.
 *** https://www.markdownguide.org/basic-syntax/#reference-style-links
 -->
-[![Python][python-shield]][pypi-url]
+[![Python][py-versions-shield]][pypi-url]
 [![Latest][version-shield]][pypi-url]
 [![Tests][test-shield]][test-url]
 [![Coverage][codecov-shield]][codecov-url]
@@ -200,8 +197,8 @@ The default values for pseudo parameters:
 | **NoValue**      | ""              |
 | **Partition**    | "aws"           |
 | Region           | "us-east-1"     |
-| **StackId**      | ""              |
-| **StackName**    | ""              |
+| StackId          | (generated based on other values)              |
+| StackName    | "my-cloud-radar-stack"              |
 | **URLSuffix**    | "amazonaws.com" |
 _Note: Bold variables are not fully implemented yet see the [Roadmap](#roadmap)_
 
@@ -356,7 +353,6 @@ A real functional testing example using Pytest can be seen [here](./tests/test_c
 ### Unit
 - Add full functionality to pseudo variables.
   * Variables like `Partition`, `URLSuffix` should change if the region changes.
-  * Variables like `StackName` and `StackId` should have a better default than ""
 - Handle References to resources that shouldn't exist.
   * It's currently possible that a `!Ref` to a Resource stays in the final template even if that resource is later removed because of a conditional.
 
@@ -397,6 +393,7 @@ Levi - [@shady_cuz](https://twitter.com/shady_cuz)
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
 [python-shield]: https://img.shields.io/pypi/pyversions/cloud-radar?style=for-the-badge
+[py-versions-shield]: https://img.shields.io/pypi/pyversions/cloud-radar?style=for-the-badge
 [version-shield]: https://img.shields.io/pypi/v/cloud-radar?label=latest&style=for-the-badge
 [pypi-url]: https://pypi.org/project/cloud-radar/
 [test-shield]: https://img.shields.io/github/actions/workflow/status/DontShaveTheYak/cloud-radar/test.yml?label=Tests&style=for-the-badge

{cloud_radar-0.14.0a0 → cloud_radar-0.14.0a2}/README.md

@@ -6,7 +6,7 @@
 *** for contributors-url, forks-url, etc. This is an optional, concise syntax you may use.
 *** https://www.markdownguide.org/basic-syntax/#reference-style-links
 -->
-[![Python][python-shield]][pypi-url]
+[![Python][py-versions-shield]][pypi-url]
 [![Latest][version-shield]][pypi-url]
 [![Tests][test-shield]][test-url]
 [![Coverage][codecov-shield]][codecov-url]
@@ -169,8 +169,8 @@ The default values for pseudo parameters:
 | **NoValue**      | ""              |
 | **Partition**    | "aws"           |
 | Region           | "us-east-1"     |
-| **StackId**      | ""              |
-| **StackName**    | ""              |
+| StackId          | (generated based on other values)              |
+| StackName    | "my-cloud-radar-stack"              |
 | **URLSuffix**    | "amazonaws.com" |
 _Note: Bold variables are not fully implemented yet see the [Roadmap](#roadmap)_
 
@@ -325,7 +325,6 @@ A real functional testing example using Pytest can be seen [here](./tests/test_c
 ### Unit
 - Add full functionality to pseudo variables.
   * Variables like `Partition`, `URLSuffix` should change if the region changes.
-  * Variables like `StackName` and `StackId` should have a better default than ""
 - Handle References to resources that shouldn't exist.
   * It's currently possible that a `!Ref` to a Resource stays in the final template even if that resource is later removed because of a conditional.
 
@@ -366,6 +365,7 @@ Levi - [@shady_cuz](https://twitter.com/shady_cuz)
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
 [python-shield]: https://img.shields.io/pypi/pyversions/cloud-radar?style=for-the-badge
+[py-versions-shield]: https://img.shields.io/pypi/pyversions/cloud-radar?style=for-the-badge
 [version-shield]: https://img.shields.io/pypi/v/cloud-radar?label=latest&style=for-the-badge
 [pypi-url]: https://pypi.org/project/cloud-radar/
 [test-shield]: https://img.shields.io/github/actions/workflow/status/DontShaveTheYak/cloud-radar/test.yml?label=Tests&style=for-the-badge

{cloud_radar-0.14.0a0 → cloud_radar-0.14.0a2}/pyproject.toml

@@ -1,31 +1,36 @@
-[tool.poetry]
+[project]
 name = "cloud-radar"
-version = "0.14.0a0"
+version = "0.14.0a2"
 description = "Run functional tests on cloudformation stacks."
 readme = "README.md"
-authors = ["Levi Blaney <shadycuz@gmail.com>"]
+authors = [
+    { name = "Levi Blaney", email = "shadycuz+dev@gmail.com" },
+]
 license = "Apache-2.0"
-repository = "https://github.com/DontShaveTheYak/cloud-radar"
 keywords = ["aws", "cloudformation", "cloud-radar", "testing", "taskcat", "cloud", "radar"]
+requires-python = ">=3.9,<4.0"
+dynamic = [ "classifiers" ]
+dependencies = [
+  "taskcat >=0.9.41, <1.0.0",
+  "cfn-flip >=1.3.0, <2.0.0",
+  "botocore >=1.35.36, <2.0.0",
+]
+[project.urls]
+Repository = "https://github.com/DontShaveTheYak/cloud-radar"
+Issues = "https://github.com/DontShaveTheYak/cloud-radar/issues"
+Changelog = "https://github.com/DontShaveTheYak/cloud-radar/releases"
+
+
+[tool.poetry]
+requires-poetry = ">=2.0"
 classifiers = [
   "Development Status :: 2 - Pre-Alpha",
-  "License :: OSI Approved :: Apache Software License",
   "Operating System :: OS Independent",
-  "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.9",
-  "Programming Language :: Python :: 3.10",
-  "Programming Language :: Python :: 3.11",
-  "Programming Language :: Python :: 3.12",
-  "Programming Language :: Python :: 3.13",
   "Topic :: Software Development :: Libraries",
   "Topic :: Software Development :: Testing"
 ]
 
-[tool.poetry.dependencies]
-python = ">=3.9,<3.14"
-taskcat = "^0.9.41"
-cfn-flip = "^1.3.0"
-botocore = {version = ">=1.35.36", python = ">=3.13"}
+
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.0.0"
@@ -41,8 +46,11 @@ flake8-bugbear = "^24.0.0"
 mypy = "^1.0.0"
 types-requests = "^2.28.11"
 types-PyYAML = "^6.0.12"
-cfn-lint = "1.22.3"
-setuptools = {version = "75.4.0", python = ">=3.12"}
+cfn-lint = "1.24.0"
+setuptools = {version = "75.8.0", python = ">=3.12"}
+
+[tool.poetry.requires-plugins]
+poetry-plugin-export = ">=1.8"
 
 [tool.coverage.paths]
 source = ["src", "*/site-packages"]

{cloud_radar-0.14.0a0 → cloud_radar-0.14.0a2}/src/cloud_radar/cf/unit/_template.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import json
 import re
+import uuid
 from pathlib import Path
 from typing import Any, Callable, Dict, Generator, List, Optional, Tuple, Union
 
@@ -26,8 +27,8 @@ class Template:
     NoValue: str = ""  # Not yet implemented
     Partition: str = "aws"  # Other regions not implemented
     Region: str = "us-east-1"
-    StackId: str = ""  # Not yet implemented
-    StackName: str = ""  # Not yet implemented
+    StackId: str = ""  # If left blank this will be generated
+    StackName: str = "my-cloud-radar-stack"
     URLSuffix: str = "amazonaws.com"  # Other regions not implemented
 
     def __init__(
@@ -310,6 +311,19 @@ class Template:
 
         return template
 
+    # If the StackId variable is not set, generate a value for it
+    def _get_populated_stack_id(self) -> str:
+        if not Template.StackId:
+            # Not explicitly set, generate a value
+            unique_uuid = uuid.uuid4()
+
+            return (
+                f"arn:{Template.Partition}:cloudformation:{self.Region}:"
+                f"{Template.AccountId}:stack/{Template.StackName}/{unique_uuid}"
+            )
+
+        return Template.StackId
+
     def create_stack(
         self,
         params: Optional[Dict[str, str]] = None,
@@ -318,6 +332,7 @@ class Template:
     ):
         if region:
             self.Region = region
+        self.StackId = self._get_populated_stack_id()
 
         self.render(params, parameters_file=parameters_file)