atlas-init 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

atlas_init/__init__.py

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

atlas_init/atlas_init.yaml

@@ -1,69 +1,69 @@
 repo_aliases:
-    mongodb/terraform-provider-mongodbatlas: tf
-    mongodb/mongodbatlas-cloudformation-resources: cfn
+  mongodb/terraform-provider-mongodbatlas: tf
+  mongodb/mongodbatlas-cloudformation-resources: cfn
 test_suites:
 - name: cluster
   repo_go_packages:
     cfn:
-      - 'cfn-resources/cluster'
+    - cfn-resources/cluster
 - name: federated
   repo_go_packages:
     tf:
-      - 'internal/service/federatedsettingsorgrolemapping'
+    - internal/service/federatedsettingsorgrolemapping
   vars:
     use_federated_vars: true
-- name: project
-  vars: 
-    use_project_extra: true
-  repo_go_packages:
-    cfn:
-    - 'cfn-resources/project'
-- name: network_peering
-  vars: 
-    use_aws_vpc: true
-    use_aws_vars: true
-    use_vpc_peering: true
+- name: network
   repo_go_packages:
     tf:
-    - 'internal/service/networkpeering'
-- name: network
-  vars: 
+    - internal/service/privatelinkendpointservicedatafederationonlinearchive
+  vars:
     use_private_link: true
+- name: network_peering
   repo_go_packages:
     tf:
-    - 'internal/service/privatelinkendpointservicedatafederationonlinearchive'
-- name: privatelink
+    - internal/service/networkpeering
   vars:
-    use_aws_vpc: true
+    use_vpc_peering: true
     use_aws_vars: true
+    use_aws_vpc: true
+- name: privatelink
   repo_go_packages:
     tf:
-    - 'internal/service/privatelinkendpointservice'
-- name: stream_connection
-  repo_go_packages: 
-    tf:
-    - 'internal/service/streamconnection'
-    cfn:
-    - 'cfn-resources/stream-connection'
+    - internal/service/privatelinkendpointservice
   vars:
-    cluster_info: true
-    stream_instance: true
-- name: search_index
+    use_aws_vars: true
+    use_aws_vpc: true
+- name: project
   repo_go_packages:
-    tf:
-    - 'internal/service/searchindex'
+    cfn:
+    - cfn-resources/project
   vars:
-    cluster_info: true
+    use_project_extra: true
 - name: s3
   repo_go_packages:
     tf:
-    - 'internal/service/cloudbackupsnapshotexportbucket'
+    - internal/service/cloudbackupsnapshotexportbucket
   vars:
     use_aws_s3: true
 - name: s3_with_cluster
   repo_go_packages:
     tf:
-    - 'internal/service/cloudbackupsnapshotexportjob'
+    - internal/service/cloudbackupsnapshotexportjob
   vars:
-    use_aws_s3: true
     cluster_info_m10: true
+    use_aws_s3: true
+- name: search_index
+  repo_go_packages:
+    tf:
+    - internal/service/searchindex
+  vars:
+    cluster_info: true
+- name: stream_connection
+  repo_go_packages:
+    tf:
+    - internal/service/streamconnection
+    cfn:
+    - cfn-resources/stream-connection
+  vars:
+    cluster_info: true
+    stream_instance: true

atlas_init/cli.py

@@ -1,4 +1,5 @@
 import logging
+import os
 import sys
 from collections.abc import Callable
 from functools import partial
@@ -10,6 +11,7 @@ from zero_3rdparty.file_utils import iter_paths
 from atlas_init import running_in_repo
 from atlas_init.cli_cfn.app import app as app_cfn
 from atlas_init.cli_helper import sdk_auto_changes
