diff --git a/admin/main.go b/admin/main.go index e37a1a5..8962bf4 100644 --- a/admin/main.go +++ b/admin/main.go @@ -40,6 +40,31 @@ func load() error { return nil } +func makeReq(method string, url string, body io.Reader) error { + req, err := http.NewRequest(method, url, body) + if err != nil { + return err + } + + req.Header.Set("Authorization", token) + res, err := http.DefaultClient.Do(req) + if err != nil { + return err + } + + recv, err := io.ReadAll(res.Body) + if err != nil { + return err + } + + if res.StatusCode != 200 { + fmt.Printf("<-- %d\n", res.StatusCode) + } + fmt.Printf("%s", recv) + return nil + +} + func main() { cmd := &cli.Command{ Name: "keys-admin", @@ -110,25 +135,7 @@ func clients(ctx context.Context, cmd *cli.Command) error { url = fmt.Sprintf("%s/admin/clients", server) } - req, err := http.NewRequest(http.MethodGet, url, nil) - if err != nil { - return err - } - - req.Header.Set("Authorization", token) - - res, err := http.DefaultClient.Do(req) - if err != nil { - return err - } - - body, err := io.ReadAll(res.Body) - if err != nil { - return err - } - - fmt.Printf("%s", body) - return nil + return makeReq(http.MethodGet, url, nil) } func logs(ctx context.Context, cmd *cli.Command) error { @@ -158,28 +165,10 @@ func logs(ctx context.Context, cmd *cli.Command) error { } } - url = fmt.Sprintf("%s/admin/%s/logs%s", server, id, paramsStr) + url = fmt.Sprintf("%s/admin/logs/%s%s", server, id, paramsStr) } else { url = fmt.Sprintf("%s/admin/logs", server) } - req, err := http.NewRequest(http.MethodGet, url, nil) - if err != nil { - return err - } - - req.Header.Set("Authorization", token) - - res, err := http.DefaultClient.Do(req) - if err != nil { - return err - } - - body, err := io.ReadAll(res.Body) - if err != nil { - return err - } - - fmt.Printf("%s", body) - return nil + return makeReq(http.MethodGet, url, nil) }