Terrance DeJesus
fb2b4529c5
* removed custom semver and replaced with pypi * updated beats.py version references * updated bump-versions CLI command to use semver and change logic * updated schemas __init__, test_version_lock and unstage incompatible rules CLI * updated test_stack_schema_map in TestVersions unittest * updated test_all_rules unit testing Version() references * updated stack_compat.py for get_restricted_field references) * updated version_lock.py Version() references * updated docs.py Version() reference for parse_registry * updated devtools.py Version() reference for trim-version-lock * updated mixins.py Version() reference in validate_field_compatibility * adjusted schemas.__init__ Version() reference in get_stack_schemas * adjusted ecs.py Version() references * adjusted integrations.py Version() references * adjusted rule.py Version() references * sorted imports * replaced custom semver with pypi semver in unit test files * addressed unit test and flake errors * changed semver strings casted to version_lock.py * fixed sorting in integrations.py * updated bump-pkgs-versions CLI command * adjusted semantic version in unstage-incompatible-rules command * adjusted semver import to VersionInfo * added semver 3 and adjusted import names * added option_minor_and_patch parameter where version is major.minor * updated bump-pkg-versions to always save to packages.yml * removed leftover split call & updated find latest compatible version command * updated integrations.py, version_lock.py and schemas.__init__.py * changed fstring reference in downgrade function * reverted formatting changes for detection_rules __init__.py * added newline to detection_rules __init__.py * adjusted finding latest_release for attack package logic * adjusted unstage-incompatible-rules command logic comparing versions * removing changes from misc.py related to auto-formatting * adding newline to misc.py * fixed bug in downgrade function calling decorators * added semantic version validation on migrate decorator function * added expected type returned from find_latest_integration_version in integrations.py * add comment about stripped versions for version lock file Co-authored-by: Mika Ayenson <Mikaayenson@users.noreply.github.com> --------- Co-authored-by: Mika Ayenson <Mikaayenson@users.noreply.github.com>
55 lines
2.3 KiB
Python
55 lines
2.3 KiB
Python
# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
|
|
# or more contributor license agreements. Licensed under the Elastic License
|
|
# 2.0; you may not use this file except in compliance with the Elastic License
|
|
# 2.0.
|
|
|
|
from dataclasses import Field
|
|
from typing import Dict, List, Optional, Tuple
|
|
|
|
from semver import Version
|
|
|
|
from ..misc import cached
|
|
|
|
|
|
@cached
|
|
def get_restricted_field(schema_field: Field) -> Tuple[Optional[Version], Optional[Version]]:
|
|
"""Get an optional min and max compatible versions of a field (from a schema or dataclass)."""
|
|
# nested get is to support schema fields being passed directly from dataclass or fields in schema class, since
|
|
# marshmallow_dataclass passes the embedded metadata directly
|
|
min_compat = schema_field.metadata.get('metadata', schema_field.metadata).get('min_compat')
|
|
max_compat = schema_field.metadata.get('metadata', schema_field.metadata).get('max_compat')
|
|
min_compat = Version.parse(min_compat, optional_minor_and_patch=True) if min_compat else None
|
|
max_compat = Version.parse(max_compat, optional_minor_and_patch=True) if max_compat else None
|
|
return min_compat, max_compat
|
|
|
|
|
|
@cached
|
|
def get_restricted_fields(schema_fields: List[Field]) -> Dict[str, Tuple[Optional[Version],
|
|
Optional[Version]]]:
|
|
"""Get a list of optional min and max compatible versions of fields (from a schema or dataclass)."""
|
|
restricted = {}
|
|
for _field in schema_fields:
|
|
min_compat, max_compat = get_restricted_field(_field)
|
|
if min_compat or max_compat:
|
|
restricted[_field.name] = (min_compat, max_compat)
|
|
|
|
return restricted
|
|
|
|
|
|
@cached
|
|
def get_incompatible_fields(schema_fields: List[Field], package_version: Version) -> \
|
|
Optional[Dict[str, tuple]]:
|
|
"""Get a list of fields that are incompatible with the package version."""
|
|
if not schema_fields:
|
|
return
|
|
|
|
incompatible = {}
|
|
restricted_fields = get_restricted_fields(schema_fields)
|
|
for field_name, values in restricted_fields.items():
|
|
min_compat, max_compat = values
|
|
|
|
if min_compat and package_version < min_compat or max_compat and package_version > max_compat:
|
|
incompatible[field_name] = (min_compat, max_compat)
|
|
|
|
return incompatible
|