Deployment and lifecycle management for Nix
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

client: address staticcheck

+43 -24
+19
.golangci.yml
··· 1 + version: "2" 1 2 linters: 2 3 enable: 3 4 - sloglint 5 + exclusions: 6 + generated: lax 7 + presets: 8 + - comments 9 + - common-false-positives 10 + - legacy 11 + - std-error-handling 12 + paths: 13 + - third_party$ 14 + - builtin$ 15 + - examples$ 16 + formatters: 17 + exclusions: 18 + generated: lax 19 + paths: 20 + - third_party$ 21 + - builtin$ 22 + - examples$
+11 -11
cmd/client/builder/main.go
··· 28 28 // func All() error { 29 29 // err := Eval() 30 30 // if err != nil { 31 - // return fmt.Errorf("Failed to build: %v", err) 31 + // return fmt.Errorf("failed to build: %v", err) 32 32 // } 33 33 // 34 34 // return nil ··· 44 44 } 45 45 46 46 if q.FailureTasks() > 0 { 47 - return fmt.Errorf("Failed to build one or more output") 47 + return fmt.Errorf("failed to build one or more output") 48 48 } 49 49 50 50 return nil ··· 60 60 } 61 61 62 62 if q.FailureTasks() > 0 { 63 - return fmt.Errorf("Failed to build one or more output") 63 + return fmt.Errorf("failed to build one or more output") 64 64 } 65 65 66 66 return nil ··· 80 80 81 81 func evalJobs(workers int, resultQueue *queue.Queue, resultFunc func(evalResult) error) error { 82 82 if workers == 0 { 83 - return fmt.Errorf("No workers specified") 83 + return fmt.Errorf("no workers specified") 84 84 } 85 85 86 86 cmd := exec.Command("nix-eval-jobs", "--flake", ".#sowerJobs", "--force-recurse", "--workers", fmt.Sprint(workers)) 87 87 88 88 stdout, err := cmd.StdoutPipe() 89 89 if err != nil { 90 - return fmt.Errorf("Error creating stdout: %v", err) 90 + return fmt.Errorf("error creating stdout: %v", err) 91 91 } 92 92 93 93 stdoutDone := make(chan struct{}) ··· 101 101 err := json.Unmarshal([]byte(line), &result) 102 102 103 103 if err != nil { 104 - slog.Error("Failed to parse eval result", "error", err) 104 + slog.Error("failed to parse eval result", "error", err) 105 105 continue 106 106 } 107 107 108 108 if result.Error != "" { 109 - slog.Error("Failed eval result", "result", result) 109 + slog.Error("failed eval result", "result", result) 110 110 } else { 111 111 if err := resultQueue.QueueTask(func(ctx context.Context) error { 112 112 err := resultFunc(result) ··· 127 127 slog.Debug("Running command", "cmd", cmd.String()) 128 128 err = cmd.Start() 129 129 if err != nil { 130 - return fmt.Errorf("Error starting command: %v", err) 130 + return fmt.Errorf("error starting command: %v", err) 131 131 } 132 132 133 133 <-stdoutDone 134 134 err = cmd.Wait() 135 135 if err != nil { 136 - return fmt.Errorf("Failure during nix-eval-jobs: %v", err) 136 + return fmt.Errorf("failure during nix-eval-jobs: %v", err) 137 137 } 138 138 139 139 return nil ··· 143 143 slog.Debug("Building result", "result", result) 144 144 err := commands.SimpleRun(exec.Command("nix", "build", fmt.Sprintf("%v^*", result.DrvPath))) 145 145 if err != nil { 146 - return fmt.Errorf("Failed to build: %v", err) 146 + return fmt.Errorf("failed to build: %v", err) 147 147 } 148 148 149 149 return nil ··· 158 158 func pushResult(result evalResult) error { 159 159 err := commands.SimpleRun(exec.Command("nix", "build", fmt.Sprintf("%v^*", result.DrvPath))) 160 160 if err != nil { 161 - return fmt.Errorf("Failed to build: %v", err) 161 + return fmt.Errorf("failed to build: %v", err) 162 162 } 163 163 164 164 return nil
+1 -1
cmd/client/channel-client.go
··· 22 22 23 23 endpoint, err := url.Parse(fmt.Sprintf("%s/client", c.config.Endpoint)) 24 24 if err != nil { 25 - return fmt.Errorf("Failed to parse endpoint: %v", err) 25 + return fmt.Errorf("failed to parse endpoint: %v", err) 26 26 } 27 27 endpoint.RawQuery = fmt.Sprintf("token=%s", url.QueryEscape(c.config.ApiToken)) 28 28
+7 -7
cmd/client/commands/main.go
··· 12 12 // Set up the pipes for stdout and stderr 13 13 stdout, err := cmd.StdoutPipe() 14 14 if err != nil { 15 - return fmt.Errorf("Error creating stdout: %v", err) 15 + return fmt.Errorf("error creating stdout: %v", err) 16 16 } 17 17 stderr, err := cmd.StderrPipe() 18 18 if err != nil { 19 - return fmt.Errorf("Error creating stderr: %v", err) 19 + return fmt.Errorf("error creating stderr: %v", err) 20 20 } 21 21 22 22 slog.Debug("Running command", "cmd", cmd.String()) 23 23 err = cmd.Start() 24 24 if err != nil { 25 - return fmt.Errorf("Error starting command: %v", err) 25 + return fmt.Errorf("error starting command: %v", err) 26 26 } 27 27 28 28 var ioErr error 29 29 go func() { 30 30 _, ioErr = io.Copy(os.Stdout, stdout) // Redirect stdout to terminal's stdout 31 31 if ioErr != nil { 32 - slog.Error("Failed to configure stdout") 32 + slog.Error("failed to configure stdout") 33 33 } 34 34 }() 35 35 go func() { 36 36 _, ioErr = io.Copy(os.Stderr, stderr) // Redirect stderr to terminal's stderr 37 37 if ioErr != nil { 38 - slog.Error("Failed to configure stderr") 38 + slog.Error("failed to configure stderr") 39 39 } 40 40 }() 41 41 42 42 err = cmd.Wait() 43 43 if err != nil { 44 - return fmt.Errorf("Failed to download seed: %v", err) 44 + return fmt.Errorf("failed to download seed: %v", err) 45 45 } 46 46 47 47 if ioErr != nil { 48 - return fmt.Errorf("Error copying output: %v", ioErr) 48 + return fmt.Errorf("error copying output: %v", ioErr) 49 49 } 50 50 51 51 return nil
+2 -2
cmd/client/main.go
··· 409 409 } 410 410 } 411 411 default: 412 - return fmt.Errorf("No seed subcommand selected") 412 + return fmt.Errorf("no seed subcommand selected") 413 413 } 414 414 415 415 return nil ··· 424 424 case "root": 425 425 return "/etc/sower/client.json", nil 426 426 case "": 427 - return "", fmt.Errorf("Failed to detect user, not loading default config file") 427 + return "", fmt.Errorf("failed to detect user, not loading default config file") 428 428 default: 429 429 return fmt.Sprintf("%s/sower/client.json", xdg.ConfigHome), nil 430 430 }
+3 -3
cmd/client/seed.go
··· 15 15 func activate(seedType client.SeedSeedType, storePath string, mode string) error { 16 16 var err error 17 17 18 - switch { 19 - case seedType == client.HomeManager: 18 + switch seedType { 19 + case client.HomeManager: 20 20 cmd := exec.Command(fmt.Sprintf("%s/activate", storePath)) 21 21 err = commands.SimpleRun(cmd) 22 22 if err != nil { 23 23 return fmt.Errorf("Failed to activate home-manager generation: %v", err) 24 24 } 25 25 26 - case seedType == client.Nixos: 26 + case client.Nixos: 27 27 profileCmd := exec.Command("nix-env", "--set", "--profile", "/nix/var/nix/profiles/system", storePath) 28 28 err = commands.SimpleRun(profileCmd) 29 29 if err != nil {