atlas-init 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

atlas_init/__init__.py

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

atlas_init/cli_tf/debug_logs.py

@@ -98,12 +98,12 @@ class SDKRoundtrip(Entity):
     @property
     def version(self) -> str:
         content_type = self.response.headers.get("Content-Type", "v1")
-        try:
+        content_type_req = self.request.headers.get("Accept", "v1")
+        with suppress(ValueError):
             return extract_version(content_type)
-        except ValueError:
-            logger.warning(f"failed to extract version from response header ({content_type}), trying request")
-        content_type = self.request.headers.get("Accept", "v1")
-        return extract_version(content_type)
+        with suppress(ValueError):
+            return extract_version(content_type_req)
+        raise ValueError(f"Could not extract version from req/resp: {content_type} or {content_type_req}")
 
     @model_validator(mode="after")
     def ensure_match(self) -> Self:
@@ -159,7 +159,7 @@ def parse_http_requests(logs: str) -> list[SDKRoundtrip]:
     Can say that expected payload is either a list or a dict and if it ends with an identifier it is higher chance for a dict
     """
     test_name = parse_test_name(logs)
-    logger.info(f"Finding http requests for test name: {test_name}")
+    logger.info(f"Finding http requests for test name: '{test_name}'")
     requests, responses = parse_raw_req_responses(logs)
     tf_step_starts = [i for i, line in enumerate(logs.splitlines()) if MARKER_START_STEP in line]
     used_responses: set[int] = set()

atlas_init/cli_tf/debug_logs_test_data.py

@@ -31,7 +31,7 @@ class RequestInfo(Entity):
 
     @property
     def id(self):
-        return "__".join((self.method, self.path, self.version, self.text))  # noqa: FLY002
+        return "__".join(part for part in (self.method, self.path, self.version, self.text) if part)
 
 
 class StepRequests(Entity):
@@ -143,9 +143,9 @@ class MockRequestData(Entity):
     def replace_text_variables(self):
         for step in self.steps:
             for request in step.all_requests:
-                request.text = normalize_text(request.text, self.variables)
+                request.text = normalize_text(request.text, self.variables, expect_json=True)
                 for response in request.responses:
-                    response.text = normalize_text(response.text, self.variables)
+                    response.text = normalize_text(response.text, self.variables, expect_json=True)
 
     def prune_duplicate_responses(self):
         for step in self.steps:
@@ -202,10 +202,10 @@ def find_normalized_path(path: str, api_spec_paths: list[ApiSpecPath]) -> ApiSpe
     raise ValueError(f"Could not find path: {path}")
 
 
-def normalize_text(text: str, variables: dict[str, str]) -> str:
+def normalize_text(text: str, variables: dict[str, str], *, expect_json: bool = False) -> str:
     for var, value in variables.items():
         text = text.replace(value, f"{{{var}}}")
-    if not text:
+    if not text or not expect_json:
         return text
     try:
         parsed_text = json.loads(text)
@@ -260,8 +260,8 @@ def create_mock_data(
         for modifier in modifiers:
             if modifier.match(rt, normalized_path):
                 modifier.modification(rt)
-        normalized_text = normalize_text(rt.request.text, mock_data.variables)
-        normalized_response_text = normalize_text(rt.response.text, mock_data.variables)
+        normalized_text = normalize_text(rt.request.text, mock_data.variables, expect_json=True)
+        normalized_response_text = normalize_text(rt.response.text, mock_data.variables, expect_json=True)
         mock_data.add_roundtrip(rt, normalized_path, normalized_text, normalized_response_text, is_diff(rt))
     mock_data.replace_text_variables()
     if prune_duplicates:

atlas_init/cli_tf/mock_tf_log.py

@@ -1,11 +1,14 @@
 import json
 import logging
 import time
+from collections.abc import Callable
+from io import StringIO
 from pathlib import Path
 from typing import Self
 
 import typer
-from model_lib import Entity, dump
+import yaml
+from model_lib import Entity
 from pydantic import Field, model_validator
 from zero_3rdparty import file_utils
 
@@ -15,8 +18,16 @@ from atlas_init.cli_tf.debug_logs import (
     parse_http_requests,
     parse_test_name,
 )
-from atlas_init.cli_tf.debug_logs_test_data import create_mock_data, default_is_diff
-from atlas_init.repos.go_sdk import api_spec_path_transformed, download_admin_api, parse_api_spec_paths
+from atlas_init.cli_tf.debug_logs_test_data import (
+    RTModifier,
+    create_mock_data,
+    default_is_diff,
+)
+from atlas_init.repos.go_sdk import (
+    api_spec_path_transformed,
+    download_admin_api,
+    parse_api_spec_paths,
+)
 from atlas_init.settings.path import DEFAULT_DOWNLOADS_DIR
 
 logger = logging.getLogger(__name__)
@@ -28,6 +39,8 @@ class MockTFLog(Entity):
     admin_api_path: Path
     diff_skip_suffixes: list[str] = Field(default_factory=list)
     keep_duplicates: bool = False
+    modifiers: list[RTModifier] = Field(default_factory=list)
+    log_diff_roundtrips: bool = False
 
     @model_validator(mode="after")
     def ensure_paths_exist(self) -> Self:
@@ -44,22 +57,40 @@ class MockTFLog(Entity):
         return default_is_diff(rt) and not any(rt.request.path.endswith(suffix) for suffix in self.diff_skip_suffixes)
 
 
-def mock_tf_log(req: MockTFLog) -> None:
+def mock_tf_log(req: MockTFLog) -> Path:
     log_file_text = req.log_path.read_text()
     test_name = parse_test_name(log_file_text)
     roundtrips = parse_http_requests(log_file_text)
+    logger.info(f"Found #{len(roundtrips)} roundtrips")
+    if req.log_diff_roundtrips:
+        log_diff_roundtrips(roundtrips, req.differ)
     api_spec_paths = parse_api_spec_paths(req.admin_api_path)
     data = create_mock_data(
         roundtrips,
         api_spec_paths,
         is_diff=req.differ,
         prune_duplicates=not req.keep_duplicates,
+        modifiers=req.modifiers,
     )
     # avoid anchors
-    data_yaml = dump(json.loads(dump(data, "json")), "yaml")
+    data_json = data.model_dump_json(exclude_none=True)
+    data_parsed = json.loads(data_json)
+    s = StringIO()
+    yaml.safe_dump(
+        data_parsed,
+        s,
+        default_flow_style=False,
+        width=100_000,
+        allow_unicode=True,
+        sort_keys=False,
+    )
+    data_yaml = s.getvalue()
+    test_name = test_name.replace("TestAcc", "TestMock")
     output_path = req.output_dir / f"{test_name}.yaml"
+    logger.info(f"Variables found {data.variables}")
     logger.info(f"Writing to {output_path}")
     file_utils.ensure_parents_write_text(output_path, data_yaml)
+    return output_path
 
 
 def mock_tf_log_cmd(
@@ -68,7 +99,7 @@ def mock_tf_log_cmd(
         "",
         "-o",
         "--output-testdir",
-        help="the path to the output test directory, for example: internal/service/advancedclustertpf/testdata/, uses cwd/testdata by default",
+        help="the path to the output test directory, for example: internal/service/advancedclustertpf/testdata/, uses $(cwd)/testdata by default",
     ),
     sdk_repo_path_str: str = option_sdk_repo_path,
     sdk_branch: str = typer.Option("main", "-b", "--branch", help="the branch for downloading openapi spec"),
@@ -77,6 +108,9 @@ def mock_tf_log_cmd(
     ),
     diff_skip_suffixes: list[str] = typer.Option(..., "-s", "--skip-suffixes", default_factory=list),
     keep_duplicates: bool = typer.Option(False, "-keep", "--keep-duplicates", help="keep duplicate requests"),
+    log_diff_roundtrips: bool = typer.Option(
+        False, "-l", "--log-diff-roundtrips", help="print out the roundtrips used in diffs"
+    ),
 ):
     cwd = Path.cwd()
     default_testdir = cwd / "testdata"
@@ -87,6 +121,7 @@ def mock_tf_log_cmd(
         admin_api_path=resolved_admin_api_path,
         diff_skip_suffixes=diff_skip_suffixes,
         keep_duplicates=keep_duplicates,
+        log_diff_roundtrips=log_diff_roundtrips,
     )
     mock_tf_log(event_in)
 
@@ -116,3 +151,20 @@ def resolve_admin_api_path(sdk_repo_path_str: str, sdk_branch: str, admin_api_pa
     assert resolved_admin_api_path.exists(), f"unable to resolve admin_api_path={resolved_admin_api_path}"
     assert resolved_admin_api_path.is_file(), f"not a file admin_api_path={resolved_admin_api_path}"
     return resolved_admin_api_path
+
+
+def log_diff_roundtrips(roundtrips: list[SDKRoundtrip], differ: Callable[[SDKRoundtrip], bool] | None = None):
+    differ = differ or default_is_diff
+    diff_count = 0
+    step_nr = 0
+    for rt in roundtrips:
+        if not differ(rt):
+            continue
+        if rt.step_number != step_nr:
+            logger.info(f"{'-' * 80}\nStep {rt.step_number}")
+            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}"
+        )
+    logger.info(f"Diffable requests: {diff_count}")

{atlas_init-0.3.1.dist-info → atlas_init-0.3.2.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-atlas_init/__init__.py,sha256=Mja1wzBho0kdXUYEG2JEXu72cDv6N_Uf0xLaUN7aQsA,372
+atlas_init/__init__.py,sha256=5-YoPkhK1DsNmcQTFT5lp8zxJ26l6WRY5tMcoGBug6o,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
@@ -23,13 +23,13 @@ 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=lnB5BpcEooVzGd2RLxbwAVQs0ZYXzRKy5sHa0hftHI8,8799
-atlas_init/cli_tf/debug_logs_test_data.py,sha256=bv4gqhHSNEnQqIijrcjvEUA0M6S-aeo73V4mji0pKCM,9435
+atlas_init/cli_tf/debug_logs.py,sha256=r9kRMzgZGP7SB0eK7hhbxETfI28yyHFtSpvSFe9NGC4,8839
+atlas_init/cli_tf/debug_logs_test_data.py,sha256=G4pnuWJ7PAQd3NXRKAtwAPC6Ne-PgpzaTZHQ9waqxZI,9565
 atlas_init/cli_tf/github_logs.py,sha256=VD7qhlXNuG21eTuJ5VI7rsflp5WHSodfngkRVgQlumw,8114
 atlas_init/cli_tf/go_test_run.py,sha256=ZoQSvIasmWauFxZJrWL0ObFX-P0k-D3c_ep3OnPY4zs,5842
 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=c0geBR74UkHiyElnV0R_yTuXUgP4F_H53rbGj6D99yc,4958
+atlas_init/cli_tf/mock_tf_log.py,sha256=u_d6c-lVo3eDddpW3V5r3FJfvQvoyrC8NnOGS1bYpR8,6572
 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
@@ -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.3.1.dist-info/METADATA,sha256=vb-qsxAC6t4yI4ec_x1L-nYaGT2sGSt0LCIRHBPSgl8,5650
-atlas_init-0.3.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-atlas_init-0.3.1.dist-info/entry_points.txt,sha256=oSNFIEAS9nUZyyZ8Fc-0F0U5j-NErygy01LpJVSHapQ,57
-atlas_init-0.3.1.dist-info/RECORD,,
+atlas_init-0.3.2.dist-info/METADATA,sha256=foETVpu_FKi1rkGOJB158pmAftoNYFiG9VNr1kPBPvA,5650
+atlas_init-0.3.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+atlas_init-0.3.2.dist-info/entry_points.txt,sha256=oSNFIEAS9nUZyyZ8Fc-0F0U5j-NErygy01LpJVSHapQ,57
+atlas_init-0.3.2.dist-info/RECORD,,