+from atlas_init.cli_helper.go import run_go_tests
 from atlas_init.cli_helper.run import (
     run_binary_command_is_ok,
     run_command_exit_on_failure,
@@ -55,7 +57,7 @@ from atlas_init.settings.path import (
     dump_vscode_dotenv,
     repo_path_rel_path,
 )
-from atlas_init.settings.rich_utils import configure_logging
+from atlas_init.settings.rich_utils import configure_logging, hide_secrets
 
 logger = logging.getLogger(__name__)
 app = typer.Typer(name="atlas_init", invoke_without_command=True, no_args_is_help=True)
@@ -89,7 +91,7 @@ def main(
     explicit_env_vars: dict[str, str] = {}
     if project_name != "":
         explicit_env_vars[as_env_var_name("project_name")] = project_name
-    configure_logging(log_level)
+    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,
@@ -104,6 +106,7 @@ def main(
         )
     if missing_env_vars or ambiguous_env_vars:
         raise typer.Exit(1)
+    hide_secrets(log_handler, {**os.environ})
     command = ctx.invoked_subcommand
     logger.info(f"in the app callback, log-level: {log_level}, command: {command}")
 
@@ -135,7 +138,7 @@ def apply(context: typer.Context, *, skip_outputs: bool = False):
         run_terraform(settings, "apply", extra_args)
     except TerraformRunError as e:
         logger.error(repr(e))  # noqa: TRY400
-        return
+        raise typer.Exit(1) from e
 
     if not skip_outputs:
         export_outputs(settings)
@@ -149,6 +152,9 @@ def apply(context: typer.Context, *, skip_outputs: bool = False):
 def destroy(context: typer.Context):
     extra_args = context.args
     settings = init_settings()
+    if not settings.tf_state_path.exists():
+        logger.warning(f"no terraform state found  {settings.tf_state_path}, exiting")
+        return
     tf_vars = get_tf_vars(settings, [])
     dump_tf_vars(settings, tf_vars)
     try:
@@ -164,9 +170,15 @@ def test_go():
     suites = active_suites(settings)
     sorted_suites = sorted(suite.name for suite in suites)
     logger.info(f"running go tests for {len(suites)} test-suites: {sorted_suites}")
-    raise NotImplementedError("fix me later!")  # noqa
-    # package_prefix = settings.config.go_package_prefix(repo_alias)
-    # run_go_tests(repo_path, repo_alias, package_prefix, settings, active_suites)
+    match repo_alias := current_repo():
+        case Repo.CFN:
+            raise NotImplementedError
+        case Repo.TF:
+            repo_path = current_repo_path()
+            package_prefix = settings.config.go_package_prefix(repo_alias)
+            run_go_tests(repo_path, repo_alias, package_prefix, settings, suites)
+        case _:
+            raise NotImplementedError
 
 
 @app_command()

atlas_init/cli_helper/go.py

@@ -2,8 +2,6 @@ import logging
 import os
 from pathlib import Path
 
-import dotenv
-
 from atlas_init.cli_helper.run import run_command_is_ok
 from atlas_init.settings.config import TestSuite
 from atlas_init.settings.env_vars import AtlasInitSettings
@@ -18,7 +16,12 @@ def run_go_tests(
     settings: AtlasInitSettings,
     groups: list[TestSuite],
 ):
-    test_env = os.environ | dotenv.dotenv_values(settings.env_vars_vs_code)
+    extra_vars = settings.load_env_vars(settings.env_vars_vs_code)
+    logger.info(f"go test env-vars-extra: {sorted(extra_vars)}")
+    test_env = os.environ | extra_vars
+    ci_value = test_env.pop("CI", None)
+    if ci_value:
+        logger.warning(f"pooped CI={ci_value}")
     for group in groups:
         packages = ",".join(f"{package_prefix}/{pkg}" for pkg in group.repo_go_packages.get(repo_alias, []))
         if not packages:

atlas_init/cli_helper/tf_runner.py

@@ -19,8 +19,8 @@ from atlas_init.settings.env_vars import AtlasInitSettings
 logger = logging.getLogger(__name__)
 
 
-def get_tf_vars(settings: AtlasInitSettings, active_groups: list[TestSuite]) -> dict[str, Any]:
-    tf_vars = TerraformVars()
+def get_tf_vars(settings: AtlasInitSettings, active_groups: list[TestSuite]) -> dict[str, Any]:  # type: ignore
+    tf_vars = TerraformVars()  # type: ignore
     tf_vars = sum((group.vars for group in active_groups), start=tf_vars)
     return {
         "atlas_public_key": settings.MONGODB_ATLAS_PUBLIC_KEY,
@@ -41,28 +41,22 @@ class TerraformRunError(Exception):
 
 @dataclass
 class state_copier:  # noqa: N801
-    profile_path: Path
+    state_path: Path
     tf_path: Path
 
-    @property
-    def state_path(self) -> Path:
-        return self.profile_path / "tf_state"
-
     def __enter__(self):
-        if not self.state_path.exists():
-            return
+        self.state_path.mkdir(exist_ok=True, parents=True)
         for state_path, rel_path in iter_paths_and_relative(self.state_path, "terraform.tfstate*", rglob=False):
             copy(state_path, self.tf_path / rel_path)
 
     def __exit__(self, *_):
-        if not self.tf_path.exists():
-            return
+        self.tf_path.mkdir(exist_ok=True, parents=True)
         for state_path, rel_path in iter_paths_and_relative(self.tf_path, "terraform.tfstate*", rglob=False):
             state_path.rename(self.state_path / rel_path)
 
 
 def run_terraform(settings: AtlasInitSettings, command: str, extra_args: list[str]):
-    with state_copier(settings.profile_dir, settings.tf_path):
+    with state_copier(settings.tf_state_path, settings.tf_path):
         _run_terraform(settings, command, extra_args)
 
 
@@ -103,12 +97,11 @@ def dump_tf_vars(settings: AtlasInitSettings, tf_vars: dict[str, Any]):
 
 
 def export_outputs(settings: AtlasInitSettings) -> None:
-    output_path = settings.profile_dir / "tf_outputs.json"
-    with state_copier(settings.profile_dir, settings.tf_path):
+    with state_copier(settings.tf_state_path, settings.tf_path):
         result = run_command_receive_result(
             "terraform output -json",
             settings.tf_path,
             logger,
             env=os.environ | {"TF_DATA_DIR": settings.tf_data_dir},
         )
-    output_path.write_text(result)
+    settings.tf_outputs_path.write_text(result)

atlas_init/settings/config.py

@@ -3,10 +3,11 @@ from __future__ import annotations
 import fnmatch
 import logging
 from collections.abc import Iterable
+from functools import total_ordering
 from pathlib import Path
 from typing import Any
 
-from model_lib import Entity
+from model_lib import Entity, dump_ignore_falsy
 from pydantic import Field, model_validator
 
 from atlas_init.repos.path import owner_project_name
@@ -14,6 +15,7 @@ from atlas_init.repos.path import owner_project_name
 logger = logging.getLogger(__name__)
 
 
+@dump_ignore_falsy
 class TerraformVars(Entity):
     cluster_info: bool = False
     cluster_info_m10: bool = False
@@ -26,8 +28,8 @@ class TerraformVars(Entity):
     use_aws_s3: bool = False
     use_federated_vars: bool = False
 
-    def __add__(self, other: TerraformVars):
-        assert isinstance(other, TerraformVars)
+    def __add__(self, other: TerraformVars):  # type: ignore
+        assert isinstance(other, TerraformVars)  # type: ignore
         kwargs = {k: v or getattr(other, k) for k, v in self}
         return type(self)(**kwargs)
 
@@ -61,6 +63,8 @@ class TerraformVars(Entity):
         return config
 
 
+@dump_ignore_falsy
+@total_ordering
 class TestSuite(Entity):
     __test__ = False
 
@@ -68,7 +72,12 @@ class TestSuite(Entity):
     sequential_tests: bool = False
     repo_go_packages: dict[str, list[str]] = Field(default_factory=dict)
     repo_globs: dict[str, list[str]] = Field(default_factory=dict)
-    vars: TerraformVars = Field(default_factory=TerraformVars)
+    vars: TerraformVars = Field(default_factory=TerraformVars)  # type: ignore
+
+    def __lt__(self, other) -> bool:
+        if not isinstance(other, TestSuite):  # type: ignore
+            raise TypeError
+        return self.name < other.name
 
     def all_globs(self, repo_alias: str) -> list[str]:
         go_packages = self.repo_go_packages.get(repo_alias, [])
@@ -95,8 +104,8 @@ class RepoAliasNotFoundError(ValueError):
 
 
 class AtlasInitConfig(Entity):
-    test_suites: list[TestSuite] = Field(default_factory=list)
     repo_aliases: dict[str, str] = Field(default_factory=dict)
+    test_suites: list[TestSuite] = Field(default_factory=list)  # type: ignore
 
     def repo_alias(self, repo_url_path: str) -> str:
         alias = self.repo_aliases.get(repo_url_path)
@@ -115,7 +124,7 @@ class AtlasInitConfig(Entity):
         alias: str | None,
         change_paths: Iterable[str],
         forced_test_suites: list[str],
-    ) -> list[TestSuite]:
+    ) -> list[TestSuite]:  # type: ignore
         forced_suites = set(forced_test_suites)
         if forced_test_suites:
             logger.warning(f"using forced test suites: {forced_test_suites}")
@@ -143,7 +152,7 @@ def active_suites(
     repo_path: Path,
     cwd_rel_path: str,
     forced_test_suites: list[str],
-) -> list[TestSuite]:
+) -> list[TestSuite]:  # type: ignore
     repo_url_path = owner_project_name(repo_path)
     repo_alias = config.repo_alias(repo_url_path)
     logger.info(f"repo_alias={repo_alias}, repo_path={repo_path}, repo_url_path={repo_url_path}")

