atlas-init 0.3.5__py3-none-any.whl → 0.3.7__py3-none-any.whl

atlas_init/__init__.py

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

atlas_init/cli_tf/debug_logs.py

@@ -32,7 +32,16 @@ class PathHeadersPayload(Entity):
 
     @property
     def expect_list_response(self) -> bool:
-        return self.method == "GET" and self.path.endswith("s") and all(not c.isdigit() for c in self.path)
+        final_path = self.path.split("/")[-1]
+        if final_path in {"settings", "processArgs"}:
+            return False
+        return self.method == "GET" and self.path.endswith("s") and all(not c.isdigit() for c in final_path)
+
+    @model_validator(mode="after")
+    def normalize_path(self) -> Self:
+        if "?" in self.path:
+            self.path = self.path.split("?", 1)[0]
+        return self
 
 
 def parse_request(request_lines: list[str]) -> PathHeadersPayload:
@@ -107,13 +116,28 @@ class SDKRoundtrip(Entity):
             return extract_version(content_type_req)
         raise ValueError(f"Could not extract version from req/resp: {content_type} or {content_type_req}")
 
+    @property
+    def java_method_match(self) -> bool:
+        java_method = self.response.headers.get("X-Java-Method")
+        if not java_method:
+            return False
+        java_method_final = java_method.split("::")[-1]
+        final_req_path = self.request.path.split("/")[-1]
+        return final_req_path.lower() in java_method_final.lower()
+
     @model_validator(mode="after")
     def ensure_match(self) -> Self:
+        if self.java_method_match:
+            return self
         req = self.request
         resp = self.response
-        _, resp_payload_list, __ = parsed(resp.text)
-        if req.expect_list_response and resp_payload_list is None:
+        resp_payload_dict, resp_payload_list, __ = parsed(resp.text)
+        resp_payload_dict = resp_payload_dict or {}
+        want_list = req.expect_list_response
+        if want_list and resp_payload_list is None and "results" not in resp_payload_dict:
             raise ValueError(f"Expected list response but got dict: {resp.text}")
+        if not want_list and (resp_payload_list or "results" in resp_payload_dict):
+            raise ValueError(f"Expected dict response but got list: {resp.text}")
         return self
 
     def __lt__(self, other) -> bool:
@@ -201,7 +225,7 @@ def match_request(
                 step_number=step_number,
             )
     remaining_responses = [resp for i, resp in enumerate(responses_list) if i not in used_responses]
-    err_msg = f"Could not match request {ref} with any response\n\n{request}\n\n\nThere are #{len(remaining_responses)} responses left that doesn't match\n{'-'*80}\n{'\n'.join(r.text for r in remaining_responses)}"
+    err_msg = f"Could not match request {request.path} ({ref}) with any response\n\n{request}\n\n\nThere are #{len(remaining_responses)} responses left that doesn't match\n{'-'*80}\n{'\n'.join(r.text for r in remaining_responses)}"
     raise ValueError(err_msg)
 
 

atlas_init/cli_tf/debug_logs_test_data.py

@@ -101,8 +101,6 @@ class MockRequestData(Entity):
         is_diff: bool,
     ):
         step = self.steps[rt.step_number - 1]
