atlas-init 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

atlas_init/__init__.py

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

atlas_init/settings/env_vars.py

@@ -6,6 +6,7 @@ from functools import cached_property
 from pathlib import Path
 from typing import Any, NamedTuple
 
+import typer
 from model_lib import field_names, parse_payload
 from pydantic import field_validator, model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
@@ -271,4 +272,16 @@ def active_suites(settings: AtlasInitSettings) -> list[TestSuite]:
 
 
 def init_settings() -> AtlasInitSettings:
+    missing_env_vars, ambiguous_env_vars = AtlasInitSettings.check_env_vars(
+        os.getenv("ATLAS_INIT_PROFILE", DEFAULT_PROFILE),
+        required_extra_fields=["project_name"],
+    )
+    if missing_env_vars:
+        typer.echo(f"missing env_vars: {missing_env_vars}")
+    if ambiguous_env_vars:
+        typer.echo(
+            f"amiguous env_vars: {ambiguous_env_vars} (specified both in cli & in .env-manual file with different values)"
+        )
+    if missing_env_vars or ambiguous_env_vars:
+        raise typer.Exit(1)
     return AtlasInitSettings.safe_settings()

atlas_init/settings/path.py

@@ -1,12 +1,15 @@
+import logging
 import os
 from collections.abc import Callable
 from pathlib import Path
 
 import dotenv
+from appdirs import user_data_dir
 from zero_3rdparty.file_utils import ensure_parents_write_text
 
 from atlas_init import running_in_repo
 
+logger = logging.getLogger(__name__)
 """WARNING these variables should only be used through the AtlasInitSettings, not directly"""
 if running_in_repo():
     ROOT_PATH = Path(__file__).parent.parent.parent.parent  # atlas_init REPO_PATH
@@ -14,9 +17,10 @@ if running_in_repo():
 else:
     ROOT_PATH = Path(__file__).parent.parent  # site package install directory
     _default_profiles_path = os.environ.get("ATLAS_INIT_PROFILES_PATH")
-    assert (
-        _default_profiles_path
-    ), "must set os.environ['ATLAS_INIT_PROFILES_PATH'] to a writeable directory for atlas_init to work"
+    if not _default_profiles_path:
+        _default_profiles_path = Path(user_data_dir("atlas_init")) / "profiles"
+        warning_msg = f"os.environ['ATLAS_INIT_PROFILES_PATH'] is not set using default: {_default_profiles_path}"
+        logger.warning(warning_msg)
     DEFAULT_PROFILES_PATH = Path(_default_profiles_path)
 DEFAULT_PROFILES_PATH.mkdir(exist_ok=True, parents=True)
 DEFAULT_TF_PATH = ROOT_PATH / "tf"

atlas_init/settings/rich_utils.py

@@ -35,7 +35,7 @@ def hide_secrets(handler: logging.Handler, secrets_dict: dict[str, str]) -> None
         if not isinstance(value, str):
             continue
         key_lower = key.lower()
-        if key_lower in {"true", "false"}:
+        if key_lower in {"true", "false"} or value.lower() in {"true", "false"}:
             continue
         if any(safe in key_lower for safe in safe_keys):
             continue

atlas_init/typer_app.py

@@ -10,7 +10,6 @@ from atlas_init.cli_cfn.app import app as app_cfn
 from atlas_init.cli_tf.app import app as app_tf
 from atlas_init.settings.env_vars import (
     DEFAULT_PROFILE,
-    AtlasInitSettings,
     as_env_var_name,
     env_var_names,
 )
@@ -52,25 +51,12 @@ def main(
     ),
     show_secrets: bool = typer.Option(False, help="show secrets in the logs"),
 ):
-    explicit_env_vars: dict[str, str] = {}
+    if profile != DEFAULT_PROFILE:
+        os.environ[as_env_var_name("profile")] = profile
     if project_name != "":
-        explicit_env_vars[as_env_var_name("project_name")] = project_name
+        os.environ[as_env_var_name("project_name")] = project_name
     log_handler = configure_logging(log_level)
     logger.info(f"running in repo: {running_in_repo()} python location:{sys.executable}")
-    missing_env_vars, ambiguous_env_vars = AtlasInitSettings.check_env_vars(
-        profile,
-        required_extra_fields=["project_name"],
-        explicit_env_vars=explicit_env_vars,
-    )
-    if missing_env_vars:
-        typer.echo(f"missing env_vars: {missing_env_vars}")
-    if ambiguous_env_vars:
-        typer.echo(
-            f"amiguous env_vars: {missing_env_vars} (specified both in cli & in .env-manual file with different values)"
-        )
-    if missing_env_vars or ambiguous_env_vars:
-        raise typer.Exit(1)
     if not show_secrets:
         hide_secrets(log_handler, {**os.environ})
