Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
go-version: '1.21.2'

- name: golangci-lint
uses: golangci/golangci-lint-action@v6
uses: golangci/golangci-lint-action@v7
with:
version: v1.58
version: v2.0

container:
name: Containerfile
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ lint: dependencies
## Loads all the dependencies to vendor directory
.PHONY: dependencies
dependencies:
go install golang.org/x/tools/cmd/goimports@v0.20.0
go install mvdan.cc/gofumpt@v0.6.0
go install github.com/daixiang0/[email protected].4
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.58.1
go install golang.org/x/tools/cmd/goimports@v0.31
go install mvdan.cc/gofumpt@v0.7
go install github.com/daixiang0/[email protected]
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2
go mod vendor
go mod tidy
36 changes: 32 additions & 4 deletions bs/fs_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,14 @@ func virtioBlkDeviceCheck(pseudoFsDevPath string) bool {
)
return false
}
defer file.Close()
defer func() {
if err := file.Close(); err != nil {
slog.Error(
"Error closing file.",
slog.String("error", err.Error()),
)
}
}()

devtype := "None"
scanner := bufio.NewScanner(file)
Expand Down Expand Up @@ -117,7 +124,14 @@ func virtioBlkDeviceUuid(blockDev string) (uuid.UUID, error) {
)
panic("virtioBlkDeviceUuid")
}
defer file.Close()
defer func() {
if err := file.Close(); err != nil {
slog.Error(
"Error closing file.",
slog.String("error", err.Error()),
)
}
}()

scanner := bufio.NewScanner(file)
for scanner.Scan() {
Expand Down Expand Up @@ -194,7 +208,14 @@ func scsiDeviceCheck(pseudoFsDevPath string) bool {
)
return false
}
defer file.Close()
defer func() {
if err := file.Close(); err != nil {
slog.Error(
"Error closing file.",
slog.String("error", err.Error()),
)
}
}()

devtype := "None"
scanner := bufio.NewScanner(file)
Expand Down Expand Up @@ -233,7 +254,14 @@ func scsiDeviceUuid(blockDev string) (uuid.UUID, error) {
)
panic("scsiDeviceUuid")
}
defer file.Close()
defer func() {
if err := file.Close(); err != nil {
slog.Error(
"Error closing file.",
slog.String("error", err.Error()),
)
}
}()

scanner := bufio.NewScanner(file)
for scanner.Scan() {
Expand Down
4 changes: 3 additions & 1 deletion cmd/koherence/check/bs.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ func bsCheckerCommand(clicontext *cli.Context) error {
b, err := BsMerge(machineInfos, bsFs, bsProvider)

if b != nil {
fmt.Fprintln(os.Stdout, string(b))
if _, err := fmt.Fprintln(os.Stdout, string(b)); err != nil {
slog.Error("failed to write to stdout", "err", err)
}
}

return err
Expand Down
4 changes: 3 additions & 1 deletion cmd/koherence/debug/bs.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ func debugBs(clicontext *cli.Context) error {
return err
}

fmt.Fprintln(os.Stdout, string(b))
if _, err := fmt.Fprintln(os.Stdout, string(b)); err != nil {
slog.Error("failed to write to stdout", "err", err)
}

return nil
}
4 changes: 3 additions & 1 deletion cmd/koherence/debug/machine.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ func debugMachine(clicontext *cli.Context) error {
return err
}

fmt.Fprintln(os.Stdout, string(b))
if _, err := fmt.Fprintln(os.Stdout, string(b)); err != nil {
slog.Error("failed to write to stdout", "err", err)
}

return nil
}
4 changes: 3 additions & 1 deletion cmd/koherence/debug/openstack.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ func debugOpenstack(clicontext *cli.Context) error {
return err
}

fmt.Fprintln(os.Stdout, string(b))
if _, err := fmt.Fprintln(os.Stdout, string(b)); err != nil {
slog.Error("failed to write to stdout", "err", err)
}

return nil
}
28 changes: 21 additions & 7 deletions cmd/koherence/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ var serveCommand = cli.Command{

func pingHandler(w http.ResponseWriter, req *http.Request) {
w.WriteHeader(http.StatusOK)
fmt.Fprintln(w, "pong")
if _, err := fmt.Fprintln(w, "pong"); err != nil {
slog.Error("failed to write to http.ResponseWriter", "err", err)
}
}

func debugBsHandler(w http.ResponseWriter, req *http.Request) {
Expand All @@ -42,7 +44,9 @@ func debugBsHandler(w http.ResponseWriter, req *http.Request) {

w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
fmt.Fprintln(w, string(b))
if _, err := fmt.Fprintln(w, string(b)); err != nil {
slog.Error("failed to write to http.ResponseWriter", "err", err)
}
}

func debugMachineFsHandler(w http.ResponseWriter, req *http.Request) {
Expand All @@ -63,7 +67,9 @@ func debugMachineFsHandler(w http.ResponseWriter, req *http.Request) {

w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
fmt.Fprintln(w, string(b))
if _, err := fmt.Fprintln(w, string(b)); err != nil {
slog.Error("failed to write to http.ResponseWriter", "err", err)
}
}

func debugMachineOpenstackHandler(w http.ResponseWriter, req *http.Request) {
Expand All @@ -84,7 +90,9 @@ func debugMachineOpenstackHandler(w http.ResponseWriter, req *http.Request) {

w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
fmt.Fprintln(w, string(b))
if _, err := fmt.Fprintln(w, string(b)); err != nil {
slog.Error("failed to write to http.ResponseWriter", "err", err)
}
}

func debugOpenstackHandler(w http.ResponseWriter, req *http.Request) {
Expand All @@ -108,7 +116,9 @@ func debugOpenstackHandler(w http.ResponseWriter, req *http.Request) {

w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
fmt.Fprintln(w, string(b))
if _, err := fmt.Fprintln(w, string(b)); err != nil {
slog.Error("failed to write to http.ResponseWriter", "err", err)
}
}

func checkBsHandler(w http.ResponseWriter, req *http.Request) {
Expand All @@ -132,7 +142,9 @@ func checkBsHandler(w http.ResponseWriter, req *http.Request) {

w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
fmt.Fprintln(w, string(b))
if _, err := fmt.Fprintln(w, string(b)); err != nil {
slog.Error("failed to write to http.ResponseWriter", "err", err)
}
}

func checkMachineHandler(w http.ResponseWriter, req *http.Request) {
Expand Down Expand Up @@ -167,7 +179,9 @@ func checkOpenstackMultiattachHandler(w http.ResponseWriter, req *http.Request)

w.Header().Set("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
fmt.Fprintln(w, string(b))
if _, err := fmt.Fprintln(w, string(b)); err != nil {
slog.Error("failed to write to http.ResponseWriter", "err", err)
}
}

func serveAllCommand(clicontext *cli.Context) error {
Expand Down
9 changes: 8 additions & 1 deletion machine/openstack_linklocal.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,14 @@ func fetchMetadataJson() (*openstackMetadata, error) {
)
return nil, err
}
defer resp.Body.Close()
defer func() {
if err := resp.Body.Close(); err != nil {
slog.Error(
"Error closing http response",
slog.String("error", err.Error()),
)
}
}()

if err = json.NewDecoder(resp.Body).Decode(&metadatas); err != nil {
slog.Error(
Expand Down
Loading