Linter and Drone config fixes, code linting.

This commit is contained in:
2021-11-20 23:06:40 +05:00
parent 9c045e9fd3
commit d5fcc5cef9
22 changed files with 152 additions and 146 deletions

View File

@@ -1,22 +1,17 @@
package requester
import (
// stdlib
"bytes"
"context"
"encoding/json"
"io/ioutil"
"net/http"
// local
"go.dev.pztrn.name/giredore/internal/logger"
// other
"github.com/rs/zerolog"
"go.dev.pztrn.name/giredore/internal/logger"
)
var (
log zerolog.Logger
)
var log zerolog.Logger
func Initialize() {
log = logger.Logger.With().Str("type", "internal").Str("package", "requester").Logger()
@@ -27,6 +22,7 @@ func Delete(url string, data interface{}) ([]byte, error) {
return execRequest("DELETE", url, data)
}
// nolint:wrapcheck
func execRequest(method string, url string, data interface{}) ([]byte, error) {
log.Debug().Str("method", method).Str("URL", url).Msg("Trying to execute HTTP request...")
@@ -38,7 +34,7 @@ func execRequest(method string, url string, data interface{}) ([]byte, error) {
}
// Compose HTTP request.
httpReq, err := http.NewRequest(method, url, bytes.NewReader(dataToSend))
httpReq, err := http.NewRequestWithContext(context.Background(), method, url, bytes.NewReader(dataToSend))
if err != nil {
return nil, err
}

View File

@@ -1,14 +1,14 @@
package requester
import (
// stdlib
"net"
"net/http"
"time"
)
// nolint:exhaustivestruct
func getHTTPClient() *http.Client {
c := &http.Client{
client := &http.Client{
Transport: &http.Transport{
ExpectContinueTimeout: time.Second * 5,
DialContext: (&net.Dialer{
@@ -19,5 +19,5 @@ func getHTTPClient() *http.Client {
},
}
return c
return client
}