CI integration

.github/workflows/test.yml

@@ -20,18 +20,6 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup SSH server
         # run docker ssh container for ssh tests
-        run: |
-          sudo mkdir -p /home/runner/.ssh
-          echo "${{ secrets.TEST_PUB_KEY }}" >> /home/runner/.ssh/id_rsa.pub
-          echo "${{ secrets.TEST_PRIV_KEY }}" >> /home/runner/.ssh/id_rsa
-          docker run -d \
-          -e PASSWORD_ACCESS=false \
-          -e PGID=1000 \
-          -e PUID=1000 \
-          -e SUDO_ACCESS=false \
-          -e USER_NAME=dev \
-          -e PUBLIC_KEY_FILE=/root/.ssh/id_rsa.pub \
-          -v /home/runner/.ssh/id_rsa.pub:/root/.ssh/id_rsa.pub \
-          linuxserver/openssh-server
+        run: make prep-ci
       - name: Test
         run: go test -v ./...

.gitignore

@@ -11,3 +11,5 @@ vendor/
 *.swp
 
 docker-compose.yaml
+ssh-key/ci/
+config-ci.yaml

Makefile

@@ -0,0 +1,8 @@
+# Example:
+#   make
+#   make ci-test
+.PHONY: prep-ci
+# Creates the ssh keys and docker container for running test
+ci-test:
+	./scripts/make-ci-test.sh
+	go test -v ./..

integration/integration_test.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/bisohns/saido/config"
 	"github.com/bisohns/saido/driver"
 	"github.com/bisohns/saido/inspector"
 )
@@ -17,6 +18,7 @@ func NewWebForTest() driver.Driver {
 }
 
 func NewSSHForTest() driver.Driver {
+	_ = config.GetConfig()
 	return &driver.SSH{
 		User:            "dev",
 		Host:            "127.0.0.1",

scripts/make-ci-test.sh

@@ -0,0 +1,20 @@
+SSH_KEY_NAME=${SSH_KEY_NAME:-ci-test-key}
+SSH_KEY_PATH=ssh-key/ci
+SSH_USER=ci-dev
+rm -rf $SSH_KEY_PATH
+mkdir -p $SSH_KEY_PATH
+ssh-keygen -f "$SSH_KEY_PATH/${SSH_KEY_NAME}" -N ""
+docker run -d -p 2222:2222 -e USER_NAME=$SSH_USER --name linux-sshserver -v $(pwd)/ci.pub:/config/.ssh/authorized_keys linuxserver/openssh-server
+cat <<EOF > config-ci.yaml
+hosts:
+	connection: 
+		type: ssh
+		username: ${SSH_USER}
+		private_key_path: $(pwd)/${SSH_KEY_NAME}.pub
+	children:
+		 "$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" linux-sshserver)":
+
+metrics:
+	- memory
+	- cpu
+EOF