localstack · whummer · Aug 21, 2022 · Aug 15, 2022 · Aug 15, 2022 · Aug 15, 2022
@@ -92,6 +92,7 @@ jobs:
         key: ${{ runner.os }}-go-${{ hashFiles('**/terraform-provider-aws/go.sum') }}
 
     - name: Run Test Cases
+      env:
+        CI: true
       run: |
-        cd terraform-provider-aws
-        AWS_ACCESS_KEY_ID=test AWS_SECRET_ACCESS_KEY=test TF_ACC=true go test ./internal/service/${{ matrix.service }}/ -v -timeout 60m -run ${{ steps.get-list.outputs.testlist }}
+        bash tests/terraform/run.sh ${{ matrix.service }} ${{ steps.get-list.outputs.testlist }}
diff --git a/localstack/services/route53resolver/models.py b/localstack/services/route53resolver/models.py
@@ -1,7 +1,12 @@
 from typing import Dict
 
-from localstack.aws.api.route53resolver import FirewallRuleGroup, ResourceNotFoundException
+from localstack.aws.api.route53resolver import (
+    FirewallConfig,
+    FirewallRuleGroup,
+    ResourceNotFoundException,
+)
 from localstack.services.generic_proxy import RegionBackend
+from localstack.services.route53resolver.utils import get_firewall_config_id, validate_vpc
 from localstack.utils.aws import aws_stack
 
 
@@ -15,94 +20,151 @@ def __init__(self):
         self.firewall_domains = {}
         self.firewall_rules = {}
         self.firewall_rule_group_associations = {}
