Bump: Update pyavd-utils to 0.0.2 (#6527)

Co-authored-by: Claus Holbech <[email protected]>

Author: gmuloc

.gitignore

@@ -35,6 +35,8 @@ dist/
 .pytest_cache/
 ## pyenv
 .python-version
+## direnv
+.envrc
 ## .vscode/*
 .vscode/
 

.pre-commit-config.yaml

@@ -133,7 +133,7 @@ repos:
           - 'anta==1.7.0'
           - 'deepmerge>=1.1.0'
           - 'jsonschema-rs>=0.24'
-          - 'pyavd-utils==0.0.2.dev3'
+          - 'pyavd-utils==0.0.2'
           - 'pydantic>=2.3.0'
           - 'pytest>=8.2.0'
           - 'pyyaml>=6.0.0'

ansible_collections/arista/avd/plugins/action/validate_inputs.py

@@ -269,7 +269,7 @@ def _get_validation_configuration(self, validated_args: dict[Any, Any]) -> Confi
 
         configuration = Configuration()
         if (warn_eos_config_keys := validation_configuration.get("warn_eos_config_keys")) is not None:
-            configuration.warn_eos_cli_config_gen_keys = warn_eos_config_keys
+            configuration.warn_eos_config_keys = warn_eos_config_keys
 
         return configuration
 

pyproject.toml

@@ -7,7 +7,7 @@ dev = [
     "cryptography>=43.0.0",
     "deepmerge>=1.1.0",
     "netaddr>=0.7.19",
-    "pyavd-utils==0.0.2.dev3",
+    "pyavd-utils==0.0.2",
     "python-socks[asyncio]>=2.7.2",
     "pyyaml>=6.0.0",
     # dev requirements"

python-avd/pyavd/validate_inputs.py

@@ -33,7 +33,7 @@ def validate_inputs(inputs: dict, *, configuration: Configuration | None = None)
     from pyavd_utils.validation import Configuration, get_validated_data  # noqa: PLC0415
 
     # Use default configuration if not provided
-    configuration = configuration or Configuration(warn_eos_cli_config_gen_keys=True)
+    configuration = configuration or Configuration(warn_eos_config_keys=True)
 
     from ._schema.store import init_store  # noqa: PLC0415
     from .api.validation import ValidatedDataResult  # noqa: PLC0415
@@ -46,5 +46,5 @@ def validate_inputs(inputs: dict, *, configuration: Configuration | None = None)
         msg = f"Unable to serialize inputs: {e}"
         raise ValueError(msg) from e
 
-    pyavd_utils_validated_data_result = get_validated_data(data_as_json=data_as_json, schema_name="eos_designs", configuration=configuration)
+    pyavd_utils_validated_data_result = get_validated_data(data_as_json=data_as_json, schema_name="avd_design", configuration=configuration)
     return ValidatedDataResult._from_pyavd_utils_validated_data_result(pyavd_utils_validated_data_result)

python-avd/pyavd/validate_structured_config.py

@@ -39,5 +39,5 @@ def validate_structured_config(structured_config: dict) -> ValidatedDataResult:
         msg = f"Unable to serialize structured_config: {e}"
         raise ValueError(msg) from e
 
-    pyavd_utils_validated_data_result = get_validated_data(data_as_json=data_as_json, schema_name="eos_cli_config_gen")
+    pyavd_utils_validated_data_result = get_validated_data(data_as_json=data_as_json, schema_name="eos_config")
     return ValidatedDataResult._from_pyavd_utils_validated_data_result(pyavd_utils_validated_data_result)

python-avd/pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
     # pinned grpclib since we patch the connection code to get proxy support
     "grpclib==0.4.9",
     "jinja2>=3.0",
-    "pyavd-utils==0.0.2.dev3",
+    "pyavd-utils==0.0.2",
     "python-socks[asyncio]>=2.7.2",
     "pyyaml>=6.0.0",
     "requests>=2.27.0",

python-avd/tests/pyavd/molecule_scenarios/test_validate_inputs.py

@@ -49,7 +49,7 @@ def test_validate_inputs_with_eos_cli_config_gen_keys() -> None:
     }
 
     # Test with warnings enabled
-    configuration = Configuration(warn_eos_cli_config_gen_keys=True)
+    configuration = Configuration(warn_eos_config_keys=True)
     validated_data_result = validate_inputs(inputs, configuration=configuration)
 
     # Should have no violations
@@ -58,7 +58,7 @@ def test_validate_inputs_with_eos_cli_config_gen_keys() -> None:
     # Should have ignored_eos_config_keys
     assert len(validated_data_result.validation_result.ignored_eos_config_keys) == 1
     assert validated_data_result.validation_result.ignored_eos_config_keys[0].path == ["dns_domain"]
-    assert "eos_cli_config_gen" in validated_data_result.validation_result.ignored_eos_config_keys[0].message
+    assert "EOS Config" in validated_data_result.validation_result.ignored_eos_config_keys[0].message
 
 
 def test_validate_inputs_with_eos_cli_config_gen_keys_disabled() -> None:
@@ -74,7 +74,7 @@ def test_validate_inputs_with_eos_cli_config_gen_keys_disabled() -> None:
     }
 
     # Test with warnings disabled using Configuration object
-    configuration = Configuration(warn_eos_cli_config_gen_keys=False)
+    configuration = Configuration(warn_eos_config_keys=False)
     validated_data_result = validate_inputs(inputs, configuration=configuration)
 
     # Should have no violations