From 61d9d2e2d15c2bd9745850e98691031210f173f4 Mon Sep 17 00:00:00 2001 From: Patrick Balsiger Date: Sun, 18 May 2025 19:33:59 +0200 Subject: [PATCH] feat: refactor deprecated WriteFile usage --- go.mod | 1 - go.sum | 2 -- pkg/http/server.go | 2 +- pkg/system/file.go | 3 +-- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 71a534d..98528f2 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ replace github.com/0x1d/rcond/cmd => ./cmd replace github.com/0x1d/rcond/pkg => ./pkg require ( - github.com/godbus/dbus v4.1.0+incompatible github.com/godbus/dbus/v5 v5.1.0 github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 diff --git a/go.sum b/go.sum index 98275cc..da7c50e 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,6 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4= -github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= diff --git a/pkg/http/server.go b/pkg/http/server.go index 828a477..5aa23c0 100644 --- a/pkg/http/server.go +++ b/pkg/http/server.go @@ -74,13 +74,13 @@ func (s *Server) RegisterRoutes() { s.router.HandleFunc("/hostname", s.verifyToken(HandleSetHostname)).Methods(http.MethodPost) s.router.HandleFunc("/users/{user}/keys", s.verifyToken(HandleAddAuthorizedKey)).Methods(http.MethodPost) s.router.HandleFunc("/users/{user}/keys/{fingerprint}", s.verifyToken(HandleRemoveAuthorizedKey)).Methods(http.MethodDelete) + s.router.HandleFunc("/system/file", s.verifyToken(HandleFileUpload)).Methods(http.MethodPost) s.router.HandleFunc("/system/restart", s.verifyToken(HandleReboot)).Methods(http.MethodPost) s.router.HandleFunc("/system/shutdown", s.verifyToken(HandleShutdown)).Methods(http.MethodPost) s.router.HandleFunc("/cluster/members", s.verifyToken(ClusterAgentHandler(s.clusterAgent, HandleClusterMembers))).Methods(http.MethodGet) s.router.HandleFunc("/cluster/join", s.verifyToken(ClusterAgentHandler(s.clusterAgent, HandleClusterJoin))).Methods(http.MethodPost) s.router.HandleFunc("/cluster/leave", s.verifyToken(ClusterAgentHandler(s.clusterAgent, HandleClusterLeave))).Methods(http.MethodPost) s.router.HandleFunc("/cluster/event", s.verifyToken(ClusterAgentHandler(s.clusterAgent, HandleClusterEvent))).Methods(http.MethodPost) - s.router.HandleFunc("/system/file", s.verifyToken(HandleFileUpload)).Methods(http.MethodPost) } func (s *Server) healthHandler(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/system/file.go b/pkg/system/file.go index 424569b..ad69bba 100644 --- a/pkg/system/file.go +++ b/pkg/system/file.go @@ -2,7 +2,6 @@ package system import ( "fmt" - "io/ioutil" "os" "path/filepath" ) @@ -17,7 +16,7 @@ func StoreFile(path string, content []byte) error { } // Write the file - if err := ioutil.WriteFile(path, content, 0644); err != nil { + if err := os.WriteFile(path, content, 0644); err != nil { return fmt.Errorf("failed to write file: %v", err) }