atlas-init 0.4.4__py3-none-any.whl → 0.4.5__py3-none-any.whl

atlas_init/__init__.py

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

atlas_init/cli_cfn/app.py

@@ -53,8 +53,8 @@ def reg(
         if local:
             deregister_cfn_resource_type(type_name, deregister=not dry_run, region_filter=region)
     logger.info(f"ready to activate {type_name}")
-    settings = init_settings(TFModuleCfn)
-    cfn_execution_role = settings.env_vars_cls(TFModuleCfn).CFN_EXAMPLE_EXECUTION_ROLE
+    init_settings(TFModuleCfn)
+    cfn_execution_role = TFModuleCfn.from_env().CFN_EXAMPLE_EXECUTION_ROLE
     last_third_party = get_last_cfn_type(type_name, region, is_third_party=True)
     assert last_third_party, f"no 3rd party extension found for {type_name} in {region}"
     if dry_run:
@@ -100,7 +100,6 @@ def inputs(
     cwd = current_dir()
     suite = suites[0]
     assert suite.cwd_is_repo_go_pkg(cwd, repo_alias="cfn")
-    env_extra = settings.load_env_vars_full()
     CREATE_FILENAME = "cfn-test-create-inputs.sh"  # noqa: N806
     create_dirs = ["test/contract-testing", "test"]
     parent_dir = None
@@ -113,7 +112,7 @@ def inputs(
     if not run_command_is_ok(
         cwd=cwd,
         cmd=f"./{parent_dir}/{CREATE_FILENAME}" + " ".join(context.args),
-        env={**os.environ} | env_extra,
+        env={**os.environ},
         logger=logger,
     ):
         logger.critical("failed to create cfn contract input files")

atlas_init/cli_cfn/cfn_parameter_finder.py

@@ -1,4 +1,5 @@
 import logging
+import os
 from pathlib import Path
 from typing import Any
 
@@ -158,7 +159,6 @@ def updated_template_path(path: Path) -> Path:
 
 
 def decode_parameters(
-    exported_env_vars: dict[str, str],
     template_path: Path,
     type_name: str,
     stack_name: str,
@@ -186,7 +186,7 @@ def decode_parameters(
             parameters_dict[param_name] = type_default
             continue
         if env_key := parameters_exported_env_vars.get(param_name):  # noqa: SIM102
-            if env_value := exported_env_vars.get(env_key):
+            if env_value := os.environ.get(env_key):
                 logger.info(f"using {env_key} to fill parameter: {param_name}")
                 parameters_dict[param_name] = env_value
                 continue

atlas_init/cli_cfn/contract.py

@@ -53,7 +53,6 @@ class RunContractTestOutput(Entity):
 
 class CreateContractTestInputs(Entity):
     resource_path: Path
-    env_vars_generated: dict[str, str]
     log_group_name: str
 
 
@@ -115,10 +114,8 @@ def contract_test(
     settings = settings or init_settings(AWSSettings)
     resource_paths = resource_paths or find_paths(Repo.CFN)
     resource_name = resource_paths.resource_name
-    generated_env_vars = settings.load_env_vars_full()
     create_inputs = CreateContractTestInputs(
         resource_path=resource_paths.resource_path,
-        env_vars_generated=generated_env_vars,
         log_group_name=f"mongodb-atlas-{resource_name}-logs",
     )
     create_response = create_contract_test_inputs(create_inputs)
@@ -164,7 +161,7 @@ def create_contract_test_inputs(
     input_files = []
     for template in sorted(test_dir.glob("*.template.json")):
         template_file = template.read_text()
-        template_file = file_replacements(template_file, event.env_vars_generated, template.name)
+        template_file = file_replacements(template_file, template.name)
         inputs_file = inputs_dir / template.name.replace(".template", "")
         ensure_parents_write_text(inputs_file, template_file)
         input_files.append(inputs_file)
@@ -173,11 +170,11 @@ def create_contract_test_inputs(
     return CreateContractTestInputsResponse(input_files=input_files, sample_files=sample_files)
 
 
-def file_replacements(text: str, replacements: dict[str, str], file_name: str) -> str:
+def file_replacements(text: str, file_name: str) -> str:
     for match in re.finditer(r"\${(\w+)}", text):
         var_name = match.group(1)
-        if var_name in replacements:
-            text = text.replace(match.group(0), replacements[var_name])
+        if env_value := os.environ.get(var_name):
+            text = text.replace(match.group(0), env_value)
         else:
             logger.warning(f"found placeholder {match.group(0)} in {file_name} but no replacement")
     return text

atlas_init/cli_cfn/example.py

@@ -136,7 +136,6 @@ def example_handler(
     )
     type_name = inputs.type_name
     stack_name = inputs.stack_name
-    env_vars_generated = settings.load_env_vars_full()
     region = inputs.region
     operation = inputs.operation
     stack_timeout_s = inputs.stack_timeout_s
@@ -160,7 +159,6 @@ def example_handler(
             return
     template_path = infer_template_path(repo_path, type_name, stack_name, inputs.example_name)
     template_path, parameters, not_found = decode_parameters(
-        exported_env_vars=env_vars_generated,
         template_path=template_path,
         stack_name=stack_name,
         force_params=inputs.resource_params,

atlas_init/cli_helper/go.py

@@ -171,7 +171,7 @@ def resolve_env_vars(
     skip_os: bool = False,
 ) -> dict[str, str]:
     if env_vars == GoEnvVars.manual:
-        test_env_vars = settings.load_profile_manual_env_vars(skip_os_update=True)
+        test_env_vars = settings.manual_env_vars
     elif env_vars == GoEnvVars.vscode:
         test_env_vars = load_dotenv(settings.env_vars_vs_code)
     else:

atlas_init/cli_root/trigger.py

@@ -4,7 +4,7 @@ import requests
 from tenacity import retry, retry_if_exception_type, stop_after_attempt, wait_fixed
 from zero_3rdparty.id_creator import simple_id
 
-from atlas_init.settings.env_vars import init_settings
+from atlas_init.settings.env_vars import env_vars_cls_or_none, init_settings
 from atlas_init.settings.env_vars_generated import (
     AtlasSettingsWithProject,
     AWSSettings,
@@ -23,15 +23,15 @@ def trigger_app():
 
 
 def create_realm_app():
-    settings = init_settings()
-    atlas_settings = settings.env_vars_cls(AtlasSettingsWithProject)
-    cluster_settings = settings.env_vars_cls(TFModuleCluster)
+    settings = init_settings(AtlasSettingsWithProject, TFModuleCluster, AWSSettings)
+    atlas_settings = AtlasSettingsWithProject.from_env()
+    cluster_settings = TFModuleCluster.from_env()
+    aws_settings = AWSSettings.from_env()
     project_id = atlas_settings.MONGODB_ATLAS_PROJECT_ID
     base_url = atlas_settings.realm_url
     cluster_name = cluster_settings.MONGODB_ATLAS_CLUSTER_NAME
     auth_headers = login_to_realm(settings, base_url)
-    realm_settings = settings.env_vars_cls_or_none(RealmSettings, path=settings.env_vars_trigger)
-    aws_settings = settings.env_vars_cls(AWSSettings)
+    realm_settings = env_vars_cls_or_none(RealmSettings, dotenv_path=settings.env_vars_trigger)
     if realm_settings and function_exists(
         base_url,
         auth_headers,

atlas_init/settings/env_vars.py

@@ -144,31 +144,6 @@ class AtlasInitSettings(StaticSettings):
     def cfn_region(self, default: str) -> str:
         return self.atlas_init_cfn_region or default
 
-    def load_env_vars_full(self) -> dict[str, str]:
-        env_path = self.env_vars_vs_code
-        assert env_path.exists(), f"no env-vars exist {env_path} have you forgotten apply?"
-        return load_dotenv(env_path)
-
-    def env_vars_cls_or_none(self, t: type[T], *, path: Path | None = None) -> T | None:
-        with suppress(ValidationError):
-            return self.env_vars_cls(t, path=path)
-
-    def env_vars_cls(self, t: type[T], *, path: Path | None = None) -> T:
-        path = path or self.env_vars_vs_code
-        env_vars = load_dotenv(path) if path.exists() else {}
-        return t(**env_vars)
-
-    def load_profile_manual_env_vars(self, *, skip_os_update: bool = False) -> dict[str, str]:
-        # sourcery skip: dict-assign-update-to-union
-        manual_env_vars = self.manual_env_vars
-        if manual_env_vars:
-            if skip_os_update:
-                return manual_env_vars
-            if new_updates := {k: v for k, v in manual_env_vars.items() if k not in os.environ}:
-                logger.info(f"loading manual env-vars {','.join(new_updates)}")
-                os.environ.update(new_updates)
-        return manual_env_vars
-
     def include_extra_env_vars_in_vscode(self, extra_env_vars: dict[str, str]) -> None:
         extra_name = ", ".join(extra_env_vars.keys())
         original_env_vars = load_dotenv(self.env_vars_vs_code)
@@ -261,20 +236,32 @@ def init_settings(
     *settings_classes: type[BaseModel],
 ) -> AtlasInitSettings:
     settings = AtlasInitSettings.from_env()
-    manual_env_vars = settings.manual_env_vars
-
+    profile_env_vars = settings.manual_env_vars
+    vscode_env_vars = settings.env_vars_vs_code
+    if vscode_env_vars.exists():
+        profile_env_vars |= load_dotenv(vscode_env_vars)
     required_env_vars = collect_required_env_vars(list(settings_classes))
-    ambiguous = detect_ambiguous_env_vars(manual_env_vars)
-    missing_env_vars = find_missing_env_vars(required_env_vars, manual_env_vars)
+    ambiguous = detect_ambiguous_env_vars(profile_env_vars)
+    missing_env_vars = find_missing_env_vars(required_env_vars, profile_env_vars)
 
     if ambiguous:
         logger.warning(
-            f"ambiguous env_vars: {ambiguous} (specified both in cli/env & in .env-manual file with different values)"
+            f"ambiguous env_vars: {ambiguous} (specified both in cli/env & in .env-(manual|vscode) file with different values)"
         )
     if missing_env_vars or ambiguous:
         raise EnvVarsError(missing_env_vars, ambiguous)
 
-    settings.load_profile_manual_env_vars()
+    if new_updates := {k: v for k, v in profile_env_vars.items() if k not in os.environ}:
+        logger.info(f"loading env-vars {','.join(sorted(new_updates))}")
+        os.environ |= new_updates
     for cls in settings_classes:
         cls()  # ensure any errors are raised
     return AtlasInitSettings.from_env()
+
+
+def env_vars_cls_or_none(t: type[T], *, dotenv_path: Path | None = None) -> T | None:
+    explicit_vars: dict[str, str] = {}
+    if dotenv_path and dotenv_path.exists():
+        explicit_vars = load_dotenv(dotenv_path)
+    with suppress(ValidationError):
+        return t(**explicit_vars)

{atlas_init-0.4.4.dist-info → atlas_init-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atlas-init
-Version: 0.4.4
+Version: 0.4.5
 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.4.4.dist-info → atlas_init-0.4.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atlas_init/__init__.py,sha256=fKwzi8Wa5MHwzV_nRwgzWoqouQipF_xSLut36HZJhxc,213
+atlas_init/__init__.py,sha256=0T7e5_mcm1rEvHTaZjzLUBsldG8S1Wg6ilQOz8p_5a4,213
 atlas_init/__main__.py,sha256=dY1dWWvwxRZMmnOFla6RSfti-hMeLeKdoXP7SVYqMUc,52
 atlas_init/atlas_init.yaml,sha256=Q_gFMbTa8OKxS8GbjszyrMA05nap8HI_Oe-cgQZNEPk,2351
 atlas_init/cli.py,sha256=f7Y_i5_g8LrIE6GJRCQrpF4gN9HMSL3I_y1TYDfqwgw,9366
@@ -7,14 +7,14 @@ atlas_init/humps.py,sha256=l0ZXXuI34wwd9TskXhCjULfGbUyK-qNmiyC6_2ow6kU,7339
 atlas_init/terraform.yaml,sha256=qPrnbzBEP-JAQVkYadHsggRnDmshrOJyiv0ckyZCxwY,2734
 atlas_init/typer_app.py,sha256=icuru2-TzP7FtSIfXZRe4WbANVvYBexD5awKzpWTszo,4200
 atlas_init/cli_cfn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atlas_init/cli_cfn/app.py,sha256=6TZvJ-K5vhFH_mwZ4sf7QIBdRVxGMS8Vhi7h-3hZa7Y,6106
+atlas_init/cli_cfn/app.py,sha256=N0z4LtAyfnKAZHlrWNQ0m5TbmarECrwXBH1qp-0xkrA,6025
 atlas_init/cli_cfn/aws.py,sha256=KtJWJmYDknPFtd4j6evMFRwmnFGcLYUFHArV6J49TjI,17911
-atlas_init/cli_cfn/cfn_parameter_finder.py,sha256=FYqVAygQtcXg4YX9CaJnaGbWN80xhYhGtjOmPs6R2OA,9447
-atlas_init/cli_cfn/contract.py,sha256=oVocGvgy9EKHFqtWt9D2Iupfka0H31DJe1Oa5_003cE,8031
-atlas_init/cli_cfn/example.py,sha256=51_liiS6cu5l7HqPbW9solJutTyRprto3oiQ2aRxgGQ,8708
+atlas_init/cli_cfn/cfn_parameter_finder.py,sha256=HWm8I2IPPZlvwyXCjTxoqZhh-eUk9fHUKdiBVlhM2GQ,9411
+atlas_init/cli_cfn/contract.py,sha256=u3kL_g_pIixMp1FkPgue19U57vGTdK7qWFiK-gs2YIA,7834
+atlas_init/cli_cfn/example.py,sha256=WFDWHHrOWIljmWlbcLY5K3rSIGoZu7G5lwuamHGghJI,8607
 atlas_init/cli_cfn/files.py,sha256=kwKDh__O__it2Shz3pHhnle4XUesRd4P929twxUODfI,2651
 atlas_init/cli_helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atlas_init/cli_helper/go.py,sha256=tT5Z8QU3CtvFAsSiOoerfGVYCQMSHc_CwRAAkHj45CM,9867
+atlas_init/cli_helper/go.py,sha256=-K3tg-OAqPyKiebiBQFxnM-eNPlmjaKIxQnDRtsx_NQ,9833
 atlas_init/cli_helper/run.py,sha256=va1eFP-hRvM76lVzvqH8eqGnyfcbzgR0zCMbL9Neb58,3660
 atlas_init/cli_helper/run_manager.py,sha256=USNRHSm1zuu4H9NRamnxQ2D4gKzrHLk8dZe0G95Be14,9022
 atlas_init/cli_helper/sdk.py,sha256=exh58-VZwxtosaxM269C62EEy1VnpJPOVziPDPkGsmE,2983
@@ -22,7 +22,7 @@ atlas_init/cli_helper/sdk_auto_changes.py,sha256=oWyXw7P0PdO28hclRvza_RcIVXAyzu0
 atlas_init/cli_helper/tf_runner.py,sha256=V8pfxPSDBSeQWkR27kI8JLu-MEadUR9TGnoXBjSP4G4,3610
 atlas_init/cli_root/__init__.py,sha256=Mf0wqy4kqq8pmbjLa98zOGuUWv0bLk2OYGc1n1_ZmZ4,223
 atlas_init/cli_root/go_test.py,sha256=roQIOS-qVfNhJMztR-V3hjtxFMf7-Ioy3e1ffqtTRyo,4601
-atlas_init/cli_root/trigger.py,sha256=M2B-c5m88Fz5V9Gl7fU_QkfhDYoxlJoRk38C0EY-iwU,8482
+atlas_init/cli_root/trigger.py,sha256=5TMc_depk9MOkfEfq3WWWgyCpPmAvoZywmeNnU0QZGg,8520
 atlas_init/cli_tf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atlas_init/cli_tf/app.py,sha256=Y3cAj8XbOT8FESSpVagOuQyfplWSaJPz9lYiigyNj0M,11611
 atlas_init/cli_tf/changelog.py,sha256=biWYKf1pZvXZ-jEgcZ5q9sY7nTGrL2PuI0h9mCILf_g,3181
@@ -60,7 +60,7 @@ atlas_init/repos/go_sdk.py,sha256=1OzM9DjHEAzAAuI9ygoRRuhUK2gqpOhXExXRqhqa0tg,17
 atlas_init/repos/path.py,sha256=5XsXrxpyQi2bkV_qOtbIhL7-XGwW68XUmCTOdyfoz1A,4517
 atlas_init/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atlas_init/settings/config.py,sha256=Cb483vmKOnNUK6m5KlhDiGeDJcZoJ1vHREdiddYONuQ,7037
-atlas_init/settings/env_vars.py,sha256=_o5FiIPAlsayn2kKqilIttr5HVZbixtbXQRXtnsxBJg,9862
+atlas_init/settings/env_vars.py,sha256=lqHL1UC6PxS9Vk3SvyfCVFUxCUQAk39XeAFnJ0HKloo,9291
 atlas_init/settings/env_vars_generated.py,sha256=eUKjyv0pFxWGzbSpAdjHnx3v2t1rtioV4wdNFwEg8J8,2121
 atlas_init/settings/env_vars_modules.py,sha256=fqVndOn8ZesuudijakzPZKsrXnm-iezGHvVx2bOng2o,1810
 atlas_init/settings/interactive.py,sha256=Xy1Z5WMAOSaJ-vQI_4xjAbSR92rWQgnffwVoDT27L68,340
@@ -98,8 +98,8 @@ atlas_init/tf/modules/vpc_peering/vpc_peering.tf,sha256=hJ3KJdGbLpOQednUpVuiJ0Cq
 atlas_init/tf/modules/vpc_privatelink/atlas-privatelink.tf,sha256=FloaaX1MNDvoMZxBnEopeLKyfIlq6kaX2dmx8WWlXNU,1298
 atlas_init/tf/modules/vpc_privatelink/variables.tf,sha256=gktHCDYD4rz6CEpLg5aiXcFbugw4L5S2Fqc52QYdJyc,255
 atlas_init/tf/modules/vpc_privatelink/versions.tf,sha256=G0u5V_Hvvrkux_tqfOY05pA-GzSp_qILpfx1dZaTGDc,237
-atlas_init-0.4.4.dist-info/METADATA,sha256=MAw0QaKaLYdAH9NW_6xXSNc6a-8NAm5yBWRAXkE9Ogo,5723
-atlas_init-0.4.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-atlas_init-0.4.4.dist-info/entry_points.txt,sha256=oSNFIEAS9nUZyyZ8Fc-0F0U5j-NErygy01LpJVSHapQ,57
-atlas_init-0.4.4.dist-info/licenses/LICENSE,sha256=aKnucPyXnK1A-aXn4vac71zRpcB5BXjDyl4PDyi_hZg,1069
-atlas_init-0.4.4.dist-info/RECORD,,
+atlas_init-0.4.5.dist-info/METADATA,sha256=bXkM3--BfYHokuVp5f7iuFIaCkIIAJoZgrst1aNwZZc,5723
+atlas_init-0.4.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+atlas_init-0.4.5.dist-info/entry_points.txt,sha256=oSNFIEAS9nUZyyZ8Fc-0F0U5j-NErygy01LpJVSHapQ,57
+atlas_init-0.4.5.dist-info/licenses/LICENSE,sha256=aKnucPyXnK1A-aXn4vac71zRpcB5BXjDyl4PDyi_hZg,1069
+atlas_init-0.4.5.dist-info/RECORD,,