atlas_init/settings/env_vars.py

@@ -47,11 +47,11 @@ class ExternalSettings(BaseSettings):
     MONGODB_ATLAS_PRIVATE_KEY: str
     MONGODB_ATLAS_PUBLIC_KEY: str
     MONGODB_ATLAS_BASE_URL: str = "https://cloud-dev.mongodb.com/"
-    ci: bool = False
+    non_interactive: bool = False
 
     @property
     def is_interactive(self) -> bool:
-        return not self.ci
+        return not self.non_interactive
 
 
 def as_env_var_name(field_name: str) -> str:
@@ -145,6 +145,17 @@ class AtlasInitPaths(BaseSettings):
     def tf_vars_path(self) -> Path:
         return self.tf_data_dir / "vars.auto.tfvars.json"
 
+    @property
+    def tf_state_path(self) -> Path:
+        return self.profile_dir / "tf_state"
+
+    @property
+    def tf_outputs_path(self) -> Path:
+        return self.profile_dir / "tf_outputs.json"
+
+    def load_env_vars(self, path: Path) -> dict[str, str]:
+        return load_dotenv(path)
+
     def load_env_vars_generated(self) -> dict[str, str]:
         env_path = self.env_vars_generated
         assert env_path.exists(), f"no env-vars exist {env_path} have you forgotten apply?"

atlas_init/settings/rich_utils.py

