From 5729a9279f4ae70e36c67263fcf842885c098716 Mon Sep 17 00:00:00 2001 From: Timur Tuktamyshev Date: Wed, 8 Oct 2025 16:08:00 +0300 Subject: [PATCH 1/4] feat: cache jq filters Signed-off-by: Timur Tuktamyshev --- go.mod | 8 +++++++- go.sum | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9c8bd49ef..7be36edfd 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dominikbraun/graph v0.23.0 github.com/ettle/strcase v0.2.0 github.com/flant/kube-client v1.3.1 - github.com/flant/shell-operator v1.11.3 + github.com/flant/shell-operator v1.11.4-0.20251008124107-dad42a6be721 github.com/go-chi/chi/v5 v5.2.2 github.com/go-openapi/loads v0.19.5 github.com/go-openapi/spec v0.19.8 @@ -44,9 +44,15 @@ require ( ) require ( + github.com/cenkalti/backoff/v4 v4.2.1 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect github.com/ohler55/ojg v1.26.7 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect go.opentelemetry.io/otel/metric v1.35.0 // indirect + go.opentelemetry.io/otel/sdk v1.35.0 // indirect + go.opentelemetry.io/proto/otlp v1.1.0 // indirect ) require ( diff --git a/go.sum b/go.sum index fd8f1d878..4d2d4b43f 100644 --- a/go.sum +++ b/go.sum @@ -166,6 +166,8 @@ github.com/flant/kube-client v1.3.1 h1:1SdD799sujXNg2F6Z27le/+qkcKQaKf9Z492YGEhV github.com/flant/kube-client v1.3.1/go.mod h1:mql6hsZMgBLAhdj3Emb8TrP5MVdXduFQ2NLjzn6IF0Y= github.com/flant/shell-operator v1.11.3 h1:Yp2N/cn/y1glCHKzfAKB8HPcIZ18TidGkgCaP38E6oc= github.com/flant/shell-operator v1.11.3/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= +github.com/flant/shell-operator v1.11.4-0.20251008124107-dad42a6be721 h1:R9k31b/xH6vYh44ACNJw8iwSgTubwDcQlKaU1l3dBw8= +github.com/flant/shell-operator v1.11.4-0.20251008124107-dad42a6be721/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU= github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw= github.com/fluxcd/flagger v1.36.1 h1:X2PumtNwZz9YSGaOtZLFm2zAKLgHhFkbNv8beg7ifyc= From bca7eade179bd656212f0962339b0da964b2536d Mon Sep 17 00:00:00 2001 From: Timur Tuktamyshev Date: Wed, 8 Oct 2025 16:40:45 +0300 Subject: [PATCH 2/4] fix: nil check Signed-off-by: Timur Tuktamyshev --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7be36edfd..85592b45b 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dominikbraun/graph v0.23.0 github.com/ettle/strcase v0.2.0 github.com/flant/kube-client v1.3.1 - github.com/flant/shell-operator v1.11.4-0.20251008124107-dad42a6be721 + github.com/flant/shell-operator v1.11.4-0.20251008134016-abfad15a4a68 github.com/go-chi/chi/v5 v5.2.2 github.com/go-openapi/loads v0.19.5 github.com/go-openapi/spec v0.19.8 diff --git a/go.sum b/go.sum index 4d2d4b43f..0ea37b09d 100644 --- a/go.sum +++ b/go.sum @@ -168,6 +168,8 @@ github.com/flant/shell-operator v1.11.3 h1:Yp2N/cn/y1glCHKzfAKB8HPcIZ18TidGkgCaP github.com/flant/shell-operator v1.11.3/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= github.com/flant/shell-operator v1.11.4-0.20251008124107-dad42a6be721 h1:R9k31b/xH6vYh44ACNJw8iwSgTubwDcQlKaU1l3dBw8= github.com/flant/shell-operator v1.11.4-0.20251008124107-dad42a6be721/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= +github.com/flant/shell-operator v1.11.4-0.20251008134016-abfad15a4a68 h1:DhYue6sgdpK7vBS4NMWZdKXWyfygLLsf3pNszhh0gwY= +github.com/flant/shell-operator v1.11.4-0.20251008134016-abfad15a4a68/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU= github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw= github.com/fluxcd/flagger v1.36.1 h1:X2PumtNwZz9YSGaOtZLFm2zAKLgHhFkbNv8beg7ifyc= From 87a012b9013e5d31331bf074a23e2de1aca1d9a3 Mon Sep 17 00:00:00 2001 From: Timur Tuktamyshev Date: Wed, 8 Oct 2025 17:14:18 +0300 Subject: [PATCH 3/4] fix: do not compile filter if absent Signed-off-by: Timur Tuktamyshev --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 85592b45b..8c5b3b1b6 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dominikbraun/graph v0.23.0 github.com/ettle/strcase v0.2.0 github.com/flant/kube-client v1.3.1 - github.com/flant/shell-operator v1.11.4-0.20251008134016-abfad15a4a68 + github.com/flant/shell-operator v1.11.4-0.20251008141340-0f311f97d996 github.com/go-chi/chi/v5 v5.2.2 github.com/go-openapi/loads v0.19.5 github.com/go-openapi/spec v0.19.8 diff --git a/go.sum b/go.sum index 0ea37b09d..f254f7a7f 100644 --- a/go.sum +++ b/go.sum @@ -170,6 +170,8 @@ github.com/flant/shell-operator v1.11.4-0.20251008124107-dad42a6be721 h1:R9k31b/ github.com/flant/shell-operator v1.11.4-0.20251008124107-dad42a6be721/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= github.com/flant/shell-operator v1.11.4-0.20251008134016-abfad15a4a68 h1:DhYue6sgdpK7vBS4NMWZdKXWyfygLLsf3pNszhh0gwY= github.com/flant/shell-operator v1.11.4-0.20251008134016-abfad15a4a68/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= +github.com/flant/shell-operator v1.11.4-0.20251008141340-0f311f97d996 h1:C4HPq/qDG8hcjrR9KG3FP4eP/z09a12cPAv617iO2d8= +github.com/flant/shell-operator v1.11.4-0.20251008141340-0f311f97d996/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU= github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw= github.com/fluxcd/flagger v1.36.1 h1:X2PumtNwZz9YSGaOtZLFm2zAKLgHhFkbNv8beg7ifyc= From 69c6213f9ca675e5c3c891270571bc8b14b6341c Mon Sep 17 00:00:00 2001 From: Timur Tuktamyshev Date: Thu, 9 Oct 2025 15:46:17 +0300 Subject: [PATCH 4/4] chore: small architecture refactor Signed-off-by: Timur Tuktamyshev --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8c5b3b1b6..8cc211b5f 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/dominikbraun/graph v0.23.0 github.com/ettle/strcase v0.2.0 github.com/flant/kube-client v1.3.1 - github.com/flant/shell-operator v1.11.4-0.20251008141340-0f311f97d996 + github.com/flant/shell-operator v1.11.4-0.20251009124515-97e333f9205f github.com/go-chi/chi/v5 v5.2.2 github.com/go-openapi/loads v0.19.5 github.com/go-openapi/spec v0.19.8 diff --git a/go.sum b/go.sum index f254f7a7f..fd09592d4 100644 --- a/go.sum +++ b/go.sum @@ -172,6 +172,8 @@ github.com/flant/shell-operator v1.11.4-0.20251008134016-abfad15a4a68 h1:DhYue6s github.com/flant/shell-operator v1.11.4-0.20251008134016-abfad15a4a68/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= github.com/flant/shell-operator v1.11.4-0.20251008141340-0f311f97d996 h1:C4HPq/qDG8hcjrR9KG3FP4eP/z09a12cPAv617iO2d8= github.com/flant/shell-operator v1.11.4-0.20251008141340-0f311f97d996/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= +github.com/flant/shell-operator v1.11.4-0.20251009124515-97e333f9205f h1:pEuAMAvWRvdfqBZ1TjCRKkE/WJ/bm1A/XCHbrF+AicA= +github.com/flant/shell-operator v1.11.4-0.20251009124515-97e333f9205f/go.mod h1:TFTCgXpp+yrvSUQSQKgotJbRK720fiqwaQdFVU6dAlU= github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU= github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw= github.com/fluxcd/flagger v1.36.1 h1:X2PumtNwZz9YSGaOtZLFm2zAKLgHhFkbNv8beg7ifyc=