diff --git a/docs/changelog.md b/docs/changelog.md index b8812fee..1dc8bad4 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,7 +2,11 @@ ## Latest + +## 2025.12.11.0 + - refactor: remove reference to test scripts, since these are not in the pypi build +- fix: nested double quotes ## 2025.11.14.0 diff --git a/ibmsecurity/isam/aac/authentication/policies.py b/ibmsecurity/isam/aac/authentication/policies.py index f74a9174..e65d7547 100644 --- a/ibmsecurity/isam/aac/authentication/policies.py +++ b/ibmsecurity/isam/aac/authentication/policies.py @@ -123,7 +123,7 @@ def add(isamAppliance, name, policy, uri, description="", dialect="urn:ibm:secur if formatting == 'json': if tools.version_compare(isamAppliance.facts["version"], "10.0.6.0") < 0: - warnings.append(f"Appliance is at version: {isamAppliance.facts["version"]}. JSON format not supported unless at least 10.0.6.0. Setting to xml.") + warnings.append(f"Appliance is at version: {isamAppliance.facts['version']}. JSON format not supported unless at least 10.0.6.0. Setting to xml.") formatting = 'xml' @@ -179,11 +179,11 @@ def update(isamAppliance, name, policy, uri, description="", } if formatting == 'json': if tools.version_compare(isamAppliance.facts["version"], "10.0.6.0") < 0: - warnings.append(f"Appliance is at version: {isamAppliance.facts["version"]}. JSON format not supported unless at least 10.0.6.0. Setting to xml.") + warnings.append(f"Appliance is at version: {isamAppliance.facts['version']}. JSON format not supported unless at least 10.0.6.0. Setting to xml.") formatting = 'xml' if enabled is not None: if tools.version_compare(isamAppliance.facts["version"], "9.0.2.1") < 0: - warnings.append(f"Appliance is at version: {isamAppliance.facts["version"]}. Enabled parameter not supported unless at least 9.0.2.1. Ignoring value.") + warnings.append(f"Appliance is at version: {isamAppliance.facts['version']}. Enabled parameter not supported unless at least 9.0.2.1. Ignoring value.") else: json_data["enabled"] = enabled if force is not True: diff --git a/ibmsecurity/isam/base/ssl_certificates/personal_certificate.py b/ibmsecurity/isam/base/ssl_certificates/personal_certificate.py index 15840dce..85c9e55c 100644 --- a/ibmsecurity/isam/base/ssl_certificates/personal_certificate.py +++ b/ibmsecurity/isam/base/ssl_certificates/personal_certificate.py @@ -246,11 +246,11 @@ def import_cert(isamAppliance, kdb_id, cert, label=None, password=None, check_mo # Delete the previous certificate and add the new. # The certificate exists with these values; so we want to overwrite it retObjDel = delete(isamAppliance, kdb_id, label, force=True, ignore_error=True) - logger.debug(f"First try deleting {label}\n\n{retObjDel.get("rc", 200)}\n") + logger.debug(f"First try deleting {label}\n\n{retObjDel.get('rc', 200)}\n") if retObjDel.get("rc", 200) > 400: # Delete using the subject as label retObjDel = delete(isamAppliance, kdb_id, certsubject, force=True, ignore_error=True) - logger.debug(f"Second try at deleting using the new subject {certsubject}\n\n{retObjDel.get("rc", 200)}\n") + logger.debug(f"Second try at deleting using the new subject {certsubject}\n\n{retObjDel.get('rc', 200)}\n") # Try again retObj = isamAppliance.invoke_post_files( "Retry Importing a personal certificate into a certificate database", @@ -329,7 +329,7 @@ def _check(isamAppliance, kdb_id, label=None, certificate=None, password=None, s newCert['subject'] = x509.subject.rfc4514_string() newCert['issuer'] = x509.issuer.rfc4514_string() logger.info( - 'Upgrade cryptography to version 36.0.0. Install with pip install cryptography') + 'Upgrade cryptography to (at least) version 36.0.0. Install with pip install cryptography') newCert['notafter'] = x509.not_valid_after_utc.strftime("%Y-%m-%d") newCert['notbefore'] = x509.not_valid_before_utc.strftime("%Y-%m-%d") diff --git a/pyproject.toml b/pyproject.toml index 997ef639..a9f299b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta" [project] name = "ibmsecurity" -version = "2025.11.14.0" +version = "2025.12.11.0" authors = [ { name="IBM", email="secorch@wwpdl.vnet.ibm.com" }, ] diff --git a/setup.py b/setup.py index e8ca14ce..84cd93f4 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ packages=find_packages(exclude=["test.*","test"]), # Date of release used for version - please be sure to use YYYY.MM.DD.seq#, MM and DD should be two digits e.g. 2017.02.05.0 # seq# will be zero unless there are multiple release on a given day - then increment by one for additional release for that date - version="2025.11.14.0", + version="2025.12.11.0", description="Idempotent functions for IBM Security Appliance REST APIs", author="IBM", author_email="secorch@wwpdl.vnet.ibm.com",