Added container tests with docker and podman (disabled on github actions)

Author: akclace

.github/workflows/test.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
-      - name: Test with Go
+      - name: Unit tests
         run: |
           export CL_HOME=`pwd`
           rm -rf internal/server/appspecs && cd internal/server
@@ -52,7 +52,9 @@ jobs:
           git clone --single-branch --depth 1 https://github.com/claceio/appspecs.git
           rm -rf appspecs/.git
           cd $CL_HOME
+
           go install github.com/commander-cli/commander/v2/cmd/commander@latest
+          export CL_CONTAINER_COMMANDS=disable # docker/podman does not run on github actions
           tests/run_cli_tests.sh
 
       - name: Upload Go test results

tests/flask.py

@@ -0,0 +1,7 @@
+from flask import Flask
+
+app = Flask(__name__)
+
+@app.route("/")
+def hello_world():
+    return "hello"

tests/run_cli_tests.sh

@@ -1,19 +1,28 @@
 #set -x
 set -e
+
+# Enabling verbose is useful for debugging but the commander command seems to
+# return exit code of 0 when verbose is enabled, even if tests fails. So verbose
+# is disabled by default.
+#export CL_TEST_VERBOSE="--verbose"
+
 cd $CL_HOME
+
+# Setup app specs
+rm -rf appspecs_bk
+if [[ -d internal/server/appspecs/dummy ]]; then
+  mv internal/server/appspecs appspecs_bk
+  cp -r config/appspecs internal/server/
+fi 
 go build ./cmd/clace
+
 cd tests
 rm -rf clace.db
 
 export CL_HOME=.
 unset CL_CONFIG_FILE
 unset SSH_AUTH_SOCK
 
-# Enabling verbose is useful for debugging but the commander command seems to
-# return exit code of 0 when verbose is enabled, even if tests fails. So verbose
-# is disabled by default.
-# export CL_TEST_VERBOSE="--verbose"
-
 trap "error_handler" ERR
 
 error_handler () {
@@ -25,7 +34,13 @@ error_handler () {
 
 cleanup() {
   rm -rf clace.db
-  rm -rf logs/ clace.toml  server.stdout
+  rm -rf logs/ clace.toml config_container.toml server.stdout flaskapp
+
+  if [[ -d ../appspecs_bk ]]; then
+    rm -rf ../internal/server/appspecs
+    mv ../appspecs_bk ../internal/server/appspecs
+  fi 
+
   set +e
   ps -ax | grep "clace server start" | grep -v grep | cut -c1-6 | xargs kill -9
 
@@ -136,5 +151,37 @@ if [[ -n "$CL_GITHUB_SECRET" ]]; then
   commander test $CL_TEST_VERBOSE test_oauth.yaml
 fi
 
+if [[ $CL_CONTAINER_COMMANDS = "disable" ]]; then
+  CL_CONTAINER_COMMANDS=""
+elif [[ -z "$CL_CONTAINER_COMMANDS" ]]; then
+  CL_CONTAINER_COMMANDS="docker podman"
+fi
+
+port_base=9000
+
+for cmd in ${CL_CONTAINER_COMMANDS}; do
+    http_port=`expr $port_base + 1`
+    https_port=`expr $port_base + 2`
+    port_base=`expr $port_base + 2`
+
+    # Use password hash for "abcd"
+    cat <<EOF > config_container.toml
+[http]
+port = $http_port
+[https]
+port = $https_port
+[security]
+app_default_auth_type="none"
+EOF
+    rm -rf clace.db* run/clace.sock
+    CL_CONFIG_FILE=config_container.toml ../clace server start &
+    sleep 2
+
+    export CL_CONTAINER_CMD=$cmd
+    export HTTP_PORT=$http_port
+    echo "********Testing container apps for $cmd*********"
+    commander test $CL_TEST_VERBOSE test_containers.yaml
+done
+
 cleanup
 echo "All tests passed"

tests/test_containers.yaml

@@ -0,0 +1,36 @@
+config:
+  env:
+    CL_CONFIG_FILE: clace.toml
+    CL_CONTAINER_CMD: ${CL_CONTAINER_CMD}
+    HTTP_PORT: ${HTTP_PORT}
+tests:
+  container0010: # setup flask app
+    command: rm -rf ./flaskapp && mkdir flaskapp && cp flask.py flaskapp/app.py
+  container0020: # setup flask dev app
+    command: ../clace app create --dev --spec python-flask --approve ./flaskapp /cont_flaskdev
+  container0030: # setup flask prod app
+    command: ../clace app create --spec python-flask --approve ./flaskapp /cont_flaskprod
+  container0040: # check curl dev works
+    command: curl -sS localhost:${HTTP_PORT}/cont_flaskdev
+    stdout: "hello"
+  container0050: # update app code
+    command: perl -i -pe 's/"hello"/"updated"/g' flaskapp/app.py
+  container0060: # check dev picked up change
+    command: curl -sS localhost:${HTTP_PORT}/cont_flaskdev
+    stdout: "updated"
+  container0070: # stage is not yet updated
+    command: curl -sS localhost:${HTTP_PORT}/cont_flaskprod_cl_stage
+    stdout: "hello"
+  container0080: # do reload
+    command: ../clace app reload /cont_flaskprod
+  container0090: # stage is updated
+    command: curl -sS localhost:${HTTP_PORT}/cont_flaskprod_cl_stage
+    stdout: "updated"
+  container0100: # prod is not yet updated
+    command: curl -sS localhost:${HTTP_PORT}/cont_flaskprod
+    stdout: "hello"
+  container0110: # do promote
+    command: ../clace app promote /cont_flaskprod
+  container0120: # prod is updated
+    command: curl -sS localhost:${HTTP_PORT}/cont_flaskprod
+    stdout: "updated"