ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-16 11:58:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

work around issue with discriminated typed unions (#939)

Browse Source 
We're experiencing a bug where Unions of sub-models are getting downcast, which causes a loss of information.  

As an example, EventScalesetCreated was getting downcast to EventScalesetDeleted.  I have not figured out why, nor can I replicate it locally to minimize the bug send upstream, but I was able to reliably replicate it on the service.

While working through this issue, I noticed that deserialization of SignalR events was frequently wrong, leaving things like tasks as "init" in `status top`.

Both of these issues are Unions of models with a type field, so it's likely these are related.
This commit is contained in:
bmc-msft
2021-06-02 12:40:58 -04:00
committed by GitHub
parent 3d191c3c5d
commit a92c84d42a
7 changed files with 81 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/api-service/__app__/onefuzzlib/events.py
View File

@ -24,7 +24,7 @@ def get_events() -> Optional[str]:
for _ in range(5):
try:
event = EVENTS.get(block=False)
events.append(json.loads(event.json(exclude_none=True)))
events.append(json.loads(event))
EVENTS.task_done()
except Empty:
break
@ -36,13 +36,13 @@ def get_events() -> Optional[str]:
def log_event(event: Event, event_type: EventType) -> None:
scrubbed_event = filter_event(event, event_type)
scrubbed_event = filter_event(event)
logging.info(
"sending event: %s - %s", event_type, scrubbed_event.json(exclude_none=True)
)
def filter_event(event: Event, event_type: EventType) -> BaseModel:
def filter_event(event: Event) -> BaseModel:
clone_event = event.copy(deep=True)
filtered_event = filter_event_recurse(clone_event)
return filtered_event
@ -73,12 +73,18 @@ def filter_event_recurse(entry: BaseModel) -> BaseModel:
def send_event(event: Event) -> None:
event_type = get_event_type(event)
log_event(event, event_type)
event_message = EventMessage(
event_type=event_type,
event=event,
event=event.copy(deep=True),
instance_id=get_instance_id(),
instance_name=get_instance_name(),
)
EVENTS.put(event_message)
# work around odd bug with Event Message creation. See PR 939
if event_message.event != event:
event_message.event = event.copy(deep=True)
EVENTS.put(event_message.json())
Webhook.send_event(event_message)
log_event(event, event_type)