cloud-radar 0.13.3a16__py3-none-any.whl → 0.14.0a1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- cloud_radar/cf/unit/_template.py +17 -2
- cloud_radar/cf/unit/functions.py +12 -1
- {cloud_radar-0.13.3a16.dist-info → cloud_radar-0.14.0a1.dist-info}/METADATA +21 -4
- {cloud_radar-0.13.3a16.dist-info → cloud_radar-0.14.0a1.dist-info}/RECORD +6 -6
- {cloud_radar-0.13.3a16.dist-info → cloud_radar-0.14.0a1.dist-info}/LICENSE.txt +0 -0
- {cloud_radar-0.13.3a16.dist-info → cloud_radar-0.14.0a1.dist-info}/WHEEL +0 -0
cloud_radar/cf/unit/_template.py
CHANGED
@@ -2,6 +2,7 @@ from __future__ import annotations
|
|
2
2
|
|
3
3
|
import json
|
4
4
|
import re
|
5
|
+
import uuid
|
5
6
|
from pathlib import Path
|
6
7
|
from typing import Any, Callable, Dict, Generator, List, Optional, Tuple, Union
|
7
8
|
|
@@ -26,8 +27,8 @@ class Template:
|
|
26
27
|
NoValue: str = "" # Not yet implemented
|
27
28
|
Partition: str = "aws" # Other regions not implemented
|
28
29
|
Region: str = "us-east-1"
|
29
|
-
StackId: str = "" #
|
30
|
-
StackName: str = ""
|
30
|
+
StackId: str = "" # If left blank this will be generated
|
31
|
+
StackName: str = "my-cloud-radar-stack"
|
31
32
|
URLSuffix: str = "amazonaws.com" # Other regions not implemented
|
32
33
|
|
33
34
|
def __init__(
|
@@ -310,6 +311,19 @@ class Template:
|
|
310
311
|
|
311
312
|
return template
|
312
313
|
|
314
|
+
# If the StackId variable is not set, generate a value for it
|
315
|
+
def _get_populated_stack_id(self) -> str:
|
316
|
+
if not Template.StackId:
|
317
|
+
# Not explicitly set, generate a value
|
318
|
+
unique_uuid = uuid.uuid4()
|
319
|
+
|
320
|
+
return (
|
321
|
+
f"arn:{Template.Partition}:cloudformation:{self.Region}:"
|
322
|
+
f"{Template.AccountId}:stack/{Template.StackName}/{unique_uuid}"
|
323
|
+
)
|
324
|
+
|
325
|
+
return Template.StackId
|
326
|
+
|
313
327
|
def create_stack(
|
314
328
|
self,
|
315
329
|
params: Optional[Dict[str, str]] = None,
|
@@ -318,6 +332,7 @@ class Template:
|
|
318
332
|
):
|
319
333
|
if region:
|
320
334
|
self.Region = region
|
335
|
+
self.StackId = self._get_populated_stack_id()
|
321
336
|
|
322
337
|
self.render(params, parameters_file=parameters_file)
|
323
338
|
|
cloud_radar/cf/unit/functions.py
CHANGED
@@ -455,7 +455,18 @@ def get_att(template: "Template", values: Any) -> str:
|
|
455
455
|
if resource_name not in template.template["Resources"]:
|
456
456
|
raise KeyError(f"Fn::GetAtt - Resource {resource_name} not found in template.")
|
457
457
|
|
458
|
-
|
458
|
+
# Get the resource definition
|
459
|
+
resource = template.template["Resources"][resource_name]
|
460
|
+
|
461
|
+
# Check if there is a value in the resource Metadata for this attribute.
|
462
|
+
# If the attribute requested is in the metadata, return it.
|
463
|
+
# Otherwise use the string value of "{resource_name}.{att_name}"
|
464
|
+
|
465
|
+
metadata = resource.get("Metadata", {})
|
466
|
+
cloud_radar_metadata = metadata.get("Cloud-Radar", {})
|
467
|
+
attribute_values = cloud_radar_metadata.get("attribute-values", {})
|
468
|
+
|
469
|
+
return attribute_values.get(att_name, f"{resource_name}.{att_name}")
|
459
470
|
|
460
471
|
|
461
472
|
def get_azs(_t: "Template", region: Any) -> List[str]:
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: cloud-radar
|
3
|
-
Version: 0.
|
3
|
+
Version: 0.14.0a1
|
4
4
|
Summary: Run functional tests on cloudformation stacks.
|
5
5
|
Home-page: https://github.com/DontShaveTheYak/cloud-radar
|
6
6
|
License: Apache-2.0
|
@@ -200,8 +200,8 @@ The default values for pseudo parameters:
|
|
200
200
|
| **NoValue** | "" |
|
201
201
|
| **Partition** | "aws" |
|
202
202
|
| Region | "us-east-1" |
|
203
|
-
|
|
204
|
-
|
|
203
|
+
| StackId | (generated based on other values) |
|
204
|
+
| StackName | "my-cloud-radar-stack" |
|
205
205
|
| **URLSuffix** | "amazonaws.com" |
|
206
206
|
_Note: Bold variables are not fully implemented yet see the [Roadmap](#roadmap)_
|
207
207
|
|
@@ -242,6 +242,24 @@ dynamic_references = {
|
|
242
242
|
template = Template(template_content, dynamic_references=dynamic_references)
|
243
243
|
```
|
244
244
|
|
245
|
+
There are cases where the default behaviour of our `GetAtt` implementation may not be sufficient and you need a more accurate returned value. When unit testing there are no real AWS resources created, and cloud-radar does not attempt to realistically generate attribute values - a string is always returned. This works good enough most of the time, but there are some cases where if you are attempting to apply intrinsic functions against the attribute value it needs to be more correct. When this occurs, you can add Metadata to the template to provide test values to use.
|
246
|
+
|
247
|
+
```
|
248
|
+
Resources:
|
249
|
+
MediaPackageV2Channel:
|
250
|
+
Type: AWS::MediaPackageV2::Channel
|
251
|
+
Metadata:
|
252
|
+
Cloud-Radar:
|
253
|
+
attribute-values:
|
254
|
+
# Default behaviour of a string is not good enough here, the attribute value is expected to be a List.
|
255
|
+
IngestEndpointUrls:
|
256
|
+
- http://one.example.com
|
257
|
+
- http://two.example.com
|
258
|
+
Properties:
|
259
|
+
ChannelGroupName: dev_video_1
|
260
|
+
ChannelName: !Sub ${AWS::StackName}-MediaPackageChannel
|
261
|
+
```
|
262
|
+
|
245
263
|
A real unit testing example using Pytest can be seen [here](./tests/test_cf/test_examples/test_unit.py)
|
246
264
|
|
247
265
|
</details>
|
@@ -338,7 +356,6 @@ A real functional testing example using Pytest can be seen [here](./tests/test_c
|
|
338
356
|
### Unit
|
339
357
|
- Add full functionality to pseudo variables.
|
340
358
|
* Variables like `Partition`, `URLSuffix` should change if the region changes.
|
341
|
-
* Variables like `StackName` and `StackId` should have a better default than ""
|
342
359
|
- Handle References to resources that shouldn't exist.
|
343
360
|
* 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.
|
344
361
|
|
@@ -9,10 +9,10 @@ cloud_radar/cf/unit/_output.py,sha256=rhQQ4aJu06bxAoG7GOXkuOPzAmLCrTA2Ytb8rNXA4V
|
|
9
9
|
cloud_radar/cf/unit/_parameter.py,sha256=AdPIqc2ggSW1VR0USF30zjphX3z1HHbGKQt8n-Kzhfo,3199
|
10
10
|
cloud_radar/cf/unit/_resource.py,sha256=dWaR-5s6ea5mIu6Dhf1hY31Wd4WLHbHsbyxnu2Tz6QI,8512
|
11
11
|
cloud_radar/cf/unit/_stack.py,sha256=_S0L9O7Lw-QAJDKubClp2b6UYtYfyzg272_7WQkUdo8,5785
|
12
|
-
cloud_radar/cf/unit/_template.py,sha256=
|
13
|
-
cloud_radar/cf/unit/functions.py,sha256=
|
12
|
+
cloud_radar/cf/unit/_template.py,sha256=ESpor5rputwtCKJuvlfp_M0VUuYrciRaLNE8TfdqhRU,32782
|
13
|
+
cloud_radar/cf/unit/functions.py,sha256=iWBhc9JmyObusAAZ2iAXf7dXof36mdqoHOLR4UzuC58,29234
|
14
14
|
cloud_radar/cf/unit/test__template.py,sha256=jVPMJTn6Q0sSZ8BjRGyutuR9-NjdHdwDTVsd2kvjQbs,1491
|
15
|
-
cloud_radar-0.
|
16
|
-
cloud_radar-0.
|
17
|
-
cloud_radar-0.
|
18
|
-
cloud_radar-0.
|
15
|
+
cloud_radar-0.14.0a1.dist-info/LICENSE.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
16
|
+
cloud_radar-0.14.0a1.dist-info/METADATA,sha256=bnK78rCtNf-t9giZQ2I6rX7NKK24xIcYLz_4lA_ATkE,16756
|
17
|
+
cloud_radar-0.14.0a1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
|
18
|
+
cloud_radar-0.14.0a1.dist-info/RECORD,,
|
File without changes
|
File without changes
|