Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ec2.vpc resource support to Tagging API (#3375)

Browse Source 
Closes #1849
This commit is contained in:
Brian Pandola 2020-10-10 11:05:21 -07:00 committed by GitHub
parent a2bd4515eb
commit 4a336b8b04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
moto/resourcegroupstaggingapi/models.py
View File

@ -3,6 +3,7 @@ import uuid
import six
from boto3 import Session
from moto.core import ACCOUNT_ID
from moto.core import BaseBackend
from moto.core.exceptions import RESTError
@ -367,6 +368,23 @@ class ResourceGroupsTaggingAPIBackend(BaseBackend):
# RedShift Subnet group
# VPC
if (
not resource_type_filters
or "ec2" in resource_type_filters
or "ec2:vpc" in resource_type_filters
):
for vpc in self.ec2_backend.vpcs.values():
tags = get_ec2_tags(vpc.id)
if not tags or not tag_filter(
tags
): # Skip if no tags, or invalid filter
continue
yield {
"ResourceARN": "arn:aws:ec2:{0}:{1}:vpc/{2}".format(
self.region_name, ACCOUNT_ID, vpc.id
),
"Tags": tags,
}
# VPC Customer Gateway
# VPC DHCP Option Set
# VPC Internet Gateway

21
tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py
View File

@ -61,6 +61,27 @@ def test_get_resources_ec2():
resp["ResourceTagMappingList"][0]["ResourceARN"].should.contain("instance/")
@mock_ec2
@mock_resourcegroupstaggingapi
def test_get_resources_ec2_vpc():
ec2 = boto3.resource("ec2", region_name="us-west-1")
vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16")
ec2.create_tags(Resources=[vpc.id], Tags=[{"Key": "test", "Value": "test"}])
def assert_response(resp):
results = resp.get("ResourceTagMappingList", [])
results.should.have.length_of(1)
vpc.id.should.be.within(results[0]["ResourceARN"])
rtapi = boto3.client("resourcegroupstaggingapi", region_name="us-west-1")
resp = rtapi.get_resources(ResourceTypeFilters=["ec2"])
assert_response(resp)
resp = rtapi.get_resources(ResourceTypeFilters=["ec2:vpc"])
assert_response(resp)
resp = rtapi.get_resources(TagFilters=[{"Key": "test", "Values": ["test"]}])
assert_response(resp)
@mock_ec2
@mock_resourcegroupstaggingapi
def test_get_tag_keys_ec2():