From 9d82197b394ac95c64300a2f1adbf803f8422b73 Mon Sep 17 00:00:00 2001 From: Eslam-Nawara Date: Thu, 26 Dec 2024 11:06:15 +0200 Subject: [PATCH] show /etc/resolv.conf --- pkg/zos_api/admin.go | 9 ++++++++- pkg/zos_api/routes.go | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/zos_api/admin.go b/pkg/zos_api/admin.go index 15c87faf0..31b9c56eb 100644 --- a/pkg/zos_api/admin.go +++ b/pkg/zos_api/admin.go @@ -4,6 +4,8 @@ import ( "context" "encoding/json" "fmt" + "os" + "path/filepath" "github.com/threefoldtech/zos/pkg/zinit" ) @@ -42,7 +44,7 @@ func (g *ZosAPI) adminRestartAllHandler(ctx context.Context, payload []byte) (in return nil, nil } -func (g *ZosAPI) adminShowLogs(ctx context.Context, payload []byte) (interface{}, error) { +func (g *ZosAPI) adminShowLogsHandler(ctx context.Context, payload []byte) (interface{}, error) { var n int if err := json.Unmarshal(payload, &n); err != nil { return nil, fmt.Errorf("failed to decode input, expecting string: %w", err) @@ -53,6 +55,11 @@ func (g *ZosAPI) adminShowLogs(ctx context.Context, payload []byte) (interface{} return zinit.Log(n) } +func (g *ZosAPI) adminShowResolveHandler(ctx context.Context, payload []byte) (interface{}, error) { + path := filepath.Join("/etc", "resolv.conf") + return os.ReadFile(path) +} + func (g *ZosAPI) adminInterfacesHandler(ctx context.Context, payload []byte) (interface{}, error) { // list all interfaces on node type Interface struct { diff --git a/pkg/zos_api/routes.go b/pkg/zos_api/routes.go index 558785d07..aed39dfec 100644 --- a/pkg/zos_api/routes.go +++ b/pkg/zos_api/routes.go @@ -49,7 +49,8 @@ func (g *ZosAPI) SetupRoutes(router *peer.Router) { admin.WithHandler("restart", g.adminRestartServiceHandler) admin.WithHandler("restart_all", g.adminRestartAllHandler) - admin.WithHandler("show_logs", g.adminShowLogs) + admin.WithHandler("show_logs", g.adminShowLogsHandler) + admin.WithHandler("show_resolve", g.adminShowResolveHandler) admin.WithHandler("interfaces", g.adminInterfacesHandler) admin.WithHandler("set_public_nic", g.adminSetPublicNICHandler)