793a427c50
Merge in RR/pyinfra from RED-6273-multi-tenant-storage to master
Squashed commit of the following:
commit 0fead1f8b59c9187330879b4e48d48355885c27c
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Tue Mar 28 15:02:22 2023 +0200
fix typos
commit 892a803726946876f8b8cd7905a0e73c419b2fb1
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Tue Mar 28 14:41:49 2023 +0200
Refactoring
Replace custom storage caching logic with LRU decorator
commit eafcd90260731e3360ce960571f07dee8f521327
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Fri Mar 24 12:50:13 2023 +0100
fix bug in storage connection from endpoint
commit d0c9fb5b7d1c55ae2f90e8faa1efec9f7587c26a
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Fri Mar 24 11:49:34 2023 +0100
add logs to PayloadProcessor
- set log messages to determine if x-tenant
storage connection is working
commit 97309fe58037b90469cf7a3de342d4749a0edfde
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Fri Mar 24 10:41:59 2023 +0100
update PayloadProcessor
- introduce storage cache to make every unique
storage connection only once
- add functionality to pass optional processing
kwargs in queue message like the operation key to
the processing function
commit d48e8108fdc0d463c89aaa0d672061ab7dca83a0
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Wed Mar 22 13:34:43 2023 +0100
add multi-tenant storage connection 1st iteration
- forward x-tenant-id from queue message header to
payload processor
- add functions to receive storage infos from an
endpoint or the config. This enables hashing and
caching of connections created from these infos
- add function to initialize storage connections
from storage infos
- streamline and refactor tests to make them more
readable and robust and to make it easier to add
new tests
- update payload processor with first iteration
of multi tenancy storage connection support
with connection caching and backwards compability
commit 52c047c47b98e62d0b834a9b9b6c0e2bb0db41e5
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Tue Mar 21 15:35:57 2023 +0100
add AES/GCM cipher functions
- decrypt x-tenant storage connection strings
55 lines
1.7 KiB
Python
55 lines
1.7 KiB
Python
import pytest
|
|
|
|
from pyinfra.payload_processing.payload import (
|
|
QueueMessagePayload,
|
|
QueueMessagePayloadParser,
|
|
)
|
|
from pyinfra.utils.file_extension_parsing import make_file_extension_parser
|
|
|
|
|
|
@pytest.fixture
|
|
def expected_parsed_payload(x_tenant_id):
|
|
return QueueMessagePayload(
|
|
dossier_id="test",
|
|
file_id="test",
|
|
x_tenant_id=x_tenant_id,
|
|
target_file_extension="json.gz",
|
|
response_file_extension="json.gz",
|
|
target_file_type="json",
|
|
target_compression_type="gz",
|
|
response_file_type="json",
|
|
response_compression_type="gz",
|
|
target_file_name="test/test.json.gz",
|
|
response_file_name="test/test.json.gz",
|
|
processing_kwargs={},
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def file_extension_parser(allowed_file_types, allowed_compression_types):
|
|
return make_file_extension_parser(allowed_file_types, allowed_compression_types)
|
|
|
|
|
|
@pytest.fixture
|
|
def payload_parser(file_extension_parser):
|
|
return QueueMessagePayloadParser(file_extension_parser)
|
|
|
|
|
|
@pytest.mark.parametrize("allowed_file_types,allowed_compression_types", [(["json", "pdf"], ["gz"])])
|
|
class TestPayload:
|
|
@pytest.mark.parametrize("x_tenant_id", [None, "klaus"])
|
|
def test_payload_is_parsed_correctly(self, payload_parser, payload, expected_parsed_payload):
|
|
payload = payload_parser(payload)
|
|
assert payload == expected_parsed_payload
|
|
|
|
@pytest.mark.parametrize(
|
|
"extension,expected",
|
|
[
|
|
("json.gz", ("json", "gz")),
|
|
("json", ("json", None)),
|
|
("prefix.json.gz", ("json", "gz")),
|
|
],
|
|
)
|
|
def test_parse_file_extension(self, file_extension_parser, extension, expected):
|
|
assert file_extension_parser(extension) == expected
|