chore: fix lint and tests

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

Author: timmilesdw

pkg/shell-operator/combine_binding_context_test.go

@@ -31,7 +31,7 @@ func Test_CombineBindingContext_MultipleHooks(t *testing.T) {
 		}, labels)
 		assert.Nil(t, buckets)
 	})
-	metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {
+	metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {
 	})
 
 	TaskQueues := queue.NewTaskQueueSet().WithMetricStorage(metricStorage)
@@ -141,7 +141,7 @@ func Test_CombineBindingContext_Nil_On_NoCombine(t *testing.T) {
 		}, labels)
 		assert.Nil(t, buckets)
 	})
-	metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {
+	metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {
 	})
 
 	TaskQueues := queue.NewTaskQueueSet().WithMetricStorage(metricStorage)
@@ -216,7 +216,7 @@ func Test_CombineBindingContext_Group_Compaction(t *testing.T) {
 		}, labels)
 		assert.Nil(t, buckets)
 	})
-	metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {
+	metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {
 	})
 
 	TaskQueues := queue.NewTaskQueueSet().WithMetricStorage(metricStorage)
@@ -334,7 +334,7 @@ func Test_CombineBindingContext_Group_Type(t *testing.T) {
 		}, labels)
 		assert.Nil(t, buckets)
 	})
-	metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {
+	metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {
 	})
 
 	TaskQueues := queue.NewTaskQueueSet().WithMetricStorage(metricStorage)

pkg/task/dump/dump_test.go

@@ -95,7 +95,7 @@ func Test_Dump(t *testing.T) {
 		assert.Contains(t, mapSlice, labels)
 		assert.Nil(t, buckets)
 	})
-	metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {
+	metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {
 	})
 
 	tqs := queue.NewTaskQueueSet().WithMetricStorage(metricStorage)

pkg/task/queue/task_counter.go

@@ -76,17 +76,13 @@ func (tc *TaskCounter) Remove(task task.Task) {
 
 	counter, ok := tc.counter[id]
 	if !ok {
-		if _, reached := tc.reachedCap[id]; reached {
-			delete(tc.reachedCap, id)
-		}
+		delete(tc.reachedCap, id)
 		return
 	}
 
 	if counter == 0 {
 		delete(tc.counter, id)
-		if _, reached := tc.reachedCap[id]; reached {
-			delete(tc.reachedCap, id)
-		}
+		delete(tc.reachedCap, id)
 		return
 	}
 
@@ -99,9 +95,7 @@ func (tc *TaskCounter) Remove(task task.Task) {
 	}
 
 	if counter < compactionThreshold {
-		if _, reached := tc.reachedCap[id]; reached {
-			delete(tc.reachedCap, id)
-		}
+		delete(tc.reachedCap, id)
 	}
 }