releng - update deps (cloud-custodian#9832)

supersun · Nov 14, 2024 · 8dfa5f5 · 8dfa5f5
1 parent 626bfa8
commit 8dfa5f5
Show file tree

Hide file tree

Showing 19 changed files with 2,364 additions and 2,423 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ classifiers=[
 custodian = 'c7n.cli:main'
 
 [tool.poetry.dependencies]
-cryptography = "<43"
+cryptography = "<46"
 python = "^3.8"
 boto3 = "^1.12.31"
 jsonschema = ">=4.18"

diff --git a/tools/c7n_awscc/poetry.lock b/tools/c7n_awscc/poetry.lock
diff --git a/tools/c7n_azure/poetry.lock b/tools/c7n_azure/poetry.lock
diff --git a/tools/c7n_gcp/poetry.lock b/tools/c7n_gcp/poetry.lock
diff --git a/tools/c7n_kube/poetry.lock b/tools/c7n_kube/poetry.lock
diff --git a/tools/c7n_left/c7n_left/providers/terraform/variables.py b/tools/c7n_left/c7n_left/providers/terraform/variables.py
@@ -130,9 +130,9 @@ def get_uninitialized_var_files(self):
                 if not v["__tfmeta"]["path"].startswith("variable"):
                     continue
                 if v["__tfmeta"]["label"] not in var_map:
-                    uninitialized_vars[v["__tfmeta"]["label"]] = self.type_defaults[
+                    uninitialized_vars[v["__tfmeta"]["label"]] = self.get_type_default(
                         v.get("type", "string") or "string"
-                    ]
+                    )
 
         if not uninitialized_vars:
             return []
@@ -145,6 +145,15 @@ def get_uninitialized_var_files(self):
             ).relative_to(self.source_dir.absolute())
         ]
 
+    @classmethod
+    def get_type_default(cls, vtype):
+        if vtype in cls.type_defaults:
+            return cls.type_defaults[vtype]
+        elif " " in vtype:
+            vtype, _ = vtype.split(' ', 1)
+            return cls.type_defaults[vtype]
+        return cls.type_defaults["string"]
+
     def get_env_variables(self):
         prefix = "TF_VAR_"
         return {k[len(prefix) :]: v for k, v in os.environ.items() if k.startswith(prefix)}

diff --git a/tools/c7n_left/poetry.lock b/tools/c7n_left/poetry.lock
diff --git a/tools/c7n_left/tests/test_left.py b/tools/c7n_left/tests/test_left.py
@@ -29,6 +29,7 @@
     )
     from c7n_left.providers.terraform.graph import Resolver
     from c7n_left.providers.terraform.filters import Taggable
+    from c7n_left.providers.terraform.variables import VariableResolver
 
     LEFT_INSTALLED = True
 except ImportError:
@@ -637,6 +638,11 @@ def test_graph_merge_function(policy_env):
     assert log_group["tags"] == {"Env": "Public", "Component": "application"}
 
 
+def test_variable_type_default():
+    assert VariableResolver.get_type_default("xyz") == ""
+    assert VariableResolver.get_type_default("map of strings") == {}
+
+
 def test_null_tag_value(policy_env):
     policy_env.write_tf(
         """

diff --git a/tools/c7n_logexporter/poetry.lock b/tools/c7n_logexporter/poetry.lock
diff --git a/tools/c7n_mailer/poetry.lock b/tools/c7n_mailer/poetry.lock
diff --git a/tools/c7n_oci/poetry.lock b/tools/c7n_oci/poetry.lock
diff --git a/tools/c7n_openstack/poetry.lock b/tools/c7n_openstack/poetry.lock
diff --git a/tools/c7n_org/poetry.lock b/tools/c7n_org/poetry.lock
diff --git a/tools/c7n_policystream/poetry.lock b/tools/c7n_policystream/poetry.lock
diff --git a/tools/c7n_sphinxext/poetry.lock b/tools/c7n_sphinxext/poetry.lock
diff --git a/tools/c7n_tencentcloud/poetry.lock b/tools/c7n_tencentcloud/poetry.lock
diff --git a/tools/c7n_terraform/poetry.lock b/tools/c7n_terraform/poetry.lock
diff --git a/tools/c7n_trailcreator/poetry.lock b/tools/c7n_trailcreator/poetry.lock