Merge pull request #26 from derhnyel/feature/test-goreleaser

Hotfix Test 👍🏿 Adding Go Actions Caching 🫡
bisohns · Nov 26, 2022 · 47ee043 · 47ee043
2 parents 932ecdc + 3d3dc2d
commit 47ee043
Show file tree

Hide file tree

Showing 9 changed files with 133 additions and 39 deletions.
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
@@ -1,6 +1,6 @@
 on: 
   push:
-    branches: [ main, develop]
+    branches: [ main, develop,feature/test-goreleaser]
   pull_request:
     branches: [ main]
 name: Test-MacOs
@@ -14,6 +14,30 @@ jobs:
           go-version:  '>=1.16'
       - name: Checkout code
         uses: actions/checkout@v2
+      - name: Cache node modules
+        id: cache-node-modules
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ./web/node_modules
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./web/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+      - name: Cache go modules
+        id: cache-go-modules
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-go-modules
+        with:
+          path: ~/go
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: Setup config script 
         # using locals for mac-OS because github CI mac platforms don't have docker
         run: | 

diff --git a/.github/workflows/test-ssh.yml b/.github/workflows/test-ssh.yml
@@ -1,6 +1,6 @@
 on: 
   push:
-    branches: [ main, develop]
+    branches: [ main, develop,feature/test-goreleaser]
   pull_request:
     branches: [ main]
 name: Test-Linux
@@ -14,13 +14,41 @@ jobs:
           go-version:  '>=1.16'
       - name: Checkout code
         uses: actions/checkout@v2
+
+      - name: Cache node modules
+        id: cache-node-modules
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ./web/node_modules
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./web/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+      - name: Cache go modules
+        id: cache-go-modules
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-go-modules
+        with:
+          path: ~/go
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: Setup SSH server and config
         # run docker ssh container for ssh tests
         run: |
-          make prep-ci-ssh
           make dependencies
           make build-frontend
+          make prep-ci-ssh
       - name: Test
         run: | 
-          go mod tidy  
+          go mod tidy
           go test -v ./...
+      
+
+
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -1,6 +1,6 @@
 on: 
   push:
-    branches: [ main, develop]
+    branches: [ main, develop,feature/test-goreleaser]
   pull_request:
     branches: [ main]
 name: Test-Windows
@@ -14,6 +14,30 @@ jobs:
           go-version:  '>=1.16'
       - name: Checkout code
         uses: actions/checkout@v2
+      - name: Cache node modules
+        id: cache-node-modules
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ./web/node_modules
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./web/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+      - name: Cache go modules
+        id: cache-go-modules
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-go-modules
+        with:
+          path: ~/go
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: Choco Install make
         uses: crazy-max/ghaction-chocolatey@v1
         with:

diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ endif
 dependencies:
 ifeq ($(bin),main.exe)
 	@make prep-ci-local-windows
-	yarn add react-scripts@latest
+	cd web && yarn add react-scripts@latest
 else
 	@make prep-ci-local
 endif

