Skip to content

fix(taskworker) Remove bytes from relocation celery task #90861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 5, 2025
Merged

fix(taskworker) Remove bytes from relocation celery task #90861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a8343c
fix(taskworker) Remove bytes from relocation celery task
markstory May 2, 2025
fd6cc72
Fix mypy
markstory May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/sentry/relocation/services/relocation_export/impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# in modules such as this one where hybrid cloud data models or service classes are
# defined, because we want to reflect on type annotations and avoid forward references.

import base64
import logging
from datetime import UTC, datetime
from io import BytesIO
Expand Down Expand Up @@ -65,7 +66,7 @@ def request_new_export(
requesting_region_name,
replying_region_name,
org_slug,
encrypt_with_public_key,
base64.b64encode(encrypt_with_public_key).decode("utf8"),
int(round(datetime.now(tz=UTC).timestamp())),
]
)
Expand Down
8 changes: 5 additions & 3 deletions src/sentry/relocation/tasks/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

import base64
import logging
import re
from collections import defaultdict
Expand Down Expand Up @@ -344,7 +345,7 @@ def fulfill_cross_region_export_request(
requesting_region_name: str,
replying_region_name: str,
org_slug: str,
encrypt_with_public_key: bytes,
encrypt_with_public_key: str,
# Unix timestamp, in seconds.
scheduled_at: int,
) -> None:
Expand All @@ -357,14 +358,15 @@ def fulfill_cross_region_export_request(
call is received with the encrypted export in tow, it will trigger the next step in the
`SAAS_TO_SAAS` relocation's pipeline, namely `uploading_complete`.
"""
encrypt_with_public_key_bytes = base64.b64decode(encrypt_with_public_key.encode("utf8"))

logger_data = {
"uuid": uuid_str,
"task": "fulfill_cross_region_export_request",
"requesting_region_name": requesting_region_name,
"replying_region_name": replying_region_name,
"org_slug": org_slug,
"encrypted_public_key_size": len(encrypt_with_public_key),
"encrypted_public_key_size": len(encrypt_with_public_key_bytes),
"scheduled_at": scheduled_at,
}
logger.info(
Expand Down Expand Up @@ -396,7 +398,7 @@ def fulfill_cross_region_export_request(

export_in_organization_scope(
fp,
encryptor=LocalFileEncryptor(BytesIO(encrypt_with_public_key)),
encryptor=LocalFileEncryptor(BytesIO(encrypt_with_public_key_bytes)),
org_filter={org_slug},
printer=LoggingPrinter(uuid_str),
checkpointer=StorageBackedCheckpointExporter(
Expand Down
Loading