Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update charm libraries #277

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Update charm libraries #277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions lib/charms/saml_integrator/v0/saml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class method `from_relation_data`.

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 9
LIBPATCH = 10

# pylint: disable=wrong-import-position
import re
Expand All @@ -92,7 +92,7 @@ class SamlEndpoint(BaseModel):
"""

name: str = Field(..., min_length=1)
url: AnyHttpUrl
url: typing.Optional[AnyHttpUrl]
binding: str = Field(..., min_length=1)
response_url: typing.Optional[AnyHttpUrl]

Expand All @@ -108,7 +108,8 @@ def to_relation_data(self) -> typing.Dict[str, str]:
# Transform name into snakecase
lowercase_name = re.sub(r"(?<!^)(?=[A-Z])", "_", self.name).lower()
prefix = f"{lowercase_name}_{http_method}_"
result[f"{prefix}url"] = str(self.url)
if self.url:
result[f"{prefix}url"] = str(self.url)
result[f"{prefix}binding"] = self.binding
if self.response_url:
result[f"{prefix}response_url"] = str(self.response_url)
Expand Down Expand Up @@ -137,7 +138,11 @@ def from_relation_data(cls, relation_data: typing.Dict[str, str]) -> "SamlEndpoi
prefix = f"{lowercase_name}_{http_method}_"
return cls(
name=name,
url=parse_obj_as(AnyHttpUrl, relation_data[f"{prefix}url"]),
url=(
parse_obj_as(AnyHttpUrl, relation_data[f"{prefix}url"])
if relation_data[f"{prefix}url"]
else None
),
binding=relation_data[f"{prefix}binding"],
response_url=(
parse_obj_as(AnyHttpUrl, relation_data[f"{prefix}response_url"])
Expand All @@ -158,7 +163,7 @@ class SamlRelationData(BaseModel):
"""

entity_id: str = Field(..., min_length=1)
metadata_url: AnyHttpUrl
metadata_url: typing.Optional[AnyHttpUrl]
certificates: typing.Tuple[str, ...]
endpoints: typing.Tuple[SamlEndpoint, ...]

Expand All @@ -170,9 +175,10 @@ def to_relation_data(self) -> typing.Dict[str, str]:
"""
result = {
"entity_id": self.entity_id,
"metadata_url": str(self.metadata_url),
"x509certs": ",".join(self.certificates),
}
if self.metadata_url:
result["metadata_url"] = str(self.metadata_url)
for endpoint in self.endpoints:
result.update(endpoint.to_relation_data())
return result
Expand Down Expand Up @@ -201,8 +207,10 @@ def from_relation_data(cls, relation_data: ops.RelationDataContent) -> "SamlRela
endpoints.sort(key=lambda ep: ep.name)
return cls(
entity_id=relation_data.get("entity_id"), # type: ignore
metadata_url=parse_obj_as(
AnyHttpUrl, relation_data.get("metadata_url")
metadata_url=(
parse_obj_as(AnyHttpUrl, relation_data.get("metadata_url"))
if relation_data.get("metadata_url")
else None
), # type: ignore
certificates=tuple(relation_data.get("x509certs").split(",")), # type: ignore
endpoints=tuple(endpoints),
Expand Down Expand Up @@ -232,7 +240,7 @@ def entity_id(self) -> str:
return self.saml_relation_data.entity_id

@property
def metadata_url(self) -> str:
def metadata_url(self) -> typing.Optional[str]:
"""Fetch the SAML metadata URL from the relation."""
return str(self.saml_relation_data.metadata_url)

Expand Down
Loading