feat(tags): add resource tags to E services (#2007)

Co-authored-by: Pepe Fagoaga <pepe@verica.io>

tests/providers/aws/services/ec2/ec2_service_test.py

@@ -127,6 +127,14 @@ class Test_EC2_Service:
         sg_id = ec2_client.create_security_group(
             Description="test-description",
             GroupName="test-security-group",
+            TagSpecifications=[
+                {
+                    "ResourceType": "security-group",
+                    "Tags": [
+                        {"Key": "test", "Value": "test"},
+                    ],
+                },
+            ],
         )["GroupId"]
         # EC2 client for this test class
         audit_info = self.set_mocked_audit_info()
@@ -153,6 +161,9 @@ class Test_EC2_Service:
                         "UserIdGroupPairs": [],
                     }
                 ]
+                assert security_group.tags == [
+                    {"Key": "test", "Value": "test"},
+                ]
 
     # Test EC2 Describe Nacls
     @mock_ec2
@@ -164,6 +175,14 @@ class Test_EC2_Service:
         vpc_id = ec2_client.create_vpc(CidrBlock="10.0.0.0/16")["Vpc"]["VpcId"]
         nacl_id = ec2_resource.create_network_acl(
             VpcId=vpc_id,
+            TagSpecifications=[
+                {
+                    "ResourceType": "network-acl",
+                    "Tags": [
+                        {"Key": "test", "Value": "test"},
+                    ],
+                },
+            ],
         ).id
         # EC2 client for this test class
         audit_info = self.set_mocked_audit_info()
@@ -178,6 +197,9 @@ class Test_EC2_Service:
                     == f"arn:{audit_info.audited_partition}:ec2:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:network-acl/{acl.id}"
                 )
                 assert acl.entries == []
+                assert acl.tags == [
+                    {"Key": "test", "Value": "test"},
+                ]
 
     # Test EC2 Describe Snapshots
     @mock_ec2
@@ -193,6 +215,14 @@ class Test_EC2_Service:
         ).id
         snapshot_id = ec2_client.create_snapshot(
             VolumeId=volume_id,
+            TagSpecifications=[
+                {
+                    "ResourceType": "snapshot",
+                    "Tags": [
+                        {"Key": "test", "Value": "test"},
+                    ],
+                },
+            ],
         )["SnapshotId"]
         # EC2 client for this test class
         audit_info = self.set_mocked_audit_info()
@@ -207,6 +237,9 @@ class Test_EC2_Service:
                     == f"arn:{audit_info.audited_partition}:ec2:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:snapshot/{snapshot.id}"
                 )
                 assert snapshot.region == AWS_REGION
+                assert snapshot.tags == [
+                    {"Key": "test", "Value": "test"},
+                ]
                 assert not snapshot.encrypted
                 assert not snapshot.public
 
@@ -286,7 +319,16 @@ class Test_EC2_Service:
         # Generate EC2 Client
         ec2_client = client("ec2", region_name=AWS_REGION)
         allocation_id = ec2_client.allocate_address(
-            Domain="vpc", Address="127.38.43.222"
+            Domain="vpc",
+            Address="127.38.43.222",
+            TagSpecifications=[
+                {
+                    "ResourceType": "elastic-ip",
+                    "Tags": [
+                        {"Key": "test", "Value": "test"},
+                    ],
+                },
+            ],
         )["AllocationId"]
         # EC2 client for this test class
         audit_info = self.set_mocked_audit_info()
@@ -296,6 +338,9 @@ class Test_EC2_Service:
             ec2.elastic_ips[0].arn
             == f"arn:aws:ec2:{AWS_REGION}:{AWS_ACCOUNT_NUMBER}:eip-allocation/{allocation_id}"
         )
+        assert ec2.elastic_ips[0].tags == [
+            {"Key": "test", "Value": "test"},
+        ]
 
     # Test EC2 Describe Network Interfaces
     @mock_ec2
@@ -310,7 +355,6 @@ class Test_EC2_Service:
             GroupName="test-securitygroup", Description="n/a"
         )
         eni_id = subnet.create_network_interface(Groups=[sg.id]).id
-        print(eni_id)
         ec2_client.modify_network_interface_attribute(
             NetworkInterfaceId=eni_id, Groups=[sg.id]
         )
@@ -383,6 +427,13 @@ class Test_EC2_Service:
         )
         assert not ec2.images[0].public
         assert ec2.images[0].region == AWS_REGION
+        assert ec2.images[0].tags == [
+            {
+                "Key": "Base_AMI_Name",
+                "Value": "Deep Learning Base AMI (Amazon Linux 2) Version 31.0",
+            },
+            {"Key": "OS_Version", "Value": "AWS Linux 2"},
+        ]
 
     # Test EC2 Describe Volumes
     @mock_ec2
