Skip to content

Commit

Permalink
chore: Update charm libraries (#146)
Browse files Browse the repository at this point in the history
  • Loading branch information
telcobot committed Apr 30, 2024
1 parent a0245a9 commit b949ddd
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion lib/charms/tls_certificates_interface/v3/tls_certificates.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ def _on_all_certificates_invalidated(self, event: AllCertificatesInvalidatedEven

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

PYDEPS = ["cryptography", "jsonschema"]

Expand Down Expand Up @@ -965,6 +965,8 @@ def generate_csr( # noqa: C901
organization: Optional[str] = None,
email_address: Optional[str] = None,
country_name: Optional[str] = None,
state_or_province_name: Optional[str] = None,
locality_name: Optional[str] = None,
private_key_password: Optional[bytes] = None,
sans: Optional[List[str]] = None,
sans_oid: Optional[List[str]] = None,
Expand All @@ -983,6 +985,8 @@ def generate_csr( # noqa: C901
organization (str): Name of organization.
email_address (str): Email address.
country_name (str): Country Name.
state_or_province_name (str): State or Province Name.
locality_name (str): Locality Name.
private_key_password (bytes): Private key password
sans (list): Use sans_dns - this will be deprecated in a future release
List of DNS subject alternative names (keeping it for now for backward compatibility)
Expand All @@ -1008,6 +1012,12 @@ def generate_csr( # noqa: C901
subject_name.append(x509.NameAttribute(x509.NameOID.EMAIL_ADDRESS, email_address))
if country_name:
subject_name.append(x509.NameAttribute(x509.NameOID.COUNTRY_NAME, country_name))
if state_or_province_name:
subject_name.append(
x509.NameAttribute(x509.NameOID.STATE_OR_PROVINCE_NAME, state_or_province_name)
)
if locality_name:
subject_name.append(x509.NameAttribute(x509.NameOID.LOCALITY_NAME, locality_name))
csr = x509.CertificateSigningRequestBuilder(subject_name=x509.Name(subject_name))

_sans: List[x509.GeneralName] = []
Expand Down

0 comments on commit b949ddd

Please sign in to comment.