@@ -9,11 +9,46 @@ class _LogLevel(BaseModel):
     log_level: Literal["INFO", "WARNING", "ERROR", "CRITICAL"]
 
 
-def configure_logging(log_level: str = "INFO"):
+def remove_secrets(message: str, secrets: list[str]) -> str:
+    for secret in secrets:
+        message = message.replace(secret, "***")
+    return message
+
+
+class SecretsHider(logging.Filter):
+    def __init__(self, secrets: list[str], name: str = "") -> None:
+        self.secrets = secrets
+        super().__init__(name)
+
+    def filter(self, record: logging.LogRecord) -> bool:
+        record.msg = remove_secrets(record.msg, self.secrets)
+        return True
+
+
+dangerous_keys = ["key", "id", "secret"]
+safe_keys: list[str] = ["/"]
+
+
+def hide_secrets(handler: logging.Handler, secrets_dict: dict[str, str]) -> None:
+    secrets_to_hide = set()
+    for key, value in secrets_dict.items():
+        if not isinstance(value, str):
+            continue
+        key_lower = key.lower()
+        if any(safe in key_lower for safe in safe_keys):
+            continue
+        if any(danger in key_lower for danger in dangerous_keys):
+            secrets_to_hide.add(value)
+    handler.addFilter(SecretsHider(list(secrets_to_hide), name="secrets-hider"))
+
+
+def configure_logging(log_level: str = "INFO") -> logging.Handler:
     _LogLevel(log_level=log_level)  # type: ignore
+    handler = RichHandler(rich_tracebacks=True)
     logging.basicConfig(
         level=logging.getLevelName(log_level),
         format="%(message)s",
         datefmt="[%X]",
-        handlers=[RichHandler(rich_tracebacks=True)],
+        handlers=[handler],
     )
+    return handler

atlas_init/tf/.terraform.lock.hcl

