feat: and playbook action pushes

[skip ci]
flanksource · Jan 22, 2024 · 97b748c · 97b748c
1 parent f48fd6c
commit 97b748c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/job/job.go b/job/job.go
@@ -20,6 +20,7 @@ import (
 const (
 	ResourceTypeCheckStatuses = "check_statuses"
 	ResourceTypeComponent     = "components"
+	ResourceTypePlaybook      = "playbook"
 	ResourceTypeUpstream      = "upstream"
 )
 

diff --git a/models/playbooks.go b/models/playbooks.go
@@ -91,7 +91,7 @@ type PlaybookRunAction struct {
 	StartTime     time.Time            `json:"start_time,omitempty" time_format:"postgres_timestamp"  gorm:"default:NOW(), NOT NULL"`
 	EndTime       *time.Time           `json:"end_time,omitempty" time_format:"postgres_timestamp"`
 	Result        types.JSONMap        `json:"result,omitempty" gorm:"default:null"`
-	Error         string               `json:"error,omitempty" gorm:"default:null"`
+	Error         *string              `json:"error,omitempty" gorm:"default:null"`
 	IsPushed      bool                 `json:"is_pushed"`
 	AgentID       *uuid.UUID           `json:"agent_id,omitempty"`
 }

diff --git a/schema/playbooks.hcl b/schema/playbooks.hcl
@@ -238,8 +238,9 @@ table "playbook_run_actions" {
     default = "running"
   }
   column "playbook_run_id" {
-    null = false
+    null = true
     type = uuid
+    comment = "a run id is mandatory except for an agent"
   }
   column "start_time" {
     null    = true
@@ -283,4 +284,11 @@ table "playbook_run_actions" {
     on_update   = NO_ACTION
     on_delete   = CASCADE
   }
+  check "playbook_action_not_null_run_id" {
+    expr    = <<EOF
+    (playbook_run_id IS NULL AND agent_id IS NOT NULL) OR
+    (playbook_run_id IS NOT NULL)
+    EOF
+    comment = "a run id is mandatory except for an agent"
+  }
 }
diff --git a/upstream/commands.go b/upstream/commands.go
@@ -187,5 +187,17 @@ func InsertUpstreamMsg(ctx context.Context, req *PushData) error {
 		}
 	}
 
+	for i := range req.PlaybookActions {
+		updates := map[string]any{
+			"result":   req.PlaybookActions[i].Result,
+			"end_time": req.PlaybookActions[i].EndTime,
+			"status":   req.PlaybookActions[i].Status,
+			"error":    req.PlaybookActions[i].Error,
+		}
+		if err := db.Model(&models.PlaybookRunAction{}).Where("id = ?", req.PlaybookActions[i].ID).Updates(updates).Error; err != nil {
+			return fmt.Errorf("error updating playbook action [%s]: %w", req.PlaybookActions[i].ID.String(), err)
+		}
+	}
+
 	return nil
 }
diff --git a/upstream/upstream.go b/upstream/upstream.go
@@ -73,6 +73,7 @@ type PushData struct {
 	ComponentRelationships       []models.ComponentRelationship       `json:"component_relationships,omitempty"`
 	ConfigComponentRelationships []models.ConfigComponentRelationship `json:"config_component_relationships,omitempty"`
 	Topologies                   []models.Topology                    `json:"topologies,omitempty"`
+	PlaybookActions              []models.PlaybookRunAction           `json:"playbook_actions,omitempty"`
 }
 
 func (p *PushData) String() string {
@@ -148,7 +149,7 @@ func (p *PushData) Attributes() map[string]any {
 func (t *PushData) Count() int {
 	return len(t.Canaries) + len(t.Checks) + len(t.Components) + len(t.ConfigScrapers) +
 		len(t.ConfigAnalysis) + len(t.ConfigChanges) + len(t.ConfigItems) + len(t.CheckStatuses) +
-		len(t.ConfigRelationships) + len(t.ComponentRelationships) + len(t.ConfigComponentRelationships) + len(t.Topologies)
+		len(t.ConfigRelationships) + len(t.ComponentRelationships) + len(t.ConfigComponentRelationships) + len(t.Topologies) + len(t.PlaybookActions)
 }
 
 // ReplaceTopologyID replaces the topology_id for all the components