From 438a3cb2816cc01c70aee71726eeaa02b987ea76 Mon Sep 17 00:00:00 2001 From: Nevil Macwan Date: Wed, 20 Mar 2024 11:48:19 +0530 Subject: [PATCH 1/2] added aws validated tests for rgsa --- .../resourcegroupstaggingapi/test_rgsa.py | 32 +++++++++++-------- .../test_rgsa.snapshot.json | 25 +++++++++++++++ .../test_rgsa.validation.json | 5 +++ 3 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 tests/aws/services/resourcegroupstaggingapi/test_rgsa.snapshot.json create mode 100644 tests/aws/services/resourcegroupstaggingapi/test_rgsa.validation.json diff --git a/tests/aws/services/resourcegroupstaggingapi/test_rgsa.py b/tests/aws/services/resourcegroupstaggingapi/test_rgsa.py index 0f33ef3b6a544..516cf71c445b4 100644 --- a/tests/aws/services/resourcegroupstaggingapi/test_rgsa.py +++ b/tests/aws/services/resourcegroupstaggingapi/test_rgsa.py @@ -2,18 +2,24 @@ class TestRGSAIntegrations: - @markers.aws.unknown - def test_get_resources(self, aws_client): + @markers.aws.validated + @markers.snapshot.skip_snapshot_verify( + paths=["$..PaginationToken"] + ) + def test_get_resources(self, aws_client, cleanups, snapshot): vpc = aws_client.ec2.create_vpc(CidrBlock="10.0.0.0/16") - try: - aws_client.ec2.create_tags( - Resources=[vpc.get("Vpc").get("VpcId")], - Tags=[{"Key": "test", "Value": "test"}], - ) + vpd_id = vpc.get("Vpc").get("VpcId") - resp = aws_client.resourcegroupstaggingapi.get_resources(ResourceTypeFilters=["ec2"]) - results = resp.get("ResourceTagMappingList", []) - assert 1 == len(results) - assert [{"Key": "test", "Value": "test"}] == results[0].get("Tags") - finally: - aws_client.ec2.delete_vpc(VpcId=vpc["Vpc"]["VpcId"]) + snapshot.add_transformers_list( + [snapshot.transform.key_value("ResourceARN", "ARN")] + ) + cleanups.append(lambda: aws_client.ec2.delete_vpc(VpcId=vpd_id)) + + tags = [{"Key": "test", "Value": "test"}] + + aws_client.ec2.create_tags( + Resources=[vpc.get("Vpc").get("VpcId")], + Tags=tags, + ) + resp = aws_client.resourcegroupstaggingapi.get_resources(TagFilters=[{"Key": "test", "Values": ["test"]}]) + snapshot.match("get_resources", resp) diff --git a/tests/aws/services/resourcegroupstaggingapi/test_rgsa.snapshot.json b/tests/aws/services/resourcegroupstaggingapi/test_rgsa.snapshot.json new file mode 100644 index 0000000000000..405bb2cfe6395 --- /dev/null +++ b/tests/aws/services/resourcegroupstaggingapi/test_rgsa.snapshot.json @@ -0,0 +1,25 @@ +{ + "tests/aws/services/resourcegroupstaggingapi/test_rgsa.py::TestRGSAIntegrations::test_get_resources": { + "recorded-date": "20-03-2024, 06:15:41", + "recorded-content": { + "get_resources": { + "PaginationToken": "", + "ResourceTagMappingList": [ + { + "ResourceARN": "", + "Tags": [ + { + "Key": "test", + "Value": "test" + } + ] + } + ], + "ResponseMetadata": { + "HTTPHeaders": {}, + "HTTPStatusCode": 200 + } + } + } + } +} diff --git a/tests/aws/services/resourcegroupstaggingapi/test_rgsa.validation.json b/tests/aws/services/resourcegroupstaggingapi/test_rgsa.validation.json new file mode 100644 index 0000000000000..80b413a88f6d3 --- /dev/null +++ b/tests/aws/services/resourcegroupstaggingapi/test_rgsa.validation.json @@ -0,0 +1,5 @@ +{ + "tests/aws/services/resourcegroupstaggingapi/test_rgsa.py::TestRGSAIntegrations::test_get_resources": { + "last_validated_date": "2024-03-20T06:15:41+00:00" + } +} From 04f4dca6a4c9d31bb36b3844def1a5a56422f23f Mon Sep 17 00:00:00 2001 From: Nevil Macwan Date: Wed, 20 Mar 2024 11:48:47 +0530 Subject: [PATCH 2/2] fixed linting --- .../services/resourcegroupstaggingapi/test_rgsa.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/aws/services/resourcegroupstaggingapi/test_rgsa.py b/tests/aws/services/resourcegroupstaggingapi/test_rgsa.py index 516cf71c445b4..60e85f094c495 100644 --- a/tests/aws/services/resourcegroupstaggingapi/test_rgsa.py +++ b/tests/aws/services/resourcegroupstaggingapi/test_rgsa.py @@ -3,16 +3,12 @@ class TestRGSAIntegrations: @markers.aws.validated - @markers.snapshot.skip_snapshot_verify( - paths=["$..PaginationToken"] - ) + @markers.snapshot.skip_snapshot_verify(paths=["$..PaginationToken"]) def test_get_resources(self, aws_client, cleanups, snapshot): vpc = aws_client.ec2.create_vpc(CidrBlock="10.0.0.0/16") vpd_id = vpc.get("Vpc").get("VpcId") - snapshot.add_transformers_list( - [snapshot.transform.key_value("ResourceARN", "ARN")] - ) + snapshot.add_transformers_list([snapshot.transform.key_value("ResourceARN", "ARN")]) cleanups.append(lambda: aws_client.ec2.delete_vpc(VpcId=vpd_id)) tags = [{"Key": "test", "Value": "test"}] @@ -21,5 +17,7 @@ def test_get_resources(self, aws_client, cleanups, snapshot): Resources=[vpc.get("Vpc").get("VpcId")], Tags=tags, ) - resp = aws_client.resourcegroupstaggingapi.get_resources(TagFilters=[{"Key": "test", "Values": ["test"]}]) + resp = aws_client.resourcegroupstaggingapi.get_resources( + TagFilters=[{"Key": "test", "Values": ["test"]}] + ) snapshot.match("get_resources", resp)