klauvsteinen/go-unifi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix linter issues

Browse Source
This commit is contained in:
Joshua Spence
2021-06-24 12:50:12 +10:00
committed by Paul Tyng
parent 496fcdf07c
commit 64a73cdd4b
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fields/extract.go
View File

@@ -44,9 +44,9 @@ func downloadJar(version string) (string, error) {
var uncompressedReader io.Reader var uncompressedReader io.Reader
arReader := ar.NewReader(debResp.Body) arReader := ar.NewReader(debResp.Body)
for true { for {
header, err := arReader.Next() header, err := arReader.Next()
if err == io.EOF || header == nil { if errors.Is(err, io.EOF) || header == nil {
break break
} }
if err != nil { if err != nil {
@@ -70,9 +70,9 @@ func downloadJar(version string) (string, error) {
var aceJar *os.File var aceJar *os.File
for true { for {
header, err := tarReader.Next() header, err := tarReader.Next()
if err == io.EOF { if errors.Is(err, io.EOF) {
break break
} }
if err != nil { if err != nil {

10
fields/main.go
View File

@@ -355,7 +355,9 @@ func main() {
code, _ := resource.generateCode() code, _ := resource.generateCode()
_ = os.Remove(filepath.Join(outDir, goFile)) _ = os.Remove(filepath.Join(outDir, goFile))
ioutil.WriteFile(filepath.Join(outDir, goFile), ([]byte)(code), 0644) if err := ioutil.WriteFile(filepath.Join(outDir, goFile), ([]byte)(code), 0644); err != nil {
panic(err)
}
} }
fmt.Printf("%s\n", outDir) fmt.Printf("%s\n", outDir)
@@ -447,12 +449,12 @@ func (r *Resource) fieldInfoFromValidation(name string, validation interface{})
} }
omitEmpty = true omitEmpty = true
fieldInfo, err = NewFieldInfo(fieldName, name, "float64", fieldValidation, omitEmpty, false), nil fieldInfo = NewFieldInfo(fieldName, name, "float64", fieldValidation, omitEmpty, false)
return fieldInfo, r.FieldProcessor(fieldName, fieldInfo) return fieldInfo, r.FieldProcessor(fieldName, fieldInfo)
} }
omitEmpty = true omitEmpty = true
fieldInfo, err = NewFieldInfo(fieldName, name, "int", fieldValidation, omitEmpty, false), nil fieldInfo = NewFieldInfo(fieldName, name, "int", fieldValidation, omitEmpty, false)
fieldInfo.CustomUnmarshalType = "emptyStringInt" fieldInfo.CustomUnmarshalType = "emptyStringInt"
return fieldInfo, r.FieldProcessor(fieldName, fieldInfo) return fieldInfo, r.FieldProcessor(fieldName, fieldInfo)
} }
@@ -493,7 +495,7 @@ func (r *Resource) generateCode() (string, error) {
"embedTypes": func() bool { return embedTypes }, "embedTypes": func() bool { return embedTypes },
}).Parse(apiGoTemplate)) }).Parse(apiGoTemplate))
tpl.Execute(writer, r) err = tpl.Execute(writer, r)
return buf.String(), err return buf.String(), err
} }

4
unifi/unifi.go
View File

@@ -247,7 +247,9 @@ func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody int
errBody := struct { errBody := struct {
Meta meta `json:"meta"` Meta meta `json:"meta"`
}{} }{}
err = json.NewDecoder(resp.Body).Decode(&errBody) if err = json.NewDecoder(resp.Body).Decode(&errBody); err != nil {
return err
}
return fmt.Errorf("%w (%s) for %s %s", errBody.Meta.error(), resp.Status, method, url.String()) return fmt.Errorf("%w (%s) for %s %s", errBody.Meta.error(), resp.Status, method, url.String())
} }