Address code review comments

elastic · May 13, 2021 · de9f51b · de9f51b
1 parent a7f7cc3
commit de9f51b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/x-pack/osquerybeat/beater/action_handler.go b/x-pack/osquerybeat/beater/action_handler.go
@@ -27,7 +27,7 @@ type actionData struct {
 }
 
 func actionDataFromRequest(req map[string]interface{}) (ad actionData, err error) {
-	if req == nil {
+	if len(req) == 0 {
 		return ad, ErrActionRequest
 	}
 	if v, ok := req["id"]; ok {

diff --git a/x-pack/osquerybeat/beater/install.go b/x-pack/osquerybeat/beater/install.go
@@ -24,11 +24,7 @@ func installOsquery(ctx context.Context) error {
 	exedir := filepath.Dir(exefp)
 
 	// Install osqueryd if needed
-	err = installOsqueryWithDir(ctx, exedir)
-	if err != nil {
-		return err
-	}
-	return nil
+	return installOsqueryWithDir(ctx, exedir)
 }
 
 func installOsqueryWithDir(ctx context.Context, dir string) error {