Skip to content

Commit 8b0554d

Browse files
committed
Review feedback: Modularize http status code check
1 parent 40a95d8 commit 8b0554d

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

pkg/plugin/client.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ func (d *DataSetClient) doPingRequest(req interface{}) (*LRQResult, error) {
8383

8484
const TOKEN_HEADER = "X-Dataset-Query-Forward-Tag"
8585

86+
isSuccessful := func(r *http.Response) bool {
87+
return 200 <= r.StatusCode && r.StatusCode < 300
88+
}
89+
8690
body, err := json.Marshal(req)
8791
if err != nil {
8892
log.DefaultLogger.Error("error marshalling request to DataSet", "err", err)
@@ -126,9 +130,9 @@ func (d *DataSetClient) doPingRequest(req interface{}) (*LRQResult, error) {
126130
return nil, err
127131
}
128132

129-
if !(200 <= resp.StatusCode && resp.StatusCode < 300) {
130-
log.DefaultLogger.Error("non-2xx status code from DataSet request", "code", resp.StatusCode)
131-
return nil, fmt.Errorf("non-2xx (%d) status code from DataSet request", resp.StatusCode)
133+
if !isSuccessful(resp) {
134+
log.DefaultLogger.Error("unsuccessful status code from DataSet request", "code", resp.StatusCode)
135+
return nil, fmt.Errorf("unsuccessful (%d) status code from DataSet request", resp.StatusCode)
132136
}
133137

134138
if err = json.Unmarshal(respBytes, &respBody); err != nil {
@@ -180,8 +184,8 @@ func (d *DataSetClient) doPingRequest(req interface{}) (*LRQResult, error) {
180184
io.ReadAll(resp.Body)
181185
resp.Body.Close()
182186

183-
if !(200 <= resp.StatusCode && resp.StatusCode < 300) {
184-
log.DefaultLogger.Warn("non-2xx status code from DataSet delete", "code", resp.StatusCode)
187+
if !isSuccessful(resp) {
188+
log.DefaultLogger.Warn("unsuccessful status code from DataSet delete", "code", resp.StatusCode)
185189
}
186190
}
187191
}

0 commit comments

Comments
 (0)