@@ -0,0 +1,149 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/hashicorp/aws" {
+  version     = "5.49.0"
+  constraints = "~> 5.0"
+  hashes = [
+    "h1:BKrMq4aIOvXbJA9fd0kdmIm3Q01MQcheDIEzXtrkNf4=",
+    "h1:EMzIW40AXkmr5qYv2ynb6ToWO7oRwMNYHwHo20kXAdY=",
+    "h1:HemCol/k4BjtyRE6GpfECiFU7JF+O3ayqfVQBwsgizQ=",
+    "h1:RZtXnBRpO4LNmmz0tXJQLa2heqk9VFGblFZtRCZkm/M=",
+    "h1:Y3xvYjzBIwYSbcnZDcs6moiy30uxRoY5oT2ExQHKG5A=",
+    "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932",
+    "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1",
+    "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403",
+    "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0",
+    "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c",
+    "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f",
+    "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722",
+    "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922",
+    "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
+    "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267",
+    "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905",
+    "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97",
+    "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106",
+    "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007",
+    "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/http" {
+  version     = "3.4.2"
+  constraints = "3.4.2"
+  hashes = [
+    "h1:Te941FhpXymGvOraU9IQiMrvDVCMAF4gwjvyVZuvRtk=",
+    "h1:YxJewcIIT5sF2h8N+F7eZMsdEimpDpveAOzq/RUiUEo=",
+    "h1:eqo0hkFNrixeaT93PC5NiU893s7rUwwOMeqnCjjj3u0=",
+    "h1:v6Hn+15SfN2SI281Sp+uNXdWhD197ycP07fnaoGpPcc=",
+    "h1:vaoPfsLm6mOk6avKTrWi35o+9p4fEeZAY3hzYoXVTfo=",
+    "zh:0ba051c9c8659ce0fec94a3d50926745f11759509c4d6de0ad5f5eb289f0edd9",
+    "zh:23e6760e8406fef645913bf47bfab1ca984c1c5805d2bb0ef8310b16913d29cd",
+    "zh:3c69fde4548bfe65b968534c4df8d699648c921d6a065b97fec5faece73a442b",
+    "zh:41c7f9a8c117704b7a8fa96a57ebfb92b72129d9625128eeb0dee7d5a09d1110",
+    "zh:59d09d2e00727df10565cc82a33250b44201fcd353eb2b1579507a5a0adcce18",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:c95b2f63d4357b3068531b90d9dca62a32551d7693defb7ab14b650b5d139c57",
+    "zh:cc0a3bbd3026191b35f417d3a8f26bdfad376d15be9e8d99a8803487ca5b0105",
+    "zh:d1185c6abb3ba25123fb7df1ad7dbe2b9cd8f43962628da551040fbe1934656f",
+    "zh:dfb26fccab7ecdc150f67415e6cfe19d699dc43e8bf5722f36032b17b46a0fbe",
+    "zh:eb1fcc00073bc0463f64e49600a73d925b1a0c0ae5b94dd7b67d3ebac248a113",
+    "zh:ec9b9ad69cf790cb0603a1036d758063bbbc35c0c75f72dd04a1eddaf46ad010",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/local" {
+  version     = "2.4.1"
+  constraints = "2.4.1"
+  hashes = [
+    "h1:7lfUMKAsu/HRUUs02tJxBle9XvSuNKkpTOqcFqMe5JI=",
+    "h1:FzraUapGrJoH3ZOWiUT2m6QpZAD+HmU+JmqZgM4/o2Y=",
+    "h1:V2G4qygMV0uHy+QTMlrjSyYgzpYmYyB6gWuE09+5CPI=",
+    "h1:gpp25uNkYJYzJVnkyRr7RIBVfwLs9GSq2HNnFpTRBg0=",
+    "h1:kgA44Hg57WNSNH/tEzpOSLEk7U3fkAkYxActZEvX0Q4=",
+    "zh:244b445bf34ddbd167731cc6c6b95bbed231dc4493f8cc34bd6850cfe1f78528",
+    "zh:3c330bdb626123228a0d1b1daa6c741b4d5d484ab1c7ae5d2f48d4c9885cc5e9",
+    "zh:5ff5f9b791ddd7557e815449173f2db38d338e674d2d91800ac6e6d808de1d1d",
+    "zh:70206147104f4bf26ae67d730c995772f85bf23e28c2c2e7612c74f4dae3c46f",
+    "zh:75029676993accd6bef933c196b2fad51a9ec8a69a847dbbe96ec8ebf7926cdc",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:7d48d5999fe1fcdae9295a7c3448ac1541f5a24c474bd82df6d4fa3732483f2b",
+    "zh:b766b38b027f0f84028244d1c2f990431a37d4fc3ac645962924554016507e77",
+    "zh:bfc7ad301dada204cf51c59d8bd6a9a87de5fddb42190b4d6ba157d6e08a1f10",
+    "zh:c902b527702a8c5e2c25a6637d07bbb1690cb6c1e63917a5f6dc460efd18d43f",
+    "zh:d68ae0e1070cf429c46586bc87580c3ed113f76241da2b6e4f1a8348126b3c46",
+    "zh:f4903fd89f7c92a346ae9e666c2d0b6884c4474ae109e9b4bd15e7efaa4bfc29",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/null" {
+  version = "3.2.2"
+  hashes = [
+    "h1:Gef5VGfobY5uokA5nV/zFvWeMNR2Pmq79DH94QnNZPM=",
+    "h1:IMVAUHKoydFrlPrl9OzasDnw/8ntZFerCC9iXw1rXQY=",
+    "h1:m467k2tZ9cdFFgHW7LPBK2GLPH43LC6wc3ppxr8yvoE=",
+    "h1:vWAsYRd7MjYr3adj8BVKRohVfHpWQdvkIwUQ2Jf5FVM=",
+    "h1:zT1ZbegaAYHwQa+QwIFugArWikRJI9dqohj8xb0GY88=",
+    "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7",
+    "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a",
+    "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3",
+    "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606",
+    "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546",
+    "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539",
+    "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422",
+    "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae",
+    "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1",
+    "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/random" {
+  version = "3.6.1"
+  hashes = [
+    "h1:12+TxYsSS5bzT7uiE2w0ke2WxmhehRV7uKU1wKUUnmM=",
+    "h1:1OlP753r4lOKlBprL0HdZGWerm5DCabD5Mli8k8lWAg=",
+    "h1:8iqExjtAvirFTJkpm5YyYD+fC+DGV8NTJzKsE2c70VA=",
+    "h1:Xx3UvdKXObNTjfd4yYHDcFalYZujg7NBY/VpZISiTb4=",
+    "h1:a+Goawwh6Qtg4/bRWzfDtIdrEFfPlnVy0y4LdUQY3nI=",
+    "zh:2a0ec154e39911f19c8214acd6241e469157489fc56b6c739f45fbed5896a176",
+    "zh:57f4e553224a5e849c99131f5e5294be3a7adcabe2d867d8a4fef8d0976e0e52",
+    "zh:58f09948c608e601bd9d0a9e47dcb78e2b2c13b4bda4d8f097d09152ea9e91c5",
+    "zh:5c2a297146ed6fb3fe934c800e78380f700f49ff24dbb5fb5463134948e3a65f",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:7ce41e26f0603e31cdac849085fc99e5cd5b3b73414c6c6d955c0ceb249b593f",
+    "zh:8c9e8d30c4ef08ee8bcc4294dbf3c2115cd7d9049c6ba21422bd3471d92faf8a",
+    "zh:93e91be717a7ffbd6410120eb925ebb8658cc8f563de35a8b53804d33c51c8b0",
+    "zh:982542e921970d727ce10ed64795bf36c4dec77a5db0741d4665230d12250a0d",
+    "zh:b9d1873f14d6033e216510ef541c891f44d249464f13cc07d3f782d09c7d18de",
+    "zh:cfe27faa0bc9556391c8803ade135a5856c34a3fe85b9ae3bdd515013c0c87c1",
+    "zh:e4aabf3184bbb556b89e4b195eab1514c86a2914dd01c23ad9813ec17e863a8a",
+  ]
+}
+
+provider "registry.terraform.io/mongodb/mongodbatlas" {
+  version     = "1.16.0"
+  constraints = ">= 1.4.3, 1.16.0"
+  hashes = [
+    "h1:3xNtkJvf24ChFvQm8yl7QCf2K/KOJNF4UQNpDiZgATo=",
+    "h1:Hmk5/O4IyOsLAc4sEChPkrP0bGetebqR0Wrz0RUNGvs=",
+    "h1:IP2Gb4KrKAwmUSG5B0oqKYQOyGQjkeazVokw+TIuVcU=",
+    "h1:cWeuysKYmhgvWhf6g7kC5yKsgP7uNzTFTapcAxAHMkQ=",
+    "h1:nRsHPefWnvdHuPKUUlamC65meS60AvSg8UNL2Jp0P04=",
+    "zh:086a72493614a00fd5e38c7c0d077269f0069dd0d9d0cbfa1b0b1834278870b3",
+    "zh:11489ece5a1683f65ea64898c8a4cd06300cd91ae8bebbf05631020d5b549186",
+    "zh:4a45180e6d951affb27cab0320c845fb97e1e5e0396227d9f38a27f70ede113b",
+    "zh:4c63c33f100d20af6cce8d3c66f7c9df9a1b8d777c402a085bd888185d6c8ac5",
+    "zh:673cb0986e2a3b6de919f5778c574842cc26502a75b1d197bf2dae5758b5b98b",
+    "zh:7822d563d0ddaefbc476fbfd8772edc0bc7a7e53304eeb2e34ad827947e36601",
+    "zh:7ad9a83ae72e83b1c179dd2952b16b2d1e31a34ea62ab685eb3b97025a0cf8be",
+    "zh:928aed6481fdd7a81dd9127068438533c76ddb34fbb4cd9da71c8398bd7edefc",
+    "zh:932543248081671d8cc5a3dcbc46cf0e4e83d3a2c333f5486e78677509b0718c",
+    "zh:968bb58413656bd2064776cb9c5a4f435beebbe63edcbe3801d82a558be14bcf",
+    "zh:b88b4368b501aa0159c3804d82b61e5ef71c380dd6889424003a4ca37c5aff5f",
+    "zh:c9a98c72d1b6183dec7555a90ad0ed8a3741820d998332c33cd9a08ea26e78b4",
+    "zh:d2f1f716cd8a3de58f23f384254847aa06eb3e0b0fe5d7ffe13aec7ada3d69ef",
+    "zh:d70d14be3db7a1d8bb2528d8761bb8dc02ca4a06ee14657e57d2b2cec6217e13",
+  ]
+}

atlas_init/tf/always.tf

@@ -9,6 +9,7 @@ resource "random_password" "username" {
 }
 
 data "http" "myip" {
+  count = var.use_project_myip ? 1 : 0
   url = "https://ipv4.icanhazip.com"
 }
 
@@ -38,6 +39,7 @@ resource "mongodbatlas_project" "project" {
 }
 
 resource "mongodbatlas_project_ip_access_list" "mongo-access" {
+  count = var.use_project_myip ? 1 : 0
   project_id = mongodbatlas_project.project.id
-  cidr_block = "${chomp(data.http.myip.response_body)}/32"
-}
+  cidr_block = "${chomp(data.http.myip[0].response_body)}/32"
+}

atlas_init/tf/variables.tf

@@ -33,6 +33,11 @@ variable "project_name" {
   }
 }
 
+variable "use_project_myip" {
+  type = bool
+  default = false
+}
+
 variable "out_dir" {
   type = string
 }

{atlas_init-0.1.0.dist-info → atlas_init-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: atlas-init
-Version: 0.1.0
+Version: 0.1.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
@@ -23,7 +23,9 @@ Requires-Dist: tenacity==8.2.3
 Requires-Dist: typer==0.12.0
 Description-Content-Type: text/markdown
 
-# Atlas Init - A CLI for developing with MongoDB Atlas
+# Atlas Init - A CLI for developing integrations with MongoDB Atlas
+
+[![codecov](https://codecov.io/github/EspenAlbert/atlas-init/graph/badge.svg?token=DR7FDJXNZY)](https://codecov.io/github/EspenAlbert/atlas-init)
 
 Currently, used with
 - <https://github.com/mongodb/terraform-provider-mongodbatlas>
@@ -68,6 +70,8 @@ source .venv/bin/activate # ensure you are in your preferred python env
 ### 2. Local development, run from github repo
 
 ```shell
+git clone https://github.com/EspenAlbert/atlas-init
+cd atlas-init
 brew install pre-commit uv hatch
 # https://github.com/astral-sh/uv <-- python packaging lightning fast
 # https://hatch.pypa.io/latest/ <-- uv compatible build system for python
@@ -76,19 +80,25 @@ pre-commit install
 
 # check that everything works
 pre-commit run --all-files
+
+# configure your virtualenv
 cd py
 hatch test
-VENV_PATH=$(hatch env find hatch-test) # your venv path
-cd ..
+export VENV_DIR=$(hatch env find hatch-test | grep py3.12) # hatch venv path for env=hatch-test
+export VENV_PYTHON=$VENV_DIR/bin/python
+$VENV_PYTHON # ensure you are in shell with python3.12 (cmd+d to exit)
+cd .. # back to repo root
 
-# open in your IDE
+# open in your IDE with virtualenv enabled
 code .
-# select venv path from $VENV_PATH output
+# select venv path from $VENV_PYTHON output as python interpreter
 
 # to make it easy to invoke from any terminal
-export pyexe=$(which python) # VENV_PATH above
-export pypath=$(pwd)/py
-echo "alias atlas_init='export PYTHONPATH=$pypath && \"$pyexe\" -m atlas_init'" >> ~/.zprofile # replace with your shell profile
+export pypath=$(pwd)/py # pwd=repo root(atlas-init)
+echo "alias atlas_init='export PYTHONPATH=$pypath && \"$VENV_PYTHON\" -m atlas_init'" >> ~/.zprofile # replace with your shell profile
+
+# test that it works
+atlas_init # should show how to use the cli
 ```
 
 ### 3. `pip install` local wheel
@@ -140,3 +150,12 @@ provider_installation {
  
 }
 ```
+
+### Re-generating the lock files
+```shell
+terraform providers lock \
+    -platform=darwin_amd64 \
+    -platform=linux_amd64 \
+    -platform=darwin_arm64 \
+    -platform=linux_arm64
+    # -platform=windows_amd64 \

{atlas_init-0.1.0.dist-info → atlas_init-0.1.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-atlas_init/__init__.py,sha256=F14PVpz01PXFYFq9nBPKgNteb0-NOECpL4K9CS8TWLY,376
+atlas_init/__init__.py,sha256=nxYhj4r6g5B1cOn6xF2mSn99hp8VxU4lXIg4funFVnc,376
 atlas_init/__main__.py,sha256=dY1dWWvwxRZMmnOFla6RSfti-hMeLeKdoXP7SVYqMUc,52
-atlas_init/atlas_init.yaml,sha256=z1yqKwwjxbYuLs0pJ5v8Ao33ntqdUQo-2hGvYPdkH_I,1552
-atlas_init/cli.py,sha256=XrWxi1_-9lgit4h5e2f_sWpdGEuEUf2bsrHVSP-p88c,9168
+atlas_init/atlas_init.yaml,sha256=qC4zHwmqm6ui9VuAwE3tYrIFDklQ0Gm1Sh9il2l2WdQ,1518
+atlas_init/cli.py,sha256=FbSCjKikTAOrrxyA5cPqqIcEK5hHy4y4pBw6AO46AkM,9639
 atlas_init/cli_args.py,sha256=6ucjRGLGde1XcZIfUCGrWbmQLJB9bWZaXxyAsYXMSSw,427
 atlas_init/terraform.yaml,sha256=5Cxaru1FpnSJqHKRZ7j8YDhMV4h50e3iiahBz3eWlD0,726
 atlas_init/cli_cfn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -9,11 +9,11 @@ atlas_init/cli_cfn/app.py,sha256=6Y_KZ5WH_sOr24AO-7JdwrVsAdGXy5grUE575uIs30U,985
 atlas_init/cli_cfn/cfn.py,sha256=87G3VpMWmus7pY06rWu_s3lFPAJeYn85I43dH5w0cDQ,12492
 atlas_init/cli_cfn/cfn_parameter_finder.py,sha256=QFlLrWh0g4HwGAlK_M9OmhG61mTtxIBGzSx1VgDSMfs,7441
 atlas_init/cli_helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atlas_init/cli_helper/go.py,sha256=-pmW9CQ45wgAksjHcQ8rGKwu2QB62RYe2M_R4D1ia20,1047
+atlas_init/cli_helper/go.py,sha256=LVMXTWvEYOHOul_UG5uQT3QAoL0H1f1O7e4d-11kPrw,1232
 atlas_init/cli_helper/run.py,sha256=NEjFP1yttPe3Sg9JFnDbRreEWProb-plvKwomBsQz8w,2517
 atlas_init/cli_helper/sdk.py,sha256=exh58-VZwxtosaxM269C62EEy1VnpJPOVziPDPkGsmE,2983
 atlas_init/cli_helper/sdk_auto_changes.py,sha256=oWyXw7P0PdO28hclRvza_RcIVXAyzu0lCYTJTNBDMeo,189
-atlas_init/cli_helper/tf_runner.py,sha256=M4CTfUg5YHnel8vULXx0r63ViFh1tSklKio0t2h4sv8,3799
+atlas_init/cli_helper/tf_runner.py,sha256=vNi8f34LJZkPnvZZnB2MMyfTVMBPwS_1nrD-stO0-iM,3690
 atlas_init/cli_tf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atlas_init/cli_tf/app.py,sha256=Xspc5qp3f4Uir5hgxcF3DaFg28ld1iWARtbhfq7uI04,2644
 atlas_init/cli_tf/schema.py,sha256=AFALXAju4OBVZQ8T9REtoench6HKmQ88bmmzHC_BxII,3258
@@ -25,16 +25,17 @@ atlas_init/repos/cfn.py,sha256=zSrQ_csdh5HsO7Yoc_bC65j9SMsiSYEhd_0ug8gAIb8,2279
 atlas_init/repos/go_sdk.py,sha256=6_ENYMP6yQufo1dXJbLJFDxCuq-8oeTYiGAPC61Uauc,424
 atlas_init/repos/path.py,sha256=N1VdelcMb2YuNbdoZtyL9ChuFEu7Kz4VwOIV7eefzTE,4160
 atlas_init/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atlas_init/settings/config.py,sha256=0OC1xFSIVhPFub743Aa8kncWH9c4iP7ByIgu9OA3-6Q,5523
-atlas_init/settings/env_vars.py,sha256=NdMAC333wcgQqeUT8xSktNQdaI-fNAnEf7PEreGjvpw,8423
+atlas_init/settings/config.py,sha256=eg1KfDRAbJezpaVTaPYKlteTnzNRm189ZMhg2WPbE9Y,5894
+atlas_init/settings/env_vars.py,sha256=OReAsZ7M4fUZrqSeEoPqizjeRXhEyCpZtB7nqYHdnmY,8745
 atlas_init/settings/interactive.py,sha256=Xy1Z5WMAOSaJ-vQI_4xjAbSR92rWQgnffwVoDT27L68,340
 atlas_init/settings/path.py,sha256=Dbp-C8Cr5Q7E-QSpY6_Pe30nNx_e8hT_RYzKn-3fCO4,1998
-atlas_init/settings/rich_utils.py,sha256=oMHAGlxouJxS0-4IaHww9DTObV91TvrflR6pGJcGF68,491
-atlas_init/tf/always.tf,sha256=QB9FchXSmjZxPfDHtMDk3eRRo9ATL5lFy5wYj8j0UQE,1020
+atlas_init/settings/rich_utils.py,sha256=J75-LGMtGwUAkCwCtjU2DyOeesiFB7rKP54NPb_6UmA,1601
+atlas_init/tf/.terraform.lock.hcl,sha256=wyL4o4Hy1L_9M3U7tXqdZC4OX0uHypCv4MQqZKaeZEI,8206
+atlas_init/tf/always.tf,sha256=dYd7JfxLpeE3sl2jUtbSb6CVya4EuIx9IeFqyE4zCL0,1102
 atlas_init/tf/main.tf,sha256=0ZH1QiBPmE1rQQoOookddfWoNJZLzoQDZPrtGKhkT6c,3824
 atlas_init/tf/outputs.tf,sha256=z5VtLuUia4GPzx3Kw0ECUW68Az0p_zvE8PVtZwPfx4w,3452
 atlas_init/tf/providers.tf,sha256=aBRwlUPQctHMFkFvrXs43Iq9b1og1wo0uSTsbKVt7_g,724
-atlas_init/tf/variables.tf,sha256=uH0Nl5AxCjZd4exPz6hUnrB4b0hpPCTW_3_1C4fWJXw,1860
+atlas_init/tf/variables.tf,sha256=-sW-2lNJD2sOIAodUsN-6SKkLIbznOGYVKVYcxsvPQw,1925
 atlas_init/tf/modules/aws_s3/aws_s3.tf,sha256=SP5vZf5Y2g9Z5yWpBKSKzEEF5FITPycoGKe-kaHoVCI,738
 atlas_init/tf/modules/aws_s3/provider.tf,sha256=MokTWfkT2IPWfIgGbKcX-UC_PycO9TzjZDOeFA9PLRM,162
 atlas_init/tf/modules/aws_vars/aws_vars.tf,sha256=VcVOIt-VCu2UdGddN6SjLkavLl-JGex64RnSEIZhWpw,386
@@ -55,7 +56,7 @@ atlas_init/tf/modules/vpc_peering/vpc_peering.tf,sha256=sRmteM23eTQcrTFLjaxeGTXS
 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=GlmYD7fOBe4cbILEXX9UjIr1rJKLIaqL_cDGc2u6upg,238
-atlas_init-0.1.0.dist-info/METADATA,sha256=Kifr-peIohM93DIQcjrJvtH3Yf2BBsDDKp4z7X8rCPs,4763
-atlas_init-0.1.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-atlas_init-0.1.0.dist-info/entry_points.txt,sha256=6Ycq_NZ7cym1BCA9YiVhYylJzy6woREjt7QSCSLm-1o,54
-atlas_init-0.1.0.dist-info/RECORD,,
+atlas_init-0.1.1.dist-info/METADATA,sha256=Qo8FMgBaZ37BEKYxVvcTQ-FlJ0h96oIOs38nn05wJoI,5504
+atlas_init-0.1.1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+atlas_init-0.1.1.dist-info/entry_points.txt,sha256=6Ycq_NZ7cym1BCA9YiVhYylJzy6woREjt7QSCSLm-1o,54
+atlas_init-0.1.1.dist-info/RECORD,,