Enable ineffassign linter

superfly · Aug 11, 2022 · 6c5fb7d · 6c5fb7d
1 parent dd71c48
commit 6c5fb7d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 78 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -33,7 +33,7 @@ linters:
     - goimports
     - gosimple
     - govet
-    # - ineffassign
+    - ineffassign
     - staticcheck
     - unconvert
     - unused

diff --git a/helpers/wrapper.go b/helpers/wrapper.go
diff --git a/internal/command/machine/launch.go b/internal/command/machine/launch.go
@@ -191,9 +191,8 @@ func run(ctx context.Context) (err error) {
 
 	fmt.Fprintf(io.Out, "Wrote to fly.toml\n")
 
-	var deployNow bool = false
-
 	if !flag.GetBool(ctx, "no-deploy") && (srcInfo != nil && !srcInfo.SkipDeploy) {
+		var deployNow bool
 		if flag.GetBool(ctx, "now") {
 			deployNow = true
 		} else {

diff --git a/internal/command/machine/stop.go b/internal/command/machine/stop.go
@@ -74,6 +74,9 @@ func runMachineStop(ctx context.Context) (err error) {
 		}
 
 		app, err := appFromMachineOrName(ctx, arg, appName)
+		if err != nil {
+			return fmt.Errorf("could not get app: %w", err)
+		}
 
 		flapsClient, err := flaps.New(ctx, app)
 		if err != nil {

diff --git a/logs/polling.go b/logs/polling.go
@@ -96,8 +96,7 @@ func Poll(ctx context.Context, out chan<- LogEntry, client *api.Client, opts *Lo
 
 func backoff(current, max time.Duration) (val time.Duration) {
 	if val = current << 1; current > max {
-		current = max
+		val = max
 	}
-
 	return
 }