Skip to content

Fix unidiomatic error handling, unchecked errors, and other unidiomatic code #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Fix unidiomatic error handling, unchecked errors, and other unidiomatic code #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
706ce8f
Fix error handling for cmd/configure.go
leofleeo Jul 4, 2025
37b8809
Changed something I didn't mean to change
leofleeo Jul 4, 2025
7d1ceb7
Remove deprecated use of math/rand package
leofleeo Jul 23, 2025
74abfc1
Export RootFs as it is used in an exported function (NewFs)
leofleeo Jul 23, 2025
dad1266
Fix errors in deferred functions not being checked part 1
leofleeo Jul 23, 2025
f3b2210
Fix errors in deferred functions not being checked part 2
leofleeo Jul 23, 2025
b3c6fb2
Remove old logsink and installsink fields as sinks map is being used …
leofleeo Jul 23, 2025
d699bb0
Rewrite code used to create diagnostic report for better error handling
leofleeo Jul 23, 2025
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
29 changes: 16 additions & 13 deletions cmd/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package cmd
import (
"crypto/tls"
"fmt"
"github.com/pelican-dev/wings/utils"
"io"
"log"
"net/http"
"net/url"
"os"
Expand Down Expand Up @@ -53,13 +55,15 @@ func configureCmdRun(cmd *cobra.Command, args []string) {
}

if _, err := os.Stat(configureArgs.ConfigPath); err == nil && !configureArgs.Override {
survey.AskOne(&survey.Confirm{Message: "Override existing configuration file"}, &configureArgs.Override)
err := survey.AskOne(&survey.Confirm{Message: "Override existing configuration file"}, &configureArgs.Override)
if err != nil && err != terminal.InterruptErr {
log.Fatal(err)
}
if !configureArgs.Override {
fmt.Println("Aborting process; a configuration file already exists for this node.")
os.Exit(1)
log.Fatal("Aborting process; a configuration file already exists for this node.")
}
} else if err != nil && !os.IsNotExist(err) {
panic(err)
log.Fatal(err)
}

var questions []*survey.Question
Expand Down Expand Up @@ -111,8 +115,7 @@ func configureCmdRun(cmd *cobra.Command, args []string) {
if err == terminal.InterruptErr {
return
}

panic(err)
log.Fatal(err)
}

c := &http.Client{
Expand All @@ -121,7 +124,7 @@ func configureCmdRun(cmd *cobra.Command, args []string) {

req, err := getRequest()
if err != nil {
panic(err)
log.Fatal(err)
}

fmt.Printf("%+v", req.Header)
Expand All @@ -132,7 +135,7 @@ func configureCmdRun(cmd *cobra.Command, args []string) {
fmt.Println("Failed to fetch configuration from the panel.\n", err.Error())
os.Exit(1)
}
defer res.Body.Close()
defer utils.CloseResponseBodyWithErrorHandling(res.Body)

if res.StatusCode == http.StatusForbidden || res.StatusCode == http.StatusUnauthorized {
fmt.Println("The authentication credentials provided were not valid.")
Expand All @@ -148,18 +151,18 @@ func configureCmdRun(cmd *cobra.Command, args []string) {

cfg, err := config.NewAtPath(configPath)
if err != nil {
panic(err)
log.Fatal(err)
}

if err := json.Unmarshal(b, cfg); err != nil {
panic(err)
log.Fatal(err)
}

// Manually specify the Panel URL as it won't be decoded from JSON.
cfg.PanelLocation = configureArgs.PanelURL

if err = config.WriteToDisk(cfg); err != nil {
panic(err)
log.Fatal(err)
}

fmt.Println("Successfully configured wings.")
Expand All @@ -168,7 +171,7 @@ func configureCmdRun(cmd *cobra.Command, args []string) {
func getRequest() (*http.Request, error) {
u, err := url.Parse(configureArgs.PanelURL)
if err != nil {
panic(err)
log.Fatal(err)
}

u.Path = path.Join(u.Path, fmt.Sprintf("api/application/nodes/%s/configuration", configureArgs.Node))
Expand Down
Loading
Loading