Update the test suite for ACME v2

Author: buchdag

test/setup/setup-boulder.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-acme_endpoint='http://boulder:4000/directory'
+acme_endpoint='http://boulder:4001/directory'
 
 setup_boulder() {
   export GOPATH=${TRAVIS_BUILD_DIR}/go

test/tests/permissions_custom/run.sh

@@ -42,8 +42,8 @@ wait_for_symlink "${domains[0]}" "$le_container_name"
 # Array of folder paths to test
 folders=( \
   [0]="/etc/nginx/certs/accounts" \
-  [1]="/etc/nginx/certs/accounts/boulder:4000" \
-  [2]="/etc/nginx/certs/accounts/boulder:4000/directory" \
+  [1]="/etc/nginx/certs/accounts/boulder:4001" \
+  [2]="/etc/nginx/certs/accounts/boulder:4001/directory" \
   [3]="/etc/nginx/certs/${domains[0]}" \
   )
 
@@ -62,6 +62,7 @@ symlinks=( \
   [2]="/etc/nginx/certs/${domains[0]}.chain.pem" \
   [3]="/etc/nginx/certs/${domains[0]}.dhparam.pem" \
   [4]="/etc/nginx/certs/${domains[0]}/account_key.json" \
+  [5]="/etc/nginx/certs/${domains[0]}/account_reg.json" \
   )
 
   # Test symlinks paths
@@ -75,8 +76,9 @@ symlinks=( \
 # Array of private file paths to test
 private_files=( \
   [0]="/etc/nginx/certs/default.key" \
-  [1]="/etc/nginx/certs/accounts/boulder:4000/directory/default.json" \
-  [2]="/etc/nginx/certs/${domains[0]}/key.pem" \
+  [1]="/etc/nginx/certs/accounts/boulder:4001/directory/default_key.json" \
+  [2]="/etc/nginx/certs/accounts/boulder:4001/directory/default_reg.json" \
+  [3]="/etc/nginx/certs/${domains[0]}/key.pem" \
   )
 
 # Test private file paths
@@ -89,11 +91,12 @@ done
 
 # Array of public files paths to test
 public_files=( \
-  [0]="/etc/nginx/certs/${domains[0]}/cert.pem" \
-  [1]="/etc/nginx/certs/${domains[0]}/chain.pem" \
-  [2]="/etc/nginx/certs/${domains[0]}/fullchain.pem" \
-  [3]="/etc/nginx/certs/default.crt" \
-  [4]="/etc/nginx/certs/dhparam.pem" \
+  [0]="/etc/nginx/certs/${domains[0]}/.companion" \
+  [1]="/etc/nginx/certs/${domains[0]}/cert.pem" \
+  [2]="/etc/nginx/certs/${domains[0]}/chain.pem" \
+  [3]="/etc/nginx/certs/${domains[0]}/fullchain.pem" \
+  [4]="/etc/nginx/certs/default.crt" \
+  [5]="/etc/nginx/certs/dhparam.pem" \
   )
 
 # Test public file paths

test/tests/permissions_default/run.sh

@@ -36,8 +36,8 @@ wait_for_symlink "${domains[0]}" "$le_container_name"
 # Array of folder paths to test
 folders=( \
   [0]="/etc/nginx/certs/accounts" \
-  [1]="/etc/nginx/certs/accounts/boulder:4000" \
-  [2]="/etc/nginx/certs/accounts/boulder:4000/directory" \
+  [1]="/etc/nginx/certs/accounts/boulder:4001" \
+  [2]="/etc/nginx/certs/accounts/boulder:4001/directory" \
   [3]="/etc/nginx/certs/${domains[0]}" \
   )
 
@@ -56,6 +56,7 @@ symlinks=( \
   [2]="/etc/nginx/certs/${domains[0]}.chain.pem" \
   [3]="/etc/nginx/certs/${domains[0]}.dhparam.pem" \
   [4]="/etc/nginx/certs/${domains[0]}/account_key.json" \
+  [5]="/etc/nginx/certs/${domains[0]}/account_reg.json" \
   )
 
   # Test symlinks paths
@@ -69,8 +70,9 @@ symlinks=( \
 # Array of private file paths to test
 private_files=( \
   [0]="/etc/nginx/certs/default.key" \
-  [1]="/etc/nginx/certs/accounts/boulder:4000/directory/default.json" \
-  [2]="/etc/nginx/certs/${domains[0]}/key.pem" \
+  [1]="/etc/nginx/certs/accounts/boulder:4001/directory/default_key.json" \
+  [2]="/etc/nginx/certs/accounts/boulder:4001/directory/default_reg.json" \
+  [3]="/etc/nginx/certs/${domains[0]}/key.pem" \
   )
 
 # Test private file paths
@@ -83,11 +85,12 @@ done
 
 # Array of public files paths to test
 public_files=( \
-  [0]="/etc/nginx/certs/${domains[0]}/cert.pem" \
-  [1]="/etc/nginx/certs/${domains[0]}/chain.pem" \
-  [2]="/etc/nginx/certs/${domains[0]}/fullchain.pem" \
-  [3]="/etc/nginx/certs/default.crt" \
-  [4]="/etc/nginx/certs/dhparam.pem" \
+  [0]="/etc/nginx/certs/${domains[0]}/.companion" \
+  [1]="/etc/nginx/certs/${domains[0]}/cert.pem" \
+  [2]="/etc/nginx/certs/${domains[0]}/chain.pem" \
+  [3]="/etc/nginx/certs/${domains[0]}/fullchain.pem" \
+  [4]="/etc/nginx/certs/default.crt" \
+  [5]="/etc/nginx/certs/dhparam.pem" \
   )
 
 # Test public file paths

test/tests/test-functions.sh

@@ -24,7 +24,7 @@ function run_le_container {
     $cli_args \
     --env "DHPARAM_BITS=256" \
     --env "DEBUG=true" \
-    --env "ACME_CA_URI=http://boulder:4000/directory" \
+    --env "ACME_CA_URI=http://boulder:4001/directory" \
     --label com.github.jrcs.letsencrypt_nginx_proxy_companion.test_suite \
     --network boulder_bluenet \
     "$image" > /dev/null && echo "Started letsencrypt container for test ${name%%_2*}"