[shell-operator] feat/compaction and queue refactor (#789)

Signed-off-by: Timur Tuktamyshev <timur.tuktamyshev@flant.com>

Author: timmilesdw

pkg/hook/task_metadata/task_metadata.go

@@ -26,6 +26,14 @@ type BindingContextAccessor interface {
 	GetBindingContext() []bindingcontext.BindingContext
 }
 
+type BindingContextSetter interface {
+	SetBindingContext([]bindingcontext.BindingContext) interface{}
+}
+
+type MonitorIDSetter interface {
+	SetMonitorIDs([]string) interface{}
+}
+
 type MonitorIDAccessor interface {
 	GetMonitorIDs() []string
 }
@@ -74,6 +82,12 @@ func (m HookMetadata) GetBindingContext() []bindingcontext.BindingContext {
 	return m.BindingContext
 }
 
+func (m HookMetadata) SetBindingContext(context []bindingcontext.BindingContext) interface{} {
+	m.BindingContext = context
+
+	return m
+}
+
 func (m HookMetadata) GetAllowFailure() bool {
 	return m.AllowFailure
 }
@@ -82,6 +96,11 @@ func (m HookMetadata) GetMonitorIDs() []string {
 	return m.MonitorIDs
 }
 
+func (m HookMetadata) SetMonitorIDs(monitorIDs []string) interface{} {
+	m.MonitorIDs = monitorIDs
+	return m
+}
+
 func (m *HookMetadata) WithHookName(name string) *HookMetadata {
 	m.HookName = name
 	return m

pkg/hook/task_metadata/task_metadata_test.go

@@ -1,18 +1,13 @@
 package task_metadata
 
 import (
-	"fmt"
-	"strings"
 	"testing"
 
 	. "github.com/onsi/gomega"
-	"github.com/stretchr/testify/assert"
 
 	bctx "github.com/flant/shell-operator/pkg/hook/binding_context"
 	htypes "github.com/flant/shell-operator/pkg/hook/types"
-	"github.com/flant/shell-operator/pkg/metric"
 	"github.com/flant/shell-operator/pkg/task"
-	"github.com/flant/shell-operator/pkg/task/queue"
 )
 
 func Test_HookMetadata_Access(t *testing.T) {
@@ -38,74 +33,3 @@ func Test_HookMetadata_Access(t *testing.T) {
 	g.Expect(hm.BindingContext[0].Binding).Should(Equal("each_1_min"))
 	g.Expect(hm.BindingContext[1].Binding).Should(Equal("each_5_min"))
 }
-
-func Test_HookMetadata_QueueDump_Task_Description(t *testing.T) {
-	g := NewWithT(t)
-
-	logLabels := map[string]string{
-		"hook": "hook1.sh",
-	}
-
-	metricStorage := metric.NewStorageMock(t)
-	metricStorage.HistogramObserveMock.Set(func(metric string, value float64, labels map[string]string, buckets []float64) {
-		assert.Equal(t, metric, "{PREFIX}tasks_queue_action_duration_seconds")
-		assert.NotZero(t, value)
-		assert.Equal(t, map[string]string{
-			"queue_action": "AddLast",
-			"queue_name":   "",
-		}, labels)
-		assert.Nil(t, buckets)
-	})
-
-	q := queue.NewTasksQueue().WithMetricStorage(metricStorage)
-
-	q.AddLast(task.NewTask(EnableKubernetesBindings).
-		WithMetadata(HookMetadata{
-			HookName: "hook1.sh",
-			Binding:  string(EnableKubernetesBindings),
-		}))
-
-	q.AddLast(task.NewTask(HookRun).
-		WithMetadata(HookMetadata{
-			HookName:    "hook1.sh",
-			BindingType: htypes.OnKubernetesEvent,
-			Binding:     "monitor_pods",
-		}).
-		WithLogLabels(logLabels).
-		WithQueueName("main"))
-
-	q.AddLast(task.NewTask(HookRun).
-		WithMetadata(HookMetadata{
-			HookName:     "hook1.sh",
-			BindingType:  htypes.Schedule,
-			AllowFailure: true,
-			Binding:      "every 1 sec",
-			Group:        "monitor_pods",
-		}).
-		WithLogLabels(logLabels).
-		WithQueueName("main"))
-
-	queueDump := taskQueueToText(q)
-
-	g.Expect(queueDump).Should(ContainSubstring("hook1.sh"), "Queue dump should reveal a hook name.")
-	g.Expect(queueDump).Should(ContainSubstring("EnableKubernetesBindings"), "Queue dump should reveal EnableKubernetesBindings.")
-	g.Expect(queueDump).Should(ContainSubstring(":kubernetes:"), "Queue dump should show kubernetes binding.")
-	g.Expect(queueDump).Should(ContainSubstring(":schedule:"), "Queue dump should show schedule binding.")
-	g.Expect(queueDump).Should(ContainSubstring("group=monitor_pods"), "Queue dump should show group name.")
-}
-
-func taskQueueToText(q *queue.TaskQueue) string {
-	var buf strings.Builder
-	buf.WriteString(fmt.Sprintf("Queue '%s': length %d, status: '%s'\n", q.Name, q.Length(), q.Status))
-	buf.WriteString("\n")
-
-	index := 1
-	q.Iterate(func(task task.Task) {
-		buf.WriteString(fmt.Sprintf("%2d. ", index))
-		buf.WriteString(task.GetDescription())
-		buf.WriteString("\n")
-		index++
-	})
-
-	return buf.String()
-}