From 36243929c3b50384a5e6406ae31ed0a56d77c214 Mon Sep 17 00:00:00 2001 From: Jeroen Dekkers Date: Tue, 18 Feb 2025 21:06:57 +0100 Subject: [PATCH] Remove unused queue_uri from boefje settings (#4068) Co-authored-by: Jan Klopper --- boefjes/boefjes/config.py | 5 +---- boefjes/packaging/deb/data/etc/kat/boefjes.conf | 2 -- boefjes/pyproject.toml | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/boefjes/boefjes/config.py b/boefjes/boefjes/config.py index a3947ed399c..7ccf3f78e1f 100644 --- a/boefjes/boefjes/config.py +++ b/boefjes/boefjes/config.py @@ -3,7 +3,7 @@ from pathlib import Path from typing import Any, Literal -from pydantic import AmqpDsn, AnyHttpUrl, Field, FilePath, IPvAnyAddress, PostgresDsn, conint +from pydantic import AnyHttpUrl, Field, FilePath, IPvAnyAddress, PostgresDsn, conint from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, SettingsConfigDict from pydantic_settings.sources import EnvSettingsSource @@ -63,9 +63,6 @@ class Settings(BaseSettings): examples=['{"kat_external_db_normalize": 3, "kat_dns_normalize": 1}'], ) - # Queue configuration - queue_uri: AmqpDsn = Field(..., description="KAT queue URI", examples=["amqp://"], validation_alias="QUEUE_URI") - katalogus_db_uri: PostgresDsn = Field( ..., examples=["postgresql://xx:xx@host:5432/katalogus"], diff --git a/boefjes/packaging/deb/data/etc/kat/boefjes.conf b/boefjes/packaging/deb/data/etc/kat/boefjes.conf index 8baa0e64fd4..6d986354bfa 100644 --- a/boefjes/packaging/deb/data/etc/kat/boefjes.conf +++ b/boefjes/packaging/deb/data/etc/kat/boefjes.conf @@ -1,5 +1,3 @@ -QUEUE_URI= - # OCTOPOES_API=http://localhost:8001 # BYTES_API=http://localhost:8002 BYTES_USERNAME=bytes diff --git a/boefjes/pyproject.toml b/boefjes/pyproject.toml index 223bf59937f..1a5073aad75 100644 --- a/boefjes/pyproject.toml +++ b/boefjes/pyproject.toml @@ -97,7 +97,6 @@ markers = ["slow: marks tests as slow"] addopts = "-m 'not slow'" env = [ "D:KATALOGUS_DB_URI=postgresql://postgres:postgres@ci_katalogus-db:5432/ci_katalogus", - "D:QUEUE_URI=amqp://placeholder", "D:BOEFJES_API=http://placeholder:8006", "D:KATALOGUS_API=http://placeholder:8000", "D:OCTOPOES_API=http://placeholder:8001",