From c679b6f158c3d499cc82ae471a39cd7c2bf9da36 Mon Sep 17 00:00:00 2001 From: Federico Barcelona Date: Mon, 18 Jan 2021 10:32:52 +0100 Subject: [PATCH 1/2] fix: Solve v2 events not scoping created events --- sdcclient/monitor/_events_v2.py | 2 +- specs/monitor/events_v2_spec.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sdcclient/monitor/_events_v2.py b/sdcclient/monitor/_events_v2.py index 274e39e5..66b02e90 100644 --- a/sdcclient/monitor/_events_v2.py +++ b/sdcclient/monitor/_events_v2.py @@ -123,7 +123,7 @@ def post_event(self, name, description=None, severity=None, event_filter=None, t 'name': name, 'description': description, 'severity': severity, - 'filter': event_filter, + 'scope': event_filter, 'tags': tags } edata = { diff --git a/specs/monitor/events_v2_spec.py b/specs/monitor/events_v2_spec.py index 42dbbc2e..431298ea 100644 --- a/specs/monitor/events_v2_spec.py +++ b/specs/monitor/events_v2_spec.py @@ -19,6 +19,17 @@ description="This event was created in a CI pipeline for the Python SDK library") expect(call).to(be_successful_api_call) + with it("is able to create a custom event with a scope"): + call = self.client.post_event(name=self.event_name, + description="This event was created in a CI pipeline for the Python SDK library", + event_filter="host.hostName='ci'") + expect(call).to(be_successful_api_call) + + ok, res = self.client.get_events() + expect((ok, res)).to(be_successful_api_call) + expect(res).to(have_key("events")) + expect(res["events"]).to(contain(have_key("scope", equal("host.hostName = 'ci'")))) + with it("is able to list the events happened without any filter"): time.sleep(3) # Wait for the event to appear in the feed ok, res = self.client.get_events() From 777921d197b3f8ddb8f04bf3501014a35e5303ac Mon Sep 17 00:00:00 2001 From: Federico Barcelona Date: Mon, 18 Jan 2021 10:45:49 +0100 Subject: [PATCH 2/2] fix(ci): Sleep after creating the event --- specs/monitor/events_v2_spec.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specs/monitor/events_v2_spec.py b/specs/monitor/events_v2_spec.py index 431298ea..ba077289 100644 --- a/specs/monitor/events_v2_spec.py +++ b/specs/monitor/events_v2_spec.py @@ -1,6 +1,7 @@ import os import time from datetime import datetime, timedelta +from time import sleep from expects import expect, have_key, contain, have_keys, be_empty, equal, be_false, be_above_or_equal, have_len from mamba import it, before, context, description @@ -24,6 +25,7 @@ description="This event was created in a CI pipeline for the Python SDK library", event_filter="host.hostName='ci'") expect(call).to(be_successful_api_call) + sleep(2) # sleep to guarantee the event is created ok, res = self.client.get_events() expect((ok, res)).to(be_successful_api_call)