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

atlas_init/repos/path.py

@@ -1,4 +1,9 @@
+from __future__ import annotations
+import logging
+import re
+from collections import defaultdict
 from collections.abc import Callable
+from dataclasses import dataclass
 from enum import StrEnum
 from functools import lru_cache
 from pathlib import Path
@@ -8,6 +13,7 @@ from git import Repo as _GitRepo
 
 from atlas_init.settings.path import current_dir, repo_path_rel_path
 
+logger = logging.getLogger(__name__)
 GH_OWNER_TERRAFORM_PROVIDER_MONGODBATLAS = "mongodb/terraform-provider-mongodbatlas"
 GH_OWNER_MONGODBATLAS_CLOUDFORMATION_RESOURCES = "mongodb/mongodbatlas-cloudformation-resources"
 _KNOWN_OWNER_PROJECTS = {
@@ -59,10 +65,10 @@ def is_resource_call(repo_path: Path) -> Callable[[Path], bool]:
 
 
 def resource_dir(repo_path: Path, full_path: Path) -> Path:
-    dir_name = resource_name(repo_path, full_path)
-    if not dir_name:
+    if dir_name := resource_name(repo_path, full_path):
+        return resource_root(repo_path) / dir_name
+    else:
         raise ValueError(f"no resource name for {full_path}")
-    return resource_root(repo_path) / dir_name
 
 
 class Repo(StrEnum):
@@ -116,10 +122,10 @@ def resource_name(repo_path: Path, full_path: Path) -> str:
     is_resource = is_resource_call(repo_path)
     if not root.exists():
         raise ValueError(f"no resource root found for {repo_path}")
-    for parent in [full_path, *full_path.parents]:
-        if parent.parent == root and is_resource(parent):
-            return parent.name
-    return ""
+    return next(
+        (parent.name for parent in [full_path, *full_path.parents] if parent.parent == root and is_resource(parent)),
+        "",
+    )
 
 
 def find_paths(assert_repo: Repo | None = None) -> ResourcePaths:
@@ -153,3 +159,100 @@ def find_go_mod_dir(repo_path: Path):
             return go_mod.parent
     msg = "go.mod not found or more than 1 level deep"
     raise ValueError(msg)
+
+
+def find_test_names(file: Path, prefix: str = "Test") -> list[str]:
+    test_names = []
+    with file.open("r") as f:
+        for line in f:
+            if line.startswith(f"func {prefix}"):
+                test_name = line.split("(")[0].strip().removeprefix("func ")
+                test_names.append(test_name)
+    return sorted(test_names)
+
+
+class MultipleResourceNames(ValueError):
+    def __init__(self, names: list[str]):
+        super().__init__(f"multiple resource names found: {names}")
+        self.names = names
+
+
+def find_tf_resource_name_in_test(path: Path, provider_prefix: str = "mongodbatlas_") -> str:
+    candidates: set[str] = {
+        match.group(1) for match in re.finditer(rf"=\s\"{provider_prefix}([a-zA-Z0-9_]+)\.?", path.read_text())
+    }
+    if len(candidates) > 1:
+        pkg_name = path.parent.name
+        for candidate in candidates:
+            if candidate.replace("_", "") == pkg_name:
+                return candidate
+        logger.warning(f"multiple resource names found in {path}: {candidates}")
+        raise MultipleResourceNames(sorted(candidates))
+    return candidates.pop() if candidates else ""
+
+
+def find_pkg_test_names(pkg_path: Path, prefix: str = "Test") -> list[str]:
+    test_names = []
+    for test_file in pkg_path.glob("*_test.go"):
+        test_names.extend(find_test_names(test_file, prefix))
+    return sorted(test_names)
+
+
+def terraform_resource_test_names(
+    repo_path: Path, prefix: str = "Test", package_path: str = "internal/service"
+) -> dict[str, list[str]]:
+    """find all test names in the given package path"""
+    pkg_path = terraform_package_path(repo_path, package_path)
+    resource_dirs, _ = find_resource_dirs(pkg_path)
+    test_names = defaultdict(list)
+    for name, pkg_dir in resource_dirs.items():
+        for test_file in pkg_dir.glob("*_test.go"):
+            test_names[name].extend(find_test_names(test_file, prefix))
+    return test_names
+
+
+def terraform_resources(repo_path: Path, package_path: str = "internal/service") -> list[TFResoure]:
+    pkg_path = terraform_package_path(repo_path, package_path)
+    resource_dirs, _ = find_resource_dirs(pkg_path)
+    resources = []
+    for name, pkg_dir in resource_dirs.items():
+        test_names = find_pkg_test_names(pkg_dir)
+        resources.append(TFResoure(name=name, package_rel_path=str(pkg_dir.relative_to(repo_path)), tests=test_names))
+    return resources
+
+
+def terraform_package_path(repo_path: Path, package_path: str = "internal/service"):
+    pkg_path = repo_path / package_path
+    if not pkg_path.exists():
+        raise ValueError(f"package path not found: {pkg_path}")
+    return pkg_path
+
+
+def find_resource_dirs(pkg_path: Path) -> tuple[dict[str, Path], list[Path]]:
+    resource_dirs: dict[str, Path] = {}
+    non_resource_dirs: list[Path] = []
+    for pkg_dir in pkg_path.iterdir():
+        if not pkg_dir.is_dir():
+            continue
+        if pkg_dir.name == "testdata":
+            continue
+        found = False
+        for test_file in pkg_dir.glob("*_test.go"):
+            try:
+                if name := find_tf_resource_name_in_test(test_file):
+                    resource_dirs[name] = pkg_dir
+                    found = True
+            except MultipleResourceNames as e:
+                for name in e.names:
+                    resource_dirs[name] = pkg_dir
+                found = True
+        if not found:
+            non_resource_dirs.append(pkg_dir)
+    return resource_dirs, non_resource_dirs
+
+
+@dataclass
+class TFResoure:
+    name: str
+    package_rel_path: str
+    tests: list[str]

atlas_init/settings/config.py

@@ -12,7 +12,7 @@ from typing import Any
 from model_lib import Entity, IgnoreFalsy
 from pydantic import Field, model_validator
 
-from atlas_init.repos.path import as_repo_alias, go_package_prefix, owner_project_name, package_glob
+from atlas_init.repos.path import as_repo_alias, find_test_names, go_package_prefix, owner_project_name, package_glob
 
 logger = logging.getLogger(__name__)
 
@@ -95,11 +95,8 @@ class TestSuite(IgnoreFalsy):
         for package in packages:
             pkg_name = f"{go_package_prefix(repo_path)}/{package}"
             for go_file in repo_path.glob(f"{package}/*.go"):
-                with go_file.open() as f:
-                    for line in f:
-                        if line.startswith(f"func {prefix}"):
-                            test_name = line.split("(")[0].strip().removeprefix("func ")
-                            names[pkg_name][test_name] = go_file.parent
+                for name in find_test_names(go_file, prefix):
+                    names[pkg_name][name] = go_file.parent
         return names
 
     def is_active(self, repo_alias: str, change_paths: Iterable[str]) -> bool:

atlas_init/settings/env_vars.py

@@ -64,6 +64,9 @@ class AtlasInitSettings(StaticSettings):
 
     non_interactive: bool = False
 
+    mongo_database: str = "atlas_init"
+    mongo_url: str = "mongodb://user:pass@localhost:27017?retryWrites=true&w=majority&authSource=admin"
+
     @property
     def is_interactive(self) -> bool:
         return not self.non_interactive
@@ -234,6 +237,7 @@ def find_missing_env_vars(required_env_vars: list[str], manual_env_vars: dict[st
 
 def init_settings(
     *settings_classes: type[BaseModel],
+    skip_ambiguous_check: bool = False,
 ) -> AtlasInitSettings:
     settings = AtlasInitSettings.from_env()
     profile_env_vars = settings.manual_env_vars
@@ -241,7 +245,7 @@ def init_settings(
     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(profile_env_vars)
+    ambiguous = [] if skip_ambiguous_check else detect_ambiguous_env_vars(profile_env_vars)
     missing_env_vars = find_missing_env_vars(required_env_vars, profile_env_vars)
 
     if ambiguous:

atlas_init/settings/interactive2.py

@@ -0,0 +1,134 @@
+"""Inspired by: https://github.com/tmbo/questionary/blob/master/tests/utils.py"""
+
+from dataclasses import dataclass
+from typing import Callable, TypeVar
+
+from prompt_toolkit.input.defaults import create_pipe_input
+from prompt_toolkit.output import DummyOutput
+from questionary import Question, checkbox
+from questionary import confirm as _confirm
+from questionary import select as _select
+from questionary import text as _text
+
+T = TypeVar("T")
+TypedAsk = Callable[[Question, type[T]], T]
+
+_question_asker: TypedAsk = lambda q, _: q.ask()  # noqa: E731
+
+
+def confirm(prompt_text: str, *, default: bool | None = None) -> bool:
+    if default is None:
+        return _question_asker(_confirm(prompt_text), bool)
+    return _question_asker(_confirm(prompt_text, default=default), bool)
+
+
+def select_list_multiple(
+    prompt_text: str,
+    choices: list[str],
+    default: list[str] | None = None,
+) -> list[str]:
+    assert choices, "choices must not be empty"
+    default = default or []
+    return _question_asker(checkbox(prompt_text, choices=choices), list[str]) or default
+
+
+def text(
+    prompt_text: str,
+    default: str = "",
+) -> str:
+    return _question_asker(_text(prompt_text, default=default), str)
+
+
+T = TypeVar("T")
+
+
+def select_dict(
+    prompt_text: str,
+    choices: dict[str, T],
+    default: str | None = None,
+) -> T:
+    assert choices, "choices must not be empty"
+    selection = _question_asker(_select(prompt_text, default=default, choices=list(choices)), str)
+    return choices[selection]
+
+
+StrT = TypeVar("StrT", bound=str)
+
+
+def select_list(
+    prompt_text: str,
+    choices: list[StrT],
+    default: StrT | None = None,
+) -> StrT:
+    assert choices, "choices must not be empty"
+    return _question_asker(_select(prompt_text, default=default, choices=choices), str)
+
+
+class KeyInput:
+    DOWN = "\x1b[B"
+    UP = "\x1b[A"
+    LEFT = "\x1b[D"
+    RIGHT = "\x1b[C"
+    ENTER = "\r"
+    ESCAPE = "\x1b"
+    CONTROLC = "\x03"
+    CONTROLN = "\x0e"
+    CONTROLP = "\x10"
+    BACK = "\x7f"
+    SPACE = " "
+    TAB = "\x09"
+    ONE = "1"
+    TWO = "2"
+    THREE = "3"
+
+
+@dataclass
+class question_patcher:
+    responses: list[str]
+    next_response: int = 0
+
+    def __enter__(self):
+        global _question_asker
+        self._old_patcher = _question_asker
+        _question_asker = self.ask_question
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        global _question_patcher
+        _question_patcher = self._old_patcher
+
+    def ask_question(self, q: Question, response_type: type[T]) -> T:
+        q.application.output = DummyOutput()
+
+        def run(inp) -> T:
+            try:
+                input_response = self.responses[self.next_response]
+            except IndexError:
+                raise ValueError(
+                    f"Not enough responses provided. Expected {len(self.responses)}, got {self.next_response + 1} questions."
+                )
+            self.next_response += 1
+            inp.send_text(input_response + KeyInput.ENTER + "\r")
+            q.application.output = DummyOutput()
+            q.application.input = inp
+            return q.ask()
+
+        with create_pipe_input() as inp:
+            return run(inp)
+
+
+if __name__ == "__main__":
+    print(select_list("Select an option:", ["Option 1", "Option 2", "Option 3"]))  # noqa: T201
+    print(  # noqa: T201
+        select_dict(
+            "Select an option:",
+            {"Option 1": "1", "Option 2": "2", "Option 3": "3"},
+            default="Option 3",
+        )
+    )
+    print(confirm("Can you confirm?", default=True))  # noqa: T201
+    print(confirm("Can you confirm?", default=False))  # noqa: T201
+    print(  # noqa: T201
+        select_list_multiple("Select options:", ["Option 1", "Option 2", "Option 3"], ["Option 1"])
+    )
+    print(text("Enter your name:", default="John Doe"))  # noqa: T201

atlas_init/tf/.terraform.lock.hcl

@@ -2,25 +2,25 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version     = "5.87.0"
+  version     = "5.98.0"
   constraints = "~> 5.0"
   hashes = [
-    "h1:IYq3by7O/eJuXzJwOF920z2nZEkw08PkDFdw2xkyhrs=",
-    "zh:017f237466875c919330b9e214fb33af14fffbff830d3755e8976d8fa3c963c2",
-    "zh:0776d1e60aa93c85ecbb01144aed2789c8e180bb0f1c811a0aba17ca7247b26c",
-    "zh:0dfa5c6cfb3724494fdc73f7d042515e88a20da8968959f48b3ec0b937bd8c8f",
-    "zh:1707a5ead36a7980cb3f83e8b69a67a14ae725bfc990ddfcc209b59400b57b04",
-    "zh:1c71f54fdd6adcbe547d6577dbb843d72a30fef0ab882d0afbeb8a7b348bc442",
-    "zh:3563c850a29790957ec3f4d3ba203bfa2e084ac7319035b3f43b91f818a2c9b4",
-    "zh:520bf6cef53785a92226651d5bebacbbf9314bdbc3211d0bf0903bce4e45149d",
-    "zh:56f9778575830f6e5c23462c2eccbf2c9afaddb00a69275fcfb33cd1a6d17f4d",
-    "zh:73e381cb0b1e76d471d7b0952f3d2a80350b507d15bda9b7041ea69077e3b5b5",
-    "zh:7da74b48f8fa088be758a92407980400cb4b039a8d9ba3c108907e4055e9ad6f",
-    "zh:8dacfa9623ba2e0197fe7db6faaaa0820a3b91fe00ba9e5d8a646340522bc8dd",
+    "h1:neMFK/kP1KT6cTGID+Tkkt8L7PsN9XqwrPDGXVw3WVY=",
+    "zh:23377bd90204b6203b904f48f53edcae3294eb072d8fc18a4531c0cde531a3a1",
+    "zh:2e55a6ea14cc43b08cf82d43063e96c5c2f58ee953c2628523d0ee918fe3b609",
+    "zh:4885a817c16fdaaeddc5031edc9594c1f300db0e5b23be7cd76a473e7dcc7b4f",
+    "zh:6ca7177ad4e5c9d93dee4be1ac0792b37107df04657fddfe0c976f36abdd18b5",
+    "zh:78bf8eb0a67bae5dede09666676c7a38c9fb8d1b80a90ba06cf36ae268257d6f",
+    "zh:874b5a99457a3f88e2915df8773120846b63d820868a8f43082193f3dc84adcb",
+    "zh:95e1e4cf587cde4537ac9dfee9e94270652c812ab31fce3a431778c053abf354",
     "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
-    "zh:9c2ebd21d697e1a611fe201788dc9e1678949a088afc85d4589563bca484d835",
-    "zh:ac5d0bbf36f9a6cedbfb63993f6baf0aabdaf21c8d7fc3b1e69ba8cbf344b5f3",
-    "zh:c2329644179f78a0458b6cf2dd5eaadca4c610fc3577a1b50620544d92df13e8",
+    "zh:a75145b58b241d64570803e6565c72467cd664633df32678755b51871f553e50",
+    "zh:aa31b13d0b0e8432940d6892a48b6268721fa54a02ed62ee42745186ee32f58d",
+    "zh:ae4565770f76672ce8e96528cbb66afdade1f91383123c079c7fdeafcb3d2877",
+    "zh:b99f042c45bf6aa69dd73f3f6d9cbe0b495b30442c526e0b3810089c059ba724",
+    "zh:bbb38e86d926ef101cefafe8fe090c57f2b1356eac9fc5ec81af310c50375897",
+    "zh:d03c89988ba4a0bd3cfc8659f951183ae7027aa8018a7ca1e53a300944af59cb",
+    "zh:d179ef28843fe663fc63169291a211898199009f0d3f63f0a6f65349e77727ec",
   ]
 }
 
@@ -65,61 +65,61 @@ provider "registry.terraform.io/hashicorp/local" {
 }
 
 provider "registry.terraform.io/hashicorp/null" {
-  version = "3.2.3"
+  version = "3.2.4"
   hashes = [
-    "h1:I0Um8UkrMUb81Fxq/dxbr3HLP2cecTH2WMJiwKSrwQY=",
-    "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2",
-    "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d",
-    "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3",
-    "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f",
-    "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1",
+    "h1:L5V05xwp/Gto1leRryuesxjMfgZwjb7oool4WS1UEFQ=",
+    "zh:59f6b52ab4ff35739647f9509ee6d93d7c032985d9f8c6237d1f8a59471bbbe2",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301",
-    "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670",
-    "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed",
-    "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65",
-    "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd",
-    "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5",
+    "zh:795c897119ff082133150121d39ff26cb5f89a730a2c8c26f3a9c1abf81a9c43",
+    "zh:7b9c7b16f118fbc2b05a983817b8ce2f86df125857966ad356353baf4bff5c0a",
+    "zh:85e33ab43e0e1726e5f97a874b8e24820b6565ff8076523cc2922ba671492991",
+    "zh:9d32ac3619cfc93eb3c4f423492a8e0f79db05fec58e449dee9b2d5873d5f69f",
+    "zh:9e15c3c9dd8e0d1e3731841d44c34571b6c97f5b95e8296a45318b94e5287a6e",
+    "zh:b4c2ab35d1b7696c30b64bf2c0f3a62329107bd1a9121ce70683dec58af19615",
+    "zh:c43723e8cc65bcdf5e0c92581dcbbdcbdcf18b8d2037406a5f2033b1e22de442",
+    "zh:ceb5495d9c31bfb299d246ab333f08c7fb0d67a4f82681fbf47f2a21c3e11ab5",
+    "zh:e171026b3659305c558d9804062762d168f50ba02b88b231d20ec99578a6233f",
+    "zh:ed0fe2acdb61330b01841fa790be00ec6beaac91d41f311fb8254f74eb6a711f",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/random" {
-  version = "3.6.3"
+  version = "3.7.2"
   hashes = [
-    "h1:zG9uFP8l9u+yGZZvi5Te7PV62j50azpgwPunq2vTm1E=",
-    "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451",
-    "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8",
-    "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe",
-    "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1",
-    "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36",
-    "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e",
+    "h1:KG4NuIBl1mRWU0KD/BGfCi1YN/j3F7H4YgeeM7iSdNs=",
+    "zh:14829603a32e4bc4d05062f059e545a91e27ff033756b48afbae6b3c835f508f",
+    "zh:1527fb07d9fea400d70e9e6eb4a2b918d5060d604749b6f1c361518e7da546dc",
+    "zh:1e86bcd7ebec85ba336b423ba1db046aeaa3c0e5f921039b3f1a6fc2f978feab",
+    "zh:24536dec8bde66753f4b4030b8f3ef43c196d69cccbea1c382d01b222478c7a3",
+    "zh:29f1786486759fad9b0ce4fdfbbfece9343ad47cd50119045075e05afe49d212",
+    "zh:4d701e978c2dd8604ba1ce962b047607701e65c078cb22e97171513e9e57491f",
     "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30",
-    "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615",
-    "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad",
-    "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556",
-    "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0",
+    "zh:7b8434212eef0f8c83f5a90c6d76feaf850f6502b61b53c329e85b3b281cba34",
+    "zh:ac8a23c212258b7976e1621275e3af7099e7e4a3d4478cf8d5d2a27f3bc3e967",
+    "zh:b516ca74431f3df4c6cf90ddcdb4042c626e026317a33c53f0b445a3d93b720d",
+    "zh:dc76e4326aec2490c1600d6871a95e78f9050f9ce427c71707ea412a2f2f1a62",
+    "zh:eac7b63e86c749c7d48f527671c7aee5b4e26c10be6ad7232d6860167f99dbb0",
   ]
 }
 
 provider "registry.terraform.io/mongodb/mongodbatlas" {
-  version     = "1.19.0"
-  constraints = "1.19.0"
+  version     = "1.33.0"
+  constraints = "1.33.0"
   hashes = [
-    "h1:zzKWs4GzWXo+ImMQud/b0ECObJmbtB2wCrK3b98z1ms=",
-    "zh:3a8198e83b9b2dd1c461049f19464e82ce3f24d9fa7508e0e6dd642e2be70f73",
-    "zh:3a89a8395624a8e8516c6147b1612798f05e59ed3f13c1f6d8878099c9ca5f6e",
-    "zh:41ff89b10d5f1069d4bfa093e2d9297f1670863716f60d7b874f076bc37bc2ac",
-    "zh:5baf75906ccfc658be79b4c02c86032943af18c159f9c80a067ed696f23db527",
-    "zh:697aa8aebc5f4f8b6c42ba33bd1fec5ab8244555905bf6c6482ebf4733fe7976",
-    "zh:6d7fe4c2bca1e34e0c881266a463bbe16dd9a2934b7fa6d116c711a56b895f6f",
-    "zh:6dca00e357d04fbaeab6d2fa336c6704e289c076beef250a3cfe948a901bc4d4",
-    "zh:877a40cabcc49ee9fb40143dcbd6253d0c08ac1603a71e2cf2dde2d1fbfde574",
-    "zh:8a43a657196f4917f32f07ea91f056a2be6e7adb8a1fb7df4517ad9b71362c30",
-    "zh:91ef30b6020da3d5c5781ea6718b5f785c1eb3c7f4677343b31af2297d9f3558",
-    "zh:9bbc42509526c942db3979eaacd15b96ad454777993a0b002f908f9e9fcef51c",
-    "zh:b11fd160fcdd9cf7423283af7e0c3f0970b391b5a62ec30fe699ffdd54351896",
-    "zh:c297a0a188141741f14578cd8db41c309361e37b1b0904e635a7ebd0993e86f7",
-    "zh:c8af40986dbc42e77d0e34af7ea2d730cb87aa0471236392dbea0926ab95159a",
+    "h1:z8zdSte741iw5ij4wkY8XBAXftY7gEsFjYRMjyk1EX0=",
+    "zh:04e26c9e1dfd11c114c5dbd4e4375bb3a329fbaa2f39f92d01f6bba9d76923ba",
+    "zh:1d175f30a1a2505578c63d7ef76c7c1c846d086ab0e6a1bcebf32d3bfe10a2f6",
+    "zh:1fd08f988587efa41121dbe0cae7298fa8aa739c0038aa2443f8deb53e7367ad",
+    "zh:4c6c337f7a53882e8b5431ba13276bfd1f423becfd4dbbcb0f68443532354455",
+    "zh:4f7028a474d00012280a6069d74584e6eeda2f85be2300040012210f91daa97a",
+    "zh:6ad4d292b60350dae24eb1a6721a7b35f34129ad42a00125ffb7ab6b4565eb15",
+    "zh:6c8f5a14edd77433f559e8440c2b6ee7333c13e5256aa76a17eb585046bef0c1",
+    "zh:8e18a10107beeb9d677e96cc0b25b6f48be9dfbedc62da7bdde7b03b9bfc34b7",
+    "zh:9130c4a1c06ba4587235c479eae182f86b4baadd82a90bd3c69ad54cf2a8c37d",
+    "zh:a1464ff45db030c6b94f9e80e5890061baf4cb3a8595d473d422e2778fc6a5fb",
+    "zh:a20f97e43befeb8a0737cfc2f1a3ea3e483d5928e0baf7dc841bad67d21ac90b",
+    "zh:d3e440568d5f3d2197555ba614d08950cb7fbdf605f3ec2f4b6fc9edff563668",
+    "zh:de11d29abae0ceefd11b6d21575c3335b586d9b27fd5a8ebc8c40a6ce67c01a9",
+    "zh:fea06f8ccd2aec629ca7f24b4cbbd8cba832044d7ee0ee395b3c6e8eab4ed903",
   ]
 }

atlas_init/tf/always.tf

@@ -10,7 +10,7 @@ resource "random_password" "username" {
 
 data "http" "myip" {
   count = var.use_project_myip ? 1 : 0
-  url = "https://ipv4.icanhazip.com"
+  url   = "https://ipv4.icanhazip.com"
 }
 
 data "http" "last_provider_version" {
@@ -35,18 +35,18 @@ resource "mongodbatlas_project" "project" {
   name   = var.project_name
   org_id = var.org_id
 
-  tags = local.tags
+  tags                      = local.tags
   region_usage_restrictions = var.is_mongodbgov_cloud ? "GOV_REGIONS_ONLY" : null
-  project_owner_id = length(var.user_id) > 0 ? var.user_id : null
+  project_owner_id          = length(var.user_id) > 0 ? var.user_id : null
 }
 
 resource "mongodbatlas_project_ip_access_list" "mongo-access" {
-  count = var.use_project_myip ? 1 : 0
+  count      = var.use_project_myip ? 1 : 0
   project_id = mongodbatlas_project.project.id
   cidr_block = "${chomp(data.http.myip[0].response_body)}/32"
 }
 
 data "mongodbatlas_atlas_user" "this" {
-  count = length(var.user_id) > 0 ? 1 : 0
+  count   = length(var.user_id) > 0 ? 1 : 0
   user_id = var.user_id
 }

atlas_init/tf/main.tf

@@ -141,9 +141,9 @@ module "aws_kms" {
   access_iam_role_arns = {
     atlas = module.cloud_provider[0].iam_role_arn
   }
-  aws_account_id       = local.aws_account_id
-  aws_region           = var.aws_region
-  key_suffix           = var.project_name
+  aws_account_id = local.aws_account_id
+  aws_region     = var.aws_region
+  key_suffix     = var.project_name
 }
 
 module "federated_vars" {

atlas_init/tf/modules/aws_kms/aws_kms.tf

@@ -5,7 +5,7 @@ variable "aws_region" {
   type = string
 }
 variable "access_iam_role_arns" {
-  type = map(string)
+  type        = map(string)
   description = "static name to arn"
 }
 

atlas_init/tf/modules/aws_s3/provider.tf

@@ -2,8 +2,9 @@ terraform {
   required_providers {
     mongodbatlas = {
       source  = "mongodb/mongodbatlas"
-      version = "1.19.0"
+      version = "1.33"
     }
   }
+
   required_version = ">= 1.0"
 }

atlas_init/tf/modules/aws_vpc/provider.tf

@@ -2,11 +2,12 @@ terraform {
   required_providers {
     mongodbatlas = {
       source  = "mongodb/mongodbatlas"
-      version = "1.19.0"
+      version = "1.33"
     }
     aws = {
       source = "hashicorp/aws"
     }
   }
+
   required_version = ">= 1.0"
 }

atlas_init/tf/modules/cfn/cfn.tf

@@ -1,11 +1,3 @@
-terraform {
-  required_providers {
-    aws = {
-      source = "hashicorp/aws"
-    }
-  }
-}
-
 locals {
   services_yaml         = file("${path.module}/assume_role_services.yaml")
   resource_actions_yaml = file("${path.module}/resource_actions.yaml")

atlas_init/tf/modules/cfn/kms.tf

@@ -19,13 +19,13 @@ locals {
         Resource  = "*"
       },
       {
-        Sid       = "Enable IAM User Permissions for Role",
-        Effect    = "Allow",
+        Sid    = "Enable IAM User Permissions for Role",
+        Effect = "Allow",
         Principal = {
           AWS = "*"
         }
-        Action    = "kms:Decrypt",
-        Resource  = "*"
+        Action   = "kms:Decrypt",
+        Resource = "*"
         Condition = {
           StringEquals = {
             "aws:PrincipalArn" = "arn:aws:iam::${var.aws_account_id}:role/${local.role_name}"
@@ -50,5 +50,5 @@ resource "aws_kms_key" "this" {
   count                   = var.use_kms_key ? 1 : 0
   description             = "KMS key for ${var.cfn_profile}"
   deletion_window_in_days = 7
-  policy = local.kms_key_policy_json
+  policy                  = local.kms_key_policy_json
 }

atlas_init/tf/modules/cfn/provider.tf

@@ -0,0 +1,7 @@
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+    }
+  }
+}

atlas_init/tf/modules/cfn/variables.tf

@@ -18,7 +18,7 @@ variable "tags" {
 }
 
 variable "use_kms_key" {
-  type = bool
+  type    = bool
   default = false
 }
 

atlas_init/tf/modules/cloud_provider/cloud_provider.tf

@@ -48,7 +48,7 @@ EOF
 
 output "env_vars" {
   value = {
-    IAM_ROLE_ID = mongodbatlas_cloud_provider_access_authorization.auth_role.role_id
+    IAM_ROLE_ID      = mongodbatlas_cloud_provider_access_authorization.auth_role.role_id
     AWS_IAM_ROLE_ARN = aws_iam_role.aws_role.arn
   }
 }

atlas_init/tf/modules/cloud_provider/provider.tf

@@ -2,12 +2,13 @@ terraform {
   required_providers {
     mongodbatlas = {
       source  = "mongodb/mongodbatlas"
-      version = "1.19.0"
+      version = "1.33"
     }
     aws = {
       source  = "hashicorp/aws"
       version = "~> 5.0"
     }
   }
+
   required_version = ">= 1.0"
 }