-        if rt.request.method == "PATCH":
-            logger.info(f"PATCH: {rt.request.path}")
         step.add_request(
             normalized_path,
             rt.request.method,

atlas_init/cli_tf/debug_logs_test_data_package_config.py

@@ -46,3 +46,10 @@ def package_skip_suffixes(pkg_name: str) -> list[str]:
     if pkg_name == "resourcepolicy":
         return [":validate"]
     return []
+
+
+def package_must_substrings(pkg_name: str) -> list[str]:
+    # sourcery skip: assign-if-exp, reintroduce-else
+    if pkg_name == "advancedcluster":
+        return ["/clusters"]
+    return []

atlas_init/cli_tf/mock_tf_log.py

@@ -23,7 +23,11 @@ from atlas_init.cli_tf.debug_logs_test_data import (
     create_mock_data,
     default_is_diff,
 )
-from atlas_init.cli_tf.debug_logs_test_data_package_config import package_modifiers, package_skip_suffixes
+from atlas_init.cli_tf.debug_logs_test_data_package_config import (
+    package_modifiers,
+    package_must_substrings,
+    package_skip_suffixes,
+)
 from atlas_init.repos.go_sdk import (
     api_spec_path_transformed,
     download_admin_api,
@@ -39,6 +43,7 @@ class MockTFLog(Entity):
     output_dir: Path
     admin_api_path: Path
     diff_skip_suffixes: list[str] = Field(default_factory=list)
+    diff_must_substrings: list[str] = Field(default_factory=list)
     keep_duplicates: bool = False
     modifiers: list[RTModifier] = Field(default_factory=list)
     package_name: str = ""
@@ -57,10 +62,16 @@ class MockTFLog(Entity):
         if (package_name := self.package_name) and not self.skip_default_package_config:
             self.modifiers.extend(package_modifiers(package_name))
             self.diff_skip_suffixes.extend(package_skip_suffixes(package_name))
+            self.diff_must_substrings.extend(package_must_substrings(package_name))
         return self
 
     def differ(self, rt: SDKRoundtrip) -> bool:
-        return default_is_diff(rt) and not any(rt.request.path.endswith(suffix) for suffix in self.diff_skip_suffixes)
+        is_diff = default_is_diff(rt) and not any(
+            rt.request.path.endswith(suffix) for suffix in self.diff_skip_suffixes
+        )
+        if is_diff and self.diff_must_substrings:
+            return is_diff and all(substring in rt.request.path for substring in self.diff_must_substrings)
+        return is_diff
 
 
 def mock_tf_log(req: MockTFLog) -> Path:
@@ -117,6 +128,7 @@ def mock_tf_log_cmd(
     log_diff_roundtrips: bool = typer.Option(
         False, "-l", "--log-diff-roundtrips", help="print out the roundtrips used in diffs"
     ),
+    package_name: str = typer.Option("", "-p", "--package-name", help="the package name to use for modifiers"),
 ):
     cwd = Path.cwd()
     default_testdir = cwd / "testdata"
@@ -128,6 +140,7 @@ def mock_tf_log_cmd(
         diff_skip_suffixes=diff_skip_suffixes,
         keep_duplicates=keep_duplicates,
         log_diff_roundtrips=log_diff_roundtrips,
+        package_name=package_name,
     )
     mock_tf_log(event_in)
 
@@ -171,6 +184,6 @@ def log_diff_roundtrips(roundtrips: list[SDKRoundtrip], differ: Callable[[SDKRou
             step_nr = rt.step_number
         diff_count += 1
         logger.info(
-            f"\n{rt.request.method} {rt.request.path}\n{rt.request.text}\n{rt.response.status}-{rt.response.status_text}\n{rt.response.text}"
+            f"\n{rt.request.method} {rt.request.path} {rt.version}\n{rt.request.text}\n{rt.response.status}-{rt.response.status_text}\n{rt.response.text}"
         )
     logger.info(f"Diffable requests: {diff_count}")

{atlas_init-0.3.5.dist-info → atlas_init-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: atlas-init
-Version: 0.3.5
+Version: 0.3.7
 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.3.5.dist-info → atlas_init-0.3.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atlas_init/__init__.py,sha256=bmmvmAoWZR99QstJeXgp8n5fDtO2RL8UYwdJpDBOnj8,372
+atlas_init/__init__.py,sha256=6fPQOXGNVhrm-NHeu2MniZbhzKrbg2XjuDcXCG4gGqY,372
 atlas_init/__main__.py,sha256=dY1dWWvwxRZMmnOFla6RSfti-hMeLeKdoXP7SVYqMUc,52
 atlas_init/atlas_init.yaml,sha256=OAosOZw4kjhTWcPeEv0jtztRFWRhsie8D9r5afySAxM,2065
 atlas_init/cli.py,sha256=xOnAOUccHDLkivICdF0GsLhccr_IxvnTKTbe1KGW7kU,8971
@@ -24,14 +24,14 @@ atlas_init/cli_root/trigger.py,sha256=oEgqb_l25tyYgUaFHEuChcOCJA7k3mnRa4D-Myz-Ig
 atlas_init/cli_tf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atlas_init/cli_tf/app.py,sha256=0Y5c-Pc9ibOz6kXvFlL-yhH_fx1nHLgBgK9OAVqjX9s,11390
 atlas_init/cli_tf/changelog.py,sha256=biWYKf1pZvXZ-jEgcZ5q9sY7nTGrL2PuI0h9mCILf_g,3181
-atlas_init/cli_tf/debug_logs.py,sha256=q71ZNOnQOz1ikPCyqUz_6zyd4Bm1QVkCkTcixJBZ1xI,8988
-atlas_init/cli_tf/debug_logs_test_data.py,sha256=G4pnuWJ7PAQd3NXRKAtwAPC6Ne-PgpzaTZHQ9waqxZI,9565
-atlas_init/cli_tf/debug_logs_test_data_package_config.py,sha256=0GB-m8l9TWL4vstnFVO2jw5Jvtlz9WfHTp-9RmaPugw,1473
+atlas_init/cli_tf/debug_logs.py,sha256=NvIEtOb30aK_drYgNyYDsXt7uNtw6L9vhIZicANyDRQ,10022
+atlas_init/cli_tf/debug_logs_test_data.py,sha256=-KfhlVgp00zXzV0XMVbABEwKpBZ_r2B-cjBKLuhiBZU,9471
+atlas_init/cli_tf/debug_logs_test_data_package_config.py,sha256=BOAgln1pWne_ZhP6a0SM2ddn2csr0sgGkYf2kMS_V9o,1666
 atlas_init/cli_tf/github_logs.py,sha256=VD7qhlXNuG21eTuJ5VI7rsflp5WHSodfngkRVgQlumw,8114
 atlas_init/cli_tf/go_test_run.py,sha256=LQUQ-3zJ8EUCixwu33QTAzUns3um793osst8tE0UKjk,6792
 atlas_init/cli_tf/go_test_run_format.py,sha256=OUd6QPHDeTzbwVuh6MhP-xXgjOOGP9W_sCLJ8KylBTs,1201
 atlas_init/cli_tf/go_test_summary.py,sha256=agr4SITgxchjgOzRpScoTUk-iG38QDLkpnsMtTW9GTY,5382
-atlas_init/cli_tf/mock_tf_log.py,sha256=311sUVpxbvcz6Qdpz2Z1kFQm67zfjs4aUsQOKrJ2LrY,6988
+atlas_init/cli_tf/mock_tf_log.py,sha256=1Q5OWkDM1Dxac5vhG-vMVGScDBnXmwruZjsHDya5Uu4,7546
 atlas_init/cli_tf/schema.py,sha256=iwvb4wD2Wba0MMu7ooTNAIi1jHbpLiXGPOT51_o_YW8,12431
 atlas_init/cli_tf/schema_go_parser.py,sha256=PiRfFFVnkhltxcGFfOCgH53wwzIEynw2BXmSfaINLL8,8294
 atlas_init/cli_tf/schema_inspection.py,sha256=ujLvGfg3baByND4nRD0drZoI45STxo3VfYvim-PfVOc,1764
@@ -88,7 +88,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.3.5.dist-info/METADATA,sha256=1JS-oOF2C-MZatON3IcBf3QlOC_KVuU0Xl61MBWEYco,5650
-atlas_init-0.3.5.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-atlas_init-0.3.5.dist-info/entry_points.txt,sha256=oSNFIEAS9nUZyyZ8Fc-0F0U5j-NErygy01LpJVSHapQ,57
-atlas_init-0.3.5.dist-info/RECORD,,
+atlas_init-0.3.7.dist-info/METADATA,sha256=JsyU3TvkLcpLmTq0QDcuavjTz-J6l31nZf6qsTvljxs,5650
+atlas_init-0.3.7.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+atlas_init-0.3.7.dist-info/entry_points.txt,sha256=oSNFIEAS9nUZyyZ8Fc-0F0U5j-NErygy01LpJVSHapQ,57
+atlas_init-0.3.7.dist-info/RECORD,,