Merge remote-tracking branch 'origin/refs/pull/50/head'

Author: james-callahan

.env

@@ -0,0 +1 @@
+PYTHONWARNINGS="ignore:DeprecationWarning"

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018-2019 Danny Grove
+Copyright 2018-2022 Danny Grove
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

Makefile

@@ -19,6 +19,10 @@ shell:
 setup: set-hooks
 	@pipenv sync --dev
 
+.PHONY: Pipfile.lock
+Pipfile.lock:
+	@pipenv lock
+
 .PHONY: requirements.txt
 requirements.txt:
 	@echo "Generating requirements.txt"
@@ -59,19 +63,19 @@ run:
 
 .PHONY: test
 test: setup
-	-@$(PIP_ENV)/bin/coverage run -m unittest -v
+	-@pipenv run coverage run -m unittest -v
 
 .PHONY: test-by-name
 test-by-name:
-	-@$(PIP_ENV)/bin/coverage run -m unittest $(TEST) -v
+	-@pipenv run coverage run -m unittest $(NAME) -v
 
 .PHONY: coverage
 coverage:
-	@$(PIP_ENV)/bin/coverage report -m
+	-@pipenv run coverage report -m
 
 .PHONY: coveralls
 coveralls:
-	@$(PIP_ENV)/bin/coveralls
+	@pipenv run coveralls
 
 .PHONY: pkg
 pkg: build

Pipfile

@@ -4,16 +4,16 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-black = "==20.8b1"
-coverage = "==5.3"
-coveralls = "==2.1.2"
-docker = "==4.3.1"
-flake8 = "==3.8.4"
+black = "==21.12b0"
+coverage = "==6.2"
+coveralls = "==3.3.1"
+docker = "==5.0.3"
+flake8 = "==4.0.1"
 
 [packages]
-click = "==7.1.2"
-cryptography = "==3.2"
-pyOpenSSL = "==19.1.0"
-python-gnupg = "==0.4.6"
-requests = "==2.24.0"
-urllib3 = "==1.25.10"
+click = "==8.0.1"
+cryptography = "==36.0.1"
+pyOpenSSL = "==21.0.0"
+python-gnupg = "==0.4.8"
+requests = "==2.27.1"
+urllib3 = "==1.26.8"

Pipfile.lock

@@ -301,19 +301,15 @@ def create_certificate(
 
 
 @certificate.command("revoke", help="Revoke a certificate for a given server.")
-@click.option("--fingerprint", "-f", default=None, help="User PGP Fingerprint")
 @click.option(
     "--serial-number", default=None, help="Serial Number of certificate"
 )
-@click.option(
-    "--name", "-n", default=None, help="The common name on the certificate."
-)
 @click.pass_context
-def revoke_certificate(ctx, fingerprint, serial_number, name):
+def revoke_certificate(ctx, serial_number):
     if not isinstance(ctx.obj["mtls"], MutualTLS):
         click.secho("A server was not provided.", fg="red")
         sys.exit(1)
-    ctx.obj["mtls"].revoke_cert(fingerprint, serial_number, name)
+    ctx.obj["mtls"].revoke_cert(serial_number)
 
 
 @certificate.command("crl", help="Get the CRL for a given server")