unused-import-mistake (#117)

Add versioning check

.github/workflows/publish.yml

@@ -4,7 +4,6 @@ on:
     branches:
       - 'develop'
       - 'main'
-      - 'feature/versioning'
 jobs:
   docker:
     runs-on: ubuntu-latest

api/main.go

@@ -16,7 +16,6 @@ import (
 	"mizuserver/pkg/routes"
 	"mizuserver/pkg/sensitiveDataFiltering"
 	"mizuserver/pkg/utils"
-	"mizuserver/pkg/version"
 	"os"
 	"os/signal"
 	"strings"
@@ -28,8 +27,6 @@ var standalone = flag.Bool("standalone", false, "Run in standalone tapper and AP
 var aggregatorAddress = flag.String("aggregator-address", "", "Address of mizu collector for tapping")
 
 func main() {
-	rlog.Infof("Version parameters are: %s %s %s %s",  version.Branch, version.SemVer, version.GitCommitHash, version.BuildTimestamp)
-
 	flag.Parse()
 	hostMode := os.Getenv(shared.HostModeEnvVar) == "1"
 	tapOpts := &tap.TapOpts{HostMode: hostMode}

api/pkg/controllers/metadata_controller.go

@@ -2,13 +2,11 @@ package controllers
 
 import (
 	"github.com/gofiber/fiber/v2"
+	"github.com/up9inc/mizu/shared"
+	"mizuserver/pkg/version"
 )
 
-type VersionResponse struct {
-	SemVer string `json:"semver"`
-}
-
 func GetVersion(c *fiber.Ctx) error {
-	resp := VersionResponse{SemVer: "1.2.3"}
+	resp := shared.VersionResponse{SemVer: version.SemVer}
 	return c.Status(fiber.StatusOK).JSON(resp)
 }

api/pkg/routes/entries_routes.go

@@ -5,7 +5,7 @@ import (
 	"mizuserver/pkg/controllers"
 )
 
-// EntriesRoutes func for describe group of public routes.
+// EntriesRoutes defines the group of har entries routes.
 func EntriesRoutes(fiberApp *fiber.App) {
 	routeGroup := fiberApp.Group("/api")
 

api/pkg/routes/metadata_routes.go

@@ -5,7 +5,7 @@ import (
 	"mizuserver/pkg/controllers"
 )
 
-// EntriesRoutes func for describe group of public routes.
+// MetadataRoutes defines the group of metadata routes.
 func MetadataRoutes(fiberApp *fiber.App) {
 	routeGroup := fiberApp.Group("/metadata")
 

api/pkg/routes/not_found_route.go

@@ -2,7 +2,7 @@ package routes
 
 import "github.com/gofiber/fiber/v2"
 
-// NotFoundRoute func for describe 404 Error route.
+// NotFoundRoute defines the 404 Error route.
 func NotFoundRoute(fiberApp *fiber.App) {
 	fiberApp.Use(
 		func(c *fiber.Ctx) error {

cli/Makefile

@@ -3,7 +3,6 @@ COMMIT_HASH=$(shell git rev-parse HEAD)
 GIT_BRANCH=$(shell git branch --show-current | tr '[:upper:]' '[:lower:]')
 GIT_VERSION=$(shell git branch --show-current | tr '[:upper:]' '[:lower:]')
 BUILD_TIMESTAMP=$(shell date +%s)
-SEM_VER=0.0.0
 
 .PHONY: help
 .DEFAULT_GOAL := help

cli/cmd/fetch.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
+	"github.com/up9inc/mizu/cli/mizu"
 )
 
 type MizuFetchOptions struct {
@@ -17,6 +18,11 @@ var fetchCmd = &cobra.Command{
 	Use:   "fetch",
 	Short: "Download recorded traffic to files",
 	RunE: func(cmd *cobra.Command, args []string) error {
+		if isCompatible, err := mizu.CheckVersionCompatibility(mizuFetchOptions.MizuPort); err != nil {
+			return err
+		} else if !isCompatible {
+			return nil
+		}
 		RunMizuFetch(&mizuFetchOptions)
 		return nil
 	},

cli/cmd/view.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/spf13/cobra"
+	"github.com/up9inc/mizu/cli/mizu"
 )
 
 type MizuViewOptions struct {
@@ -14,9 +15,15 @@ var viewCmd = &cobra.Command{
 	Use:   "view",
 	Short: "Open GUI in browser",
 	RunE: func(cmd *cobra.Command, args []string) error {
+		if isCompatible, err := mizu.CheckVersionCompatibility(mizuFetchOptions.MizuPort); err != nil {
+			return err
+		} else if !isCompatible {
+			return nil
+		}
 		runMizuView(mizuViewOptions)
 		return nil
 	},
+
 }
 
 func init() {

cli/mizu/versionCheck.go

@@ -0,0 +1,46 @@
+package mizu
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/up9inc/mizu/shared"
+	"github.com/up9inc/mizu/shared/semver"
+	"net/http"
+	"net/url"
+)
+
+
+func getApiVersion(port uint16) (string, error) {
+	versionUrl, _ := url.Parse(fmt.Sprintf("http://localhost:%d/mizu/metadata/version", port))
+	req := &http.Request{
+		Method: http.MethodGet,
+		URL:    versionUrl,
+	}
+	statusResp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer statusResp.Body.Close()
+
+	versionResponse := &shared.VersionResponse{}
+	if err := json.NewDecoder(statusResp.Body).Decode(&versionResponse); err != nil {
+		return "", err
+	}
+
+	return versionResponse.SemVer, nil
+}
+
+func CheckVersionCompatibility(port uint16) (bool, error) {
+	apiSemVer, err := getApiVersion(port)
+	if err != nil {
+		return false, err
+	}
+
+	if semver.SemVersion(apiSemVer).Major() == semver.SemVersion(SemVer).Major() &&
+		semver.SemVersion(apiSemVer).Minor() == semver.SemVersion(SemVer).Minor() {
+		return true, nil
+	}
+
+	fmt.Printf(Red, fmt.Sprintf("cli version (%s) is not compatible with api version (%s)\n", SemVer, apiSemVer))
+	return false, nil
+}

shared/models.go

@@ -61,3 +61,8 @@ type TrafficFilteringOptions struct {
 	PlainTextMaskingRegexes []*SerializableRegexp
 	HideHealthChecks        bool
 }
+
+type VersionResponse struct {
+	SemVer string `json:"semver"`
+}
+