Merge branch 'prep-release' into 'main'

v1.14.0

See merge request fullctl/fullctl!221

Author: Matt Griswold

.pre-commit-config.yaml

@@ -37,4 +37,8 @@ repos:
         name: flake8
         entry: poetry run flake8 .
         language: system
-        pass_filenames: false
+        pass_filenames: false
+  - repo: https://github.com/pre-commit/mirrors-eslint
+    rev: ''  # Use the sha / tag you want to point at
+    hooks:
+      - id: eslint

CHANGELOG.md

@@ -4,6 +4,11 @@
 ## Unreleased
 
 
+## 1.14.0
+### Added
+- Metrics support
+
+
 ## 1.13.0
 ### Added
 - task queue health checks and display

CHANGELOG.yaml

@@ -5,6 +5,9 @@ Unreleased:
   deprecated: []
   removed: []
   security: []
+1.14.0:
+  added:
+  - Metrics support
 1.13.0:
   added:
   - task queue health checks and display

Ctl/VERSION

@@ -1 +1 @@
-1.13.0
+1.14.0

Ctl/dev/docker-compose.yml

@@ -16,6 +16,17 @@ services:
       - ./initdb.d:/docker-entrypoint-initdb.d
       - postgres_data:/var/lib/postgresql/data
 
+  victoriametrics:
+    image: victoriametrics/victoria-metrics
+    ports:
+      - "8428:8428"
+    volumes:
+      - victoria-metrics-data:/victoria-metrics-data
+    command:
+      - '--storageDataPath=/victoria-metrics-data'
+      - '--httpListenAddr=:8428'
+      - '--httpAuth.username=fullctl'
+      - '--httpAuth.password=devPASSWORD'
 
   aaactl_web:
     user: "0:0"
@@ -194,6 +205,7 @@ services:
       - ../../../ripestat-data-parser/ripestat:/srv/service/venv/lib/python3.11/site-packages/ripestat:Z
       - ../../../prefix-meta-sorbs/src/prefix_meta_sorbs:/srv/service/venv/lib/python3.11/site-packages/prefix_meta_sorbs:Z
       - ../../../prefix-meta-arin/src/prefix_meta_arin:/srv/service/venv/lib/python3.11/site-packages/prefix_meta_arin:Z
+      - ../../../prefixctl-reputation/tests:/srv/service/main/tests/prefixctl_reputation_tests
 
   prefixctl_tasks:
     user: "0:0"
@@ -285,3 +297,4 @@ services:
 
 volumes:
   postgres_data:
+  victoria-metrics-data:

poetry.lock

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "fullctl"
 repository = "https://github.com/fullctl/fullctl"
-version = "1.13.0"
+version = "1.14.0"
 description = "Core classes and functions for service applications"
 authors = ["FullCtl <code@fullctl.com>"]
 readme = "README.md"
@@ -40,6 +40,8 @@ django-structlog = ">=2.1.3"
 django-filter = ">=23.4"
 django-cors-headers = ">=4.3.1"
 
+pydantic = ">=2.6.3"
+
 # can't release to pypi with git reference
 # social-auth-app-django = { git = "https://github.com/python-social-auth/social-app-django.git", branch="master" }
 

pyproject.toml

@@ -81,7 +81,7 @@ def account_service(request):
     # otherwise check if the organization of the request has a branding applied
     # to it through aaactl (either on the org directly or through a BRANDING_ORG
     # set in aaactl)
-    elif not branding:
+    elif not branding and not local_auth:
 
         # AAACTL SELECTS BRANDING
 

src/fullctl/django/context_processors.py

@@ -4,6 +4,16 @@
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
+__all__ = [
+    "validate_ip4",
+    "validate_ip6",
+    "validate_prefix",
+    "validate_masklength_range",
+    "validate_mac_address",
+    "validate_mac_addresses",
+    "validate_as_set",
+]
+
 # valid IRR source identifiers
 # reference: http://www.irr.net/docs/list.html
 IRR_SOURCE = (
@@ -54,6 +64,18 @@ def validate_masklength_range(value):
         raise ValidationError("Needs to be [0-9]+..[0-9]+ or 'exact'")
 
 
+def validate_mac_address(value: str):
+    if not re.match(r"^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$", value):
+        raise ValidationError("Invalid MAC address")
+
+def validate_mac_addresses(value: list[str]):
+    for mac in value:
+        try:
+            validate_mac_address(mac)
+        except ValidationError:
+            raise ValidationError(f"Invalid MAC address: {mac}")
+
+
 def validate_as_set(value):
     """
     Validates irr as-set string

src/fullctl/django/inet/validators.py

@@ -1,2 +1,3 @@
 from fullctl.django.models.abstract.base import *  # noqa: F401, F403
 from fullctl.django.models.abstract.service_bridge import *  # noqa: F401, F403
+from fullctl.django.models.abstract.metric import *  # noqa: F401, F403