@@ -75,33 +75,9 @@ func doParseableQuery(query string, streamName string, startTime string, endTime
7575 return arrResult , nil
7676}
7777
78- func listParseableStreams () ([]string , error ) {
78+ func listParseableStreams () ([]map [ string ] interface {} , error ) {
7979 url := ParseableBaseURL + "/api/v1/logstream"
80- httpReq , err := http .NewRequest ("GET" , url , nil )
81- if err != nil {
82- return nil , err
83- }
84- addBasicAuth (httpReq )
85- resp , err := HTTPClient .Do (httpReq )
86- if err != nil {
87- return nil , err
88- }
89- defer func () {
90- if err := resp .Body .Close (); err != nil {
91- slog .Error ("failed to close response body" , "error" , err )
92- }
93- }()
94- var apiResult []struct {
95- Name string `json:"name"`
96- }
97- if err := json .NewDecoder (resp .Body ).Decode (& apiResult ); err != nil {
98- return nil , err
99- }
100- streams := make ([]string , 0 , len (apiResult ))
101- for _ , s := range apiResult {
102- streams = append (streams , s .Name )
103- }
104- return streams , nil
80+ return doSimpleGetArray (url )
10581}
10682
10783func getParseableSchema (stream string ) (map [string ]interface {}, error ) {
@@ -129,38 +105,31 @@ func getParseableSchema(stream string) (map[string]interface{}, error) {
129105
130106func getParseableStats (streamName string ) (map [string ]interface {}, error ) {
131107 url := ParseableBaseURL + "/api/v1/logstream/" + streamName + "/stats"
132- stats , m , err := doSimpleGet (url )
133- if err != nil {
134- return m , err
135- }
136- return stats , nil
108+ stats , _ , err := doSimpleGet (url )
109+ return stats , err
137110}
138111
139112func getParseableInfo (streamName string ) (map [string ]interface {}, error ) {
140113 url := ParseableBaseURL + "/api/v1/logstream/" + streamName + "/info"
141- info , m , err := doSimpleGet (url )
142- if err != nil {
143- return m , err
144- }
145- return info , nil
114+ info , _ , err := doSimpleGet (url )
115+ return info , err
146116}
147117
148118func getParseableAbout () (map [string ]interface {}, error ) {
149119 url := ParseableBaseURL + "/api/v1/about"
150- about , m , err := doSimpleGet (url )
151- if err != nil {
152- return m , err
153- }
154- return about , nil
120+ about , _ , err := doSimpleGet (url )
121+ return about , err
155122}
156123
157124func getParseableRoles () (map [string ]interface {}, error ) {
158125 url := ParseableBaseURL + "/api/v1/roles"
159- roles , m , err := doSimpleGet (url )
160- if err != nil {
161- return m , err
162- }
163- return roles , nil
126+ roles , _ , err := doSimpleGet (url )
127+ return roles , err
128+ }
129+
130+ func getParseableUsers () ([]map [string ]interface {}, error ) {
131+ url := ParseableBaseURL + "/api/v1/users"
132+ return doSimpleGetArray (url )
164133}
165134
166135func doSimpleGet (url string ) (map [string ]interface {}, map [string ]interface {}, error ) {
@@ -178,9 +147,31 @@ func doSimpleGet(url string) (map[string]interface{}, map[string]interface{}, er
178147 slog .Error ("failed to close response body" , "error" , err )
179148 }
180149 }()
181- var stats map [string ]interface {}
182- if err := json .NewDecoder (resp .Body ).Decode (& stats ); err != nil {
150+ var response map [string ]interface {}
151+ if err := json .NewDecoder (resp .Body ).Decode (& response ); err != nil {
183152 return nil , nil , err
184153 }
185- return stats , nil , nil
154+ return response , nil , nil
155+ }
156+
157+ func doSimpleGetArray (url string ) ([]map [string ]interface {}, error ) {
158+ httpReq , err := http .NewRequest ("GET" , url , nil )
159+ if err != nil {
160+ return nil , err
161+ }
162+ addBasicAuth (httpReq )
163+ resp , err := HTTPClient .Do (httpReq )
164+ if err != nil {
165+ return nil , err
166+ }
167+ defer func () {
168+ if err := resp .Body .Close (); err != nil {
169+ slog .Error ("failed to close response body" , "error" , err )
170+ }
171+ }()
172+ var response []map [string ]interface {}
173+ if err := json .NewDecoder (resp .Body ).Decode (& response ); err != nil {
174+ return nil , err
175+ }
176+ return response , nil
186177}
0 commit comments