Skip to content

Commit 20a888b

Browse files
committed
Add secret to results, add error handling
1 parent 84d4ebb commit 20a888b

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

resolve_duplicate_secret_scanning_alerts.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,13 @@ def index_results_by_secret(results: Iterable[dict]) -> dict:
2828
indexed_results: dict = {}
2929

3030
for result in results:
31-
repo = result["repo"]
32-
secret_type = result["secret_type"]
33-
secret = result["secret"]
31+
try:
32+
repo = result["repo"]
33+
secret_type = result["secret_type"]
34+
secret = result["secret"]
35+
except KeyError as e:
36+
LOG.error(f"Missing key in result: {e}: {result}")
37+
continue
3438

3539
# parse out just the private_key_id for matching on google_cloud_service_account_credentials
3640
if secret_type == "google_cloud_service_account_credentials":
@@ -183,7 +187,10 @@ def main() -> None:
183187
matching_secrets_lookup = {k: v for k, v in matching_secrets}
184188

185189
# find secret scanning alerts
186-
results = list_secret_scanning_alerts(name, scope, hostname, state=state, since=since)
190+
results = list_secret_scanning_alerts(name, scope, hostname, state=state, since=since, include_secret=True)
191+
if not results:
192+
LOG.info("No secret scanning alerts found")
193+
return
187194

188195
# index results by secret and type for easy lookup
189196
indexed_results = index_results_by_secret(results)

0 commit comments

Comments
 (0)