Merge pull request #192 from peopledoc/hvac

Author: Joachim Jablon

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   pull_request:
   push:
-    branches: 
+    branches:
       - 'master'
     tags:
       - '*'
@@ -40,12 +40,21 @@ jobs:
         include:
           - python-version: 3.6
             tox-env: py36-tests
+            auth-method: token
           - python-version: 3.7
             tox-env: py37-tests
+            auth-method: token
           - python-version: 3.8
             tox-env: py38-tests
+            auth-method: token
+          - python-version: 3.8
+            tox-env: py38-tests
+            auth-method: userpass
+          - python-version: 3.8
+            tox-env: py38-tests
+            auth-method: cert
 
-    name: Test (python ${{ matrix.python-version }})
+    name: Test (python ${{ matrix.python-version }} / ${{ matrix.auth-method }})
     runs-on: ubuntu-latest
 
     services:
@@ -66,7 +75,7 @@ jobs:
           set -xeu
           pwd
           python -VV
-          ./dev-env auth token
+          ./dev-env auth ${{ matrix.auth-method }}
           pip install tox
       - name: Run tox targets for ${{ matrix.python-version }}
         run: tox -e ${{ matrix.tox-env }}

.gitignore

@@ -10,3 +10,6 @@ dist/
 docs/_build
 htmlcov/
 vault.yml
+server-chain.crt
+client.crt
+client.key

dev-env

@@ -2,6 +2,11 @@
 
 case ${1-default} in
     auth)
+        curl -o server-chain.crt https://raw.githubusercontent.com/ewjoachim/vault-cli-dev/master/conf/certs/server-chain.crt
+        if [ "${2}" = "cert" ]; then
+            curl -o client.crt https://raw.githubusercontent.com/ewjoachim/vault-cli-dev/master/conf/certs/client.crt
+            curl -o client.key https://raw.githubusercontent.com/ewjoachim/vault-cli-dev/master/conf/certs/client.key
+        fi
         ln -fs vault.${2}.yml vault.yml
         ;;
     *)

server-chain.crt

@@ -24,7 +24,7 @@ install_requires =
     Click>=7.0
     pyyaml>=5.3.1
     jinja2
-    hvac
+    hvac<0.10.12  # Temporary fix for #191
 
 [options.entry_points]
 console_scripts =

setup.cfg

@@ -1,6 +1,6 @@
 ---
 url: https://localhost:8443
 base_path: secretkvv1/
-ca_bundle: dev_docker_config/certs/server-chain.crt
-login_cert: dev_docker_config/certs/client.crt
-login_cert_key: dev_docker_config/certs/client.key
+ca_bundle: server-chain.crt
+login_cert: client.crt
+login_cert_key: client.key

vault.cert.yml

@@ -1,6 +1,6 @@
 ---
-base_path: secretkvv1/
-ca_bundle: dev_docker_config/certs/server-chain.crt
 url: https://localhost:8443
+base_path: secretkvv1/
+ca_bundle: server-chain.crt
 username: userpass-login
 password: userpass-pass