Skip to content

Commit 5b7b771

Browse files
ldmonsterldmonster
authored
[chore] bump go dependencies (#856)
Signed-off-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>
1 parent 4dd9f2c commit 5b7b771

9 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Set up Go
1212
uses: actions/setup-go@v5
1313
with:
14-
go-version: "1.25.5"
14+
go-version: "1.26.1"
1515
- name: Check out shell-operator code
1616
uses: actions/checkout@v4
1717
- name: Restore Go modules

‎.github/workflows/lint.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Go
1313
uses: actions/setup-go@v5
1414
with:
15-
go-version: "1.25.5"
15+
go-version: "1.26.1"
1616
- name: Check out shell-operator code
1717
uses: actions/checkout@v4
1818
- name: Restore Go modules
@@ -31,7 +31,7 @@ jobs:
3131
echo -n "Go modules unpacked size is: " && du -sh $HOME/go/pkg/mod
3232
- name: Run golangci-lint
3333
run: |
34-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v2.8.0
34+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b . v2.11.4
3535
./golangci-lint run --build-tags integration,test
3636
codespell:
3737
name: Run codespell

‎.github/workflows/tests-labeled.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: Set up Go
6666
uses: actions/setup-go@v5
6767
with:
68-
go-version: "1.25.5"
68+
go-version: "1.26.1"
6969
- name: Check out shell-operator code
7070
uses: actions/checkout@v4
7171
- name: Restore Go modules

‎.github/workflows/tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Go
1313
uses: actions/setup-go@v5
1414
with:
15-
go-version: "1.25.5"
15+
go-version: "1.26.1"
1616
- name: Check out shell-operator code
1717
uses: actions/checkout@v4
1818
- name: Restore Go modules

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ YQ = $(LOCALBIN)/yq
3434
## TODO: remap in yaml file (version.yaml or smthng)
3535
## Tool Versions
3636
# GO_BUILDER_VERSION must be without 'v' prefix
37-
GO_BUILDER_VERSION = 1.25.5
38-
GOLANGCI_LINT_VERSION = v2.8.0
37+
GO_BUILDER_VERSION = 1.26.1
38+
GOLANGCI_LINT_VERSION = v2.11.4
3939
YQ_VERSION ?= v4.50.1
4040

4141

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/flant/shell-operator
22

3-
go 1.24.0
3+
go 1.25.8
44

55
require (
66
github.com/deckhouse/deckhouse/pkg/log v0.2.0
@@ -37,7 +37,7 @@ require (
3737
replace github.com/go-openapi/validate => github.com/flant/go-openapi-validate v0.19.12-flant.0
3838

3939
require (
40-
github.com/deckhouse/module-sdk v0.10.2
40+
github.com/deckhouse/module-sdk v0.10.4
4141
github.com/gojuno/minimock/v3 v3.4.7
4242
github.com/itchyny/gojq v0.12.17
4343
github.com/muesli/termenv v0.16.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ github.com/deckhouse/deckhouse/pkg/log v0.2.0 h1:6tmZQLwNb1o/hP1gzJQBjcwfA/bubbg
3737
github.com/deckhouse/deckhouse/pkg/log v0.2.0/go.mod h1:pbAxTSDcPmwyl3wwKDcEB3qdxHnRxqTV+J0K+sha8bw=
3838
github.com/deckhouse/deckhouse/pkg/metrics-storage v0.3.0 h1:xZvbKuexrSQGEw6CB4n3UC7XbOb9QNLbm8UhcGZ2R1I=
3939
github.com/deckhouse/deckhouse/pkg/metrics-storage v0.3.0/go.mod h1:Rz++SzCLkFW03WGgftnn91TimGU2shiKb5S/YuxcBuE=
40-
github.com/deckhouse/module-sdk v0.10.2 h1:jYxFTgjdaZ9NKWKbFP95RvD55WJvhwjPAeSMFKhZb0o=
41-
github.com/deckhouse/module-sdk v0.10.2/go.mod h1:Z1jfmd0fICoYww0daMijWAU+OZTxeJUXfMciKKuYAYA=
40+
github.com/deckhouse/module-sdk v0.10.4 h1:1C61nXevgQiUnmv5Is+XP9Octu05XWKgjFi6gmL7miM=
41+
github.com/deckhouse/module-sdk v0.10.4/go.mod h1:wpEKjpMUHZ4D5JGPfHChKGzBcOVyZnUN4sP0yTEaHdU=
4242
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
4343
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
4444
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=

‎pkg/task/dump/dump.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ func TaskMainQueue(tqs *queue.TaskQueueSet, format string) interface{} {
5050

5151
if format == "text" {
5252
var buf strings.Builder
53-
buf.WriteString(fmt.Sprintf("Queue '%s': length %d, status: '%s'\n", dq.Name, dq.TasksCount, dq.Status))
53+
fmt.Fprintf(&buf, "Queue '%s': length %d, status: '%s'\n", dq.Name, dq.TasksCount, dq.Status)
5454
buf.WriteString("\n")
5555

5656
for _, ts := range dq.Tasks {
57-
buf.WriteString(fmt.Sprintf("%2d. ", ts.Index))
57+
fmt.Fprintf(&buf, "%2d. ", ts.Index)
5858
buf.WriteString(ts.Description)
5959
buf.WriteString("\n")
6060
}
@@ -264,21 +264,21 @@ func (dtq dumpTaskQueues) asText(showEmpty bool) string {
264264
buf.WriteString("\n")
265265
}
266266

267-
buf.WriteString(fmt.Sprintf("Queue '%s': length %d, status: '%s'\n", taskQueue.Name, taskQueue.TasksCount, taskQueue.Status))
267+
fmt.Fprintf(&buf, "Queue '%s': length %d, status: '%s'\n", taskQueue.Name, taskQueue.TasksCount, taskQueue.Status)
268268
buf.WriteString("\n")
269269

270270
for _, tk := range taskQueue.Tasks {
271-
buf.WriteString(fmt.Sprintf("%2d. ", tk.Index))
271+
fmt.Fprintf(&buf, "%2d. ", tk.Index)
272272
buf.WriteString(tk.Description)
273273
buf.WriteString("\n")
274274
}
275275
}
276276

277277
// Empty queues. Do not report single empty main queue.
278278
if showEmpty {
279-
buf.WriteString(fmt.Sprintf("\nEmpty queues (%d):\n", len(dtq.Empty)))
279+
fmt.Fprintf(&buf, "\nEmpty queues (%d):\n", len(dtq.Empty))
280280
for _, taskQueue := range dtq.Empty {
281-
buf.WriteString(fmt.Sprintf("- %s\n", taskQueue.Name))
281+
fmt.Fprintf(&buf, "- %s\n", taskQueue.Name)
282282
}
283283
}
284284

@@ -300,22 +300,22 @@ func (dtq dumpTaskQueues) asText(showEmpty bool) string {
300300
buf.WriteString("Summary:\n")
301301
if dtq.MainQueue != nil {
302302
otherQueuesCount-- // minus main queue
303-
buf.WriteString(fmt.Sprintf("- '%s' queue: %s.\n",
303+
fmt.Fprintf(&buf, "- '%s' queue: %s.\n",
304304
dtq.MainQueue.Name,
305-
pluralize(len(dtq.MainQueue.Tasks), "empty", "task", "tasks")))
305+
pluralize(len(dtq.MainQueue.Tasks), "empty", "task", "tasks"))
306306
}
307307

308308
if otherQueuesCount > 0 {
309-
buf.WriteString(fmt.Sprintf("- %s (%d active, %d empty): %s.\n",
309+
fmt.Fprintf(&buf, "- %s (%d active, %d empty): %s.\n",
310310
pluralize(otherQueuesCount, "", "other queue", "other queues"),
311311
dtq.Summary.otherQueuesActiveCount, dtq.Summary.otherQueuesEmptyCount,
312-
pluralize(dtq.Summary.otherQueuesTasksCount, "", "task", "tasks")))
312+
pluralize(dtq.Summary.otherQueuesTasksCount, "", "task", "tasks"))
313313
}
314314
if dtq.Summary.totalTasksCount == 0 {
315315
buf.WriteString("- no tasks to handle.\n")
316316
} else {
317-
buf.WriteString(fmt.Sprintf("- total %s to handle.\n",
318-
pluralize(dtq.Summary.totalTasksCount, "", "task", "tasks")))
317+
fmt.Fprintf(&buf, "- total %s to handle.\n",
318+
pluralize(dtq.Summary.totalTasksCount, "", "task", "tasks"))
319319
}
320320
}
321321

‎pkg/task/queue/task_queue.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ func (q *TaskQueue) String() string {
10531053
qLen := q.Length()
10541054

10551055
q.IterateSnapshot(func(t task.Task) {
1056-
buf.WriteString(fmt.Sprintf("[%s,id=%10.10s]", t.GetDescription(), t.GetId()))
1056+
fmt.Fprintf(&buf, "[%s,id=%10.10s]", t.GetDescription(), t.GetId())
10571057
index++
10581058
if index == qLen {
10591059
return

0 commit comments

Comments
 (0)