Skip to content

Commit

Permalink
Merge pull request #112 from crossplane/fix_unit_tests
Browse files Browse the repository at this point in the history
Bump protobuf and add defensive checks to get_* helpers
  • Loading branch information
negz authored Jan 8, 2025
2 parents d4b3506 + 685918f commit 064ffe7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions crossplane/function/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ def get_condition(resource: structpb.Struct, typ: str) -> Condition:
"""
unknown = Condition(typ=typ, status="Unknown")

if "status" not in resource:
if not resource or "status" not in resource:
return unknown

if "conditions" not in resource["status"]:
if not resource["status"] or "conditions" not in resource["status"]:
return unknown

for c in resource["status"]["conditions"]:
Expand Down Expand Up @@ -157,9 +157,9 @@ class Credentials:
def get_credentials(req: structpb.Struct, name: str) -> Credentials:
"""Get the supplied credentials."""
empty = Credentials(type="data", data={})
if "credentials" not in req:
if not req or "credentials" not in req:
return empty
if name not in req["credentials"]:
if not req["credentials"] or name not in req["credentials"]:
return empty
return Credentials(
type=req["credentials"][name]["type"],
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ classifiers = [
dependencies = [
"grpcio==1.*",
"grpcio-reflection==1.*",
"protobuf==5.27.2",
"protobuf==5.28.1",
"pydantic==2.*",
"structlog==24.*",
]
Expand Down

0 comments on commit 064ffe7

Please sign in to comment.