all: fix nilness issues

Signed-off-by: Matt Layher <mdlayher@gmail.com>

cmd/containerboot/main_test.go

@@ -999,9 +999,6 @@ func (k *kubeServer) serveSecret(w http.ResponseWriter, r *http.Request) {
 		defer k.Unlock()
 		for k, v := range k.secret {
 			v := base64.StdEncoding.EncodeToString([]byte(v))
-			if err != nil {
-				panic("encode failed")
-			}
 			ret["data"][k] = v
 		}
 		if err := json.NewEncoder(w).Encode(ret); err != nil {

control/controlclient/direct.go

@@ -710,9 +710,6 @@ func (c *Direct) doLogin(ctx context.Context, opt loginOpt) (mustRegen bool, new
 	c.persist = persist.View()
 	c.mu.Unlock()
 
-	if err != nil {
-		return regen, "", nil, err
-	}
 	if ctx.Err() != nil {
 		return regen, "", nil, ctx.Err()
 	}

ipn/ipnlocal/cert.go

@@ -594,7 +594,7 @@ func acmeKey(cs certStore) (crypto.Signer, error) {
 			return nil, errors.New("acme/autocert: invalid account key found in cache")
 		}
 		return parsePrivateKey(priv.Bytes)
-	} else if err != nil && !errors.Is(err, ipn.ErrStateNotExist) {
+	} else if !errors.Is(err, ipn.ErrStateNotExist) {
 		return nil, err
 	}
 

ipn/ipnserver/proxyconnect.go

@@ -48,7 +48,7 @@ func (s *Server) handleProxyConnectConn(w http.ResponseWriter, r *http.Request)
 
 	hj, ok := w.(http.Hijacker)
 	if !ok {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
+		http.Error(w, "CONNECT hijack unavailable", http.StatusInternalServerError)
 		return
 	}
 	c, br, err := hj.Hijack()

ipn/prefs.go

@@ -444,8 +444,7 @@ func (p *Prefs) Equals(p2 *Prefs) bool {
 		return false
 	}
 
-	return p != nil && p2 != nil &&
+	return p.ControlURL == p2.ControlURL &&
-		p.ControlURL == p2.ControlURL &&
 		p.RouteAll == p2.RouteAll &&
 		p.AllowSingleHosts == p2.AllowSingleHosts &&
 		p.ExitNodeID == p2.ExitNodeID &&

portlist/portlist_linux.go

@@ -178,7 +178,7 @@ func (li *linuxImpl) parseProcNetFile(r *bufio.Reader, fileBase string) error {
 	// Scratch buffer for making inode strings.
 	inoBuf := make([]byte, 0, 50)
 
-	for err == nil {
+	for {
 		line, err := r.ReadSlice('\n')
 		if err == io.EOF {
 			break

posture/serialnumber_notmacos.go

@@ -99,13 +99,7 @@ func GetSerialNumbers(logf logger.Logf) ([]string, error) {
 		}
 	}
 
-	// if there were no serial numbers, check if any errors were
+	logf("got serial numbers %v", serials)
-	// returned and combine them.
-	if len(serials) == 0 && err != nil {
-		return nil, err
-	}
-
-	logf("got serial numbers %v (errors: %s)", serials, err)
 
 	return serials, nil
 }