Merge pull request #11 from bilalcaliskan/devel

refactor: handle remove cli subcommand properly at the daemon side

internal/constants/errors.go

@@ -22,4 +22,5 @@ const (
 	FailedToCleanupIPC                = "failed to cleanup IPC"
 	FailedToInitializeIPC             = "failed to initialize IPC"
 	FailedToRemoveRouteEntry          = "failed to remove RouteEntry from state"
+	EntryAlreadyExists                = "route entry already exists in state"
 )

internal/ipc/ipc.go

@@ -168,7 +168,7 @@ func handleRemoveCommand(logger zerolog.Logger, gw string, domains []string, con
 			if err := writeResponse(&DaemonResponse{
 				Success:  false,
 				Response: "",
-				Error:    errors.New(constants.EntryNotFound).Error(),
+				Error:    errors.Wrap(errors.New(constants.EntryNotFound), constants.FailedToRemoveRouteEntry).Error(),
 			}, conn); err != nil {
 				logger.Error().
 					Err(err).

internal/state/state.go

@@ -39,10 +39,12 @@ func NewRouteEntry(domain, resolvedIP, gateway string) *RouteEntry {
 func (s *State) AddEntry(entry *RouteEntry) error {
 	for _, e := range s.Entries {
 		if e.Domain == entry.Domain {
-			if e.ResolvedIP != entry.ResolvedIP {
-				e.ResolvedIP = entry.ResolvedIP
+			if e.ResolvedIP == entry.ResolvedIP {
+				return errors.New(constants.EntryAlreadyExists)
 			}
-			return nil
+
+			e.ResolvedIP = entry.ResolvedIP
+			return s.Write("/tmp/state.json")
 		}
 	}
 
@@ -56,7 +58,7 @@ func (s *State) RemoveEntry(domain string) error {
 	for i, entry := range s.Entries {
 		if entry.Domain == domain {
 			s.Entries = append(s.Entries[:i], s.Entries[i+1:]...)
-			return nil
+			return s.Write("/tmp/state.json")
 		}
 	}