-
-
-## helper functions for the backend
-def get_firewall_rule_group(id):
-    """returns firewall rule group with the given id if it exists"""
-    region_details = Route53ResolverBackend.get()
-    firewall_rule_group = region_details.firewall_rule_groups.get(id)
-    if not firewall_rule_group:
-        raise ResourceNotFoundException(
-            f"Can't find the resource with ID '{id}'. Trace Id: '{aws_stack.get_trace_id()}'"
+        self.resolver_query_log_configs = {}
+        self.resolver_query_log_config_associations = {}
+        self.firewall_configs = {}
+
+    ## helper functions for the backend
+    def get_firewall_rule_group(self, id):
+        """returns firewall rule group with the given id if it exists"""
+
+        firewall_rule_group = self.firewall_rule_groups.get(id)
+        if not firewall_rule_group:
+                raise ResourceNotFoundException(
+                f"Can't find the resource with ID '{id}'. Trace Id: '{aws_stack.get_trace_id()}'"
+            )
+        return firewall_rule_group
+
+    def delete_firewall_rule_group(self, id):
+        """deletes the firewall rule group with the given id"""
+        # if firewall_rule_groups doesn't exist it will throw an error
+
+        firewall_rule_group = self.get_firewall_rule_group(id)
+        self.firewall_rule_groups.pop(id)
+        return firewall_rule_group
+
+    def get_firewall_rule_group_association(self, id):
+        """returns firewall rule group association with the given id if it exists"""
+
+        firewall_rule_group_association = self.firewall_rule_group_associations.get(id)
+        if not firewall_rule_group_association:
+            raise ResourceNotFoundException(
+                f"[RSLVR-02025] Can't find the resource with ID '{id}'. Trace Id: '{aws_stack.get_trace_id()}'"
+            )
+        return self.firewall_rule_group_associations.get(id)
+
+    def delete_firewall_rule_group_association(self, id):
+        """deletes the firewall rule group association with the given id"""
+        # if firewall_rule_group_associations doesn't exist it will throw an error
+
+        firewall_rule_group_associations = self.get_firewall_rule_group_association(id)
+        self.firewall_rule_group_associations.pop(id)
+        return firewall_rule_group_associations
+
+    def get_firewall_domain(self, d):
+        """returns firewall domain with the given id if it exists"""
+        # firewall_domain can return none
+
+        firewall_domain = self.firewall_domains.get(id)
+        return firewall_domain
+
+    def get_firewall_domain_list(self, id):
+        """returns firewall domain list with the given id if it exists"""
+
+        firewall_domain_list = self.firewall_domain_lists.get(id)
+        if not firewall_domain_list:
+            raise ResourceNotFoundException(
+                f"Can't find the resource with ID '{id}'. Trace Id: '{aws_stack.get_trace_id()}'"
+            )
+        return firewall_domain_list
+
+    def delete_firewall_domain_list(self, id):
+        """deletes the firewall domain list with the given id"""
+        # if firewall_domain_lists doesn't exist it will throw an error
+
+        firewall_domain_list = self.get_firewall_domain_list(id)
+        self.firewall_domain_lists.pop(id)
+        return firewall_domain_list
+
+    def get_firewall_rule(self, firewall_rule_group_id, firewall_domain_list_id):
+        """returns firewall rule with the given id if it exists"""
+
+        firewall_rule = self.firewall_rules.get(firewall_rule_group_id, {}).get(
+            firewall_domain_list_id
         )
-    return firewall_rule_group
-
-
-def delete_firewall_rule_group(id):
-    """deletes the firewall rule group with the given id"""
-    # if firewall_rule_groups doesn't exist it will throw an error
-    region_details = Route53ResolverBackend.get()
-    firewall_rule_group = get_firewall_rule_group(id)
-    region_details.firewall_rule_groups.pop(id)
-    return firewall_rule_group
-
-
-def get_firewall_rule_group_association(id):
-    """returns firewall rule group association with the given id if it exists"""
-    region_details = Route53ResolverBackend.get()
-    firewall_rule_group_association = region_details.firewall_rule_group_associations.get(id)
-    if not firewall_rule_group_association:
-        raise ResourceNotFoundException(
-            f"[RSLVR-02025] Can't find the resource with ID '{id}'. Trace Id: '{aws_stack.get_trace_id()}'"
-        )
-    return region_details.firewall_rule_group_associations.get(id)
-
-
-def delete_firewall_rule_group_association(id):
-    """deletes the firewall rule group association with the given id"""
-    # if firewall_rule_group_associations doesn't exist it will throw an error
-    region_details = Route53ResolverBackend.get()
-    firewall_rule_group_associations = get_firewall_rule_group_association(id)
-    region_details.firewall_rule_group_associations.pop(id)
-    return firewall_rule_group_associations
-
-
-def get_firewall_domain(id):
-    """returns firewall domain with the given id if it exists"""
-    # firewall_domain can return none
-    region_details = Route53ResolverBackend.get()
-    firewall_domain = region_details.firewall_domains.get(id)
-    return firewall_domain
-
-
-def get_firewall_domain_list(id):
-    """returns firewall domain list with the given id if it exists"""
-    region_details = Route53ResolverBackend.get()
-    firewall_domain_list = region_details.firewall_domain_lists.get(id)
-    if not firewall_domain_list:
-        raise ResourceNotFoundException(
-            f"Can't find the resource with ID '{id}'. Trace Id: '{aws_stack.get_trace_id()}'"
-        )
-    return firewall_domain_list
-
-
-def delete_firewall_domain_list(id):
-    """deletes the firewall domain list with the given id"""
-        # if firewall_domain_lists doesn't exist it will throw an error
-    region_details = Route53ResolverBackend.get()
-    firewall_domain_list = get_firewall_domain_list(id)
-    region_details.firewall_domain_lists.pop(id)
-    return firewall_domain_list
-
-
-def get_firewall_rule(firewall_rule_group_id, firewall_domain_list_id):
-    """returns firewall rule with the given id if it exists"""
-    region_details = Route53ResolverBackend.get()
-    firewall_rule = region_details.firewall_rules.get(firewall_rule_group_id, {}).get(
-        firewall_domain_list_id
-    )
-    if not firewall_rule:
-        raise ResourceNotFoundException(
-            f"Can't find the resource with ID '{firewall_rule_group_id}'. Trace Id: '{aws_stack.get_trace_id()}'"
-        )
-    return firewall_rule
-
-
-def delete_firewall_rule(firewall_rule_group_id, firewall_domain_list_id):
-    """deletes the firewall rule with the given id"""
-    # if firewall_rules doesn't exist it will throw an error
-    region_details = Route53ResolverBackend.get()
-    firewall_rule = get_firewall_rule(firewall_rule_group_id, firewall_domain_list_id)
-    region_details.firewall_rules.get(firewall_rule_group_id, {}).pop(firewall_domain_list_id)
-    return firewall_rule
+        if not firewall_rule:
+            raise ResourceNotFoundException(
+                f"Can't find the resource with ID '{firewall_rule_group_id}'. Trace Id: '{aws_stack.get_trace_id()}'"
+            )
+        return firewall_rule
+
+    def delete_firewall_rule(self, firewall_rule_group_id, firewall_domain_list_id):
+        """deletes the firewall rule with the given id"""
+        # if firewall_rules doesn't exist it will throw an error
+
+        firewall_rule = self.get_firewall_rule(firewall_rule_group_id, firewall_domain_list_id)
+        self.firewall_rules.get(firewall_rule_group_id, {}).pop(firewall_domain_list_id)
+        return firewall_rule
+
+    def get_resolver_query_log_config(self, id):
+        """returns resolver query log config with the given id if it exists"""
+
+        resolver_query_log_config = self.resolver_query_log_configs.get(id)
+        if not resolver_query_log_config:
+            raise ResourceNotFoundException(
+                f"[RSLVR-01601] The specified query logging configuration doesn't exist. Trace Id: '{aws_stack.get_trace_id()}'"
+            )
+        return resolver_query_log_config
+
+    def delete_resolver_query_log_config(self, id):
+        """deletes the resolver query log config with the given id"""
+
+        self.get_resolver_query_log_config(id)
+        resolver_query_log_config = self.resolver_query_log_configs.pop(id)
+        return resolver_query_log_config
+
+    def get_resolver_query_log_config_associations(self, id):
+        """returns resolver query log config association with the given id if it exists"""
+
+        resolver_query_log_config_association = self.resolver_query_log_config_associations.get(id)
+        if not resolver_query_log_config_association:
+            raise ResourceNotFoundException(
+                f"[RSLVR-01601] The specified query logging configuration doesn't exist. Trace Id: '{aws_stack.get_trace_id()}'"
+            )
+        return resolver_query_log_config_association
+
+    def delete_resolver_query_log_config_associations(
+        self, resolver_query_log_config_id, resource_id
+    ):
+        """deletes the resolver query log config association with the given id and vpc id"""
+
+        association_id = None
+        for association in self.resolver_query_log_config_associations.values():
+            if not (
+                association.get("ResolverQueryLogConfigId") == resolver_query_log_config_id
+                and association.get("ResourceId") == resource_id
+            ):
+                raise ResourceNotFoundException(
+                    f"[RSLVR-01602] The specified query logging configuration association doesn't exist. Trace Id: '{aws_stack.get_trace_id()}'"
+                )
+            association["Status"] = "DELETING"
+            association_id = association.get("Id")
+        return self.resolver_query_log_config_associations.pop(association_id)
+
+    def get_or_create_firewall_config(self, resource_id, region, owner_id):
+        """returns the firewall config with the given id if it exists or creates a new one"""
+
+        validate_vpc(resource_id, region)
+        firewall_config: FirewallConfig
+        if self.firewall_configs.get(resource_id):
+            firewall_config = self.firewall_configs[resource_id]
+        else:
+            id = get_firewall_config_id()
+            firewall_config = FirewallConfig(
+                Id=id,
+                ResourceId=resource_id,
+                OwnerId=owner_id,
+                FirewallFailOpen="DISABLED",
+            )
+            self.firewall_configs[resource_id] = firewall_config
+        return firewall_config