Tests, version and minor changes in automation

.gitlab-ci.yml

@@ -17,7 +17,6 @@
     allow_failure: false
     only:
         - tags
-        - master
     script:
         - pip install --upgrade setuptools wheel
         - python setup.py sdist bdist_wheel
@@ -55,7 +54,6 @@ publish_package:
     allow_failure: false
     only:
         - tags
-        - master
     image: python:3.6
     script:
         - pip install --upgrade setuptools wheel twine

README.md

@@ -1,5 +1,7 @@
 # vault-cert-deploy
 
+![pipeline](https://gitlab.com/rvojcik/vault-certificate-deploy/badges/master/pipeline.svg)
+
 Deploy SSL certificates from HashiCorp's Vault secret server
 Script is able to deploy certificates from KV store of Vault
 or when you use issue version of script it use PKI secret storage.

scripts/vault-certificate-deploy

@@ -3,6 +3,7 @@
 from __future__ import print_function
 import sys
 import argparse
+import vault_certificate_deploy
 from vault_certificate_deploy import base
 import hvac
 import os
@@ -282,6 +283,12 @@ if __name__ == '__main__':
         default=False,
         action='store_true',
         help='Skip certificate check')
+    parser.add_argument(
+        '--version',
+        dest='version_print',
+        default=False,
+        action='store_true',
+        help='Show version of the script')
     parser.add_argument(
         '-d',
         dest='debug',
@@ -291,6 +298,10 @@ if __name__ == '__main__':
 
     args = parser.parse_args()
 
+    if args.version_print:
+        print(vault_certificate_deploy.__version__)
+        sys.exit(0)
+
     # Config file parsing
     base.pdeb("Loading configuration from %s" % (args.config_file), args.debug)
     config = base.ConfigParse(args.config_file)

scripts/vault-certificate-issue-deploy

@@ -3,6 +3,7 @@
 from __future__ import print_function
 import sys
 import argparse
+import vault_certificate_deploy
 from vault_certificate_deploy import base
 import hvac
 import os
@@ -371,6 +372,12 @@ if __name__ == '__main__':
         default=False,
         action='store_true',
         help='Skip certificate check')
+    parser.add_argument(
+        '--version',
+        dest='version_print',
+        default=False,
+        action='store_true',
+        help='Show version of the script')
     parser.add_argument(
         '-d',
         dest='debug',
@@ -380,6 +387,10 @@ if __name__ == '__main__':
 
     args = parser.parse_args()
 
+    if args.version_print:
+        print(vault_certificate_deploy.__version__)
+        sys.exit(0)
+
     # Config file parsing
     base.pdeb("Loading configuration from %s" % (args.config_file), args.debug)
     config = base.ConfigParse(args.config_file)

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name="vault-certificate-deploy",
-    version="1.1.0",
+    version="1.1.1",
     packages=find_packages(),
     install_requires=install_reqs,
     license="GPLv3",
@@ -32,6 +32,9 @@
             "Programming Language :: Python",
             "Programming Language :: Python :: 2.7",
             "Programming Language :: Python :: 3",
+            "Programming Language :: Python :: 3.6",
+            "Programming Language :: Python :: 3.8",
+            "Topic :: System :: Systems Administration",
             "Topic :: Database",
             "Topic :: Security",
             "Topic :: Security :: Cryptography"

vault_certificate_deploy/__init__.py

@@ -3,7 +3,7 @@
 """
 
 __author__ = "Robert Vojcik ([email protected])"
-__version__ = "1.0.1"
+__version__ = "1.1.1"
 __copyright__ = "OpenSource"
 __license__ = "GPLv3"