Read cached from us-east-1 in W2030 and E3008 (#2635)

* Read cached from us-east-1 in W2030 and E3008

Author: kddejong

.coveragerc

@@ -1,4 +1,3 @@
 [run]
 branch = True
-include =
-  *src/cfnlint/*
+include = src/cfnlint/*

src/cfnlint/rules/parameters/AllowedValue.py

@@ -28,6 +28,14 @@ def initialize(self, cfn):
         ):
             self.resource_sub_property_types.append(property_type_spec)
 
+    def _get_value_specs(self, value_type, region):
+        value_specs = RESOURCE_SPECS.get(region).get("ValueTypes").get(value_type, {})
+        if value_specs == "CACHED":
+            value_specs = (
+                RESOURCE_SPECS.get("us-east-1").get("ValueTypes").get(value_type, {})
+            )
+        return value_specs
+
     def check_value_ref(self, value, path, **kwargs):
         """Check Ref"""
         matches = []
@@ -111,15 +119,14 @@ def check(self, cfn, properties, value_specs, property_specs, path):
                         property_type = (
                             property_specs.get("Properties").get(prop).get("Type")
                         )
+                        type_specs = self._get_value_specs(value_type, cfn.regions[0])
                         matches.extend(
                             cfn.check_value(
                                 p_value,
                                 prop,
                                 p_path,
                                 check_ref=self.check_value_ref,
-                                value_specs=RESOURCE_SPECS.get(cfn.regions[0])
-                                .get("ValueTypes")
-                                .get(value_type, {}),
+                                value_specs=type_specs,
                                 cfn=cfn,
                                 property_type=property_type,
                                 property_name=prop,

src/cfnlint/rules/resources/properties/ValueRefGetAtt.py

@@ -234,6 +234,14 @@ def check_value_getatt(self, value, path, **kwargs):
 
         return matches
 
+    def _get_value_specs(self, value_type, region):
+        value_specs = RESOURCE_SPECS.get(region).get("ValueTypes").get(value_type, {})
+        if value_specs == "CACHED":
+            value_specs = (
+                RESOURCE_SPECS.get("us-east-1").get("ValueTypes").get(value_type, {})
+            )
+        return value_specs
+
     def check(self, cfn, properties, value_specs, property_specs, path):
         """Check itself"""
         matches = []
@@ -247,19 +255,21 @@ def check(self, cfn, properties, value_specs, property_specs, path):
                         property_type = (
                             property_specs.get("Properties").get(prop).get("Type")
                         )
+                        value_type_specs = self._get_value_specs(
+                            value_type, cfn.regions[0]
+                        )
+                        list_value_specs = self._get_value_specs(
+                            list_value_type, cfn.regions[0]
+                        )
                         matches.extend(
                             cfn.check_value(
                                 p_value,
                                 prop,
                                 p_path,
                                 check_ref=self.check_value_ref,
                                 check_get_att=self.check_value_getatt,
-                                value_specs=RESOURCE_SPECS.get(cfn.regions[0])
-                                .get("ValueTypes")
-                                .get(value_type, {}),
-                                list_value_specs=RESOURCE_SPECS.get(cfn.regions[0])
-                                .get("ValueTypes")
-                                .get(list_value_type, {}),
+                                value_specs=value_type_specs,
+                                list_value_specs=list_value_specs,
                                 cfn=cfn,
                                 property_type=property_type,
                                 property_name=prop,

tox.ini

@@ -8,7 +8,7 @@ commands =
   coverage xml
 skip_install = True
 deps =
-  coverage<7.0.0
+  coverage>=7.2.1
   pydot
 setenv =
   LANG=en_US.UTF-8