Revamp formatting and linting on commit

Remove the prepare script, and run the two stages manually. Better
handle Black reformatting by doing a check (for the errcode) then
reformat and abort commit to review.

.hooks/pre-commit

@@ -4,9 +4,16 @@ pushd $( git rev-parse --show-toplevel ) &>/dev/null
 
 ex=0
 
-./prepare
+./format check
 if [[ $? -ne 0 ]]; then
-    echo "Aborting commit due to formatting or linting errors."
+    ./format
+    echo "Black formatting change detected; review and recommit"
+    ex=1
+fi
+
+./lint
+if [[ $? -ne 0 ]]; then
+    echo "Linting error detected; correct and recommit"
     ex=1
 fi
 

build-and-deploy.sh

@@ -32,7 +32,8 @@ pushd $( git rev-parse --show-toplevel ) &>/dev/null
 
 # Prepare code
 echo "Preparing code (format and lint)..."
-./prepare || exit
+./format || exit 1
+./lint || exit 1
 
 # Build the packages
 echo -n "Building packages... "

client-cli/pvc/cli_lib/vm.py

@@ -377,13 +377,18 @@ def vm_state(config, vm, target_state, force=False, wait=False):
     API arguments: state={state}, wait={wait}
     API schema: {"message":"{data}"}
     """
+    if wait or target_state == "disable":
+        timeout = 300
+    else:
+        timeout = 3
+
     params = {
         "state": target_state,
         "force": str(force).lower(),
         "wait": str(wait).lower(),
     }
     response = call_api(
-        config, "post", "/vm/{vm}/state".format(vm=vm), params=params, timeout=120
+        config, "post", "/vm/{vm}/state".format(vm=vm), params=params, timeout=timeout
     )
 
     if response.status_code == 200:

format

@@ -5,10 +5,14 @@ if ! which black &>/dev/null; then
     exit 1
 fi
 
+if [[ $1 == "check" ]]; then
+    check="--check"
+fi
+
 pushd $( git rev-parse --show-toplevel ) &>/dev/null
 
 echo "Formatting..."
-black --safe --exclude api-daemon/migrations .
+black --safe ${check} --exclude api-daemon/migrations .
 ret=$?
 if [[ $ret -eq 0 ]]; then
     echo "Successfully formatted project!"

prepare

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-#set -o errexit
-
-./format
-./lint