move sofa table to new osquery interface

Author: korylprince

tables/sofa/sofa_info.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-version"
+	"github.com/macadmins/osquery-extension/pkg/utils"
 	osquery "github.com/osquery/osquery-go"
 	"github.com/osquery/osquery-go/plugin/table"
 )
@@ -113,11 +114,6 @@ type OSVersion struct {
 
 type Option func(*SofaClient)
 
-type OsqueryClient interface {
-	QueryRow(query string) (map[string]string, error)
-	Close()
-}
-
 func SofaSecurityReleaseInfoColumns() []table.ColumnDefinition {
 	return []table.ColumnDefinition{
 		table.TextColumn("update_name"),
@@ -238,7 +234,7 @@ func getSecurityReleaseInfoForOSVersion(root Root, osVersion string) ([]Security
 	return out, nil
 }
 
-func getCurrentOSVersion(client OsqueryClient) (string, error) {
+func getCurrentOSVersion(client utils.OsqueryClient) (string, error) {
 	osVersionQuery := "SELECT * FROM os_version;"
 
 	resp, err := client.QueryRow(osVersionQuery)

tables/sofa/sofa_info_test.go

@@ -4,18 +4,11 @@ import (
 	_ "embed"
 	"testing"
 
+	"github.com/macadmins/osquery-extension/pkg/utils"
 	"github.com/osquery/osquery-go/plugin/table"
 	"github.com/stretchr/testify/assert"
 )
 
-type MockOsqueryClient struct{}
-
-func (m MockOsqueryClient) QueryRow(query string) (map[string]string, error) {
-	return map[string]string{"version": "1.0.0"}, nil
-}
-
-func (m MockOsqueryClient) Close() {}
-
 func TestGetSecurityReleaseInfoForOSVersion(t *testing.T) {
 	tests := []struct {
 		name         string
@@ -77,7 +70,11 @@ func TestGetSecurityReleaseInfoForOSVersion(t *testing.T) {
 }
 
 func TestGetCurrentOSVersion(t *testing.T) {
-	mockClient := MockOsqueryClient{}
+	mockClient := &utils.MockOsqueryClient{
+		Data: map[string][]map[string]string{
+			"SELECT * FROM os_version;": {{"version": "1.0.0"}},
+		},
+	}
 	version, err := getCurrentOSVersion(mockClient)
 	assert.NoError(t, err)
 	assert.Equal(t, "1.0.0", version)