Skip to content

Commit 5b5f219

Browse files
authored
Fix request id lookup to avoid errors. (#31)
1 parent 3984c03 commit 5b5f219

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

resources/keywords.robot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Delete Ruletypes
3535
Given I Am Logged Into Minder
3636
Given Ruletypes Are Ready
3737
When All Ruletypes Are Deleted
38+
When All Datasources Are Deleted
3839

3940
Set Project as Environment Variable With Test Name
4041
[Documentation] Set the environment variable for the current test and log the test name.

resources/minder_restapi_lib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def _make_request(self, method, path, **kwargs):
5252
logger.debug(f"Request: {kwargs}")
5353
response = requests.request(method, url, headers=headers, **kwargs)
5454
logger.debug(
55-
f"Request ID: '{response.headers['grpc-metadata-request-id']}'"
55+
f"Request ID: '{response.headers.get('grpc-metadata-request-id')}'"
5656
)
5757
logger.debug(f"Response: {response.json()}")
5858
response.raise_for_status()

resources/ruletypes.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import json
12
import os
23
from sh import gh, minder
34
from robot.api.deco import keyword
@@ -49,6 +50,21 @@ def datasources_are_created(self):
4950
datasources = os.path.join(self.path, "data-sources")
5051
minder.datasource.create(f=datasources)
5152

53+
@keyword
54+
def all_datasources_are_deleted(self):
55+
"""
56+
Remove all datasources from minder.
57+
"""
58+
res = minder.datasource.list("-o", "json")
59+
60+
if "dataSources" not in res:
61+
return ValueError("Datasources list is malformed")
62+
63+
parsed = json.loads(res)
64+
65+
for ds in parsed["dataSources"]:
66+
minder.datasource.delete("-n", ds["name"])
67+
5268
def _clone_ruletypes_from_github(self):
5369
"""
5470
Clone the ruletypes repository from GitHub.

0 commit comments

Comments
 (0)