diff --git a/fields/extract.go b/fields/extract.go index 646d04f..395a7d2 100644 --- a/fields/extract.go +++ b/fields/extract.go @@ -44,9 +44,9 @@ func downloadJar(version string) (string, error) { var uncompressedReader io.Reader arReader := ar.NewReader(debResp.Body) - for true { + for { header, err := arReader.Next() - if err == io.EOF || header == nil { + if errors.Is(err, io.EOF) || header == nil { break } if err != nil { @@ -70,9 +70,9 @@ func downloadJar(version string) (string, error) { var aceJar *os.File - for true { + for { header, err := tarReader.Next() - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { diff --git a/fields/main.go b/fields/main.go index 3d45ed1..f284c51 100644 --- a/fields/main.go +++ b/fields/main.go @@ -355,7 +355,9 @@ func main() { code, _ := resource.generateCode() _ = 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) @@ -447,12 +449,12 @@ func (r *Resource) fieldInfoFromValidation(name string, validation interface{}) } 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) } omitEmpty = true - fieldInfo, err = NewFieldInfo(fieldName, name, "int", fieldValidation, omitEmpty, false), nil + fieldInfo = NewFieldInfo(fieldName, name, "int", fieldValidation, omitEmpty, false) fieldInfo.CustomUnmarshalType = "emptyStringInt" return fieldInfo, r.FieldProcessor(fieldName, fieldInfo) } @@ -493,7 +495,7 @@ func (r *Resource) generateCode() (string, error) { "embedTypes": func() bool { return embedTypes }, }).Parse(apiGoTemplate)) - tpl.Execute(writer, r) + err = tpl.Execute(writer, r) return buf.String(), err } diff --git a/unifi/unifi.go b/unifi/unifi.go index 640694d..a3d5adc 100644 --- a/unifi/unifi.go +++ b/unifi/unifi.go @@ -247,7 +247,9 @@ func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody int errBody := struct { 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()) }