Skip to content

Commit 6967f86

Browse files
timmilesdwldmonster
timmilesdw
and
ldmonster
authored
[addon-operator] chore: bump shell operator (#703)
Signed-off-by: Timur Tuktamyshev <timur.tuktamyshev@flant.com> Signed-off-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com> Co-authored-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>
1 parent e5dd964 commit 6967f86

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/dominikbraun/graph v0.23.0
1111
github.com/ettle/strcase v0.2.0
1212
github.com/flant/kube-client v1.5.0
13-
github.com/flant/shell-operator v1.12.1
13+
github.com/flant/shell-operator v1.12.2
1414
github.com/go-chi/chi/v5 v5.2.2
1515
github.com/go-openapi/loads v0.23.1
1616
github.com/go-openapi/spec v0.22.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
155155
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
156156
github.com/flant/kube-client v1.5.0 h1:6QZOZy3uk58Bh9YUn4CnhEz13og/cEGXB2uBZ1gWwtM=
157157
github.com/flant/kube-client v1.5.0/go.mod h1:hpJZ0FnDKHW3r5q5SYQgBrTw9k94q4+dcnJ4uOGYBHc=
158-
github.com/flant/shell-operator v1.12.1 h1:ARrZaPiiQVjPjXombUt//doaHFCBlzGATgsUpQHT85o=
159-
github.com/flant/shell-operator v1.12.1/go.mod h1:RFXNvfK/v18J5u4RMqfFSDFhwJvMNPv5OR3BpioyxI0=
158+
github.com/flant/shell-operator v1.12.2 h1:/B5tB7CfpzRnIFLAkXtQOVKLLdhvaB9h2LTKuWyDj8M=
159+
github.com/flant/shell-operator v1.12.2/go.mod h1:RFXNvfK/v18J5u4RMqfFSDFhwJvMNPv5OR3BpioyxI0=
160160
github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU=
161161
github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw=
162162
github.com/fluxcd/flagger v1.36.1 h1:X2PumtNwZz9YSGaOtZLFm2zAKLgHhFkbNv8beg7ifyc=

‎pkg/addon-operator/queue_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func Test_ModuleEnsureCRDsTasksInQueueAfterId(t *testing.T) {
2525
queue: func() *queue.TaskQueue {
2626
metricStorage := metric.NewStorageMock(t)
2727
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
28-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
28+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
2929

3030
q := queue.NewTasksQueue("test", metricStorage)
3131

@@ -47,7 +47,7 @@ func Test_ModuleEnsureCRDsTasksInQueueAfterId(t *testing.T) {
4747
queue: func() *queue.TaskQueue {
4848
metricStorage := metric.NewStorageMock(t)
4949
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
50-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
50+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
5151

5252
q := queue.NewTasksQueue("test", metricStorage)
5353

@@ -68,7 +68,7 @@ func Test_ModuleEnsureCRDsTasksInQueueAfterId(t *testing.T) {
6868
queue: func() *queue.TaskQueue {
6969
metricStorage := metric.NewStorageMock(t)
7070
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
71-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
71+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
7272

7373
q := queue.NewTasksQueue("test", metricStorage)
7474

@@ -105,7 +105,7 @@ func Test_QueueHasPendingModuleRunTask(t *testing.T) {
105105
queue: func() *queue.TaskQueue {
106106
metricStorage := metric.NewStorageMock(t)
107107
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
108-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
108+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
109109

110110
q := queue.NewTasksQueue("test", metricStorage)
111111

@@ -126,7 +126,7 @@ func Test_QueueHasPendingModuleRunTask(t *testing.T) {
126126
queue: func() *queue.TaskQueue {
127127
metricStorage := metric.NewStorageMock(t)
128128
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
129-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
129+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
130130

131131
q := queue.NewTasksQueue("test", metricStorage)
132132

@@ -150,7 +150,7 @@ func Test_QueueHasPendingModuleRunTask(t *testing.T) {
150150
queue: func() *queue.TaskQueue {
151151
metricStorage := metric.NewStorageMock(t)
152152
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
153-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
153+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
154154

155155
q := queue.NewTasksQueue("test", metricStorage)
156156

@@ -171,7 +171,7 @@ func Test_QueueHasPendingModuleRunTask(t *testing.T) {
171171
queue: func() *queue.TaskQueue {
172172
metricStorage := metric.NewStorageMock(t)
173173
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
174-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
174+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
175175

176176
q := queue.NewTasksQueue("test", metricStorage)
177177

@@ -292,7 +292,7 @@ func Test_RemoveAdjacentConvergeModules(t *testing.T) {
292292
t.Run(tt.name, func(t *testing.T) {
293293
metricStorage := metric.NewStorageMock(t)
294294
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
295-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
295+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
296296

297297
q := queue.NewTasksQueue("test", metricStorage)
298298

@@ -383,7 +383,7 @@ func Test_ModulesWithPendingModuleRun(t *testing.T) {
383383
t.Run(tt.name, func(t *testing.T) {
384384
metricStorage := metric.NewStorageMock(t)
385385
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
386-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
386+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
387387

388388
q := queue.NewTasksQueue("test", metricStorage)
389389

@@ -664,7 +664,7 @@ func Test_RemoveCurrentConvergeTasksFromId(t *testing.T) {
664664
t.Run(tt.name, func(t *testing.T) {
665665
metricStorage := metric.NewStorageMock(t)
666666
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
667-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
667+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
668668

669669
q := queue.NewTasksQueue("test", metricStorage)
670670

@@ -713,7 +713,7 @@ func Test_ConvergeModulesInQueue(t *testing.T) {
713713
queue: func() *queue.TaskQueue {
714714
metricStorage := metric.NewStorageMock(t)
715715
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
716-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
716+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
717717

718718
q := queue.NewTasksQueue("test", metricStorage)
719719

@@ -734,7 +734,7 @@ func Test_ConvergeModulesInQueue(t *testing.T) {
734734
queue: func() *queue.TaskQueue {
735735
metricStorage := metric.NewStorageMock(t)
736736
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
737-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
737+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
738738

739739
q := queue.NewTasksQueue("test", metricStorage)
740740

@@ -762,7 +762,7 @@ func Test_ConvergeModulesInQueue(t *testing.T) {
762762
queue: func() *queue.TaskQueue {
763763
metricStorage := metric.NewStorageMock(t)
764764
metricStorage.HistogramObserveMock.Set(func(_ string, _ float64, _ map[string]string, _ []float64) {})
765-
metricStorage.GaugeSetMock.Set(func(_ string, _ float64, _ map[string]string) {})
765+
metricStorage.GaugeSetMock.Optional().Set(func(_ string, _ float64, _ map[string]string) {})
766766

767767
q := queue.NewTasksQueue("test", metricStorage)
768768

0 commit comments

Comments
 (0)