-    command = ctx.invoked_subcommand
-    logger.info(f"in the app callback, log-level: {log_level}, command: {command}")
+    logger.info(f"in the app callback, log-level: {log_level}, command: {ctx.command}")

{atlas_init-0.2.0.dist-info → atlas_init-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: atlas-init
-Version: 0.2.0
+Version: 0.3.0
 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
@@ -10,6 +10,7 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.12
+Requires-Dist: appdirs==1.4.4
 Requires-Dist: boto3==1.34.55
 Requires-Dist: gitpython==3.1.42
 Requires-Dist: humanize==4.9.0
@@ -46,7 +47,15 @@ Currently, used with
 - <https://github.com/mongodb/mongodb/mongodbatlas-cloudformation-resources>
 - see [atlas_init#repo_aliases](atlas_init.yaml) for an up-to-date list
 
-## Requirements
+## Quickstart
+Recommended as a tool with [uvx](https://docs.astral.sh/uv/guides/tools/#running-tools)
+```shell
+uvx atlas-init # help info
+uvx atlas-init tf # help for tf specific commands
+uvx atlas-init cfn # help for cfn specific commands
+```
+
+## Profile Configuration
 1. [Create an organization](https://cloud-dev.mongodb.com/v2#/preferences/organizations)
 2. Go to `access_manager` and click `Create Api Key`: <https://cloud-dev.mongodb.com/v2#/org/{ORG_ID_IN_URL_FROM_1}/access/apiKeys>
    - Tick all permissions
@@ -72,17 +81,7 @@ ATLAS_INIT_CFN_PROFILE=YOUR_NAME
 ATLAS_INIT_CFN_REGION=eu-south-2 # find a region with few other profiles
 ```
 
-## Three modes of running
-
-### 1. `pip install` normal user
-
-```shell
-source .venv/bin/activate # ensure you are in your preferred python env
-(uv) pip install atlas-init
-# use export ATLAS_INIT_PROFILES_PATH=/somewhere/to/store/your/env-vars/and/tf/state
-```
-
-### 2. Local development, run from github repo
+## Local development
 
 ```shell
 git clone https://github.com/EspenAlbert/atlas-init
@@ -117,27 +116,11 @@ echo "alias atlas_init='export PYTHONPATH=$pypath && \"$VENV_PYTHON\" -m atlas_i
 atlas_init # should show how to use the cli
 ```
 
-### 3. `pip install` local wheel
-- will be used by the CI in other repos
+### CI Installation Tests (`pip install` local wheel)
 - [atlasci_local_install](atlasci_local_install.sh)
   - creates a local `.venv` builds the wheel from this repo and installs it
 - use `export ATLAS_INIT_PROFILES_PATH=/somewhere/to/store/your/env-vars/and/tf/state`
 
-## Commands
-
-```shell
-cd terraform/cfn/{YOUR_RESOURCE_PATH}
-# if you used `pip install` replace `atlas_init` with `atlasci`
-atlas_init # help info
-atlas_init # initialize the terraform providers
-atlas_init tf # help for tf specific commands
-atlas_init cfn # help for cfn specific commands
-atals_init apply # `terraform apply`
-# use cmd+v if you plan on using other tools, e.g., cfn make commands
-# see appendix on how to configure .vscode test env-vars
-atals_init destroy # `terraform destroy`
-```
-
 
 ## Appendix
 
@@ -177,3 +160,4 @@ terraform providers lock \
     -platform=darwin_arm64 \
     -platform=linux_arm64
     # -platform=windows_amd64 \
+```

{atlas_init-0.2.0.dist-info → atlas_init-0.3.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-atlas_init/__init__.py,sha256=bW9zb8obruloS6_54VzQHbSGtnnhhbEBuu5fipDvPcc,372
+atlas_init/__init__.py,sha256=wefdLatWmYi2mgkWhGxe2aEGq2miR5yH7tbuwRX6TAc,372
 atlas_init/__main__.py,sha256=dY1dWWvwxRZMmnOFla6RSfti-hMeLeKdoXP7SVYqMUc,52
 atlas_init/atlas_init.yaml,sha256=GMyJVhKKRc7WzEu7fafmWgeTsDaExTLv7QvXOmE_Brg,1907
 atlas_init/cli.py,sha256=IiOEC_Jry6vrSDH3_OvsU50F-_3iVIS4tV6-R7659fY,9642
 atlas_init/cli_args.py,sha256=tiwUYAE0JBSl9lHV6VJ41vFCU90ChBZ4mKvi-YoF_HY,541
 atlas_init/humps.py,sha256=l0ZXXuI34wwd9TskXhCjULfGbUyK-qNmiyC6_2ow6kU,7339
 atlas_init/terraform.yaml,sha256=qPrnbzBEP-JAQVkYadHsggRnDmshrOJyiv0ckyZCxwY,2734
-atlas_init/typer_app.py,sha256=irgBK7WSewg7on25KKHY9FNUDvmXgavmc0Z39yhYNjI,2507
+atlas_init/typer_app.py,sha256=nxwKwr2GNZ6Zd8uXfJV8mZucEHT0KvfRyF_qxJ3IpYQ,1962
 atlas_init/cli_cfn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atlas_init/cli_cfn/app.py,sha256=iMukpUDgsAgZh_U_APGZB3gmewOo-3vtFK0byJuDz9w,6649
 atlas_init/cli_cfn/aws.py,sha256=GbohR7uczSGwQjLEYozCmlxbeIHo1uwQIJMwsh7kF7M,17894
@@ -54,10 +54,10 @@ atlas_init/repos/go_sdk.py,sha256=nh3lw9iw4lDGdHnhC8KK0PZTDMUGKvCHTMTuEtIUKNg,10
 atlas_init/repos/path.py,sha256=wrT8e01OBoAHj8iMrxqutgqWu-BHPe9-bEWtcZRu238,4187
 atlas_init/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atlas_init/settings/config.py,sha256=HIytZom8RRvpLGy6u8CpZ83tmFXI6v1tO3iSiuo08kc,6259
-atlas_init/settings/env_vars.py,sha256=B81u9QhWTnkKL6Uzq5KKyJHB8J5btrl-ZBuPAdXUX1A,9146
+atlas_init/settings/env_vars.py,sha256=q8Hj2LPJIg-PK0fCjrEigoPwTGIEbqjLEZckwgnkG8s,9688
 atlas_init/settings/interactive.py,sha256=Xy1Z5WMAOSaJ-vQI_4xjAbSR92rWQgnffwVoDT27L68,340
-atlas_init/settings/path.py,sha256=rsDeutRlyFkU9ICoRogDdwe8PqryALyyVCJ_0Ssn1ZI,2367
-atlas_init/settings/rich_utils.py,sha256=fkxd2oKZlVb0dFFcQlJEx7CtxSDUgudjeydVOPDLX5o,1665
+atlas_init/settings/path.py,sha256=FQ6-SVgc_KyxUjU9GWqq5YjViLDEEpojnApk8EwlS6U,2570
+atlas_init/settings/rich_utils.py,sha256=JyVD_RuZTBeZdbnXN7B3WsYGkROhmypgzAym-zD92B4,1703
 atlas_init/tf/.terraform.lock.hcl,sha256=DIojR50rr4fyLShYiQ-UpRV8z6vuBjwGWdK60FODoyM,6876
 atlas_init/tf/always.tf,sha256=ij6QKI8Lg0140bFZwOyiYK5c-2p5e7AGZ1qKbYyv6Os,1359
 atlas_init/tf/main.tf,sha256=DH0C8y9RDEHnSAZvL-TjE5MQjxj5ALfgk5zVO88cpZw,3960
@@ -86,7 +86,7 @@ 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.2.0.dist-info/METADATA,sha256=DY-E8A0r-DLm9H9hX4Nc60Wjb1fcLs0QWLU-vdJ8LjA,6167
-atlas_init-0.2.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-atlas_init-0.2.0.dist-info/entry_points.txt,sha256=6Ycq_NZ7cym1BCA9YiVhYylJzy6woREjt7QSCSLm-1o,54
-atlas_init-0.2.0.dist-info/RECORD,,
+atlas_init-0.3.0.dist-info/METADATA,sha256=Kgl-C8C71uv9NU9s6q1uOfhF2fcUIAmYfU5mdzR1vSE,5650
+atlas_init-0.3.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+atlas_init-0.3.0.dist-info/entry_points.txt,sha256=oSNFIEAS9nUZyyZ8Fc-0F0U5j-NErygy01LpJVSHapQ,57
+atlas_init-0.3.0.dist-info/RECORD,,

atlas_init-0.3.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+atlas-init = atlas_init.cli:typer_main

atlas_init-0.2.0.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-atlasci = atlas_init.cli:typer_main