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

lint issues

Browse Source
This commit is contained in:
Paul Tyng
2022-10-22 21:02:27 -04:00
parent 0552712b3b
commit e7f16ff6c4
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fields/extract.go
View File

@@ -7,7 +7,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"os" "os"
"path" "path"
@@ -128,7 +127,7 @@ func extractJSON(jarFile, fieldsDir string) error {
} }
} }
settingsData, err := ioutil.ReadFile(filepath.Join(fieldsDir, "Setting.json")) settingsData, err := os.ReadFile(filepath.Join(fieldsDir, "Setting.json"))
if errors.Is(err, os.ErrNotExist) { if errors.Is(err, os.ErrNotExist) {
return nil return nil
} }
@@ -150,7 +149,7 @@ func extractJSON(jarFile, fieldsDir string) error {
return fmt.Errorf("unable to marshal setting %q: %w", k, err) return fmt.Errorf("unable to marshal setting %q: %w", k, err)
} }
err = ioutil.WriteFile(filepath.Join(fieldsDir, fileName), data, 0755) err = os.WriteFile(filepath.Join(fieldsDir, fileName), data, 0755)
if err != nil { if err != nil {
return fmt.Errorf("unable to write new settings file: %w", err) return fmt.Errorf("unable to write new settings file: %w", err)
} }

13
fields/main.go
View File

@@ -9,7 +9,6 @@ import (
"fmt" "fmt"
"go/format" "go/format"
"io" "io"
"io/ioutil"
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
@@ -274,7 +273,7 @@ func main() {
os.Exit(0) os.Exit(0)
} }
fieldsFiles, err := ioutil.ReadDir(fieldsDir) fieldsFiles, err := os.ReadDir(fieldsDir)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@@ -299,7 +298,7 @@ func main() {
goFile := strcase.ToSnake(structName) + ".generated.go" goFile := strcase.ToSnake(structName) + ".generated.go"
fieldsFilePath := filepath.Join(fieldsDir, fieldsFile.Name()) fieldsFilePath := filepath.Join(fieldsDir, fieldsFile.Name())
b, err := ioutil.ReadFile(fieldsFilePath) b, err := os.ReadFile(fieldsFilePath)
if err != nil { if err != nil {
fmt.Printf("skipping file %s: %s", fieldsFile.Name(), err) fmt.Printf("skipping file %s: %s", fieldsFile.Name(), err)
continue continue
@@ -426,7 +425,7 @@ func main() {
} }
_ = os.Remove(filepath.Join(outDir, goFile)) _ = os.Remove(filepath.Join(outDir, goFile))
if err := ioutil.WriteFile(filepath.Join(outDir, goFile), ([]byte)(code), 0644); err != nil { if err := os.WriteFile(filepath.Join(outDir, goFile), ([]byte)(code), 0644); err != nil {
panic(err) panic(err)
} }
} }
@@ -445,7 +444,7 @@ const UnifiVersion = %q
panic(err) panic(err)
} }
if err := ioutil.WriteFile(filepath.Join(outDir, "version.generated.go"), versionGo, 0644); err != nil { if err := os.WriteFile(filepath.Join(outDir, "version.generated.go"), versionGo, 0644); err != nil {
panic(err) panic(err)
} }
@@ -586,12 +585,12 @@ func (r *Resource) generateCode() (string, error) {
err = tpl.Execute(writer, r) err = tpl.Execute(writer, r)
if err != nil { if err != nil {
return "", fmt.Errorf("Failed to render template: %w", err) return "", fmt.Errorf("failed to render template: %w", err)
} }
src, err := format.Source(buf.Bytes()) src, err := format.Source(buf.Bytes())
if err != nil { if err != nil {
return "", fmt.Errorf("Failed to format source: %w", err) return "", fmt.Errorf("failed to format source: %w", err)
} }
return string(src), err return string(src), err