Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix QsqueryQueryData Data type for query results api call #474

Merged
merged 2 commits into from
Aug 13, 2024
Merged

fix QsqueryQueryData Data type for query results api call #474

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e4cd89
fix QsqueryQueryData Data type for query results api call
Aug 8, 2024
12f2131
use OsqueryQueryData from osctrl/logging
Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 3 additions & 16 deletions api/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,14 @@
package main

import (
"encoding/json"

"gorm.io/gorm"
"github.com/jmpsec/osctrl/logging"
)

// OsqueryQueryData to log query data to database
type OsqueryQueryData struct {
gorm.Model
UUID string `gorm:"index"`
Environment string
Name string
Data json.RawMessage
Status int
}

// APIQueryData to return query results from API
type APIQueryData map[string]json.RawMessage
type APIQueryData map[string]string

// Function to retrieve the query log by name
func postgresQueryLogs(name string) (APIQueryData, error) {
var logs []OsqueryQueryData
var logs []logging.OsqueryQueryData
data := make(APIQueryData)
if err := db.Conn.Where("name = ?", name).Find(&logs).Error; err != nil {
return data, err
Expand Down