@@ -394,7 +445,14 @@ class Test_EC2_Service:
             AvailabilityZone=AWS_REGION,
             Encrypted=False,
             Size=40,
-            TagSpecifications=[],
+            TagSpecifications=[
+                {
+                    "ResourceType": "volume",
+                    "Tags": [
+                        {"Key": "test", "Value": "test"},
+                    ],
+                },
+            ],
         )["VolumeId"]
 
         # EC2 client for this test class
@@ -410,3 +468,6 @@ class Test_EC2_Service:
         )
         assert ec2.volumes[0].region == AWS_REGION
         assert not ec2.volumes[0].encrypted
+        assert ec2.volumes[0].tags == [
+            {"Key": "test", "Value": "test"},
+        ]

tests/providers/aws/services/ecr/ecr_service_test.py

@@ -118,6 +118,9 @@ class Test_ECR_Service:
         ecr_client.create_repository(
             repositoryName=repo_name,
             imageScanningConfiguration={"scanOnPush": True},
+            tags=[
+                {"Key": "test", "Value": "test"},
+            ],
         )
         audit_info = self.set_mocked_audit_info()
         ecr = ECR(audit_info)
@@ -125,6 +128,9 @@ class Test_ECR_Service:
         assert ecr.repositories[0].name == repo_name
         assert ecr.repositories[0].arn == repo_arn
         assert ecr.repositories[0].scan_on_push
+        assert ecr.repositories[0].tags == [
+            {"Key": "test", "Value": "test"},
+        ]
 
     # Test describe ECR repository policies
     @mock_ecr

tests/providers/aws/services/ecs/ecs_service_test.py

@@ -111,6 +111,9 @@ class Test_ECS_Service:
                     ],
                 }
             ],
+            tags=[
+                {"key": "test", "value": "test"},
+            ],
         )
 
         task_definition = ecs_client.register_task_definition(**definition)
@@ -121,6 +124,9 @@ class Test_ECS_Service:
         assert (
             ecs.task_definitions[0].name == task_definition["taskDefinition"]["family"]
         )
+        assert ecs.task_definitions[0].tags == [
+            {"key": "test", "value": "test"},
+        ]
         assert (
             ecs.task_definitions[0].arn
             == task_definition["taskDefinition"]["taskDefinitionArn"]

tests/providers/aws/services/efs/efs_service_test.py

@@ -91,12 +91,19 @@ class Test_EFS:
     def test__describe_file_systems__(self):
         efs_client = client("efs", AWS_REGION)
         efs = efs_client.create_file_system(
-            CreationToken=creation_token, Encrypted=True
+            CreationToken=creation_token,
+            Encrypted=True,
+            Tags=[
+                {"Key": "test", "Value": "test"},
+            ],
         )
         filesystem = EFS(self.set_mocked_audit_info())
         assert len(filesystem.filesystems) == 1
         assert filesystem.filesystems[0].id == efs["FileSystemId"]
         assert filesystem.filesystems[0].encrypted == efs["Encrypted"]
+        assert filesystem.filesystems[0].tags == [
+            {"Key": "test", "Value": "test"},
+        ]
 
     @mock_efs
     # Test EFS describe file systems

tests/providers/aws/services/eks/eks_service_test.py

@@ -92,12 +92,14 @@ class Test_EKS_Service:
                 ],
             },
             roleArn=f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:role/eks-service-role-AWSServiceRoleForAmazonEKS-J7ONKE3BQ4PI",
+            tags={"test": "test"},
         )
         audit_info = self.set_mocked_audit_info()
         eks = EKS(audit_info)
         assert len(eks.clusters) == 1
         assert eks.clusters[0].name == cluster_name
         assert eks.clusters[0].region == AWS_REGION
+        assert eks.clusters[0].tags == [{"test": "test"}]
 
     # Test EKS describe clusters
     @mock_ec2

tests/providers/aws/services/emr/emr_service_test.py

@@ -108,6 +108,9 @@ class Test_EMR_Service:
             Name=cluster_name,
             ServiceRole="EMR_DefaultRole",
             VisibleToAllUsers=True,
+            Tags=[
+                {"Key": "test", "Value": "test"},
+            ],
         )
         cluster_id = emr_client.run_job_flow(**run_job_flow_args)["JobFlowId"]
         # EMR Class
@@ -127,6 +130,9 @@ class Test_EMR_Service:
             == "ec2-184-0-0-1.us-west-1.compute.amazonaws.com"
         )
         assert emr.clusters[cluster_id].public
+        assert emr.clusters[cluster_id].tags == [
+            {"Key": "test", "Value": "test"},
+        ]
 
     @mock_emr
     def test__get_block_public_access_configuration__(self):