Avoid resource leak in timestamp_infos

ddelemeny · ddelemeny · commit d78b39479a83 · 2024-04-15T09:19:59.000-05:00
diff --git a/pkg/quickwit/timestamp_infos.go b/pkg/quickwit/timestamp_infos.go
@@ -54,6 +54,7 @@ func GetTimestampFieldFromIndex(index string, qwickwitUrl string, cli *http.Clie
 		qwlog.Error(errMsg)
 		return "", "", err
 	}
+	defer r.Body.Close()
 
 	statusCode := r.StatusCode
 
@@ -63,7 +64,6 @@ func GetTimestampFieldFromIndex(index string, qwickwitUrl string, cli *http.Clie
 		return "", "", NewErrorCreationPayload(statusCode, errMsg)
 	}
 
-	defer r.Body.Close()
 	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		errMsg := fmt.Sprintf("Error when calling url = %s: err = %s", mappingEndpointUrl, err.Error())
@@ -83,6 +83,7 @@ func GetTimestampFieldFromIndexPattern(indexPattern string, qwickwitUrl string,
 		qwlog.Error(errMsg)
 		return "", "", err
 	}
+	defer r.Body.Close()
 
 	statusCode := r.StatusCode
 
@@ -92,7 +93,6 @@ func GetTimestampFieldFromIndexPattern(indexPattern string, qwickwitUrl string,
 		return "", "", NewErrorCreationPayload(statusCode, errMsg)
 	}
 
-	defer r.Body.Close()
 	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		errMsg := fmt.Sprintf("Error when calling url = %s: err = %s", mappingEndpointUrl, err.Error())

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ func GetTimestampFieldFromIndex(index string, qwickwitUrl string, cli *http.Clie`
`54`	`54`	`qwlog.Error(errMsg)`
`55`	`55`	`return "", "", err`
`56`	`56`	`}`
	`57`	`+ defer r.Body.Close()`
`57`	`58`
`58`	`59`	`statusCode := r.StatusCode`
`59`	`60`
`@@ -63,7 +64,6 @@ func GetTimestampFieldFromIndex(index string, qwickwitUrl string, cli *http.Clie`
`63`	`64`	`return "", "", NewErrorCreationPayload(statusCode, errMsg)`
`64`	`65`	`}`
`65`	`66`
`66`		`- defer r.Body.Close()`
`67`	`67`	`body, err := io.ReadAll(r.Body)`
`68`	`68`	`if err != nil {`
`69`	`69`	`errMsg := fmt.Sprintf("Error when calling url = %s: err = %s", mappingEndpointUrl, err.Error())`
`@@ -83,6 +83,7 @@ func GetTimestampFieldFromIndexPattern(indexPattern string, qwickwitUrl string,`
`83`	`83`	`qwlog.Error(errMsg)`
`84`	`84`	`return "", "", err`
`85`	`85`	`}`
	`86`	`+ defer r.Body.Close()`
`86`	`87`
`87`	`88`	`statusCode := r.StatusCode`
`88`	`89`
`@@ -92,7 +93,6 @@ func GetTimestampFieldFromIndexPattern(indexPattern string, qwickwitUrl string,`
`92`	`93`	`return "", "", NewErrorCreationPayload(statusCode, errMsg)`
`93`	`94`	`}`
`94`	`95`
`95`		`- defer r.Body.Close()`
`96`	`96`	`body, err := io.ReadAll(r.Body)`
`97`	`97`	`if err != nil {`
`98`	`98`	`errMsg := fmt.Sprintf("Error when calling url = %s: err = %s", mappingEndpointUrl, err.Error())`