diff --git a/client/controller.go b/client/controller.go
@@ -47,7 +47,7 @@ func (hosts *HostsController) getDriver(address string) *driver.Driver {
 func (hosts *HostsController) resetDriver(host config.Host) {
 	hosts.mu.Lock()
 	defer hosts.mu.Unlock()
-	hostDriver := host.Connection.ToDriver()
+	hostDriver := driver.ToDriver(*host.Connection)
 	hosts.Drivers[host.Address] = &hostDriver
 }
 
@@ -175,6 +175,12 @@ func (hosts *HostsController) ServeHTTP(w http.ResponseWriter, req *http.Request
 // NewHostsController : initialze host controller with config file
 func NewHostsController(cfg *config.Config) *HostsController {
 	dashboardInfo := config.GetDashboardInfoConfig(cfg)
+	for metric, _ := range dashboardInfo.Metrics {
+		if !inspector.Valid(metric) {
+			log.Fatalf("%s is not a valid metric", metric)
+		}
+	}
+
 	hosts := &HostsController{
 		Info:            dashboardInfo,
 		Drivers:         make(map[string]*driver.Driver),

diff --git a/config/config.go b/config/config.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/bisohns/saido/driver"
-	"github.com/bisohns/saido/inspector"
+	// "github.com/bisohns/saido/driver"
+
 	"github.com/mitchellh/mapstructure"
 	log "github.com/sirupsen/logrus"
 
@@ -49,23 +49,6 @@ type Connection struct {
 	Host                 string
 }
 
-func (conn *Connection) ToDriver() driver.Driver {
-	switch conn.Type {
-	case "ssh":
-		return &driver.SSH{
-			User:            conn.Username,
-			Host:            conn.Host,
-			Port:            int(conn.Port),
-			KeyFile:         conn.PrivateKeyPath,
-			KeyPass:         conn.PrivateKeyPassPhrase,
-			Password:        conn.Password,
-			CheckKnownHosts: false,
-		}
-	default:
-		return &driver.Local{}
-	}
-}
-
 type Host struct {
 	Address    string
 	Alias      string
@@ -104,11 +87,8 @@ func GetDashboardInfoConfig(config *Config) *DashboardInfo {
 	dashboardInfo.Hosts = parseConfig("root", "", config.Hosts, &Connection{})
 	for metric, customCommand := range config.Metrics {
 		metric := fmt.Sprintf("%v", metric)
-		if inspector.Valid(metric) {
-			metrics[metric] = fmt.Sprintf("%v", customCommand)
-		} else {
-			log.Fatalf("Found invalid metric %v", metric)
-		}
+		metrics[metric] = fmt.Sprintf("%v", customCommand)
+
 	}
 	dashboardInfo.Metrics = metrics
 	for _, host := range dashboardInfo.Hosts {

diff --git a/driver/driver.go b/driver/driver.go
@@ -1,5 +1,7 @@
 package driver
 
+import "github.com/bisohns/saido/config"
+
 // SystemInfo gives more insight into system details
 type SystemDetails struct {
 	IsWindows bool
@@ -26,3 +28,20 @@ type Driver interface {
 	// shows the driver details, not sure if we should be showing OS name
 	GetDetails() SystemDetails
 }
+
+func ToDriver(conn config.Connection) Driver {
+	switch conn.Type {
+	case "ssh":
+		return &SSH{
+			User:            conn.Username,
+			Host:            conn.Host,
+			Port:            int(conn.Port),
+			KeyFile:         conn.PrivateKeyPath,
+			KeyPass:         conn.PrivateKeyPassPhrase,
+			Password:        conn.Password,
+			CheckKnownHosts: false,
+		}
+	default:
+		return &Local{}
+	}
+}
diff --git a/driver/ssh_test.go b/driver/ssh_test.go
@@ -26,11 +26,17 @@ func NewSSHForTest() Driver {
 	yamlPath := fmt.Sprintf("%s/%s", workingDir, "config-test.yaml")
 	conf := config.LoadConfig(yamlPath)
 	dashboardInfo := config.GetDashboardInfoConfig(conf)
+	var host config.Host
+	for ind := range dashboardInfo.Hosts {
+		if dashboardInfo.Hosts[ind].Address == "0.0.0.0" {
+			host = dashboardInfo.Hosts[ind]
+		}
+	}
 	return &SSH{
-		User:            dashboardInfo.Hosts[0].Connection.Username,
-		Host:            dashboardInfo.Hosts[0].Address,
-		Port:            int(dashboardInfo.Hosts[0].Connection.Port),
-		KeyFile:         dashboardInfo.Hosts[0].Connection.PrivateKeyPath,
+		User:            host.Connection.Username,
+		Host:            host.Address,
+		Port:            int(host.Connection.Port),
+		KeyFile:         host.Connection.PrivateKeyPath,
 		KeyPass:         "",
 		CheckKnownHosts: false,
 	}

diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -35,11 +35,18 @@ func NewSSHForTest() driver.Driver {
 	yamlPath := fmt.Sprintf("%s/%s", workingDir, "config-test.yaml")
 	conf := config.LoadConfig(yamlPath)
 	dashboardInfo := config.GetDashboardInfoConfig(conf)
+	var host config.Host
+	for ind := range dashboardInfo.Hosts {
+		if dashboardInfo.Hosts[ind].Address == "0.0.0.0" {
+			host = dashboardInfo.Hosts[ind]
+		}
+	}
+
 	return &driver.SSH{
-		User:            dashboardInfo.Hosts[0].Connection.Username,
-		Host:            dashboardInfo.Hosts[0].Address,
-		Port:            int(dashboardInfo.Hosts[0].Connection.Port),
-		KeyFile:         dashboardInfo.Hosts[0].Connection.PrivateKeyPath,
+		User:            host.Connection.Username,
+		Host:            host.Address,
+		Port:            int(host.Connection.Port),
+		KeyFile:         host.Connection.PrivateKeyPath,
 		KeyPass:         "",
 		CheckKnownHosts: false,
 	}