fix: use ocpp manager v1.3, fix compile time issues, resolve mock generation

Author: xBlaz3kx

.golangci.yaml

@@ -23,7 +23,7 @@ linters:
   exclusions:
     generated: lax
     paths:
-      - ./gen
+      - ./gen/*
       - ./pkg/reader
 formatters:
   settings:
@@ -32,4 +32,7 @@ formatters:
         - github.com/ChargePi/ChargePi-go
   enable:
     - gofmt
-    - goimports
+    - goimports
+  exclusions:
+    paths:
+      - gen/*

cmd/charge-point.go cmd/charge_point.gocmd/charge-point.go renamed to cmd/charge_point.go

@@ -9,7 +9,7 @@ import (
 	cfg "github.com/ChargePi/ChargePi-go/internal/pkg/configuration"
 	exporter2 "github.com/ChargePi/ChargePi-go/internal/pkg/configuration/exporter"
 	"github.com/ChargePi/ChargePi-go/internal/pkg/configuration/manager"
-	"github.com/ChargePi/ocppManager-go/ocpp_v16"
+	"github.com/ChargePi/ocpp-manager/ocpp_v16"
 	"github.com/spf13/cobra"
 )
 

cmd/export.go

@@ -9,7 +9,7 @@ import (
 	importer2 "github.com/ChargePi/ChargePi-go/internal/pkg/configuration/importer"
 	"github.com/ChargePi/ChargePi-go/internal/pkg/configuration/manager"
 	"github.com/ChargePi/ChargePi-go/pkg/ocpp"
-	"github.com/ChargePi/ocppManager-go/ocpp_v16"
+	"github.com/ChargePi/ocpp-manager/ocpp_v16"
 	"github.com/spf13/cobra"
 )
 

cmd/import.go

@@ -1,11 +1,15 @@
 package cmd
 
 import (
+	"context"
 	"github.com/ChargePi/ChargePi-go/internal/pkg/configuration"
 	"github.com/ChargePi/ChargePi-go/pkg/observability"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"os"
+	"os/signal"
+	"syscall"
 )
 
 var rootCmd = &cobra.Command{
@@ -17,7 +21,11 @@ var rootCmd = &cobra.Command{
 
 func init() {
 	cobra.OnInitialize(func() {
-		observability.SetupLogging(log.StandardLogger(), observability.Logging{}, viper.GetBool(configuration.Debug))
+		observability.SetupLogging(
+			log.StandardLogger(),
+			observability.Logging{},
+			viper.GetBool(configuration.Debug),
+		)
 	})
 
 	rootCmd.AddCommand(runCommand())
@@ -30,7 +38,10 @@ func init() {
 }
 
 func Execute() {
-	err := rootCmd.Execute()
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGKILL, syscall.SIGTERM)
+	defer cancel()
+
+	err := rootCmd.ExecuteContext(ctx)
 	if err != nil {
 		log.WithError(err).Fatal("Unable to run")
 	}

cmd/root.go

@@ -2,10 +2,6 @@ package cmd
 
 import (
 	"context"
-	"os"
-	"os/signal"
-	"syscall"
-
 	"github.com/ChargePi/ChargePi-go/internal/api/grpc"
 	"github.com/ChargePi/ChargePi-go/internal/api/http"
 	"github.com/ChargePi/ChargePi-go/internal/auth"
@@ -19,7 +15,7 @@ import (
 	"github.com/ChargePi/ChargePi-go/internal/sessions"
 	"github.com/ChargePi/ChargePi-go/internal/users"
 	"github.com/ChargePi/ChargePi-go/pkg/observability"
-	"github.com/ChargePi/ocppManager-go/ocpp_v16"
+	"github.com/ChargePi/ocpp-manager/ocpp_v16"
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -43,10 +39,7 @@ func runCommand() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			debug := viper.GetBool(configuration.Debug)
 			runtimeSettings := configuration.GetRuntimeSettings()
-
-			// Run the charge point
-			ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGKILL, syscall.SIGTERM)
-			defer cancel()
+			ctx := cmd.Context()
 
 			// Create a logger
 			logger := log.StandardLogger()