Merge branch 'v2' into feat/ui-rework

Author: xBlaz3kx

.github/workflows/buf.yaml

@@ -0,0 +1,34 @@
+name: buf.yaml
+on:
+  pull_request:
+    branches:
+      - main
+      - v2
+    paths:
+      - 'buf.yaml'
+      - 'buf.gen.yaml'
+      - 'proto/**'
+  push:
+    branches:
+      - main
+      - v2
+    paths:
+      - 'buf.yaml'
+      - 'buf.gen.yaml'
+      - 'buf/**'
+      - 'proto/**'
+
+jobs:
+  buf:
+    name: Run buf
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - uses: bufbuild/buf-action@v1
+        with:
+          github_token: ${{ github.token }}

.github/workflows/lint.yaml

@@ -9,6 +9,7 @@ on:
       - '.run/**'
       - 'docs/**'
       - 'deployments/**'
+      - 'gen/**'
       - '*.md'
       - 'ui/**'
 
@@ -21,6 +22,7 @@ on:
       - '.run/**'
       - 'docs/**'
       - 'deployments/**'
+      - 'gen/**'
       - '*.md'
       - 'ui/**'
 
@@ -42,17 +44,3 @@ jobs:
         with:
           version: v2.1
           args: --timeout=3m
-
-  buf:
-    name: Run buf
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - uses: bufbuild/buf-action@v1
-        with:
-          github_token: ${{ github.token }}

cmd/root.go

@@ -3,9 +3,9 @@ package cmd
 import (
 	"github.com/ChargePi/ChargePi-go/internal/pkg/models/settings"
 	"github.com/ChargePi/ChargePi-go/pkg/observability/logging"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"go.uber.org/zap"
 )
 
 var rootCmd = &cobra.Command{
@@ -17,7 +17,8 @@ var rootCmd = &cobra.Command{
 
 func init() {
 	cobra.OnInitialize(func() {
-		logging.Setup(log.StandardLogger(), settings.Logging{}, viper.GetBool(settings.Debug))
+		logger := logging.SetupZap(settings.Logging{}, viper.GetBool(settings.Debug))
+		zap.ReplaceGlobals(logger)
 	})
 
 	rootCmd.AddCommand(runCommand())
@@ -32,6 +33,6 @@ func init() {
 func Execute() {
 	err := rootCmd.Execute()
 	if err != nil {
-		log.WithError(err).Fatal("Unable to run")
+		zap.L().Fatal("Unable to run", zap.Error(err))
 	}
 }

cmd/run.go

@@ -26,7 +26,7 @@ func runCommand() *cobra.Command {
 			mainSettings := configuration.GetSettings()
 
 			// Run the charge point
-			chargepoint.Run(debug, mainSettings)
+			chargepoint.Run(cmd.Context(), debug, mainSettings)
 		},
 	}
 

cmd/version.go

@@ -2,8 +2,8 @@ package cmd
 
 import (
 	chargePoint "github.com/ChargePi/ChargePi-go/internal/pkg/models/charge-point"
-	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"go.uber.org/zap"
 )
 
 // versionCmd represents the version command
@@ -13,7 +13,7 @@ func versionCommand() *cobra.Command {
 		Short: "Version of ChargePi",
 		Long:  ``,
 		Run: func(cmd *cobra.Command, args []string) {
-			log.Infof("ChargePi version: %s", chargePoint.FirmwareVersion)
+			zap.L().Info("ChargePi version", zap.String("version", chargePoint.FirmwareVersion))
 		},
 	}
 }