atlas-init 0.8.0__py3-none-any.whl → 0.8.1__py3-none-any.whl

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/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/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)

{atlas_init-0.8.0.dist-info → atlas_init-0.8.1.dist-info}/METADATA

@@ -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.dist-info → atlas_init-0.8.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atlas_init/__init__.py,sha256=HszEP86pa4V8Bem1Xhq0i_TtYub_SoFcTi_pWmwwq0I,213
+atlas_init/__init__.py,sha256=bE8OXKBhQOEYQBlOStpyAixc8Il2l2NRdaFMFXjCLq4,213
 atlas_init/__main__.py,sha256=dY1dWWvwxRZMmnOFla6RSfti-hMeLeKdoXP7SVYqMUc,52
 atlas_init/atlas_init.yaml,sha256=aCCg6PJgLcqh75v3tdEEG4UPrcJlbmbRaLj0c7PCumE,2373
 atlas_init/cli.py,sha256=0b4_osi67Oj-hZnrtK70IbSKQDREjwUFv1_30_A03Zg,9447
@@ -128,10 +128,10 @@ atlas_init/tf_ext/gen_examples.py,sha256=nN-KhPFs3PnW4PWgEop4fXFTQf1jP6A3pGdKFRW
 atlas_init/tf_ext/gen_module_readme.py,sha256=04Lu9dYRMnYeKoQrIclpxUCT5YZctNzK71mzhFr_07E,4421
 atlas_init/tf_ext/gen_resource_main.py,sha256=C-aqkOFXH5ffT51igPtNW7szIH-MkY3HnMcSZ0Q4OdE,7263
 atlas_init/tf_ext/gen_resource_output.py,sha256=_LM3mKMVmcqm2uWokvIfMxOnyCD4aCDUNGUp5DujF7E,3518
-atlas_init/tf_ext/gen_resource_variables.py,sha256=sykS9tpp1YZLXLx6kQanCwGj7XtHGoVpqGmPQYvsOB8,6690
+atlas_init/tf_ext/gen_resource_variables.py,sha256=hgaHJlgnk1bNCV46TlvUIVZ5PVUQvxxnfo-hKN05SEU,6954
 atlas_init/tf_ext/gen_versions.py,sha256=yYX4jIgQfAZuG2wfu6OsIbDAqt9g8btiLcgKm7DvNqM,469
 atlas_init/tf_ext/models.py,sha256=8tJmLtwzzuNp_waG2eZ9bFmqRx6dJeYivu-ygvJUiLM,3631
-atlas_init/tf_ext/models_module.py,sha256=mgl8zX7EyszMjVdKb8g9IfoBK7BNeNXaT3zDcPGgJSs,18065
+atlas_init/tf_ext/models_module.py,sha256=JpMGSdjgS6D8NlTJNcSIOdq0dDagKyIfSeoFI_-eVMM,18113
 atlas_init/tf_ext/newres.py,sha256=quMSLlkJRuvA3attTvJ-DQNSwRPFyT_XJ32ucmEhA-s,3104
 atlas_init/tf_ext/paths.py,sha256=3VQri_VKS5sVKdkHu2XKgHziB1uQpB8hBGBY7GwiAwU,4917
 atlas_init/tf_ext/plan_diffs.py,sha256=Sc-VFrq2k7p01ZZzgtAfqRXCog2h6bbFlonGfaxSzog,5237
@@ -147,8 +147,8 @@ atlas_init/tf_ext/tf_mod_gen_provider.py,sha256=M7jJeH0VR1uN440d2H5-9lnj0s0d9Qta
 atlas_init/tf_ext/tf_modules.py,sha256=_JokgP-i1iS-iEXVI0MMNorrBHjFG6XcJRKiUe6JbvY,16200
 atlas_init/tf_ext/tf_vars.py,sha256=A__zcIBNvJ5y0l5F5G7KMQsYCuyr3iBZtRzXm4e6DQU,7875
 atlas_init/tf_ext/typer_app.py,sha256=gGVdttrSzUX2uzTAeXzvCF4BQnMxrkltAAc3_BCsiGc,968
-atlas_init-0.8.0.dist-info/METADATA,sha256=EcUiqi9up4csGk08KKIOV3qjrifcra3qYJynHoIq6Hs,5863
-atlas_init-0.8.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-atlas_init-0.8.0.dist-info/entry_points.txt,sha256=l38KdfCjY2v5q8Ves1qkWNvPTPND6Tp2EKX-RL-MN3c,200
-atlas_init-0.8.0.dist-info/licenses/LICENSE,sha256=aKnucPyXnK1A-aXn4vac71zRpcB5BXjDyl4PDyi_hZg,1069
-atlas_init-0.8.0.dist-info/RECORD,,
+atlas_init-0.8.1.dist-info/METADATA,sha256=s0HRa9fecuwCA269e3NhIF-DkyTJtPGGK5Ddgfy0Lk0,5863
+atlas_init-0.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+atlas_init-0.8.1.dist-info/entry_points.txt,sha256=l38KdfCjY2v5q8Ves1qkWNvPTPND6Tp2EKX-RL-MN3c,200
+atlas_init-0.8.1.dist-info/licenses/LICENSE,sha256=aKnucPyXnK1A-aXn4vac71zRpcB5BXjDyl4PDyi_hZg,1069
+atlas_init-0.8.1.dist-info/RECORD,,