atlas-init 0.8.0__tar.gz → 0.8.1__tar.gz

{atlas_init-0.8.0 → atlas_init-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atlas-init
-Version: 0.8.0
+Version: 0.8.1
 Project-URL: Documentation, https://github.com/EspenAlbert/atlas-init#readme
 Project-URL: Issues, https://github.com/EspenAlbert/atlas-init/issues
 Project-URL: Source, https://github.com/EspenAlbert/atlas-init

{atlas_init-0.8.0 → atlas_init-0.8.1}/atlas_init/__init__.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-VERSION = "0.8.0"
+VERSION = "0.8.1"
 
 
 def running_in_repo() -> bool:

{atlas_init-0.8.0 → atlas_init-0.8.1}/atlas_init/tf_ext/gen_resource_variables.py

@@ -128,9 +128,11 @@ def generate_resource_variables(
     resource: type[ResourceAbs] | None, resource_config: ResourceGenConfig, extra_skipped: set[str] | None = None
 ) -> str:
     extra_skipped = extra_skipped or set()
-    required_variables = resource_config.required_variables
     if resource is None:
         return ""
+    required_variables = set(resource_config.required_variables)
+    if not resource_config.use_opt_in_required_variables:
+        required_variables |= getattr(resource, ResourceAbs.REQUIRED_ATTRIBUTES_NAME, set())
     out = []
     hints = get_type_hints(resource)
     ignored_names = (
@@ -145,7 +147,8 @@ def generate_resource_variables(
         return format_tf_content(f'''variable "{resource_config.name}" {{
   type     = {tf_type}
 }}\n''')
-    for f in fields(resource):  # type: ignore
+    fields_sorted = sorted(fields(resource), key=lambda f: (0 if f.name in required_variables else 1, f.name))
+    for f in fields_sorted:  # type: ignore
         field_name = f.name
         if field_name.isupper() or field_name in ignored_names:
             continue

{atlas_init-0.8.0 → atlas_init-0.8.1}/atlas_init/tf_ext/models_module.py

@@ -74,6 +74,7 @@ def as_import_line(name: str) -> str:
 class ResourceGenConfig(Entity):
     name: str
     use_single_variable: bool = False
+    use_opt_in_required_variables: bool = False
     required_variables: set[str] = PydanticField(default_factory=set)
     skip_variables_extra: set[str] = PydanticField(default_factory=set)
     attribute_default_hcl_strings: dict[str, str] = PydanticField(default_factory=dict)