From 1be622195baa58fe4a84298e48eb1826d537b34c Mon Sep 17 00:00:00 2001 From: Jasmine Schladen Date: Mon, 23 Sep 2024 10:22:39 -0700 Subject: [PATCH] Reorder --- lemur/certificates/cli.py | 2 +- lemur/common/celery.py | 2 +- lemur/tests/test_certificates.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lemur/certificates/cli.py b/lemur/certificates/cli.py index 1c1cf86f1..e672b0b03 100644 --- a/lemur/certificates/cli.py +++ b/lemur/certificates/cli.py @@ -580,7 +580,7 @@ def reissue_command(old_certificate_name, serial_numbers, notify, commit): reissue(old_certificate_name, serial_numbers, notify, commit) -def reissue(old_certificate_name, serial_numbers, notify, commit): +def reissue(old_certificate_name, notify, commit, serial_numbers): """ Reissues certificate with the same parameters as it was originally issued with. If no time period is provided, reissues certificate as valid from today to diff --git a/lemur/common/celery.py b/lemur/common/celery.py index af190ec77..146786a0e 100644 --- a/lemur/common/celery.py +++ b/lemur/common/celery.py @@ -591,7 +591,7 @@ def certificate_reissue(): current_app.logger.debug(log_data) try: notify = current_app.config.get("ENABLE_REISSUE_NOTIFICATION", None) - cli_certificate.reissue(None, None, notify, True) + cli_certificate.reissue(None, notify, True, None) except SoftTimeLimitExceeded: log_data["message"] = "Certificate reissue: Time limit exceeded." current_app.logger.error(log_data) diff --git a/lemur/tests/test_certificates.py b/lemur/tests/test_certificates.py index 6cd6100c0..dcd9ea0a8 100644 --- a/lemur/tests/test_certificates.py +++ b/lemur/tests/test_certificates.py @@ -988,7 +988,7 @@ def test_reissue_command_by_name( certificate = CertificateFactory(name="to_be_reissued_cert", authority=crypto_authority) - reissue(certificate.name, None, False, True) + reissue(certificate.name, False, True, None) new_cert = certificate.replaced[0] assert new_cert @@ -1010,7 +1010,7 @@ def test_reissue_command_by_serial_numbers( cert2 = CertificateFactory(name="to_be_reissued_cert_2", authority=crypto_authority) cert3 = CertificateFactory(name="to_be_reissued_cert_3", authority=crypto_authority) - reissue(None, [cert1.serial, cert2.serial, cert3.serial], False, True) + reissue(None, False, True, [cert1.serial, cert2.serial, cert3.serial]) for cert in [cert1, cert2, cert3]: new_cert = cert.replaced[0] @@ -1034,7 +1034,7 @@ def test_reissue_command_by_name_and_serial_numbers( cert3 = CertificateFactory(name="to_be_reissued_cert_3", authority=crypto_authority) cert4 = CertificateFactory(name="to_be_reissued_cert_4", authority=crypto_authority) - reissue(cert1.name, [cert2.serial, cert3.serial, cert4.serial], False, True) + reissue(cert1.name, False, True, [cert2.serial, cert3.serial, cert4.serial]) for cert in [cert1, cert2, cert3, cert4]: new_cert = cert.replaced[0]