ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-17 04:18:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove timestamp from WebhookMessageLog model (#804)

Browse Source
This commit is contained in:
bmc-msft
2021-04-14 12:49:46 -04:00
committed by GitHub
parent e413aec03d
commit c8572cd55a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api-service/__app__/onefuzzlib/webhooks.py
View File

@ -18,13 +18,13 @@ from onefuzztypes.models import Error, Result
from onefuzztypes.webhooks import Webhook as BASE_WEBHOOK from onefuzztypes.webhooks import Webhook as BASE_WEBHOOK
from onefuzztypes.webhooks import WebhookMessage from onefuzztypes.webhooks import WebhookMessage
from onefuzztypes.webhooks import WebhookMessageLog as BASE_WEBHOOK_MESSAGE_LOG from onefuzztypes.webhooks import WebhookMessageLog as BASE_WEBHOOK_MESSAGE_LOG
from pydantic import BaseModel from pydantic import BaseModel, Field
from .__version__ import __version__ from .__version__ import __version__
from .azure.creds import get_instance_id, get_instance_name from .azure.creds import get_instance_id, get_instance_name
from .azure.queue import queue_object from .azure.queue import queue_object
from .azure.storage import StorageType from .azure.storage import StorageType
from .orm import ORMMixin from .orm import MappingIntStrAny, ORMMixin
MAX_TRIES = 5 MAX_TRIES = 5
EXPIRE_DAYS = 7 EXPIRE_DAYS = 7
@ -37,10 +37,15 @@ class WebhookMessageQueueObj(BaseModel):
class WebhookMessageLog(BASE_WEBHOOK_MESSAGE_LOG, ORMMixin): class WebhookMessageLog(BASE_WEBHOOK_MESSAGE_LOG, ORMMixin):
timestamp: Optional[datetime.datetime] = Field(alias="Timestamp")
@classmethod @classmethod
def key_fields(cls) -> Tuple[str, Optional[str]]: def key_fields(cls) -> Tuple[str, Optional[str]]:
return ("webhook_id", "event_id") return ("webhook_id", "event_id")
def export_exclude(self) -> Optional[MappingIntStrAny]:
return {"etag": ..., "timestamp": ...}
@classmethod @classmethod
def search_expired(cls) -> List["WebhookMessageLog"]: def search_expired(cls) -> List["WebhookMessageLog"]:
expire_time = datetime.datetime.utcnow() - datetime.timedelta(days=EXPIRE_DAYS) expire_time = datetime.datetime.utcnow() - datetime.timedelta(days=EXPIRE_DAYS)

2
src/pytypes/onefuzztypes/webhooks.py
View File

@ -3,7 +3,6 @@
# Copyright (c) Microsoft Corporation. # Copyright (c) Microsoft Corporation.
# Licensed under the MIT License. # Licensed under the MIT License.
from datetime import datetime
from typing import List, Optional from typing import List, Optional
from uuid import UUID, uuid4 from uuid import UUID, uuid4
@ -18,7 +17,6 @@ class WebhookMessage(EventMessage):
class WebhookMessageLog(WebhookMessage): class WebhookMessageLog(WebhookMessage):
timestamp: Optional[datetime] = Field(alias="Timestamp")
state: WebhookMessageState = Field(default=WebhookMessageState.queued) state: WebhookMessageState = Field(default=WebhookMessageState.queued)
try_count: int = Field(default=0) try_count: int = Field(default=0)