From 44c759d026e9a03030e2da08da09cf80086b0317 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 12:38:58 +0200 Subject: [PATCH 01/28] Bump github.com/brianvoe/gofakeit/v6 from 6.24.0 to 6.26.0 (#2678) Bumps [github.com/brianvoe/gofakeit/v6](https://github.com/brianvoe/gofakeit) from 6.24.0 to 6.26.0. - [Release notes](https://github.com/brianvoe/gofakeit/releases) - [Commits](https://github.com/brianvoe/gofakeit/compare/v6.24.0...v6.26.0) --- updated-dependencies: - dependency-name: github.com/brianvoe/gofakeit/v6 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d9842ce24b..add8324889 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 github.com/aws/aws-sdk-go v1.47.0 github.com/blang/semver v3.5.1+incompatible - github.com/brianvoe/gofakeit/v6 v6.24.0 + github.com/brianvoe/gofakeit/v6 v6.26.0 github.com/charmbracelet/bubbles v0.16.1 github.com/charmbracelet/bubbletea v0.24.1 github.com/charmbracelet/lipgloss v0.9.0 diff --git a/go.sum b/go.sum index c8be11d635..7b1fa2e126 100644 --- a/go.sum +++ b/go.sum @@ -141,8 +141,8 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/brianvoe/gofakeit v3.18.0+incompatible h1:wDOmHc9DLG4nRjUVVaxA+CEglKOW72Y5+4WNxUIkjM8= github.com/brianvoe/gofakeit v3.18.0+incompatible/go.mod h1:kfwdRA90vvNhPutZWfH7WPaDzUjz+CZFqG+rPkOjGOc= -github.com/brianvoe/gofakeit/v6 v6.24.0 h1:74yq7RRz/noddscZHRS2T84oHZisW9muwbb8sRnU52A= -github.com/brianvoe/gofakeit/v6 v6.24.0/go.mod h1:Ow6qC71xtwm79anlwKRlWZW6zVq9D2XHE4QSSMP/rU8= +github.com/brianvoe/gofakeit/v6 v6.26.0 h1:DzJHo4K6RrAbglU6cReh+XqoaunuUMZ8OAQGXrYsXt8= +github.com/brianvoe/gofakeit/v6 v6.26.0/go.mod h1:Xj58BMSnFqcn/fAQeSK+/PLtC5kSb7FJIq4JyGa8vEs= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= From f852e9f9ee1a69837810b89f0c5b8d2794323fad Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Thu, 7 Dec 2023 11:35:17 +0500 Subject: [PATCH 02/28] PMM-7 Add debian bookworm build for pmm2-client (#2664) --- build/scripts/build-client-deb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/scripts/build-client-deb b/build/scripts/build-client-deb index e3ffe7fd72..b4b5c236e1 100755 --- a/build/scripts/build-client-deb +++ b/build/scripts/build-client-deb @@ -21,7 +21,7 @@ main() { apt-get update case "\$OS_VERSION" in - 11 | 22.04) apt-get -y install git lsb-release devscripts dh-make;; + 11 | 12 | 22.04) apt-get -y install git lsb-release devscripts dh-make;; *) apt-get -y install git lsb-release devscripts dh-make dh-systemd;; esac mkdir -p /tmp/pmm From 47a0f89cef544d50c1acf875414c01fba53859f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 12:43:07 +0200 Subject: [PATCH 03/28] Bump actions/setup-go from 4 to 5 (#2682) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nurlan Moldomurov --- .github/workflows/admin.yml | 4 ++-- .github/workflows/agent.yml | 2 +- .github/workflows/clean.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/qan-api2.yml | 2 +- .github/workflows/vmproxy.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/admin.yml b/.github/workflows/admin.yml index 625e33324a..f6f776fd55 100644 --- a/.github/workflows/admin.yml +++ b/.github/workflows/admin.yml @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Go release - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: ${{ github.workspace }}/go.mod cache: false @@ -98,7 +98,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Go release - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: ${{ github.workspace }}/go.mod cache: false diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml index 46bf271491..336050958b 100644 --- a/.github/workflows/agent.yml +++ b/.github/workflows/agent.yml @@ -66,7 +66,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Go release - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: ${{ github.workspace }}/go.mod cache: false diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index e28b694a26..d500a7d0ea 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -36,7 +36,7 @@ jobs: env: # to avoid error due to `go version` accepting -v flag with an argument since 1.15 GOFLAGS: "" - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go.version }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ecd013a33..ac351e95f3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Go release - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: ${{ github.workspace }}/go.mod cache: false diff --git a/.github/workflows/qan-api2.yml b/.github/workflows/qan-api2.yml index 328edd972b..53cc5b1602 100644 --- a/.github/workflows/qan-api2.yml +++ b/.github/workflows/qan-api2.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Go release - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: ${{ github.workspace }}/go.mod cache: false diff --git a/.github/workflows/vmproxy.yml b/.github/workflows/vmproxy.yml index ed81580f61..cb78023fbf 100644 --- a/.github/workflows/vmproxy.yml +++ b/.github/workflows/vmproxy.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Go release - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: ${{ github.workspace }}/go.mod cache: false From 1c5faa4457e70b3e5dbc9cb87fae2cc8e03d9af2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 12:43:58 +0200 Subject: [PATCH 04/28] Bump github.com/aws/aws-sdk-go from 1.47.0 to 1.48.14 (#2680) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.47.0 to 1.48.14. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.47.0...v1.48.14) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Artem Gavrilov --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index add8324889..2f6bcec02c 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/alecthomas/kong v0.8.0 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 - github.com/aws/aws-sdk-go v1.47.0 + github.com/aws/aws-sdk-go v1.48.14 github.com/blang/semver v3.5.1+incompatible github.com/brianvoe/gofakeit/v6 v6.26.0 github.com/charmbracelet/bubbles v0.16.1 diff --git a/go.sum b/go.sum index 7b1fa2e126..b4185c2b31 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.7/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= -github.com/aws/aws-sdk-go v1.47.0 h1:/JUg9V1+xh+qBn8A6ec/l15ETPaMaBqxkjz+gg63dNk= -github.com/aws/aws-sdk-go v1.47.0/go.mod h1:DlEaEbWKZmsITVbqlSVvekPARM1HzeV9PMYg15ymSDA= +github.com/aws/aws-sdk-go v1.48.14 h1:nVLrp+F84SG+xGiFMfe1TE6ZV6smF+42tuuNgYGV30s= +github.com/aws/aws-sdk-go v1.48.14/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= From 94248c5765a1472635f79f60d0f97154ac2c88e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:06:16 +0200 Subject: [PATCH 05/28] Bump golang.org/x/tools from 0.15.0 to 0.16.0 (#2681) Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.15.0 to 0.16.0. - [Release notes](https://github.com/golang/tools/releases) - [Commits](https://github.com/golang/tools/compare/v0.15.0...v0.16.0) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 10 +++++----- go.sum | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 2f6bcec02c..fbc760e442 100644 --- a/go.mod +++ b/go.mod @@ -76,11 +76,11 @@ require ( github.com/stretchr/testify v1.8.4 go.mongodb.org/mongo-driver v1.12.0 go.starlark.net v0.0.0-20230717150657-8a3343210976 - golang.org/x/crypto v0.15.0 + golang.org/x/crypto v0.16.0 golang.org/x/sync v0.5.0 - golang.org/x/sys v0.14.0 + golang.org/x/sys v0.15.0 golang.org/x/text v0.14.0 - golang.org/x/tools v0.15.0 + golang.org/x/tools v0.16.0 google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d google.golang.org/grpc v1.59.0 @@ -249,9 +249,9 @@ require ( go.opentelemetry.io/otel v1.19.0 // indirect go.opentelemetry.io/otel/trace v1.19.0 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.18.0 // indirect + golang.org/x/net v0.19.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/term v0.14.0 // indirect + golang.org/x/term v0.15.0 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gotest.tools/v3 v3.3.0 // indirect diff --git a/go.sum b/go.sum index b4185c2b31..ddb181f815 100644 --- a/go.sum +++ b/go.sum @@ -922,8 +922,8 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1011,16 +1011,16 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= -golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1098,8 +1098,8 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= +golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 0e2fa268a423c70a962ea84dc9ad166d8cc188b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:28:14 +0200 Subject: [PATCH 06/28] Bump github.com/hashicorp/raft from 1.5.0 to 1.6.0 (#2661) Bumps [github.com/hashicorp/raft](https://github.com/hashicorp/raft) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/hashicorp/raft/releases) - [Changelog](https://github.com/hashicorp/raft/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/raft/compare/v1.5.0...v1.6.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/raft dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 3 ++- go.sum | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index fbc760e442..52d7613de4 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 github.com/hashicorp/go-version v1.6.0 - github.com/hashicorp/raft v1.5.0 + github.com/hashicorp/raft v1.6.0 github.com/jmoiron/sqlx v1.3.5 github.com/jotaen/kong-completion v0.0.5 github.com/lib/pq v1.10.9 @@ -119,6 +119,7 @@ require ( github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/hashicorp/go-hclog v1.5.0 // indirect + github.com/hashicorp/go-msgpack/v2 v2.1.1 // indirect github.com/hashicorp/go-uuid v1.0.2 // indirect github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect github.com/imdario/mergo v0.3.12 // indirect diff --git a/go.sum b/go.sum index ddb181f815..e85d4b2928 100644 --- a/go.sum +++ b/go.sum @@ -429,9 +429,10 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v1.1.5 h1:9byZdVjKTe5mce63pRVNP1L7UAmdHOTEMGehn6KvJWs= github.com/hashicorp/go-msgpack v1.1.5/go.mod h1:gWVc3sv/wbDmR3rQsj1CAktEZzoz1YNK9NfGLXJ69/4= +github.com/hashicorp/go-msgpack/v2 v2.1.1 h1:xQEY9yB2wnHitoSzk/B9UjXWRQ67QKu5AOm8aFp8N3I= +github.com/hashicorp/go-msgpack/v2 v2.1.1/go.mod h1:upybraOAblm4S7rx0+jeNy+CWWhzywQsSRV5033mMu4= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= @@ -452,8 +453,8 @@ github.com/hashicorp/golang-lru/v2 v2.0.2 h1:Dwmkdr5Nc/oBiXgJS3CDHNhJtIHkuZ3DZF5 github.com/hashicorp/golang-lru/v2 v2.0.2/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM= github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= -github.com/hashicorp/raft v1.5.0 h1:uNs9EfJ4FwiArZRxxfd/dQ5d33nV31/CdCHArH89hT8= -github.com/hashicorp/raft v1.5.0/go.mod h1:pKHB2mf/Y25u3AHNSXVRv+yT+WAnmeTX0BwVppVQV+M= +github.com/hashicorp/raft v1.6.0 h1:tkIAORZy2GbJ2Trp5eUSggLXDPOJLXC+JJLNMMqtgtM= +github.com/hashicorp/raft v1.6.0/go.mod h1:Xil5pDgeGwRWuX4uPUmwa+7Vagg4N804dz6mhNi6S7o= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= From 561ec5cd7c35738b009474caa5d993f9f89a1cd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:46:48 +0200 Subject: [PATCH 07/28] Bump go.mongodb.org/mongo-driver from 1.12.0 to 1.13.1 (#2683) Bumps [go.mongodb.org/mongo-driver](https://github.com/mongodb/mongo-go-driver) from 1.12.0 to 1.13.1. - [Release notes](https://github.com/mongodb/mongo-go-driver/releases) - [Commits](https://github.com/mongodb/mongo-go-driver/compare/v1.12.0...v1.13.1) --- updated-dependencies: - dependency-name: go.mongodb.org/mongo-driver dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 52d7613de4..05513c732c 100644 --- a/go.mod +++ b/go.mod @@ -74,7 +74,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/stretchr/objx v0.5.0 github.com/stretchr/testify v1.8.4 - go.mongodb.org/mongo-driver v1.12.0 + go.mongodb.org/mongo-driver v1.13.1 go.starlark.net v0.0.0-20230717150657-8a3343210976 golang.org/x/crypto v0.16.0 golang.org/x/sync v0.5.0 diff --git a/go.sum b/go.sum index e85d4b2928..d74103d260 100644 --- a/go.sum +++ b/go.sum @@ -815,8 +815,8 @@ go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R7 go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= -go.mongodb.org/mongo-driver v1.12.0 h1:aPx33jmn/rQuJXPQLZQ8NtfPQG8CaqgLThFtqRb0PiE= -go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0= +go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk= +go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= From 3c380bb2033139f0a0c3c95ab3d3a8b2ac3269d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:05:01 +0200 Subject: [PATCH 08/28] Bump github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph (#2641) Bumps [github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph](https://github.com/Azure/azure-sdk-for-go) from 0.8.0 to 0.9.0. - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](https://github.com/Azure/azure-sdk-for-go/compare/sdk/azcore/v0.8.0...sdk/azcore/v0.9.0) --- updated-dependencies: - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 11 ++++++----- go.sum | 22 ++++++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 05513c732c..7a55da9912 100644 --- a/go.mod +++ b/go.mod @@ -112,6 +112,7 @@ require ( github.com/go-ini/ini v1.67.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.5.9 // indirect @@ -156,11 +157,11 @@ require ( ) require ( - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0-beta.2 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 - github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.8.0 - github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 + github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 + github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect github.com/ClickHouse/ch-go v0.58.2 // indirect github.com/ClickHouse/clickhouse-go v1.5.4 // indirect github.com/HdrHistogram/hdrhistogram-go v1.1.2 diff --git a/go.sum b/go.sum index d74103d260..8bf2674b65 100644 --- a/go.sum +++ b/go.sum @@ -37,14 +37,14 @@ github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w= github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0-beta.2 h1:C3zKsGguxcLd8a2uEytB8+TFtBGd75bXRxEs0QBwsv0= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0-beta.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.8.0 h1:+fxpya1I3WJEvl+qzET7NO2MkjtYkiZJxIcEN690W64= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.8.0/go.mod h1:1wZ2sD5NUZGEk/RVNxjBFPqVHC39ekUDtmNnWhKhrGY= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0 h1:fb8kj/Dh4CSwgsOzHeZY4Xh68cFVbzXx+ONXGMY//4w= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0/go.mod h1:uReU2sSxZExRPBAg3qKzmAucSi51+SP1OhohieR821Q= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 h1:d81/ng9rET2YqdVkVwkb6EXeRrLJIwyGnJcAlAWKwhs= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 h1:zLzoX5+W2l95UJoVwiyNS4dX8vHyQ6x2xRLoBBL9wMk= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0/go.mod h1:wVEOJfGTj0oPAUGA1JuRAvz/lxXQsWW16axmHPP47Bk= github.com/Azure/azure-storage-blob-go v0.13.0/go.mod h1:pA9kNqtjUeQF2zOSu4s//nUdBD+e64lEuc4sVnuOfNs= github.com/Azure/azure-storage-blob-go v0.14.0 h1:1BCg74AmVdYwO3dlKwtFU1V0wU2PZdREkXvAmZJRUlM= github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= @@ -64,8 +64,8 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkMqLPymWEppkm7vgPQY2XsHoEkaMQ0AdZY= -github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o= +github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk= +github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= @@ -324,6 +324,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= +github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-migrate/migrate/v4 v4.16.1 h1:O+0C55RbMN66pWm5MjO6mw0px6usGpY0+bkSGW9zCo0= github.com/golang-migrate/migrate/v4 v4.16.1/go.mod h1:qXiwa/3Zeqaltm1MxOCZDYysW/F6folYiBgBG03l9hc= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= From 0e5a7fdce04d9ec5d70c601fc24846e4ffaac1d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:05:35 +0200 Subject: [PATCH 09/28] Bump golang.org/x/tools from 0.14.0 to 0.16.0 in /tools (#2653) Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.14.0 to 0.16.0. - [Release notes](https://github.com/golang/tools/releases) - [Commits](https://github.com/golang/tools/compare/v0.14.0...v0.16.0) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Artem Gavrilov --- tools/go.mod | 10 +++++----- tools/go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index 5f09eaf0cf..c6a4f3e04a 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -22,7 +22,7 @@ require ( github.com/vburenin/ifacemaker v1.2.1 github.com/vektra/mockery/v2 v2.36.0 golang.org/x/perf v0.0.0-20230717203022-1ba3a21238c9 - golang.org/x/tools v0.14.0 + golang.org/x/tools v0.16.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 google.golang.org/protobuf v1.31.1-0.20231027082548-f4a6c1f6e5c1 gopkg.in/reform.v1 v1.5.1 @@ -204,15 +204,15 @@ require ( go.uber.org/zap v1.26.0 // indirect golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4 // indirect golang.org/x/build v0.0.0-20230905185615-7f65e2bc812a // indirect - golang.org/x/crypto v0.14.0 // indirect + golang.org/x/crypto v0.16.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.17.0 // indirect + golang.org/x/net v0.19.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.14.0 // indirect - golang.org/x/term v0.13.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/term v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect diff --git a/tools/go.sum b/tools/go.sum index 6807315a37..2daef83425 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -866,8 +866,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -966,8 +966,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/oauth2 v0.0.0-20170207211851-4464e7848382/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1063,8 +1063,8 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1072,8 +1072,8 @@ golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1157,8 +1157,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= -golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= +golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= +golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From ca94779a2b22ae40db948369503aeee5a9757e1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:06:14 +0200 Subject: [PATCH 10/28] Bump typescript from 5.2.2 to 5.3.3 in /cli-tests (#2679) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.2.2 to 5.3.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.2.2...v5.3.3) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Artem Gavrilov --- cli-tests/package-lock.json | 8 ++++---- cli-tests/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli-tests/package-lock.json b/cli-tests/package-lock.json index 24981a881b..fbe2adf382 100644 --- a/cli-tests/package-lock.json +++ b/cli-tests/package-lock.json @@ -15,7 +15,7 @@ "playwright": "^1.33.0", "promise-retry": "^2.0.1", "shelljs": "^0.8.5", - "typescript": "^5.2.2" + "typescript": "^5.3.3" }, "devDependencies": { "@types/promise-retry": "^1.1.3", @@ -2864,9 +2864,9 @@ } }, "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/cli-tests/package.json b/cli-tests/package.json index 3d72e3f470..a0dcf3321c 100644 --- a/cli-tests/package.json +++ b/cli-tests/package.json @@ -19,7 +19,7 @@ "playwright": "^1.33.0", "promise-retry": "^2.0.1", "shelljs": "^0.8.5", - "typescript": "^5.2.2" + "typescript": "^5.3.3" }, "devDependencies": { "@types/promise-retry": "^1.1.3", From ec39fd68e59096665de5ad214bb523d6952ae02b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 15:00:20 +0200 Subject: [PATCH 11/28] Bump @typescript-eslint/parser from 6.10.0 to 6.13.2 in /cli-tests (#2671) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.10.0 to 6.13.2. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.13.2/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli-tests/package-lock.json | 90 +++++++++++++++++++++++++++++++++---- cli-tests/package.json | 2 +- 2 files changed, 83 insertions(+), 9 deletions(-) diff --git a/cli-tests/package-lock.json b/cli-tests/package-lock.json index fbe2adf382..0cd09eedcc 100644 --- a/cli-tests/package-lock.json +++ b/cli-tests/package-lock.json @@ -21,7 +21,7 @@ "@types/promise-retry": "^1.1.3", "@types/shelljs": "^0.8.12", "@typescript-eslint/eslint-plugin": "^6.10.0", - "@typescript-eslint/parser": "^6.10.0", + "@typescript-eslint/parser": "^6.13.2", "eslint": "8.54", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.1.0", @@ -296,15 +296,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.10.0.tgz", - "integrity": "sha512-+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.2.tgz", + "integrity": "sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.10.0", - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/typescript-estree": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0", + "@typescript-eslint/scope-manager": "6.13.2", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4" }, "engines": { @@ -323,6 +323,80 @@ } } }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", + "integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", + "integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", + "integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", + "integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.13.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/@typescript-eslint/scope-manager": { "version": "6.10.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz", diff --git a/cli-tests/package.json b/cli-tests/package.json index a0dcf3321c..ea64a26a0b 100644 --- a/cli-tests/package.json +++ b/cli-tests/package.json @@ -25,7 +25,7 @@ "@types/promise-retry": "^1.1.3", "@types/shelljs": "^0.8.12", "@typescript-eslint/eslint-plugin": "^6.10.0", - "@typescript-eslint/parser": "^6.10.0", + "@typescript-eslint/parser": "^6.13.2", "eslint": "8.54", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.1.0", From 7250704286e591f7e9c8aab5562932d77318d5e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 18:30:17 +0200 Subject: [PATCH 12/28] Bump eslint from 8.54.0 to 8.55.0 in /cli-tests (#2666) Bumps [eslint](https://github.com/eslint/eslint) from 8.54.0 to 8.55.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.54.0...v8.55.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli-tests/package-lock.json | 24 ++++++++++++------------ cli-tests/package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cli-tests/package-lock.json b/cli-tests/package-lock.json index 0cd09eedcc..471fb86ecc 100644 --- a/cli-tests/package-lock.json +++ b/cli-tests/package-lock.json @@ -22,7 +22,7 @@ "@types/shelljs": "^0.8.12", "@typescript-eslint/eslint-plugin": "^6.10.0", "@typescript-eslint/parser": "^6.13.2", - "eslint": "8.54", + "eslint": "8.55", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-plugin-import": "^2.29.0", @@ -63,9 +63,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -86,9 +86,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", - "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", + "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1016,15 +1016,15 @@ } }, "node_modules/eslint": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", - "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", + "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.54.0", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.55.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", diff --git a/cli-tests/package.json b/cli-tests/package.json index ea64a26a0b..47a6d3dcec 100644 --- a/cli-tests/package.json +++ b/cli-tests/package.json @@ -26,7 +26,7 @@ "@types/shelljs": "^0.8.12", "@typescript-eslint/eslint-plugin": "^6.10.0", "@typescript-eslint/parser": "^6.13.2", - "eslint": "8.54", + "eslint": "8.55", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-plugin-import": "^2.29.0", From 32ab7d54b69a95a272594ddb5890ea246516a393 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 16:13:17 +0200 Subject: [PATCH 13/28] Bump github.com/aws/aws-sdk-go from 1.48.14 to 1.49.1 (#2695) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.48.14 to 1.49.1. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.48.14...v1.49.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7a55da9912..1b957b0fdf 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/alecthomas/kong v0.8.0 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 - github.com/aws/aws-sdk-go v1.48.14 + github.com/aws/aws-sdk-go v1.49.1 github.com/blang/semver v3.5.1+incompatible github.com/brianvoe/gofakeit/v6 v6.26.0 github.com/charmbracelet/bubbles v0.16.1 diff --git a/go.sum b/go.sum index 8bf2674b65..0e3f1a5dee 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.7/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= -github.com/aws/aws-sdk-go v1.48.14 h1:nVLrp+F84SG+xGiFMfe1TE6ZV6smF+42tuuNgYGV30s= -github.com/aws/aws-sdk-go v1.48.14/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.49.1 h1:Dsamcd8d/nNb3A+bZ0ucfGl0vGZsW5wlRW0vhoYGoeQ= +github.com/aws/aws-sdk-go v1.49.1/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= From 154cc6a9f501441ea2d91beced069be933ba2d16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 17:10:54 +0200 Subject: [PATCH 14/28] Bump github.com/grafana/grafana-api-golang-client from 0.26.0 to 0.27.0 (#2690) Bumps [github.com/grafana/grafana-api-golang-client](https://github.com/grafana/grafana-api-golang-client) from 0.26.0 to 0.27.0. - [Release notes](https://github.com/grafana/grafana-api-golang-client/releases) - [Commits](https://github.com/grafana/grafana-api-golang-client/compare/v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: github.com/grafana/grafana-api-golang-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1b957b0fdf..8fe69e8380 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/golang-migrate/migrate/v4 v4.16.1 github.com/golang/protobuf v1.5.3 github.com/google/uuid v1.4.0 - github.com/grafana/grafana-api-golang-client v0.26.0 + github.com/grafana/grafana-api-golang-client v0.27.0 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 diff --git a/go.sum b/go.sum index 0e3f1a5dee..4591f97ffe 100644 --- a/go.sum +++ b/go.sum @@ -413,8 +413,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/grafana/grafana-api-golang-client v0.26.0 h1:Eu2YsfUezYngy8ifvmLybgluIcn/2IS9u1xkzuYstEM= -github.com/grafana/grafana-api-golang-client v0.26.0/go.mod h1:uNLZEmgKtTjHBtCQMwNn3qsx2mpMb8zU+7T4Xv3NR9Y= +github.com/grafana/grafana-api-golang-client v0.27.0 h1:zIwMXcbCB4n588i3O2N6HfNcQogCNTd/vPkEXTr7zX8= +github.com/grafana/grafana-api-golang-client v0.27.0/go.mod h1:uNLZEmgKtTjHBtCQMwNn3qsx2mpMb8zU+7T4Xv3NR9Y= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk= From 0e93c708525819138bed6bbbf84a58b7b828ee85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:44:28 +0200 Subject: [PATCH 15/28] Bump eslint from 8.55.0 to 8.56.0 in /cli-tests (#2702) Bumps [eslint](https://github.com/eslint/eslint) from 8.55.0 to 8.56.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.55.0...v8.56.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli-tests/package-lock.json | 16 ++++++++-------- cli-tests/package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli-tests/package-lock.json b/cli-tests/package-lock.json index 471fb86ecc..2c831d864d 100644 --- a/cli-tests/package-lock.json +++ b/cli-tests/package-lock.json @@ -22,7 +22,7 @@ "@types/shelljs": "^0.8.12", "@typescript-eslint/eslint-plugin": "^6.10.0", "@typescript-eslint/parser": "^6.13.2", - "eslint": "8.55", + "eslint": "8.56", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-plugin-import": "^2.29.0", @@ -86,9 +86,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", - "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1016,15 +1016,15 @@ } }, "node_modules/eslint": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", - "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.55.0", + "@eslint/js": "8.56.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", diff --git a/cli-tests/package.json b/cli-tests/package.json index 47a6d3dcec..f4a67ad433 100644 --- a/cli-tests/package.json +++ b/cli-tests/package.json @@ -26,7 +26,7 @@ "@types/shelljs": "^0.8.12", "@typescript-eslint/eslint-plugin": "^6.10.0", "@typescript-eslint/parser": "^6.13.2", - "eslint": "8.55", + "eslint": "8.56", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-plugin-import": "^2.29.0", From 6572486590a3184ceecf4e6f62494904bc81e757 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:57:08 +0200 Subject: [PATCH 16/28] Bump @typescript-eslint/parser from 6.13.2 to 6.14.0 in /cli-tests (#2692) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.13.2 to 6.14.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.14.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli-tests/package-lock.json | 50 ++++++++++++++++++------------------- cli-tests/package.json | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cli-tests/package-lock.json b/cli-tests/package-lock.json index 2c831d864d..5f006cfc30 100644 --- a/cli-tests/package-lock.json +++ b/cli-tests/package-lock.json @@ -21,7 +21,7 @@ "@types/promise-retry": "^1.1.3", "@types/shelljs": "^0.8.12", "@typescript-eslint/eslint-plugin": "^6.10.0", - "@typescript-eslint/parser": "^6.13.2", + "@typescript-eslint/parser": "^6.14.0", "eslint": "8.56", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.1.0", @@ -296,15 +296,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.2.tgz", - "integrity": "sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.14.0.tgz", + "integrity": "sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.13.2", - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/typescript-estree": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/scope-manager": "6.14.0", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/typescript-estree": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4" }, "engines": { @@ -324,13 +324,13 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", - "integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.14.0.tgz", + "integrity": "sha512-VT7CFWHbZipPncAZtuALr9y3EuzY1b1t1AEkIq2bTXUPKw+pHoXflGNG5L+Gv6nKul1cz1VH8fz16IThIU0tdg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2" + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -341,9 +341,9 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", - "integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.14.0.tgz", + "integrity": "sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -354,13 +354,13 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", - "integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.14.0.tgz", + "integrity": "sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", - "@typescript-eslint/visitor-keys": "6.13.2", + "@typescript-eslint/types": "6.14.0", + "@typescript-eslint/visitor-keys": "6.14.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -381,12 +381,12 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.13.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", - "integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.14.0.tgz", + "integrity": "sha512-fB5cw6GRhJUz03MrROVuj5Zm/Q+XWlVdIsFj+Zb1Hvqouc8t+XP2H5y53QYU/MGtd2dPg6/vJJlhoX3xc2ehfw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/types": "6.14.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { diff --git a/cli-tests/package.json b/cli-tests/package.json index f4a67ad433..c379ed1201 100644 --- a/cli-tests/package.json +++ b/cli-tests/package.json @@ -25,7 +25,7 @@ "@types/promise-retry": "^1.1.3", "@types/shelljs": "^0.8.12", "@typescript-eslint/eslint-plugin": "^6.10.0", - "@typescript-eslint/parser": "^6.13.2", + "@typescript-eslint/parser": "^6.14.0", "eslint": "8.56", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.1.0", From 12f6b16777b87766724389e74b3b5787da6ab718 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:36:17 +0200 Subject: [PATCH 17/28] Bump eslint-plugin-playwright from 0.18.0 to 0.20.0 in /cli-tests (#2693) Bumps [eslint-plugin-playwright](https://github.com/playwright-community/eslint-plugin-playwright) from 0.18.0 to 0.20.0. - [Release notes](https://github.com/playwright-community/eslint-plugin-playwright/releases) - [Changelog](https://github.com/playwright-community/eslint-plugin-playwright/blob/main/CHANGELOG.md) - [Commits](https://github.com/playwright-community/eslint-plugin-playwright/compare/v0.18.0...v0.20.0) --- updated-dependencies: - dependency-name: eslint-plugin-playwright dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli-tests/package-lock.json | 8 ++++---- cli-tests/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli-tests/package-lock.json b/cli-tests/package-lock.json index 5f006cfc30..5550b0bf64 100644 --- a/cli-tests/package-lock.json +++ b/cli-tests/package-lock.json @@ -26,7 +26,7 @@ "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-plugin-import": "^2.29.0", - "eslint-plugin-playwright": "^0.18.0" + "eslint-plugin-playwright": "^0.20.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -1221,9 +1221,9 @@ } }, "node_modules/eslint-plugin-playwright": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-0.18.0.tgz", - "integrity": "sha512-VLvKOAaDvRTonUeI3J8plXIJQuReXjbjrgDGoNwsiydwdqk3lt+mbzgsBcxJscMJDHc9XgnLVo0nWTiaYHLGYQ==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-0.20.0.tgz", + "integrity": "sha512-JWTSwUyPPipSOm6AK8z78bQXtKRCykvhSGUewcmZuxstSZ5oGsykW2JaRXJQ2IIfzKJToCBeKD2ISc8Li8qVEQ==", "dev": true, "dependencies": { "globals": "^13.23.0" diff --git a/cli-tests/package.json b/cli-tests/package.json index c379ed1201..f912972bb3 100644 --- a/cli-tests/package.json +++ b/cli-tests/package.json @@ -30,6 +30,6 @@ "eslint-config-airbnb-base": "^15.0.0", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-plugin-import": "^2.29.0", - "eslint-plugin-playwright": "^0.18.0" + "eslint-plugin-playwright": "^0.20.0" } } From c40c594eea62582e55973e01a9c0efa2656d2c77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:37:03 +0200 Subject: [PATCH 18/28] Bump actions/upload-artifact from 3 to 4 (#2700) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Artem Gavrilov --- .github/workflows/admin.yml | 2 +- .github/workflows/api-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/admin.yml b/.github/workflows/admin.yml index f6f776fd55..961589399d 100644 --- a/.github/workflows/admin.yml +++ b/.github/workflows/admin.yml @@ -153,7 +153,7 @@ jobs: - name: Attach the report on failure if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "report-${{ matrix.go-version }}-${{ matrix.test-type }}" path: ${{ github.workspace }}/cli-tests/playwright-report/ diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml index 897e725e01..7737a890ef 100644 --- a/.github/workflows/api-tests.yml +++ b/.github/workflows/api-tests.yml @@ -144,7 +144,7 @@ jobs: - name: Upload the logs on failure if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "logs.zip" path: ${{ github.workspace }}/logs.zip From 1db4026e648403a582bf8a4fcf00c6f6173b84ee Mon Sep 17 00:00:00 2001 From: Talha Bin Rizwan Date: Mon, 18 Dec 2023 17:02:30 +0500 Subject: [PATCH 19/28] PMM-7 Fix pmm2-client source debian package. (#2703) --- build/scripts/build-client-deb | 2 +- build/scripts/build-client-sdeb | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/scripts/build-client-deb b/build/scripts/build-client-deb index b4b5c236e1..2a94002557 100755 --- a/build/scripts/build-client-deb +++ b/build/scripts/build-client-deb @@ -9,7 +9,7 @@ bin_dir=$(cd $(dirname $0); pwd -P) tmp_dir=${root_dir}/tmp main() { - local IMAGE=${1:-ubuntu:xenial} + local IMAGE=${1:-ubuntu:focal} docker run --rm -e DEBIAN_FRONTEND=noninteractive \ -v ${bin_dir}:/home/builder/bin \ -v ${root_dir}/results:/home/builder/results ${IMAGE} sh -c " diff --git a/build/scripts/build-client-sdeb b/build/scripts/build-client-sdeb index 45e75ffb95..4262d379b0 100755 --- a/build/scripts/build-client-sdeb +++ b/build/scripts/build-client-sdeb @@ -9,8 +9,10 @@ bin_dir=$(cd $(dirname $0); pwd -P) tmp_dir=${root_dir}/tmp main() { - local IMAGE=${1:-ubuntu:bionic} - docker run --rm -v ${bin_dir}:/home/builder/bin -v ${root_dir}/results:/home/builder/results ${IMAGE} sh -c " + local IMAGE=${1:-ubuntu:focal} + docker run --rm -e DEBIAN_FRONTEND=noninteractive \ + -v ${bin_dir}:/home/builder/bin \ + -v ${root_dir}/results:/home/builder/results ${IMAGE} sh -c " set -o errexit set -o xtrace From 75fd4a0f78ea75a25fccf34b1a9df1f4eb224beb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 12:29:58 +0200 Subject: [PATCH 20/28] Bump @typescript-eslint/eslint-plugin in /cli-tests (#2711) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.10.0 to 6.15.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.15.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- cli-tests/package-lock.json | 84 ++++++++++++++++++------------------- cli-tests/package.json | 2 +- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/cli-tests/package-lock.json b/cli-tests/package-lock.json index 5550b0bf64..467393717a 100644 --- a/cli-tests/package-lock.json +++ b/cli-tests/package-lock.json @@ -20,7 +20,7 @@ "devDependencies": { "@types/promise-retry": "^1.1.3", "@types/shelljs": "^0.8.12", - "@typescript-eslint/eslint-plugin": "^6.10.0", + "@typescript-eslint/eslint-plugin": "^6.15.0", "@typescript-eslint/parser": "^6.14.0", "eslint": "8.56", "eslint-config-airbnb-base": "^15.0.0", @@ -202,9 +202,9 @@ } }, "node_modules/@types/json-schema": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz", - "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==", + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, "node_modules/@types/json5": { @@ -245,9 +245,9 @@ "dev": true }, "node_modules/@types/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", + "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, "node_modules/@types/shelljs": { @@ -261,16 +261,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz", - "integrity": "sha512-uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.15.0.tgz", + "integrity": "sha512-j5qoikQqPccq9QoBAupOP+CBu8BaJ8BLjaXSioDISeTZkVO3ig7oSIKh3H+rEpee7xCXtWwSB4KIL5l6hWZzpg==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.10.0", - "@typescript-eslint/type-utils": "6.10.0", - "@typescript-eslint/utils": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0", + "@typescript-eslint/scope-manager": "6.15.0", + "@typescript-eslint/type-utils": "6.15.0", + "@typescript-eslint/utils": "6.15.0", + "@typescript-eslint/visitor-keys": "6.15.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -398,13 +398,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz", - "integrity": "sha512-TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.15.0.tgz", + "integrity": "sha512-+BdvxYBltqrmgCNu4Li+fGDIkW9n//NrruzG9X1vBzaNK+ExVXPoGB71kneaVw/Jp+4rH/vaMAGC6JfMbHstVg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0" + "@typescript-eslint/types": "6.15.0", + "@typescript-eslint/visitor-keys": "6.15.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -415,13 +415,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz", - "integrity": "sha512-wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.15.0.tgz", + "integrity": "sha512-CnmHKTfX6450Bo49hPg2OkIm/D/TVYV7jO1MCfPYGwf6x3GO0VU8YMO5AYMn+u3X05lRRxA4fWCz87GFQV6yVQ==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.10.0", - "@typescript-eslint/utils": "6.10.0", + "@typescript-eslint/typescript-estree": "6.15.0", + "@typescript-eslint/utils": "6.15.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -442,9 +442,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.10.0.tgz", - "integrity": "sha512-36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.15.0.tgz", + "integrity": "sha512-yXjbt//E4T/ee8Ia1b5mGlbNj9fB9lJP4jqLbZualwpP2BCQ5is6BcWwxpIsY4XKAhmdv3hrW92GdtJbatC6dQ==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -455,13 +455,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz", - "integrity": "sha512-ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.15.0.tgz", + "integrity": "sha512-7mVZJN7Hd15OmGuWrp2T9UvqR2Ecg+1j/Bp1jXUEY2GZKV6FXlOIoqVDmLpBiEiq3katvj/2n2mR0SDwtloCew==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/visitor-keys": "6.10.0", + "@typescript-eslint/types": "6.15.0", + "@typescript-eslint/visitor-keys": "6.15.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -482,17 +482,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.10.0.tgz", - "integrity": "sha512-v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.15.0.tgz", + "integrity": "sha512-eF82p0Wrrlt8fQSRL0bGXzK5nWPRV2dYQZdajcfzOD9+cQz9O7ugifrJxclB+xVOvWvagXfqS4Es7vpLP4augw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.10.0", - "@typescript-eslint/types": "6.10.0", - "@typescript-eslint/typescript-estree": "6.10.0", + "@typescript-eslint/scope-manager": "6.15.0", + "@typescript-eslint/types": "6.15.0", + "@typescript-eslint/typescript-estree": "6.15.0", "semver": "^7.5.4" }, "engines": { @@ -507,12 +507,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz", - "integrity": "sha512-xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.15.0.tgz", + "integrity": "sha512-1zvtdC1a9h5Tb5jU9x3ADNXO9yjP8rXlaoChu0DQX40vf5ACVpYIVIZhIMZ6d5sDXH7vq4dsZBT1fEGj8D2n2w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.10.0", + "@typescript-eslint/types": "6.15.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { diff --git a/cli-tests/package.json b/cli-tests/package.json index f912972bb3..d4a139a9d2 100644 --- a/cli-tests/package.json +++ b/cli-tests/package.json @@ -24,7 +24,7 @@ "devDependencies": { "@types/promise-retry": "^1.1.3", "@types/shelljs": "^0.8.12", - "@typescript-eslint/eslint-plugin": "^6.10.0", + "@typescript-eslint/eslint-plugin": "^6.15.0", "@typescript-eslint/parser": "^6.14.0", "eslint": "8.56", "eslint-config-airbnb-base": "^15.0.0", From 1edf9b318cdb4530f9cc571559b4d7878ce6ff41 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Wed, 20 Dec 2023 10:44:53 +0300 Subject: [PATCH 21/28] PMM-12643 consistent types in list output of pmm-admin (#2616) * PMM-12643 consistent types in list output of pmm-admin * PMM-12643 remove the capacity * PMM-12643 use proper syntax for an empty slice * PMM-12643 add output tests * PMM-12624 fix linter issues * PMM-12643 tests the functions * PMM-12643 fix the port * PMM-12643 fix the build * PMM-12643 revert erroneous comment --- admin/commands/list.go | 37 +++++++----- admin/commands/list_test.go | 101 +++++++++++++++++++++++++++++++++ build/scripts/build-server-rpm | 13 +++-- 3 files changed, 132 insertions(+), 19 deletions(-) diff --git a/admin/commands/list.go b/admin/commands/list.go index 128cd1841f..10e145c0e6 100644 --- a/admin/commands/list.go +++ b/admin/commands/list.go @@ -123,7 +123,7 @@ type ListCommand struct { NodeID string `help:"Node ID (default is autodetected)"` } -func (cmd *ListCommand) RunCmd() (Result, error) { //nolint:cyclop,maintidx +func (cmd *ListCommand) RunCmd() (Result, error) { if cmd.NodeID == "" { status, err := agentlocal.GetStatus(agentlocal.DoNotRequestNetworkInfo) if err != nil { @@ -142,6 +142,20 @@ func (cmd *ListCommand) RunCmd() (Result, error) { //nolint:cyclop,maintidx return nil, err } + agentsRes, err := client.Default.Agents.ListAgents(&agents.ListAgentsParams{ + Context: Ctx, + }) + if err != nil { + return nil, err + } + + return &listResult{ + Services: servicesList(servicesRes), + Agents: agentsList(agentsRes, cmd.NodeID), + }, nil +} + +func servicesList(servicesRes *services.ListServicesOK) []listResultService { getSocketOrHost := func(socket, address string, port int64) string { if socket != "" { return socket @@ -152,6 +166,7 @@ func (cmd *ListCommand) RunCmd() (Result, error) { //nolint:cyclop,maintidx l := len(servicesRes.Payload.Mysql) + len(servicesRes.Payload.Mongodb) + len(servicesRes.Payload.Postgresql) l += len(servicesRes.Payload.Proxysql) + len(servicesRes.Payload.Haproxy) + len(servicesRes.Payload.External) servicesList := make([]listResultService, 0, l) + for _, s := range servicesRes.Payload.Mysql { servicesList = append(servicesList, listResultService{ ServiceType: types.ServiceTypeMySQLService, @@ -200,13 +215,10 @@ func (cmd *ListCommand) RunCmd() (Result, error) { //nolint:cyclop,maintidx }) } - agentsRes, err := client.Default.Agents.ListAgents(&agents.ListAgentsParams{ - Context: Ctx, - }) - if err != nil { - return nil, err - } + return servicesList +} +func agentsList(agentsRes *agents.ListAgentsOK, nodeID string) []listResultAgent { //nolint:cyclop getStatus := func(s *string) string { res := pointer.GetString(s) if res == "" { @@ -222,9 +234,9 @@ func (cmd *ListCommand) RunCmd() (Result, error) { //nolint:cyclop,maintidx return "pull" } pmmAgentIDs := make(map[string]struct{}) - var agentsList []listResultAgent + agentsList := []listResultAgent{} for _, a := range agentsRes.Payload.PMMAgent { - if a.RunsOnNodeID == cmd.NodeID { + if a.RunsOnNodeID == nodeID { pmmAgentIDs[a.AgentID] = struct{}{} status := "disconnected" @@ -370,7 +382,7 @@ func (cmd *ListCommand) RunCmd() (Result, error) { //nolint:cyclop,maintidx } } for _, a := range agentsRes.Payload.ExternalExporter { - if a.RunsOnNodeID == cmd.NodeID { + if a.RunsOnNodeID == nodeID { agentsList = append(agentsList, listResultAgent{ AgentType: types.AgentTypeExternalExporter, AgentID: a.AgentID, @@ -394,8 +406,5 @@ func (cmd *ListCommand) RunCmd() (Result, error) { //nolint:cyclop,maintidx } } - return &listResult{ - Services: servicesList, - Agents: agentsList, - }, nil + return agentsList } diff --git a/admin/commands/list_test.go b/admin/commands/list_test.go index 2eb4406b4c..a16435a34c 100644 --- a/admin/commands/list_test.go +++ b/admin/commands/list_test.go @@ -15,11 +15,15 @@ package commands import ( + "encoding/json" "strings" "testing" + "github.com/AlekSi/pointer" "github.com/stretchr/testify/assert" + "github.com/percona/pmm/api/inventorypb/json/client/agents" + "github.com/percona/pmm/api/inventorypb/json/client/services" "github.com/percona/pmm/api/inventorypb/types" ) @@ -119,3 +123,100 @@ func TestNiceAgentStatus(t *testing.T) { }) } } + +func TestListJSONOutput(t *testing.T) { + t.Parallel() + t.Run("basic", func(t *testing.T) { + t.Parallel() + services := &services.ListServicesOK{ + Payload: &services.ListServicesOKBody{ + Mysql: []*services.ListServicesOKBodyMysqlItems0{ + { + ServiceID: "/service_id/4ff49c41-80a1-4030-bc02-cd76e3b0b84a", + ServiceName: "mysql-service", + Address: "127.0.0.1", + Port: 3306, + }, + }, + }, + } + agents := &agents.ListAgentsOK{ + Payload: &agents.ListAgentsOKBody{ + PMMAgent: []*agents.ListAgentsOKBodyPMMAgentItems0{ + { + AgentID: "/agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1140", + RunsOnNodeID: "/node_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1140", + Connected: true, + }, + }, + MysqldExporter: []*agents.ListAgentsOKBodyMysqldExporterItems0{ + { + AgentID: "/agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1198", + PMMAgentID: "/agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1140", + ServiceID: "/service_id/4ff49c41-80a1-4030-bc02-cd76e3b0b84a", + Status: pointer.ToString("RUNNING"), + PushMetricsEnabled: false, + ListenPort: 3306, + }, + }, + }, + } + result := listResult{ + Services: servicesList(services), + Agents: agentsList(agents, "/node_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1140"), + } + + res, err := json.Marshal(result) + assert.NoError(t, err) + expected := ` + { + "service": [ + { + "service_type": "MYSQL_SERVICE", + "service_id": "/service_id/4ff49c41-80a1-4030-bc02-cd76e3b0b84a", + "service_name": "mysql-service", + "address_port": "127.0.0.1:3306", + "external_group": "" + } + ], + "agent": [ + { + "agent_type": "PMM_AGENT", + "agent_id": "/agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1140", + "service_id": "", + "status": "CONNECTED", + "disabled": false, + "push_metrics_enabled": "" + }, + { + "agent_type": "MYSQLD_EXPORTER", + "agent_id": "/agent_id/8b732ac3-8256-40b0-a98b-0fd5fa9a1198", + "service_id": "/service_id/4ff49c41-80a1-4030-bc02-cd76e3b0b84a", + "status": "RUNNING", + "disabled": false, + "push_metrics_enabled": "pull", + "port": 3306 + } + ] + } + ` + expected = strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(expected, "\t", ""), "\n", ""), " ", "") + assert.Equal(t, expected, string(res)) + }) + t.Run("empty", func(t *testing.T) { + t.Parallel() + result := listResult{ + Services: servicesList(&services.ListServicesOK{ + Payload: &services.ListServicesOKBody{}, + }), + Agents: agentsList(&agents.ListAgentsOK{ + Payload: &agents.ListAgentsOKBody{}, + }, ""), + } + + res, err := json.Marshal(result) + assert.NoError(t, err) + expected := `{"service":[],"agent":[]}` + assert.Equal(t, expected, string(res)) + }) +} diff --git a/build/scripts/build-server-rpm b/build/scripts/build-server-rpm index 58f619ffda..4c2cb97df6 100755 --- a/build/scripts/build-server-rpm +++ b/build/scripts/build-server-rpm @@ -31,7 +31,7 @@ is_build_needed() { # s3://pmm-build-cache/RELEASE/7 - el7 # s3://pmm-build-cache/RELEASE/9 - el9 - # This is for el9 + # RPM_EPOCH is set for Feature Builds if [ -n "$RPM_EPOCH" ]; then aws s3 sync \ --region us-east-2 \ @@ -65,7 +65,7 @@ prepare_specs() { sed -i -e "s/global commit.*/global commit ${full_commit}/" ${rpmbuild_dir}/SOURCES/${spec_name}.spec if [[ ${spec_name} != "grafana" ]]; then - sed -i -e "s/Version:.*/Version: ${pmm_version}/" ${rpmbuild_dir}/SOURCES/${spec_name}.spec + sed -i -e "s/Version:.*/Version: ${pmm_version}/" ${rpmbuild_dir}/SOURCES/${spec_name}.spec fi if [ -z "${full_pmm_version}" ]; then @@ -122,14 +122,17 @@ build() { | sudo tee /etc/yum.repos.d/local.repo until /usr/bin/createrepo_c --update /home/builder/rpm/RPMS; do - echo waiting - sleep 1 + echo waiting + sleep 1 done sudo yum-builddep --randomwait=1 -y SOURCES/${spec_name}.spec spectool -C SOURCES -g SOURCES/${spec_name}.spec - rpmbuild --define '_rpmdir %{_topdir}/RPMS/${spec_name}-${rpm_version}' --define 'dist .${rpmbuild_dist}' -ba SOURCES/${spec_name}.spec + rpmbuild --define '_rpmdir %{_topdir}/RPMS/${spec_name}-${rpm_version}' \ + --define 'dist .${rpmbuild_dist}' \ + --define 'debug_package %{nil}' \ + -ba SOURCES/${spec_name}.spec rm -f SOURCES/${spec_name}.spec* sudo chown -R $(id -u):$(id -g) /home/builder/rpm/RPMS /home/builder/rpm/SOURCES From 1c486cebf90060cd11f03fa4c05b992af04df40d Mon Sep 17 00:00:00 2001 From: "Y.Horie" Date: Wed, 20 Dec 2023 19:45:19 +0900 Subject: [PATCH 22/28] Fix linter issue #2538 (#2545) * Fix linter issue #2538 * Fix nakedret * Fix gosec * Fix forbidigo * Fix gosmopolitan * Update golangci-lint * Add disable lint rules * https://github.com/percona/pmm/pull/2545#issuecomment-1762895576 * Fix defer close lint error * Fix ireturn nolint --------- Co-authored-by: Nurlan Moldomurov --- .github/workflows/main.yml | 2 +- .golangci.yml | 1 + Makefile.include | 2 +- admin/commands/base_test.go | 2 +- admin/commands/summary.go | 8 ++-- admin/pkg/client/client.go | 2 +- admin/pkg/client/tarball/tarball.go | 8 ++-- agent/agents/mysql/slowlog/parser/parser.go | 2 +- agent/agents/process/process_logger.go | 4 +- .../agents/supervisor/ports_registry_test.go | 4 +- agent/config/config.go | 15 +++--- agent/connectionchecker/connection_checker.go | 2 +- agent/runner/jobs/pbm_helpers_test.go | 3 +- api-tests/server/auth_test.go | 32 ++++++------- api-tests/server/readyz_test.go | 2 +- api-tests/server/version_test.go | 2 +- managed/cmd/pmm-managed/main.go | 2 +- managed/models/action_helpers_test.go | 2 +- managed/models/agent_helpers_test.go | 2 +- managed/models/agent_model_test.go | 2 +- managed/models/channel.go | 8 ++-- managed/models/dsn_helpers_test.go | 2 +- managed/models/kubernetes_helpers_test.go | 2 +- managed/models/location_helpers.go | 2 +- managed/models/node_helpers_test.go | 2 +- managed/models/percona_sso_model_helpers.go | 2 +- managed/models/service_helpers_test.go | 2 +- managed/services/alertmanager/alertmanager.go | 4 +- .../backup/compatibility_service_test.go | 7 +-- managed/services/checks/checks.go | 2 +- .../dbaas/kubernetes/client/client.go | 12 ++--- .../dbaas/kubernetes/client/load_config.go | 4 +- .../dbaas/kubernetes/client/writer.go | 2 +- .../services/dbaas/kubernetes/kubernetes.go | 6 +-- managed/services/dbaas/kubernetes/types.go | 12 ++--- managed/services/grafana/auth_server_test.go | 8 ++-- managed/services/grafana/client.go | 2 +- .../services/inventory/grpc/nodes_server.go | 32 +++++++++---- .../inventory/inventory_metrics_test.go | 2 +- managed/services/inventory/nodes.go | 2 +- .../management/backup/artifacts_service.go | 2 +- .../management/backup/backups_service.go | 4 +- managed/services/management/backup/deps.go | 2 +- .../dbaas/components_service_test.go | 2 +- .../management/dbaas/db_cluster_service.go | 6 +-- .../dbaas/db_cluster_service_test.go | 2 +- .../management/dbaas/dbaas_initializer.go | 12 ++--- .../services/management/dbaas/kube_clients.go | 10 ++-- .../management/dbaas/kubernetes_server.go | 2 +- .../dbaas/kubernetes_server_test.go | 6 +-- .../dbaas/version_service_client.go | 4 +- .../services/management/ia/alerts_service.go | 18 +++---- .../management/ia/alerts_service_test.go | 30 ++++++------ .../management/ia/channels_service.go | 48 +++++++++---------- managed/services/management/ia/common.go | 8 ++-- .../services/management/ia/rules_service.go | 36 +++++++------- managed/services/management/node_mgmt_test.go | 4 +- managed/services/supervisord/logs.go | 4 +- managed/services/supervisord/supervisord.go | 2 +- .../telemetry/datasource_victoria_metrics.go | 2 +- managed/services/telemetry/datasources.go | 4 +- .../telemetry/distribution_util_test.go | 2 +- .../victoriametrics/victoriametrics.go | 4 +- managed/services/vmalert/vmalert.go | 4 +- managed/utils/clean/clean_test.go | 2 +- managed/utils/platform/client.go | 2 +- qan-api2/models/data_ingestion.go | 22 ++++----- vmproxy/proxy/proxy_test.go | 4 +- 68 files changed, 239 insertions(+), 223 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ac351e95f3..26b355823d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -89,7 +89,7 @@ jobs: fail_on_error: true cache: false golangci_lint_flags: "-c=.golangci.yml" - golangci_lint_version: v1.51.2 # Version should match specified in Makefile + golangci_lint_version: v1.54.2 # Version should match specified in Makefile - name: Run go-consistent env: diff --git a/.golangci.yml b/.golangci.yml index 98c4492936..ac80308c17 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -119,6 +119,7 @@ linters: - revive - paralleltest - gocognit + - tagalign # ENDTODO diff --git a/Makefile.include b/Makefile.include index c383de9a2c..7ee186f337 100644 --- a/Makefile.include +++ b/Makefile.include @@ -20,7 +20,7 @@ init: ## Install tools cd tools && go generate -x -tags=tools # Install golangci-lint - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.51.2 # Version should match specified in CI + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.54.2 # Version should match specified in CI release: ## Build release versions of all components make -C agent release diff --git a/admin/commands/base_test.go b/admin/commands/base_test.go index 0b3f7ac205..6aa0c39421 100644 --- a/admin/commands/base_test.go +++ b/admin/commands/base_test.go @@ -157,7 +157,7 @@ func TestReadFile(t *testing.T) { err = os.Remove(cert.Name()) assert.NoError(t, err) }() - _, err = cert.Write([]byte("cert")) + _, err = cert.WriteString("cert") require.NoError(t, err) certificate, err := ReadFile(cert.Name()) diff --git a/admin/commands/summary.go b/admin/commands/summary.go index 7216a65df5..886148a8cb 100644 --- a/admin/commands/summary.go +++ b/admin/commands/summary.go @@ -85,7 +85,7 @@ func addFile(zipW *zip.Writer, name string, fileName string) { logrus.Debugf("%s", err) r = io.NopCloser(bytes.NewReader([]byte(err.Error() + "\n"))) } - defer r.Close() //nolint:gosec,errcheck + defer r.Close() //nolint:gosec,errcheck,nolintlint modTime := time.Now() if fi, _ := os.Stat(fileName); fi != nil { @@ -219,7 +219,7 @@ func addVMAgentTargets(ctx context.Context, zipW *zip.Writer, agentsInfo []*agen addData(zipW, "client/vmagent-targets.html", now, bytes.NewReader([]byte(err.Error()))) return } - defer res.Body.Close() //nolint:gosec,errcheck + defer res.Body.Close() //nolint:gosec,errcheck,nolintlint html, err = io.ReadAll(res.Body) if err != nil { logrus.Debugf("%s", err) @@ -241,7 +241,7 @@ func getURL(ctx context.Context, url string) ([]byte, error) { if err != nil { return nil, errors.WithStack(err) } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint if resp.StatusCode != http.StatusOK { return nil, errors.Errorf("status code: %d", resp.StatusCode) @@ -362,7 +362,7 @@ func (cmd *SummaryCommand) makeArchive(ctx context.Context, globals *flags.Globa if f, err = os.Create(cmd.Filename); err != nil { err = errors.WithStack(err) - return + return //nolint:nakedret } defer func() { diff --git a/admin/pkg/client/client.go b/admin/pkg/client/client.go index fda402a668..bcaa79e606 100644 --- a/admin/pkg/client/client.go +++ b/admin/pkg/client/client.go @@ -69,7 +69,7 @@ func GetLatestVersion(ctx context.Context) (string, error) { return "", err } - defer res.Body.Close() //nolint:errcheck,gosec + defer res.Body.Close() //nolint:errcheck,gosec,nolintlint url, err := res.Location() if err != nil { diff --git a/admin/pkg/client/tarball/tarball.go b/admin/pkg/client/tarball/tarball.go index 45cd697eb0..cadd02e707 100644 --- a/admin/pkg/client/tarball/tarball.go +++ b/admin/pkg/client/tarball/tarball.go @@ -104,7 +104,7 @@ func (b *Base) downloadTarball(ctx context.Context, link string) (string, error) return "", err } - defer f.Close() //nolint:gosec,errcheck + defer f.Close() //nolint:gosec,errcheck,nolintlint req, err := http.NewRequestWithContext(ctx, http.MethodGet, link, nil) if err != nil { @@ -116,7 +116,7 @@ func (b *Base) downloadTarball(ctx context.Context, link string) (string, error) return "", err } - defer res.Body.Close() //nolint:errcheck,gosec + defer res.Body.Close() //nolint:errcheck,gosec,nolintlint if res.StatusCode != http.StatusOK { return "", fmt.Errorf("%w: cannot download installation tarball (http %d)", ErrHTTPStatusNotOk, res.StatusCode) } @@ -148,7 +148,7 @@ func (b *Base) checksumTarball(ctx context.Context, link string, path string) er return err } - defer res.Body.Close() //nolint:gosec,errcheck + defer res.Body.Close() //nolint:gosec,errcheck,nolintlint if res.StatusCode != http.StatusOK { return fmt.Errorf("%w: cannot download tarball's sha256sum (http %d)", ErrHTTPStatusNotOk, res.StatusCode) } @@ -170,7 +170,7 @@ func (b *Base) checksumTarball(ctx context.Context, link string, path string) er return err } - defer f.Close() //nolint:errcheck,gosec + defer f.Close() //nolint:errcheck,gosec,nolintlint h := sha256.New() if _, err := io.Copy(h, f); err != nil { diff --git a/agent/agents/mysql/slowlog/parser/parser.go b/agent/agents/mysql/slowlog/parser/parser.go index 514dd8e937..900f5d22a8 100644 --- a/agent/agents/mysql/slowlog/parser/parser.go +++ b/agent/agents/mysql/slowlog/parser/parser.go @@ -70,7 +70,7 @@ func NewSlowLogParser(r Reader, opts log.Options) *SlowLogParser { if opts.DefaultLocation == nil { // Old MySQL format assumes time is taken from SYSTEM. - opts.DefaultLocation = time.Local + opts.DefaultLocation = time.Local //nolint:gosmopolitan } p := &SlowLogParser{ r: r, diff --git a/agent/agents/process/process_logger.go b/agent/agents/process/process_logger.go index 865a12eaf1..b34b1f1e2f 100644 --- a/agent/agents/process/process_logger.go +++ b/agent/agents/process/process_logger.go @@ -62,7 +62,7 @@ func (pl *processLogger) Write(p []byte) (n int, err error) { //nolint:nonamedre b := bytes.NewBuffer(pl.buf) n, err = b.Write(p) if err != nil { - return + return //nolint:nakedret } var line string @@ -71,7 +71,7 @@ func (pl *processLogger) Write(p []byte) (n int, err error) { //nolint:nonamedre if err != nil { pl.buf = []byte(line) err = nil - return + return //nolint:nakedret } line = strings.TrimSuffix(line, "\n") if pl.replacer != nil { diff --git a/agent/agents/supervisor/ports_registry_test.go b/agent/agents/supervisor/ports_registry_test.go index 2fd56331bd..bb88f22bb1 100644 --- a/agent/agents/supervisor/ports_registry_test.go +++ b/agent/agents/supervisor/ports_registry_test.go @@ -27,7 +27,7 @@ func TestRegistry(t *testing.T) { r := newPortsRegistry(65000, 65002, []uint16{65000}) l1, err := net.Listen("tcp", "127.0.0.1:65001") require.NoError(t, err) - defer l1.Close() //nolint:gosec,errcheck + defer l1.Close() //nolint:gosec,errcheck,nolintlint p, err := r.Reserve() assert.NoError(t, err) @@ -37,7 +37,7 @@ func TestRegistry(t *testing.T) { l2, err := net.Listen("tcp", "127.0.0.1:65002") require.NoError(t, err) - defer l2.Close() //nolint:errcheck,gosec + defer l2.Close() //nolint:errcheck,gosec,nolintlint err = r.Release(65000) assert.NoError(t, err) diff --git a/agent/config/config.go b/agent/config/config.go index 74748a24c4..551ce4512a 100644 --- a/agent/config/config.go +++ b/agent/config/config.go @@ -18,6 +18,7 @@ package config import ( "fmt" "io/fs" + "log" "net" "net/url" "os" @@ -301,25 +302,25 @@ func get(args []string, cfg *Config, l *logrus.Entry) (configFileF string, err e // parse command-line flags and environment variables app, cfgFileF := Application(cfg) if _, err = app.Parse(args); err != nil { - return + return //nolint:nakedret } if *cfgFileF == "" { - return + return //nolint:nakedret } if configFileF, err = filepath.Abs(*cfgFileF); err != nil { - return + return //nolint:nakedret } l.Infof("Loading configuration file %s.", configFileF) fileCfg, err := loadFromFile(configFileF) if err != nil { - return + return //nolint:nakedret } // re-parse flags into configuration from file app, _ = Application(fileCfg) if _, err = app.Parse(args); err != nil { - return + return //nolint:nakedret } *cfg = *fileCfg @@ -412,9 +413,9 @@ func Application(cfg *Config) (*kingpin.Application, *string) { app.Flag("version", "Show application version").Short('v').Action(func(*kingpin.ParseContext) error { if *jsonF { - fmt.Println(version.FullInfoJSON()) + log.Println(version.FullInfoJSON()) } else { - fmt.Println(version.FullInfo()) + log.Println(version.FullInfo()) } os.Exit(0) diff --git a/agent/connectionchecker/connection_checker.go b/agent/connectionchecker/connection_checker.go index d11b04393a..9837842259 100644 --- a/agent/connectionchecker/connection_checker.go +++ b/agent/connectionchecker/connection_checker.go @@ -254,7 +254,7 @@ func (cc *ConnectionChecker) checkExternalConnection(ctx context.Context, uri st res.Error = err.Error() return &res } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint if resp.StatusCode != http.StatusOK { res.Error = fmt.Sprintf("Unexpected HTTP status code: %d. Expected: 200", resp.StatusCode) diff --git a/agent/runner/jobs/pbm_helpers_test.go b/agent/runner/jobs/pbm_helpers_test.go index 3fe1bc8be8..3e533bc6f5 100644 --- a/agent/runner/jobs/pbm_helpers_test.go +++ b/agent/runner/jobs/pbm_helpers_test.go @@ -114,7 +114,8 @@ func TestCreatePBMConfig(t *testing.T) { }, } { t.Run(test.name, func(t *testing.T) { - res, err := createPBMConfig(&test.inputLocation, "test_prefix", test.inputPitr) + inputLocation := test.inputLocation + res, err := createPBMConfig(&inputLocation, "test_prefix", test.inputPitr) if test.errString != "" { assert.ErrorContains(t, err, test.errString) assert.Nil(t, res) diff --git a/api-tests/server/auth_test.go b/api-tests/server/auth_test.go index f8a798a6cb..ed7db15f10 100644 --- a/api-tests/server/auth_test.go +++ b/api-tests/server/auth_test.go @@ -62,7 +62,7 @@ func TestAuth(t *testing.T) { req, _ := http.NewRequestWithContext(pmmapitests.Context, http.MethodGet, uri.String(), nil) resp, err := http.DefaultClient.Do(req) require.NoError(t, err) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := httputil.DumpResponse(resp, true) require.NoError(t, err) @@ -119,7 +119,7 @@ func TestSetup(t *testing.T) { req.Header.Set("X-Test-Must-Setup", "1") resp, b := doRequest(t, client, req) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint assert.Equal(t, 200, resp.StatusCode, "response:\n%s", b) assert.True(t, strings.HasPrefix(string(b), ``), string(b)) @@ -153,7 +153,7 @@ func TestSetup(t *testing.T) { req.Header.Set("X-Test-Must-Setup", "1") resp, b := doRequest(t, client, req) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint assert.Equal(t, code, resp.StatusCode, "response:\n%s", b) if code == 303 { @@ -179,7 +179,7 @@ func TestSetup(t *testing.T) { req.Header.Set("X-Test-Must-Setup", "1") resp, b := doRequest(t, client, req) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint assert.Equal(t, 200, resp.StatusCode, "response:\n%s", b) assert.Equal(t, "{}", string(b), "response:\n%s", b) @@ -214,7 +214,7 @@ func TestSwagger(t *testing.T) { require.NoError(t, err) resp, _ := doRequest(t, http.DefaultClient, req) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint require.NoError(t, err) assert.Equal(t, 200, resp.StatusCode) @@ -231,7 +231,7 @@ func TestSwagger(t *testing.T) { require.NoError(t, err) resp, _ := doRequest(t, http.DefaultClient, req) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint require.NoError(t, err) assert.Equal(t, 200, resp.StatusCode) @@ -318,7 +318,7 @@ func TestPermissions(t *testing.T) { resp, err := http.DefaultClient.Do(req) require.NoError(t, err) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint assert.Equal(t, user.statusCode, resp.StatusCode) }) @@ -340,7 +340,7 @@ func TestPermissions(t *testing.T) { resp, err := http.DefaultClient.Do(req) require.NoError(t, err) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint assert.Equal(t, user.statusCode, resp.StatusCode) }) @@ -360,7 +360,7 @@ func TestPermissions(t *testing.T) { resp, err := http.DefaultClient.Do(req) require.NoError(t, err) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint assert.Equal(t, user.statusCode, resp.StatusCode) }) @@ -374,7 +374,7 @@ func doRequest(tb testing.TB, client *http.Client, req *http.Request) (*http.Res resp, err := client.Do(req) require.NoError(tb, err) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := io.ReadAll(resp.Body) require.NoError(tb, err) @@ -400,7 +400,7 @@ func deleteUser(t *testing.T, userID int) { require.NoError(t, err) resp, b := doRequest(t, http.DefaultClient, req) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint require.Equalf(t, http.StatusOK, resp.StatusCode, "failed to delete user, status code: %d, response: %s", resp.StatusCode, b) } @@ -426,7 +426,7 @@ func createUser(t *testing.T, login string) int { req.Header.Set("Content-Type", "application/json; charset=utf-8") resp, b := doRequest(t, http.DefaultClient, req) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint require.Equalf(t, http.StatusOK, resp.StatusCode, "failed to create user, status code: %d, response: %s", resp.StatusCode, b) var m map[string]interface{} @@ -453,7 +453,7 @@ func setRole(t *testing.T, userID int, role string) { req.Header.Set("Content-Type", "application/json; charset=utf-8") resp, b := doRequest(t, http.DefaultClient, req) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint require.Equalf(t, http.StatusOK, resp.StatusCode, "failed to set role for user, response: %s", b) } @@ -469,7 +469,7 @@ func deleteAPIKey(t *testing.T, apiKeyID int) { require.NoError(t, err) resp, b := doRequest(t, http.DefaultClient, req) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint require.Equalf(t, http.StatusOK, resp.StatusCode, "failed to delete API Key, status code: %d, response: %s", resp.StatusCode, b) } @@ -493,7 +493,7 @@ func createAPIKeyWithRole(t *testing.T, name, role string) (int, string) { req.Header.Set("Content-Type", "application/json; charset=utf-8") resp, b := doRequest(t, http.DefaultClient, req) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint require.Equalf(t, http.StatusOK, resp.StatusCode, "failed to create API key, status code: %d, response: %s", resp.StatusCode, b) @@ -509,7 +509,7 @@ func createAPIKeyWithRole(t *testing.T, name, role string) (int, string) { req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey)) resp1, b := doRequest(t, http.DefaultClient, req) - defer resp1.Body.Close() //nolint:gosec,errcheck + defer resp1.Body.Close() //nolint:gosec,errcheck,nolintlint require.Equalf(t, http.StatusOK, resp1.StatusCode, "failed to get API key, status code: %d, response: %s", resp1.StatusCode, b) diff --git a/api-tests/server/readyz_test.go b/api-tests/server/readyz_test.go index 066f401b82..67aaf60c80 100644 --- a/api-tests/server/readyz_test.go +++ b/api-tests/server/readyz_test.go @@ -52,7 +52,7 @@ func TestReadyz(t *testing.T) { req, _ := http.NewRequestWithContext(pmmapitests.Context, http.MethodGet, uri.String(), nil) resp, err := http.DefaultClient.Do(req) require.NoError(t, err) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := io.ReadAll(resp.Body) require.NoError(t, err) diff --git a/api-tests/server/version_test.go b/api-tests/server/version_test.go index 46dbbf9d95..20f611784e 100644 --- a/api-tests/server/version_test.go +++ b/api-tests/server/version_test.go @@ -50,7 +50,7 @@ func TestVersion(t *testing.T) { req, _ := http.NewRequestWithContext(pmmapitests.Context, http.MethodGet, uri.String(), nil) resp, err := http.DefaultClient.Do(req) require.NoError(t, err) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := io.ReadAll(resp.Body) require.NoError(t, err) diff --git a/managed/cmd/pmm-managed/main.go b/managed/cmd/pmm-managed/main.go index f60a06239e..1ca3eddd00 100644 --- a/managed/cmd/pmm-managed/main.go +++ b/managed/cmd/pmm-managed/main.go @@ -82,7 +82,7 @@ import ( "github.com/percona/pmm/managed/services/alertmanager" "github.com/percona/pmm/managed/services/backup" "github.com/percona/pmm/managed/services/checks" - "github.com/percona/pmm/managed/services/config" + "github.com/percona/pmm/managed/services/config" //nolint:staticcheck "github.com/percona/pmm/managed/services/dbaas" "github.com/percona/pmm/managed/services/dump" "github.com/percona/pmm/managed/services/grafana" diff --git a/managed/models/action_helpers_test.go b/managed/models/action_helpers_test.go index 30009aeb95..735881a0db 100644 --- a/managed/models/action_helpers_test.go +++ b/managed/models/action_helpers_test.go @@ -158,7 +158,7 @@ func TestCleanupResults(t *testing.T) { t.Helper() require.NoError(t, tx.Rollback()) } - return + return //nolint:nakedret } t.Run("CheckActionResultByID", func(t *testing.T) { diff --git a/managed/models/agent_helpers_test.go b/managed/models/agent_helpers_test.go index dd48be34e7..1fbbb118f6 100644 --- a/managed/models/agent_helpers_test.go +++ b/managed/models/agent_helpers_test.go @@ -192,7 +192,7 @@ func TestAgentHelpers(t *testing.T) { t.Helper() require.NoError(t, tx.Rollback()) } - return + return //nolint:nakedret } t.Run("AgentsForNode", func(t *testing.T) { diff --git a/managed/models/agent_model_test.go b/managed/models/agent_model_test.go index dfd83d38ef..a328bcff88 100644 --- a/managed/models/agent_model_test.go +++ b/managed/models/agent_model_test.go @@ -461,7 +461,7 @@ func TestExporterURL(t *testing.T) { t.Helper() require.NoError(t, tx.Rollback()) } - return + return //nolint:nakedret } t.Run("ExporterURL", func(t *testing.T) { diff --git a/managed/models/channel.go b/managed/models/channel.go index 653085ac3b..f6f66e8475 100644 --- a/managed/models/channel.go +++ b/managed/models/channel.go @@ -117,10 +117,10 @@ func (c *SlackConfig) Scan(src interface{}) error { return jsonScan(c, src) } // WebHookConfig is webhook notification channel configuration. type WebHookConfig struct { - SendResolved bool ` json:"send_resolved"` - URL string ` json:"url"` - HTTPConfig *HTTPConfig ` json:"http_config,omitempty"` - MaxAlerts int32 ` json:"max_alerts"` + SendResolved bool `json:"send_resolved"` + URL string `json:"url"` + HTTPConfig *HTTPConfig `json:"http_config,omitempty"` + MaxAlerts int32 `json:"max_alerts"` } // Value implements database/sql/driver.Valuer interface. Should be defined on the value. diff --git a/managed/models/dsn_helpers_test.go b/managed/models/dsn_helpers_test.go index 668f8863ce..242e8542be 100644 --- a/managed/models/dsn_helpers_test.go +++ b/managed/models/dsn_helpers_test.go @@ -169,7 +169,7 @@ func TestFindDSNByServiceID(t *testing.T) { t.Helper() require.NoError(t, tx.Rollback()) } - return + return //nolint:nakedret } t.Run("FindDSNByServiceIDandPMMAgentIDWithNoAgent", func(t *testing.T) { diff --git a/managed/models/kubernetes_helpers_test.go b/managed/models/kubernetes_helpers_test.go index 6b602ba728..625f69e006 100644 --- a/managed/models/kubernetes_helpers_test.go +++ b/managed/models/kubernetes_helpers_test.go @@ -86,7 +86,7 @@ func TestKubernetesHelpers(t *testing.T) { t.Helper() require.NoError(t, tx.Rollback()) } - return + return //nolint:nakedret } t.Run("FindAllKubernetesClusters", func(t *testing.T) { diff --git a/managed/models/location_helpers.go b/managed/models/location_helpers.go index 8172d25a0a..579d22e058 100644 --- a/managed/models/location_helpers.go +++ b/managed/models/location_helpers.go @@ -82,7 +82,7 @@ func checkFilesystemLocationConfig(c *FilesystemLocationConfig) error { return status.Error(codes.InvalidArgument, "Folder should be an absolute path (should contain leading slash).") } - if !pathRe.Match([]byte(c.Path)) { + if !pathRe.MatchString(c.Path) { return status.Error(codes.InvalidArgument, "Filesystem path can contain only dots, colons, slashes, letters, digits, underscores and dashes.") } diff --git a/managed/models/node_helpers_test.go b/managed/models/node_helpers_test.go index 6e3ac6b770..e7c64fe5df 100644 --- a/managed/models/node_helpers_test.go +++ b/managed/models/node_helpers_test.go @@ -115,7 +115,7 @@ func TestNodeHelpers(t *testing.T) { t.Helper() require.NoError(t, tx.Rollback()) } - return + return //nolint:nakedret } t.Run("CreateNode", func(t *testing.T) { diff --git a/managed/models/percona_sso_model_helpers.go b/managed/models/percona_sso_model_helpers.go index 5d4063a7e2..4f9b6a112e 100644 --- a/managed/models/percona_sso_model_helpers.go +++ b/managed/models/percona_sso_model_helpers.go @@ -87,7 +87,7 @@ func (s *PerconaSSODetails) refreshAndGetAccessToken(ctx context.Context, q *ref if err != nil { return nil, err } - defer res.Body.Close() //nolint:gosec,errcheck + defer res.Body.Close() //nolint:gosec,errcheck,nolintlint bodyBytes, err := io.ReadAll(res.Body) if err != nil { diff --git a/managed/models/service_helpers_test.go b/managed/models/service_helpers_test.go index c3076809b2..b042aa7a1c 100644 --- a/managed/models/service_helpers_test.go +++ b/managed/models/service_helpers_test.go @@ -144,7 +144,7 @@ func TestServiceHelpers(t *testing.T) { t.Helper() require.NoError(t, tx.Rollback()) } - return + return //nolint:nakedret } t.Run("FindServices", func(t *testing.T) { diff --git a/managed/services/alertmanager/alertmanager.go b/managed/services/alertmanager/alertmanager.go index a49a5c2d65..ccb4e6271f 100644 --- a/managed/services/alertmanager/alertmanager.go +++ b/managed/services/alertmanager/alertmanager.go @@ -221,7 +221,7 @@ func (svc *Service) reload(ctx context.Context) error { if err != nil { return errors.WithStack(err) } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := io.ReadAll(resp.Body) svc.l.Debugf("Alertmanager reload: %s", b) @@ -859,7 +859,7 @@ func (svc *Service) IsReady(ctx context.Context) error { if err != nil { return errors.WithStack(err) } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := io.ReadAll(resp.Body) svc.l.Debugf("Alertmanager ready: %s", b) diff --git a/managed/services/backup/compatibility_service_test.go b/managed/services/backup/compatibility_service_test.go index e49f00805a..2a329f05a6 100644 --- a/managed/services/backup/compatibility_service_test.go +++ b/managed/services/backup/compatibility_service_test.go @@ -208,7 +208,7 @@ func TestCheckCompatibility(t *testing.T) { } } -func TestFindCompatibleServiceIDs(t *testing.T) { +func TestFindCompatibleServiceIDs(t *testing.T) { //nolint:tparallel t.Parallel() cSvc := NewCompatibilityService(nil, nil) @@ -462,10 +462,11 @@ func TestFindArtifactCompatibleServices(t *testing.T) { t.Cleanup(func() { dropRecords(serviceModel, nodeModel, locationModel) }) + artifact := test.artifact - addRecord(&test.artifact) + addRecord(&artifact) t.Cleanup(func() { - dropRecords(&test.artifact) + dropRecords(&artifact) }) res, err := cSvc.FindArtifactCompatibleServices(context.Background(), test.artifactIDToSearch) diff --git a/managed/services/checks/checks.go b/managed/services/checks/checks.go index f31312834f..e8499ac61b 100644 --- a/managed/services/checks/checks.go +++ b/managed/services/checks/checks.go @@ -56,7 +56,7 @@ const ( defaultStartDelay = time.Minute // Environment variables that affect checks service; only for testing. - envCheckFile = "PERCONA_TEST_CHECKS_FILE" + envCheckFile = "PERCONA_TEST_CHECKS_FILE" //nolint:gosec envDisableStartDelay = "PERCONA_TEST_CHECKS_DISABLE_START_DELAY" checkExecutionTimeout = 5 * time.Minute // limits execution time for every single check diff --git a/managed/services/dbaas/kubernetes/client/client.go b/managed/services/dbaas/kubernetes/client/client.go index f29787d7df..5515dd5814 100644 --- a/managed/services/dbaas/kubernetes/client/client.go +++ b/managed/services/dbaas/kubernetes/client/client.go @@ -725,7 +725,7 @@ func (c Client) DoCSVWait(ctx context.Context, key types.NamespacedName) error { } csv := v1alpha1.ClusterServiceVersion{} - csvPhaseSucceeded := func() (bool, error) { + csvPhaseSucceeded := func(ctx context.Context) (bool, error) { err := kubeclient.Get(ctx, key, &csv) if err != nil { if apierrors.IsNotFound(err) { @@ -748,7 +748,7 @@ func (c Client) DoCSVWait(ctx context.Context, key types.NamespacedName) error { } } - err = wait.PollImmediateUntil(time.Second, csvPhaseSucceeded, ctx.Done()) + err = wait.PollUntilContextCancel(ctx, time.Second, true, csvPhaseSucceeded) if err != nil && errors.Is(err, context.DeadlineExceeded) { depCheckErr := c.checkDeploymentErrors(ctx, key, csv) if depCheckErr != nil { @@ -767,7 +767,7 @@ func (c Client) GetSubscriptionCSV(ctx context.Context, subKey types.NamespacedN return csvKey, err } - subscriptionInstalledCSV := func() (bool, error) { + subscriptionInstalledCSV := func(ctx context.Context) (bool, error) { sub := v1alpha1.Subscription{} err := kubeclient.Get(ctx, subKey, &sub) if err != nil { @@ -784,7 +784,7 @@ func (c Client) GetSubscriptionCSV(ctx context.Context, subKey types.NamespacedN log.Printf(" Found installed CSV %q", installedCSV) return true, nil } - return csvKey, wait.PollImmediateUntil(time.Second, subscriptionInstalledCSV, ctx.Done()) + return csvKey, wait.PollUntilContextCancel(ctx, time.Second, true, subscriptionInstalledCSV) } func (c *Client) getKubeclient() (client.Client, error) { //nolint:ireturn @@ -895,7 +895,7 @@ func (c Client) DoRolloutWait(ctx context.Context, key types.NamespacedName) err return err } - rolloutComplete := func() (bool, error) { + rolloutComplete := func(ctx context.Context) (bool, error) { deployment := appsv1.Deployment{} err := kubeclient.Get(ctx, key, &deployment) if err != nil { @@ -928,7 +928,7 @@ func (c Client) DoRolloutWait(ctx context.Context, key types.NamespacedName) err // Waiting for Deployment to rollout: waiting for deployment spec update to be observed return false, nil } - return wait.PollImmediateUntil(time.Second, rolloutComplete, ctx.Done()) + return wait.PollUntilContextCancel(ctx, time.Second, true, rolloutComplete) } // GetOperatorGroup retrieves an operator group details by namespace and name. diff --git a/managed/services/dbaas/kubernetes/client/load_config.go b/managed/services/dbaas/kubernetes/client/load_config.go index ec8cffa41c..c8fd78cc7d 100644 --- a/managed/services/dbaas/kubernetes/client/load_config.go +++ b/managed/services/dbaas/kubernetes/client/load_config.go @@ -20,12 +20,12 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" ) -// configGetter stores kubeconfig string to convert it to the final object +// configGetter stores kubeconfig string to convert it to the final object. type configGetter struct { kubeconfig string } -// NewConfigGetter creates a new configGetter struct +// NewConfigGetter creates a new configGetter struct. func NewConfigGetter(kubeconfig string) *configGetter { return &configGetter{kubeconfig: kubeconfig} } diff --git a/managed/services/dbaas/kubernetes/client/writer.go b/managed/services/dbaas/kubernetes/client/writer.go index 2c5839504c..1e22e2f8e4 100644 --- a/managed/services/dbaas/kubernetes/client/writer.go +++ b/managed/services/dbaas/kubernetes/client/writer.go @@ -30,7 +30,7 @@ type PrefixWriter interface { Flush() } -// prefixWriter implements PrefixWriter +// prefixWriter implements PrefixWriter. type prefixWriter struct { out io.Writer } diff --git a/managed/services/dbaas/kubernetes/kubernetes.go b/managed/services/dbaas/kubernetes/kubernetes.go index 207bff645a..c9cc94ccef 100644 --- a/managed/services/dbaas/kubernetes/kubernetes.go +++ b/managed/services/dbaas/kubernetes/kubernetes.go @@ -335,7 +335,7 @@ func (k *Kubernetes) GetPSMDBOperatorVersion(ctx context.Context) (string, error return k.getOperatorVersion(ctx, psmdbDeploymentName, psmdbOperatorContainerName) } -// GetPXCOperatorVersion parses PXC operator version from operator deployment +// GetPXCOperatorVersion parses PXC operator version from operator deployment. func (k *Kubernetes) GetPXCOperatorVersion(ctx context.Context) (string, error) { k.lock.RLock() defer k.lock.RUnlock() @@ -826,7 +826,7 @@ func (k *Kubernetes) InstallOperator(ctx context.Context, req InstallOperatorReq return errors.Wrap(err, "cannot create a susbcription to install the operator") } - err = wait.Poll(pollInterval, pollDuration, func() (bool, error) { + err = wait.PollUntilContextTimeout(ctx, pollInterval, pollDuration, false, func(context.Context) (bool, error) { k.lock.Lock() defer k.lock.Unlock() @@ -877,7 +877,7 @@ func (k *Kubernetes) UpgradeOperator(ctx context.Context, namespace, name string var subs *v1alpha1.Subscription // If the subscription was recently created, the install plan might not be ready yet. - err := wait.Poll(pollInterval, pollDuration, func() (bool, error) { + err := wait.PollUntilContextTimeout(ctx, pollInterval, pollDuration, false, func(context.Context) (bool, error) { var err error subs, err = k.client.GetSubscription(ctx, namespace, name) if err != nil { diff --git a/managed/services/dbaas/kubernetes/types.go b/managed/services/dbaas/kubernetes/types.go index db29220e1c..d6876f8d89 100644 --- a/managed/services/dbaas/kubernetes/types.go +++ b/managed/services/dbaas/kubernetes/types.go @@ -35,9 +35,9 @@ const ( dbaasKind = "DatabaseCluster" pxcSecretNameTmpl = "dbaas-%s-pxc-secrets" //nolint:gosec psmdbSecretNameTmpl = "dbaas-%s-psmdb-secrets" //nolint:gosec - // DatabaseTypePXC is a pxc database + // DatabaseTypePXC is a pxc database. DatabaseTypePXC dbaasv1.EngineType = "pxc" - // DatabaseTypePSMDB is a psmdb database + // DatabaseTypePSMDB is a psmdb database. DatabaseTypePSMDB dbaasv1.EngineType = "psmdb" externalNLB string = "external" @@ -82,7 +82,7 @@ func convertComputeResource(res *dbaasv1beta1.ComputeResources) (corev1.Resource return req, nil } -// DatabaseClusterForPXC fills dbaasv1.DatabaseCluster struct with data provided for specified cluster type +// DatabaseClusterForPXC fills dbaasv1.DatabaseCluster struct with data provided for specified cluster type. func DatabaseClusterForPXC(cluster *dbaasv1beta1.CreatePXCClusterRequest, clusterType ClusterType, backupLocation *models.BackupLocation) (*dbaasv1.DatabaseCluster, *dbaasv1.DatabaseClusterRestore, error) { //nolint:lll if (cluster.Params.Proxysql != nil) == (cluster.Params.Haproxy != nil) { return nil, nil, errors.New("pxc cluster must have one and only one proxy type defined") @@ -251,7 +251,7 @@ func DatabaseClusterForPXC(cluster *dbaasv1beta1.CreatePXCClusterRequest, cluste return dbCluster, nil, nil } -// DatabaseClusterForPSMDB fills dbaasv1.DatabaseCluster struct with data provided for specified cluster type +// DatabaseClusterForPSMDB fills dbaasv1.DatabaseCluster struct with data provided for specified cluster type. func DatabaseClusterForPSMDB(cluster *dbaasv1beta1.CreatePSMDBClusterRequest, clusterType ClusterType, backupLocation *models.BackupLocation, backupImage string) (*dbaasv1.DatabaseCluster, *dbaasv1.DatabaseClusterRestore, error) { //nolint:lll if backupLocation != nil && backupLocation.Type != models.S3BackupLocationType { return nil, nil, errors.New("only s3 compatible storages are supported for backup/restore") @@ -401,7 +401,7 @@ func DatabaseClusterForPSMDB(cluster *dbaasv1beta1.CreatePSMDBClusterRequest, cl return dbCluster, nil, nil } -// UpdatePatchForPSMDB returns a patch to update a database cluster +// UpdatePatchForPSMDB returns a patch to update a database cluster. func UpdatePatchForPSMDB(dbCluster *dbaasv1.DatabaseCluster, updateRequest *dbaasv1beta1.UpdatePSMDBClusterRequest, clusterType ClusterType) error { if updateRequest.Params.Suspend && updateRequest.Params.Resume { return errSimultaneous @@ -488,7 +488,7 @@ func UpdatePatchForPSMDB(dbCluster *dbaasv1.DatabaseCluster, updateRequest *dbaa return nil } -// UpdatePatchForPXC returns a patch to update a database cluster +// UpdatePatchForPXC returns a patch to update a database cluster. func UpdatePatchForPXC(dbCluster *dbaasv1.DatabaseCluster, updateRequest *dbaasv1beta1.UpdatePXCClusterRequest, clusterType ClusterType) error { //nolint:cyclop if updateRequest.Params.Suspend && updateRequest.Params.Resume { return errSimultaneous diff --git a/managed/services/grafana/auth_server_test.go b/managed/services/grafana/auth_server_test.go index 6a3994538d..4fb26b249d 100644 --- a/managed/services/grafana/auth_server_test.go +++ b/managed/services/grafana/auth_server_test.go @@ -80,7 +80,7 @@ func TestAuthServerMustSetup(t *testing.T) { assert.True(t, s.mustSetup(rw, req, logrus.WithField("test", t.Name()))) resp := rw.Result() - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint assert.Equal(t, 401, resp.StatusCode) assert.Equal(t, "1", resp.Header.Get("X-Must-Setup")) assert.Equal(t, "", resp.Header.Get("Location")) @@ -97,7 +97,7 @@ func TestAuthServerMustSetup(t *testing.T) { assert.True(t, s.mustSetup(rw, req, logrus.WithField("test", t.Name()))) resp := rw.Result() - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint assert.Equal(t, 303, resp.StatusCode) assert.Equal(t, "", resp.Header.Get("X-Must-Setup")) assert.Equal(t, "/setup", resp.Header.Get("Location")) @@ -123,7 +123,7 @@ func TestAuthServerMustSetup(t *testing.T) { assert.False(t, s.mustSetup(rw, req, logrus.WithField("test", t.Name()))) resp := rw.Result() - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint assert.Equal(t, 200, resp.StatusCode) assert.Equal(t, "", resp.Header.Get("X-Must-Setup")) assert.Equal(t, "", resp.Header.Get("Location")) @@ -148,7 +148,7 @@ func TestAuthServerMustSetup(t *testing.T) { assert.False(t, s.mustSetup(rw, req, logrus.WithField("test", t.Name()))) resp := rw.Result() - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint assert.Equal(t, 200, resp.StatusCode) assert.Equal(t, "", resp.Header.Get("X-Must-Setup")) assert.Equal(t, "", resp.Header.Get("Location")) diff --git a/managed/services/grafana/client.go b/managed/services/grafana/client.go index 8fdcc8139d..8dda69cb04 100644 --- a/managed/services/grafana/client.go +++ b/managed/services/grafana/client.go @@ -132,7 +132,7 @@ func (c *Client) do(ctx context.Context, method, path, rawQuery string, headers if err != nil { return errors.WithStack(err) } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := io.ReadAll(resp.Body) if err != nil { diff --git a/managed/services/inventory/grpc/nodes_server.go b/managed/services/inventory/grpc/nodes_server.go index 18b57b1d4d..6840c69c52 100644 --- a/managed/services/inventory/grpc/nodes_server.go +++ b/managed/services/inventory/grpc/nodes_server.go @@ -111,46 +111,58 @@ func (s *nodesServer) AddNode(ctx context.Context, req *inventorypb.AddNodeReque } // AddGenericNode adds Generic Node. -func (s *nodesServer) AddGenericNode(ctx context.Context, req *inventorypb.AddGenericNodeRequest) (*inventorypb.AddGenericNodeResponse, error) { +func (s *nodesServer) AddGenericNode( + ctx context.Context, + req *inventorypb.AddGenericNodeRequest, +) (*inventorypb.AddGenericNodeResponse, error) { //nolint:staticcheck node, err := s.svc.AddGenericNode(ctx, req) if err != nil { return nil, err } - res := &inventorypb.AddGenericNodeResponse{Generic: node} + res := &inventorypb.AddGenericNodeResponse{Generic: node} //nolint:staticcheck return res, nil } // AddContainerNode adds Container Node. -func (s *nodesServer) AddContainerNode(ctx context.Context, req *inventorypb.AddContainerNodeRequest) (*inventorypb.AddContainerNodeResponse, error) { +func (s *nodesServer) AddContainerNode( + ctx context.Context, + req *inventorypb.AddContainerNodeRequest, +) (*inventorypb.AddContainerNodeResponse, error) { //nolint:staticcheck node, err := s.svc.AddContainerNode(ctx, req) if err != nil { return nil, err } - res := &inventorypb.AddContainerNodeResponse{Container: node} + res := &inventorypb.AddContainerNodeResponse{Container: node} //nolint:staticcheck return res, nil } // AddRemoteNode adds Remote Node. -func (s *nodesServer) AddRemoteNode(ctx context.Context, req *inventorypb.AddRemoteNodeRequest) (*inventorypb.AddRemoteNodeResponse, error) { +func (s *nodesServer) AddRemoteNode( + ctx context.Context, + req *inventorypb.AddRemoteNodeRequest, +) (*inventorypb.AddRemoteNodeResponse, error) { //nolint:staticcheck node, err := s.svc.AddRemoteNode(ctx, req) if err != nil { return nil, err } - res := &inventorypb.AddRemoteNodeResponse{Remote: node} + res := &inventorypb.AddRemoteNodeResponse{Remote: node} //nolint:staticcheck return res, nil } // AddRemoteRDSNode adds Remote RDS Node. -func (s *nodesServer) AddRemoteRDSNode(ctx context.Context, req *inventorypb.AddRemoteRDSNodeRequest) (*inventorypb.AddRemoteRDSNodeResponse, error) { +func (s *nodesServer) AddRemoteRDSNode( + ctx context.Context, + req *inventorypb.AddRemoteRDSNodeRequest, +) (*inventorypb.AddRemoteRDSNodeResponse, error) { //nolint:staticcheck node, err := s.svc.AddRemoteRDSNode(ctx, req) if err != nil { return nil, err } - res := &inventorypb.AddRemoteRDSNodeResponse{RemoteRds: node} + res := &inventorypb.AddRemoteRDSNodeResponse{RemoteRds: node} //nolint:staticcheck return res, nil } @@ -158,13 +170,13 @@ func (s *nodesServer) AddRemoteRDSNode(ctx context.Context, req *inventorypb.Add func (s *nodesServer) AddRemoteAzureDatabaseNode( ctx context.Context, req *inventorypb.AddRemoteAzureDatabaseNodeRequest, -) (*inventorypb.AddRemoteAzureDatabaseNodeResponse, error) { +) (*inventorypb.AddRemoteAzureDatabaseNodeResponse, error) { //nolint:staticcheck node, err := s.svc.AddRemoteAzureDatabaseNode(ctx, req) if err != nil { return nil, err } - res := &inventorypb.AddRemoteAzureDatabaseNodeResponse{RemoteAzureDatabase: node} + res := &inventorypb.AddRemoteAzureDatabaseNodeResponse{RemoteAzureDatabase: node} //nolint:staticcheck return res, nil } diff --git a/managed/services/inventory/inventory_metrics_test.go b/managed/services/inventory/inventory_metrics_test.go index c5addf6dc8..662f911e7b 100644 --- a/managed/services/inventory/inventory_metrics_test.go +++ b/managed/services/inventory/inventory_metrics_test.go @@ -43,7 +43,7 @@ func TestNewInventoryMetricsCollector(t *testing.T) { require.NoError(t, err) resp, err := client.Do(req) require.NoError(t, err) - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint body, err := io.ReadAll(resp.Body) require.NoError(t, err) diff --git a/managed/services/inventory/nodes.go b/managed/services/inventory/nodes.go index 31a4f304d4..547df77d0d 100644 --- a/managed/services/inventory/nodes.go +++ b/managed/services/inventory/nodes.go @@ -233,7 +233,7 @@ func (s *NodesService) AddRemoteNode(ctx context.Context, req *inventorypb.AddRe return invNode.(*inventorypb.RemoteNode), nil //nolint:forcetypeassert } -// AddRemoteRDSNode adds a new RDS node +// AddRemoteRDSNode adds a new RDS node. func (s *NodesService) AddRemoteRDSNode(ctx context.Context, req *inventorypb.AddRemoteRDSNodeRequest) (*inventorypb.RemoteRDSNode, error) { params := &models.CreateNodeParams{ NodeName: req.NodeName, diff --git a/managed/services/management/backup/artifacts_service.go b/managed/services/management/backup/artifacts_service.go index 3f4d212dfc..c478591a3b 100644 --- a/managed/services/management/backup/artifacts_service.go +++ b/managed/services/management/backup/artifacts_service.go @@ -128,7 +128,7 @@ func (s *ArtifactsService) DeleteArtifact( return &backuppb.DeleteArtifactResponse{}, nil } -// ListPitrTimeranges lists available PITR timelines/time-ranges (for MongoDB) +// ListPitrTimeranges lists available PITR timelines/time-ranges (for MongoDB). func (s *ArtifactsService) ListPitrTimeranges( ctx context.Context, req *backuppb.ListPitrTimerangesRequest, diff --git a/managed/services/management/backup/backups_service.go b/managed/services/management/backup/backups_service.go index eb5492983e..f3d58b3d91 100644 --- a/managed/services/management/backup/backups_service.go +++ b/managed/services/management/backup/backups_service.go @@ -717,7 +717,7 @@ func isFolderSafe(path string) error { return status.Error(codes.InvalidArgument, "Specified folder refers to a parent directory.") } - if !folderRe.Match([]byte(path)) { + if !folderRe.MatchString(path) { return status.Error(codes.InvalidArgument, "Folder name can contain only dots, colons, slashes, letters, digits, underscores and dashes.") } @@ -725,7 +725,7 @@ func isFolderSafe(path string) error { } func isNameSafe(name string) error { - if !nameRe.Match([]byte(name)) { + if !nameRe.MatchString(name) { return status.Error(codes.InvalidArgument, "Backup name can contain only dots, colons, letters, digits, underscores and dashes.") } return nil diff --git a/managed/services/management/backup/deps.go b/managed/services/management/backup/deps.go index a8493dbe7a..0938e3aa5c 100644 --- a/managed/services/management/backup/deps.go +++ b/managed/services/management/backup/deps.go @@ -60,7 +60,7 @@ type removalService interface { DeleteArtifact(storage backup.Storage, artifactID string, removeFiles bool) error } -// pbmPITRService provides methods that help us inspect PITR artifacts +// pbmPITRService provides methods that help us inspect PITR artifacts. type pbmPITRService interface { // ListPITRTimeranges returns the available PITR timeranges for the given artifact in the provided location. ListPITRTimeranges(ctx context.Context, locationClient backup.Storage, location *models.BackupLocation, artifact *models.Artifact) ([]backup.Timeline, error) diff --git a/managed/services/management/dbaas/components_service_test.go b/managed/services/management/dbaas/components_service_test.go index 3a8198301c..e61c12d85a 100644 --- a/managed/services/management/dbaas/components_service_test.go +++ b/managed/services/management/dbaas/components_service_test.go @@ -85,7 +85,7 @@ func TestComponentService(t *testing.T) { kubeClient.On("GetServerVersion").Return(nil, nil) cs = NewComponentsService(db, dbaasClient, vsc, kubeStorage) - return + return //nolint:nakedret } t.Run("PXC", func(t *testing.T) { diff --git a/managed/services/management/dbaas/db_cluster_service.go b/managed/services/management/dbaas/db_cluster_service.go index fd42534e5e..603c31b59d 100644 --- a/managed/services/management/dbaas/db_cluster_service.go +++ b/managed/services/management/dbaas/db_cluster_service.go @@ -55,7 +55,7 @@ type DBClusterService struct { } // NewDBClusterService creates DB Clusters Service. -func NewDBClusterService( //nolint:ireturn +func NewDBClusterService( //nolint:ireturn,nolintlint db *reform.DB, grafanaClient grafanaClient, versionServiceClient *VersionServiceClient, @@ -398,7 +398,7 @@ func (s DBClusterService) DeleteDBCluster(ctx context.Context, req *dbaasv1beta1 return &dbaasv1beta1.DeleteDBClusterResponse{}, nil } -// ListS3Backups returns list of backup artifacts stored on s3 +// ListS3Backups returns list of backup artifacts stored on s3. func (s DBClusterService) ListS3Backups(ctx context.Context, req *dbaasv1beta1.ListS3BackupsRequest) (*dbaasv1beta1.ListS3BackupsResponse, error) { if req == nil || (req != nil && req.LocationId == "") { return nil, errors.New("location_id cannot be empty") @@ -453,7 +453,7 @@ func (s DBClusterService) ListS3Backups(ctx context.Context, req *dbaasv1beta1.L return &dbaasv1beta1.ListS3BackupsResponse{Backups: items}, nil } -// ListSecrets returns list of secret names to the end user +// ListSecrets returns list of secret names to the end user. func (s DBClusterService) ListSecrets(ctx context.Context, req *dbaasv1beta1.ListSecretsRequest) (*dbaasv1beta1.ListSecretsResponse, error) { kubeClient, err := s.kubeStorage.GetOrSetClient(req.KubernetesClusterName) if err != nil { diff --git a/managed/services/management/dbaas/db_cluster_service_test.go b/managed/services/management/dbaas/db_cluster_service_test.go index 8afa320443..06fa6e2235 100644 --- a/managed/services/management/dbaas/db_cluster_service_test.go +++ b/managed/services/management/dbaas/db_cluster_service_test.go @@ -74,7 +74,7 @@ const dbKubeconfigTest = ` ` const ( - dbKubernetesClusterNameTest = "test-k8s-db-cluster-name" + dbKubernetesClusterNameTest = "test-k8s-db-cluster-name" //nolint:gosec version230 = "2.30.0" ) diff --git a/managed/services/management/dbaas/dbaas_initializer.go b/managed/services/management/dbaas/dbaas_initializer.go index 155570e388..692614705b 100644 --- a/managed/services/management/dbaas/dbaas_initializer.go +++ b/managed/services/management/dbaas/dbaas_initializer.go @@ -30,7 +30,7 @@ import ( "github.com/percona/pmm/managed/models" ) -// Initializer initializes dbaas feature +// Initializer initializes dbaas feature. type Initializer struct { db *reform.DB l *logrus.Entry @@ -51,7 +51,7 @@ const ( var errClusterExists = errors.New("cluster already exists") -// NewInitializer returns initialized Initializer structure +// NewInitializer returns initialized Initializer structure. func NewInitializer(db *reform.DB, client dbaasClient) *Initializer { l := logrus.WithField("component", "dbaas_initializer") return &Initializer{ @@ -66,7 +66,7 @@ func (in *Initializer) RegisterKubernetesServer(k dbaasv1beta1.KubernetesServer) in.kubernetesServer = k } -// Update updates current dbaas settings +// Update updates current dbaas settings. func (in *Initializer) Update(ctx context.Context) error { settings, err := models.GetSettings(in.db) if err != nil { @@ -79,7 +79,7 @@ func (in *Initializer) Update(ctx context.Context) error { return in.Disable(ctx) } -// Enable enables dbaas feature and connects to dbaas-controller +// Enable enables dbaas feature and connects to dbaas-controller. func (in *Initializer) Enable(ctx context.Context) error { in.m.Lock() defer in.m.Unlock() @@ -98,7 +98,7 @@ func (in *Initializer) Enable(ctx context.Context) error { return in.registerInCluster(ctx) } -// registerIncluster automatically adds k8s cluster to dbaas when PMM is running inside k8s cluster +// registerIncluster automatically adds k8s cluster to dbaas when PMM is running inside k8s cluster. func (in *Initializer) registerInCluster(ctx context.Context) error { kubeConfig, err := in.dbaasClient.GetKubeConfig(ctx, &dbaascontrollerv1beta1.GetKubeconfigRequest{}) switch { @@ -142,7 +142,7 @@ func (in *Initializer) registerInCluster(ctx context.Context) error { return nil } -// Disable disconnects from dbaas-controller and disabled dbaas feature +// Disable disconnects from dbaas-controller and disabled dbaas feature. func (in *Initializer) Disable(_ context.Context) error { in.m.Lock() defer in.m.Unlock() diff --git a/managed/services/management/dbaas/kube_clients.go b/managed/services/management/dbaas/kube_clients.go index 305cf55c7e..0e7e34d3c0 100644 --- a/managed/services/management/dbaas/kube_clients.go +++ b/managed/services/management/dbaas/kube_clients.go @@ -25,7 +25,7 @@ import ( "github.com/percona/pmm/managed/services/dbaas/kubernetes" ) -// KubeStorage stores kuberenetes clients for DBaaS +// KubeStorage stores kuberenetes clients for DBaaS. type KubeStorage struct { mu sync.Mutex db *reform.DB @@ -34,7 +34,7 @@ type KubeStorage struct { var ErrDatabaseNotSet = errors.New("Database connection not set") -// NewKubeStorage returns a created KubeStorage +// NewKubeStorage returns a created KubeStorage. func NewKubeStorage(db *reform.DB) *KubeStorage { return &KubeStorage{ db: db, @@ -42,8 +42,8 @@ func NewKubeStorage(db *reform.DB) *KubeStorage { } } -// GetOrSetClient gets client from map or sets a new client to the map -func (k *KubeStorage) GetOrSetClient(name string) (kubernetesClient, error) { //nolint:ireturn +// GetOrSetClient gets client from map or sets a new client to the map. +func (k *KubeStorage) GetOrSetClient(name string) (kubernetesClient, error) { //nolint:ireturn,nolintlint k.mu.Lock() defer k.mu.Unlock() kubeClient, ok := k.clients[name] @@ -68,7 +68,7 @@ func (k *KubeStorage) GetOrSetClient(name string) (kubernetesClient, error) { // return kubeClient, nil } -// DeleteClient deletes client from storage +// DeleteClient deletes client from storage. func (k *KubeStorage) DeleteClient(name string) error { k.mu.Lock() defer k.mu.Unlock() diff --git a/managed/services/management/dbaas/kubernetes_server.go b/managed/services/management/dbaas/kubernetes_server.go index 5a72cb79e5..9ecf43e9c3 100644 --- a/managed/services/management/dbaas/kubernetes_server.go +++ b/managed/services/management/dbaas/kubernetes_server.go @@ -67,7 +67,7 @@ type kubernetesServer struct { } // NewKubernetesServer creates Kubernetes Server. -func NewKubernetesServer(db *reform.DB, dbaasClient dbaasClient, versionService versionService, //nolint:ireturn +func NewKubernetesServer(db *reform.DB, dbaasClient dbaasClient, versionService versionService, //nolint:ireturn,nolintlint grafanaClient grafanaClient, ) dbaasv1beta1.KubernetesServer { l := logrus.WithField("component", "kubernetes_server") diff --git a/managed/services/management/dbaas/kubernetes_server_test.go b/managed/services/management/dbaas/kubernetes_server_test.go index 5794a27d41..7e93078b8d 100644 --- a/managed/services/management/dbaas/kubernetes_server_test.go +++ b/managed/services/management/dbaas/kubernetes_server_test.go @@ -79,7 +79,7 @@ func TestKubernetesServer(t *testing.T) { } s.kubeStorage.clients = clients ks = s - return + return //nolint:nakedret } // This is for local testing. When running local tests, if pmmversion.PMMVersion is empty @@ -316,7 +316,7 @@ current-context: local` } s.kubeStorage.clients = clients ks = s - return + return //nolint:nakedret } t.Run("GetResources", func(t *testing.T) { ks, kubeClient, teardown := setup(t) @@ -462,7 +462,7 @@ current-context: local` } s.kubeStorage.clients = clients ks = s - return + return //nolint:nakedret } t.Run("ListStorageClasses", func(t *testing.T) { ks, kubeClient, teardown := setup(t) diff --git a/managed/services/management/dbaas/version_service_client.go b/managed/services/management/dbaas/version_service_client.go index b3aae4d2e0..a5a0196515 100644 --- a/managed/services/management/dbaas/version_service_client.go +++ b/managed/services/management/dbaas/version_service_client.go @@ -158,7 +158,7 @@ func (c *VersionServiceClient) Matrix(ctx context.Context, params componentsPara if err != nil { return nil, err } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint body, err := io.ReadAll(resp.Body) if err != nil { return nil, err @@ -309,7 +309,7 @@ func (c *VersionServiceClient) GetNextDatabaseImage(ctx context.Context, operato return versions[nextVersion.String()].ImagePath, nil } -// GetVersionServiceURL returns base URL for version service currently used +// GetVersionServiceURL returns base URL for version service currently used. func (c *VersionServiceClient) GetVersionServiceURL() string { url, err := url.Parse(c.url) if err != nil { diff --git a/managed/services/management/ia/alerts_service.go b/managed/services/management/ia/alerts_service.go index d1809ab0cb..6dfaaf76f5 100644 --- a/managed/services/management/ia/alerts_service.go +++ b/managed/services/management/ia/alerts_service.go @@ -71,7 +71,7 @@ func (s *AlertsService) Enabled() bool { // ListAlerts returns list of existing alerts. // Deprecated. Do not use. -func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlertsRequest) (*iav1beta1.ListAlertsResponse, error) { +func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlertsRequest) (*iav1beta1.ListAlertsResponse, error) { //nolint:staticcheck filter := &services.FilterParams{ IsIA: true, } @@ -80,7 +80,7 @@ func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlert return nil, errors.Wrap(err, "failed to get alerts from alertmanager") } - var res []*iav1beta1.Alert //nolint:prealloc + var res []*iav1beta1.Alert //nolint:prealloc,staticcheck for _, alert := range alerts { updatedAt := timestamppb.New(time.Time(*alert.UpdatedAt)) if err := updatedAt.CheckValid(); err != nil { @@ -101,7 +101,7 @@ func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlert st = iav1beta1.Status_SILENCED } - var rule *iav1beta1.Rule + var rule *iav1beta1.Rule //nolint:staticcheck // Rules files created by user in directory /srv/prometheus/rules/ doesn't have associated rules in DB. // So alertname field will be empty or will keep invalid value. Don't fill rule field in that case. ruleID, ok := alert.Labels["alertname"] @@ -146,7 +146,7 @@ func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlert } } - res = append(res, &iav1beta1.Alert{ + res = append(res, &iav1beta1.Alert{ //nolint:staticcheck AlertId: getAlertID(alert), Summary: alert.Annotations["summary"], Severity: managementpb.Severity(common.ParseSeverity(alert.Labels["severity"])), @@ -186,11 +186,11 @@ func (s *AlertsService) ListAlerts(ctx context.Context, req *iav1beta1.ListAlert } pageTotals.TotalItems = int32(len(res)) - return &iav1beta1.ListAlertsResponse{Alerts: res[from:to], Totals: pageTotals}, nil + return &iav1beta1.ListAlertsResponse{Alerts: res[from:to], Totals: pageTotals}, nil //nolint:staticcheck } // satisfiesFilters checks that alert passes filters, returns true in case of success. -func satisfiesFilters(alert *ammodels.GettableAlert, filters []*iav1beta1.Filter) (bool, error) { +func satisfiesFilters(alert *ammodels.GettableAlert, filters []*iav1beta1.Filter) (bool, error) { //nolint:staticcheck for _, filter := range filters { value, ok := alert.Labels[filter.Key] if !ok { @@ -203,7 +203,7 @@ func satisfiesFilters(alert *ammodels.GettableAlert, filters []*iav1beta1.Filter return false, nil } case iav1beta1.FilterType_REGEX: - match, err := regexp.Match(filter.Value, []byte(value)) + match, err := regexp.MatchString(filter.Value, value) if err != nil { return false, status.Errorf(codes.InvalidArgument, "bad regular expression: +%v", err) } @@ -229,7 +229,7 @@ func getAlertID(alert *ammodels.GettableAlert) string { // ToggleAlerts allows to silence/unsilence specified alerts. // Deprecated. Do not use. -func (s *AlertsService) ToggleAlerts(ctx context.Context, req *iav1beta1.ToggleAlertsRequest) (*iav1beta1.ToggleAlertsResponse, error) { +func (s *AlertsService) ToggleAlerts(ctx context.Context, req *iav1beta1.ToggleAlertsRequest) (*iav1beta1.ToggleAlertsResponse, error) { //nolint:staticcheck var err error var alerts []*ammodels.GettableAlert @@ -257,7 +257,7 @@ func (s *AlertsService) ToggleAlerts(ctx context.Context, req *iav1beta1.ToggleA return nil, err } - return &iav1beta1.ToggleAlertsResponse{}, nil + return &iav1beta1.ToggleAlertsResponse{}, nil //nolint:staticcheck } // Check interfaces. diff --git a/managed/services/management/ia/alerts_service_test.go b/managed/services/management/ia/alerts_service_test.go index 21e452dcce..e077037259 100644 --- a/managed/services/management/ia/alerts_service_test.go +++ b/managed/services/management/ia/alerts_service_test.go @@ -99,7 +99,7 @@ func TestSatisfiesFilters(t *testing.T) { errMsg: "", }} - filters := []*iav1beta1.Filter{{ + filters := []*iav1beta1.Filter{{ //nolint:staticcheck Type: iav1beta1.FilterType_EQUAL, Key: "label1", Value: "value1", @@ -130,13 +130,13 @@ func TestSatisfiesFilters(t *testing.T) { tests := []struct { name string - filters []*iav1beta1.Filter + filters []*iav1beta1.Filter //nolint:staticcheck result bool errMsg string }{ { name: "normal multiple filters", - filters: []*iav1beta1.Filter{{ + filters: []*iav1beta1.Filter{{ //nolint:staticcheck Type: iav1beta1.FilterType_EQUAL, Key: "label1", Value: "value1", @@ -149,7 +149,7 @@ func TestSatisfiesFilters(t *testing.T) { errMsg: "", }, { name: "normal simple filter", - filters: []*iav1beta1.Filter{{ + filters: []*iav1beta1.Filter{{ //nolint:staticcheck Type: iav1beta1.FilterType_EQUAL, Key: "label1", Value: "value1", @@ -158,7 +158,7 @@ func TestSatisfiesFilters(t *testing.T) { errMsg: "", }, { name: "normal regex filter", - filters: []*iav1beta1.Filter{{ + filters: []*iav1beta1.Filter{{ //nolint:staticcheck Type: iav1beta1.FilterType_REGEX, Key: "label2", Value: "v.*2", @@ -167,7 +167,7 @@ func TestSatisfiesFilters(t *testing.T) { errMsg: "", }, { name: "invalid type", - filters: []*iav1beta1.Filter{{ + filters: []*iav1beta1.Filter{{ //nolint:staticcheck Type: iav1beta1.FilterType_FILTER_TYPE_INVALID, Key: "label1", Value: "value1", @@ -176,8 +176,8 @@ func TestSatisfiesFilters(t *testing.T) { errMsg: "rpc error: code = Internal desc = Unexpected filter type.", }, { name: "unknown type", - filters: []*iav1beta1.Filter{{ - Type: iav1beta1.FilterType(12), + filters: []*iav1beta1.Filter{{ //nolint:staticcheck + Type: iav1beta1.FilterType(12), //nolint:staticcheck Key: "label1", Value: "value1", }}, @@ -185,7 +185,7 @@ func TestSatisfiesFilters(t *testing.T) { errMsg: "rpc error: code = Internal desc = Unexpected filter type.", }, { name: "bad regexp", - filters: []*iav1beta1.Filter{{ + filters: []*iav1beta1.Filter{{ //nolint:staticcheck Type: iav1beta1.FilterType_REGEX, Key: "label2", Value: ".***", @@ -291,7 +291,7 @@ func TestListAlerts(t *testing.T) { require.NoError(t, err) svc := NewAlertsService(db, mockAlert, &tmplSvc) - findAlerts := func(alerts []*iav1beta1.Alert, alertIDs ...string) bool { + findAlerts := func(alerts []*iav1beta1.Alert, alertIDs ...string) bool { //nolint:staticcheck if len(alerts) != len(alertIDs) { return false } @@ -321,7 +321,7 @@ func TestListAlerts(t *testing.T) { } t.Run("without pagination", func(t *testing.T) { - res, err := svc.ListAlerts(ctx, &iav1beta1.ListAlertsRequest{}) + res, err := svc.ListAlerts(ctx, &iav1beta1.ListAlertsRequest{}) //nolint:staticcheck assert.NoError(t, err) var expect []string for _, m := range mockedAlerts { @@ -332,7 +332,7 @@ func TestListAlerts(t *testing.T) { }) t.Run("pagination", func(t *testing.T) { - res, err := svc.ListAlerts(ctx, &iav1beta1.ListAlertsRequest{ + res, err := svc.ListAlerts(ctx, &iav1beta1.ListAlertsRequest{ //nolint:staticcheck PageParams: &managementpb.PageParams{ PageSize: 1, }, @@ -343,7 +343,7 @@ func TestListAlerts(t *testing.T) { assert.EqualValues(t, res.Totals.TotalItems, alertsCount) assert.EqualValues(t, res.Totals.TotalPages, alertsCount) - res, err = svc.ListAlerts(ctx, &iav1beta1.ListAlertsRequest{ + res, err = svc.ListAlerts(ctx, &iav1beta1.ListAlertsRequest{ //nolint:staticcheck PageParams: &managementpb.PageParams{ PageSize: 10, Index: 2, @@ -361,7 +361,7 @@ func TestListAlerts(t *testing.T) { for _, m := range mockedAlerts { expect = append(expect, *m.Fingerprint) } - res, err := svc.ListAlerts(ctx, &iav1beta1.ListAlertsRequest{ + res, err := svc.ListAlerts(ctx, &iav1beta1.ListAlertsRequest{ //nolint:staticcheck PageParams: &managementpb.PageParams{ PageSize: alertsCount * 2, }, @@ -370,7 +370,7 @@ func TestListAlerts(t *testing.T) { assert.True(t, findAlerts(res.Alerts, expect...), "wrong alerts returned") assert.EqualValues(t, res.Totals.TotalItems, len(mockedAlerts)) - res, err = svc.ListAlerts(ctx, &iav1beta1.ListAlertsRequest{ + res, err = svc.ListAlerts(ctx, &iav1beta1.ListAlertsRequest{ //nolint:staticcheck PageParams: &managementpb.PageParams{ PageSize: 1, Index: alertsCount * 2, diff --git a/managed/services/management/ia/channels_service.go b/managed/services/management/ia/channels_service.go index 96990bc337..72cf0de5b3 100644 --- a/managed/services/management/ia/channels_service.go +++ b/managed/services/management/ia/channels_service.go @@ -60,7 +60,7 @@ func (s *ChannelsService) Enabled() bool { // ListChannels returns list of available channels. // Deprecated. Do not use. -func (s *ChannelsService) ListChannels(ctx context.Context, req *iav1beta1.ListChannelsRequest) (*iav1beta1.ListChannelsResponse, error) { +func (s *ChannelsService) ListChannels(ctx context.Context, req *iav1beta1.ListChannelsRequest) (*iav1beta1.ListChannelsResponse, error) { //nolint:staticcheck var pageIndex int var pageSize int if req.PageParams != nil { @@ -68,7 +68,7 @@ func (s *ChannelsService) ListChannels(ctx context.Context, req *iav1beta1.ListC pageSize = int(req.PageParams.PageSize) } - var channels []*iav1beta1.Channel + var channels []*iav1beta1.Channel //nolint:staticcheck pageTotals := &managementpb.PageTotals{ TotalPages: 1, } @@ -85,10 +85,10 @@ func (s *ChannelsService) ListChannels(ctx context.Context, req *iav1beta1.ListC return nil, err } - return &iav1beta1.ListChannelsResponse{Channels: channels, Totals: pageTotals}, nil + return &iav1beta1.ListChannelsResponse{Channels: channels, Totals: pageTotals}, nil //nolint:staticcheck } -func (s *ChannelsService) getNotificationChannels() ([]*iav1beta1.Channel, error) { +func (s *ChannelsService) getNotificationChannels() ([]*iav1beta1.Channel, error) { //nolint:staticcheck var channels []*models.Channel errTx := s.db.InTransaction(func(tx *reform.TX) error { var err error @@ -103,7 +103,7 @@ func (s *ChannelsService) getNotificationChannels() ([]*iav1beta1.Channel, error return nil, errors.WithStack(errTx) } - res := make([]*iav1beta1.Channel, len(channels)) + res := make([]*iav1beta1.Channel, len(channels)) //nolint:staticcheck for i, channel := range channels { c, err := convertChannel(channel) if err != nil { @@ -116,7 +116,7 @@ func (s *ChannelsService) getNotificationChannels() ([]*iav1beta1.Channel, error } // Deprecated. Do not use. -func (s *ChannelsService) getNotificationChannelsPage(pageIndex, pageSize int) ([]*iav1beta1.Channel, *managementpb.PageTotals, error) { +func (s *ChannelsService) getNotificationChannelsPage(pageIndex, pageSize int) ([]*iav1beta1.Channel, *managementpb.PageTotals, error) { //nolint: staticcheck var channels []*models.Channel var totalItems int errTx := s.db.InTransaction(func(tx *reform.TX) error { @@ -137,7 +137,7 @@ func (s *ChannelsService) getNotificationChannelsPage(pageIndex, pageSize int) ( return nil, nil, errors.WithStack(errTx) } - res := make([]*iav1beta1.Channel, len(channels)) + res := make([]*iav1beta1.Channel, len(channels)) //nolint: staticcheck for i, channel := range channels { c, err := convertChannel(channel) if err != nil { @@ -161,7 +161,7 @@ func (s *ChannelsService) getNotificationChannelsPage(pageIndex, pageSize int) ( // AddChannel adds new notification channel. // Deprecated. Do not use. -func (s *ChannelsService) AddChannel(ctx context.Context, req *iav1beta1.AddChannelRequest) (*iav1beta1.AddChannelResponse, error) { +func (s *ChannelsService) AddChannel(ctx context.Context, req *iav1beta1.AddChannelRequest) (*iav1beta1.AddChannelResponse, error) { //nolint:staticcheck params := &models.CreateChannelParams{ Summary: req.Summary, Disabled: req.Disabled, @@ -207,12 +207,12 @@ func (s *ChannelsService) AddChannel(ctx context.Context, req *iav1beta1.AddChan s.alertManager.RequestConfigurationUpdate() - return &iav1beta1.AddChannelResponse{ChannelId: channel.ID}, nil + return &iav1beta1.AddChannelResponse{ChannelId: channel.ID}, nil //nolint:staticcheck } // ChangeChannel changes existing notification channel. // Deprecated. Do not use. -func (s *ChannelsService) ChangeChannel(ctx context.Context, req *iav1beta1.ChangeChannelRequest) (*iav1beta1.ChangeChannelResponse, error) { +func (s *ChannelsService) ChangeChannel(ctx context.Context, req *iav1beta1.ChangeChannelRequest) (*iav1beta1.ChangeChannelResponse, error) { //nolint:staticcheck params := &models.ChangeChannelParams{ Summary: req.Summary, Disabled: req.Disabled, @@ -256,12 +256,12 @@ func (s *ChannelsService) ChangeChannel(ctx context.Context, req *iav1beta1.Chan s.alertManager.RequestConfigurationUpdate() - return &iav1beta1.ChangeChannelResponse{}, nil + return &iav1beta1.ChangeChannelResponse{}, nil //nolint:staticcheck } // RemoveChannel removes notification channel. // Deprecated. Do not use. -func (s *ChannelsService) RemoveChannel(ctx context.Context, req *iav1beta1.RemoveChannelRequest) (*iav1beta1.RemoveChannelResponse, error) { +func (s *ChannelsService) RemoveChannel(ctx context.Context, req *iav1beta1.RemoveChannelRequest) (*iav1beta1.RemoveChannelResponse, error) { //nolint:staticcheck e := s.db.InTransaction(func(tx *reform.TX) error { return models.RemoveChannel(tx.Querier, req.ChannelId) }) @@ -271,13 +271,13 @@ func (s *ChannelsService) RemoveChannel(ctx context.Context, req *iav1beta1.Remo s.alertManager.RequestConfigurationUpdate() - return &iav1beta1.RemoveChannelResponse{}, nil + return &iav1beta1.RemoveChannelResponse{}, nil //nolint:staticcheck } // convertChannel converts a channel model to its protobuf representation. // Deprecated. Do not use. -func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { - c := &iav1beta1.Channel{ +func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { //nolint: staticcheck + c := &iav1beta1.Channel{ //nolint: staticcheck ChannelId: channel.ID, Summary: channel.Summary, Disabled: channel.Disabled, @@ -287,7 +287,7 @@ func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { case models.Email: config := channel.EmailConfig c.Channel = &iav1beta1.Channel_EmailConfig{ - EmailConfig: &iav1beta1.EmailConfig{ + EmailConfig: &iav1beta1.EmailConfig{ //nolint: staticcheck SendResolved: config.SendResolved, To: config.To, }, @@ -295,7 +295,7 @@ func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { case models.PagerDuty: config := channel.PagerDutyConfig c.Channel = &iav1beta1.Channel_PagerdutyConfig{ - PagerdutyConfig: &iav1beta1.PagerDutyConfig{ + PagerdutyConfig: &iav1beta1.PagerDutyConfig{ //nolint:staticcheck SendResolved: config.SendResolved, RoutingKey: config.RoutingKey, ServiceKey: config.ServiceKey, @@ -304,7 +304,7 @@ func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { case models.Slack: config := channel.SlackConfig c.Channel = &iav1beta1.Channel_SlackConfig{ - SlackConfig: &iav1beta1.SlackConfig{ + SlackConfig: &iav1beta1.SlackConfig{ //nolint:staticcheck SendResolved: config.SendResolved, Channel: config.Channel, }, @@ -312,7 +312,7 @@ func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { case models.WebHook: config := channel.WebHookConfig c.Channel = &iav1beta1.Channel_WebhookConfig{ - WebhookConfig: &iav1beta1.WebhookConfig{ + WebhookConfig: &iav1beta1.WebhookConfig{ //nolint:staticcheck SendResolved: config.SendResolved, Url: config.URL, HttpConfig: convertModelToHTTPConfig(config.HTTPConfig), @@ -328,7 +328,7 @@ func convertChannel(channel *models.Channel) (*iav1beta1.Channel, error) { // convertHTTPConfigToModel converts a protobuf HTTPConfig to its model representation. // Deprecated. Do not use. -func convertHTTPConfigToModel(config *iav1beta1.HTTPConfig) *models.HTTPConfig { +func convertHTTPConfigToModel(config *iav1beta1.HTTPConfig) *models.HTTPConfig { //nolint:staticcheck if config == nil { return nil } @@ -365,19 +365,19 @@ func convertHTTPConfigToModel(config *iav1beta1.HTTPConfig) *models.HTTPConfig { // convertModelToHTTPConfig converts a HTTPConfig model to its protobuf representation. // Deprecated. Do not use. -func convertModelToHTTPConfig(config *models.HTTPConfig) *iav1beta1.HTTPConfig { +func convertModelToHTTPConfig(config *models.HTTPConfig) *iav1beta1.HTTPConfig { //nolint:staticcheck if config == nil { return nil } - res := &iav1beta1.HTTPConfig{ + res := &iav1beta1.HTTPConfig{ //nolint:staticcheck BearerToken: config.BearerToken, BearerTokenFile: config.BearerTokenFile, ProxyUrl: config.ProxyURL, } if basicAuthConf := config.BasicAuth; basicAuthConf != nil { - res.BasicAuth = &iav1beta1.BasicAuth{ + res.BasicAuth = &iav1beta1.BasicAuth{ //nolint:staticcheck Username: basicAuthConf.Username, Password: basicAuthConf.Password, PasswordFile: basicAuthConf.PasswordFile, @@ -385,7 +385,7 @@ func convertModelToHTTPConfig(config *models.HTTPConfig) *iav1beta1.HTTPConfig { } if tlsConfig := config.TLSConfig; tlsConfig != nil { - res.TlsConfig = &iav1beta1.TLSConfig{ + res.TlsConfig = &iav1beta1.TLSConfig{ //nolint:staticcheck CaFile: tlsConfig.CAFile, CertFile: tlsConfig.CertFile, KeyFile: tlsConfig.KeyFile, diff --git a/managed/services/management/ia/common.go b/managed/services/management/ia/common.go index 73af3400e0..c4f7e8717a 100644 --- a/managed/services/management/ia/common.go +++ b/managed/services/management/ia/common.go @@ -52,8 +52,8 @@ func convertParamUnit(u alert.Unit) alerting.ParamUnit { return alerting.ParamUnit_PARAM_UNIT_INVALID } -func convertRule(l *logrus.Entry, rule *models.Rule, channels []*models.Channel) (*iav1beta1.Rule, error) { - r := &iav1beta1.Rule{ +func convertRule(l *logrus.Entry, rule *models.Rule, channels []*models.Channel) (*iav1beta1.Rule, error) { //nolint:staticcheck + r := &iav1beta1.Rule{ //nolint:staticcheck RuleId: rule.ID, TemplateName: rule.TemplateName, Disabled: rule.Disabled, @@ -102,9 +102,9 @@ func convertRule(l *logrus.Entry, rule *models.Rule, channels []*models.Channel) return nil, errors.Wrap(err, "failed to load rule annotations") } - r.Filters = make([]*iav1beta1.Filter, len(rule.Filters)) + r.Filters = make([]*iav1beta1.Filter, len(rule.Filters)) //nolint:staticcheck for i, filter := range rule.Filters { - r.Filters[i] = &iav1beta1.Filter{ + r.Filters[i] = &iav1beta1.Filter{ //nolint:staticcheck Type: convertModelToFilterType(filter.Type), Key: filter.Key, Value: filter.Val, diff --git a/managed/services/management/ia/rules_service.go b/managed/services/management/ia/rules_service.go index 9b196d21e0..1e217d91a2 100644 --- a/managed/services/management/ia/rules_service.go +++ b/managed/services/management/ia/rules_service.go @@ -272,7 +272,7 @@ func (s *RulesService) writeRuleFile(rule *ruleFile) error { // ListAlertRules returns a list of all Integrated Alerting rules. // Deprecated. Do not use. -func (s *RulesService) ListAlertRules(ctx context.Context, req *iav1beta1.ListAlertRulesRequest) (*iav1beta1.ListAlertRulesResponse, error) { +func (s *RulesService) ListAlertRules(ctx context.Context, req *iav1beta1.ListAlertRulesRequest) (*iav1beta1.ListAlertRulesResponse, error) { //nolint:staticcheck var pageIndex int pageSize := math.MaxInt32 if req.PageParams != nil { @@ -328,11 +328,11 @@ func (s *RulesService) ListAlertRules(ctx context.Context, req *iav1beta1.ListAl TotalPages: int32(totalPages), } - return &iav1beta1.ListAlertRulesResponse{Rules: res, Totals: totals}, nil + return &iav1beta1.ListAlertRulesResponse{Rules: res, Totals: totals}, nil //nolint:staticcheck } -func (s *RulesService) convertAlertRules(rules []*models.Rule, channels []*models.Channel) ([]*iav1beta1.Rule, error) { - res := make([]*iav1beta1.Rule, 0, len(rules)) +func (s *RulesService) convertAlertRules(rules []*models.Rule, channels []*models.Channel) ([]*iav1beta1.Rule, error) { //nolint:staticcheck + res := make([]*iav1beta1.Rule, 0, len(rules)) //nolint:staticcheck for _, rule := range rules { r, err := convertRule(s.l, rule, channels) if err != nil { @@ -346,7 +346,7 @@ func (s *RulesService) convertAlertRules(rules []*models.Rule, channels []*model // CreateAlertRule creates Integrated Alerting rule. // Deprecated. Do not use. -func (s *RulesService) CreateAlertRule(ctx context.Context, req *iav1beta1.CreateAlertRuleRequest) (*iav1beta1.CreateAlertRuleResponse, error) { +func (s *RulesService) CreateAlertRule(ctx context.Context, req *iav1beta1.CreateAlertRuleRequest) (*iav1beta1.CreateAlertRuleResponse, error) { //nolint:staticcheck if req.TemplateName != "" && req.SourceRuleId != "" { return nil, status.Errorf(codes.InvalidArgument, "Both template name and source rule id are specified.") } @@ -442,12 +442,12 @@ func (s *RulesService) CreateAlertRule(ctx context.Context, req *iav1beta1.Creat s.updateConfigurations() - return &iav1beta1.CreateAlertRuleResponse{RuleId: rule.ID}, nil + return &iav1beta1.CreateAlertRuleResponse{RuleId: rule.ID}, nil //nolint:staticcheck } // UpdateAlertRule updates Integrated Alerting rule. // Deprecated. Do not use. -func (s *RulesService) UpdateAlertRule(ctx context.Context, req *iav1beta1.UpdateAlertRuleRequest) (*iav1beta1.UpdateAlertRuleResponse, error) { +func (s *RulesService) UpdateAlertRule(ctx context.Context, req *iav1beta1.UpdateAlertRuleRequest) (*iav1beta1.UpdateAlertRuleResponse, error) { //nolint:staticcheck params := &models.ChangeRuleParams{ Name: req.Name, Disabled: req.Disabled, @@ -491,12 +491,12 @@ func (s *RulesService) UpdateAlertRule(ctx context.Context, req *iav1beta1.Updat s.updateConfigurations() - return &iav1beta1.UpdateAlertRuleResponse{}, nil + return &iav1beta1.UpdateAlertRuleResponse{}, nil //nolint:staticcheck } // ToggleAlertRule allows switching between disabled and enabled states of an Alert Rule. // Deprecated. Do not use. -func (s *RulesService) ToggleAlertRule(ctx context.Context, req *iav1beta1.ToggleAlertRuleRequest) (*iav1beta1.ToggleAlertRuleResponse, error) { +func (s *RulesService) ToggleAlertRule(ctx context.Context, req *iav1beta1.ToggleAlertRuleRequest) (*iav1beta1.ToggleAlertRuleResponse, error) { //nolint:staticcheck params := &models.ToggleRuleParams{Disabled: parseBooleanFlag(req.Disabled)} e := s.db.InTransaction(func(tx *reform.TX) error { _, err := models.ToggleRule(tx.Querier, req.RuleId, params) @@ -508,12 +508,12 @@ func (s *RulesService) ToggleAlertRule(ctx context.Context, req *iav1beta1.Toggl s.updateConfigurations() - return &iav1beta1.ToggleAlertRuleResponse{}, nil + return &iav1beta1.ToggleAlertRuleResponse{}, nil //nolint:staticcheck } // DeleteAlertRule deletes Integrated Alerting rule. // Deprecated. Do not use. -func (s *RulesService) DeleteAlertRule(ctx context.Context, req *iav1beta1.DeleteAlertRuleRequest) (*iav1beta1.DeleteAlertRuleResponse, error) { +func (s *RulesService) DeleteAlertRule(ctx context.Context, req *iav1beta1.DeleteAlertRuleRequest) (*iav1beta1.DeleteAlertRuleResponse, error) { //nolint:staticcheck e := s.db.InTransaction(func(tx *reform.TX) error { return models.RemoveRule(tx.Querier, req.RuleId) }) @@ -523,7 +523,7 @@ func (s *RulesService) DeleteAlertRule(ctx context.Context, req *iav1beta1.Delet s.updateConfigurations() - return &iav1beta1.DeleteAlertRuleResponse{}, nil + return &iav1beta1.DeleteAlertRuleResponse{}, nil //nolint:staticcheck } func (s *RulesService) updateConfigurations() { @@ -590,10 +590,10 @@ func convertModelToParamsDefinitions(definitions models.AlertExprParamsDefinitio // convertModelToParamValues converts a parameter value to its protobuf representation. // Deprecated. Do not use. -func convertModelToParamValues(values models.AlertExprParamsValues) ([]*iav1beta1.ParamValue, error) { - res := make([]*iav1beta1.ParamValue, len(values)) +func convertModelToParamValues(values models.AlertExprParamsValues) ([]*iav1beta1.ParamValue, error) { //nolint:staticcheck + res := make([]*iav1beta1.ParamValue, len(values)) //nolint:staticcheck for i, param := range values { - p := &iav1beta1.ParamValue{Name: param.Name} + p := &iav1beta1.ParamValue{Name: param.Name} //nolint:staticcheck switch param.Type { case models.Bool: @@ -615,7 +615,7 @@ func convertModelToParamValues(values models.AlertExprParamsValues) ([]*iav1beta // convertParamsValuesToModel converts a parameter value to its model equivalent. // Deprecated. Do not use. -func convertParamsValuesToModel(params []*iav1beta1.ParamValue) (models.AlertExprParamsValues, error) { +func convertParamsValuesToModel(params []*iav1beta1.ParamValue) (models.AlertExprParamsValues, error) { //nolint:staticcheck ruleParams := make(models.AlertExprParamsValues, len(params)) for i, param := range params { p := models.AlertExprParamValue{Name: param.Name} @@ -658,7 +658,7 @@ func parseBooleanFlag(bf managementpb.BooleanFlag) *bool { // convertModelToFilterType converts a filter type model to its protobuf representation. // Deprecated. Do not use. -func convertModelToFilterType(filterType models.FilterType) iav1beta1.FilterType { +func convertModelToFilterType(filterType models.FilterType) iav1beta1.FilterType { //nolint:staticcheck switch filterType { case models.Equal: return iav1beta1.FilterType_EQUAL @@ -671,7 +671,7 @@ func convertModelToFilterType(filterType models.FilterType) iav1beta1.FilterType // convertFiltersToModel converts an IA filter to its model representation. // Deprecated. Do not use. -func convertFiltersToModel(filters []*iav1beta1.Filter) (models.Filters, error) { +func convertFiltersToModel(filters []*iav1beta1.Filter) (models.Filters, error) { //nolint:staticcheck res := make(models.Filters, len(filters)) for i, filter := range filters { f := models.Filter{ diff --git a/managed/services/management/node_mgmt_test.go b/managed/services/management/node_mgmt_test.go index 92ca762c90..87bb250a4b 100644 --- a/managed/services/management/node_mgmt_test.go +++ b/managed/services/management/node_mgmt_test.go @@ -75,7 +75,7 @@ func TestMgmtNodeService(t *testing.T) { ar.AssertExpectations(t) } - return + return //nolint:nakedret } const ( @@ -269,7 +269,7 @@ func TestMgmtNodeService(t *testing.T) { ar.AssertExpectations(t) } - return + return //nolint:nakedret } t.Run("should query the node by its id", func(t *testing.T) { diff --git a/managed/services/supervisord/logs.go b/managed/services/supervisord/logs.go index 22b60f8c74..a876082933 100644 --- a/managed/services/supervisord/logs.go +++ b/managed/services/supervisord/logs.go @@ -278,7 +278,7 @@ func readLog(name string, maxLines int, maxBytes int64) ([]byte, time.Time, erro if err != nil { return nil, m, errors.WithStack(err) } - defer f.Close() //nolint:gosec,errcheck + defer f.Close() //nolint:gosec,errcheck,nolintlint fi, err := f.Stat() if err != nil { @@ -354,7 +354,7 @@ func readURL(ctx context.Context, url string) ([]byte, error) { if err != nil { return nil, errors.WithStack(err) } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := io.ReadAll(resp.Body) if err != nil { diff --git a/managed/services/supervisord/supervisord.go b/managed/services/supervisord/supervisord.go index 3ad4b7ba72..33826cd245 100644 --- a/managed/services/supervisord/supervisord.go +++ b/managed/services/supervisord/supervisord.go @@ -368,7 +368,7 @@ func (s *Service) UpdateLog(offset uint32) ([]string, uint32, error) { if err != nil { return nil, 0, errors.WithStack(err) } - defer f.Close() //nolint:errcheck,gosec + defer f.Close() //nolint:errcheck,gosec,nolintlint if _, err = f.Seek(int64(offset), io.SeekStart); err != nil { return nil, 0, errors.WithStack(err) diff --git a/managed/services/telemetry/datasource_victoria_metrics.go b/managed/services/telemetry/datasource_victoria_metrics.go index f1b9e9d931..1757a774ac 100644 --- a/managed/services/telemetry/datasource_victoria_metrics.go +++ b/managed/services/telemetry/datasource_victoria_metrics.go @@ -43,7 +43,7 @@ func (d *dataSourceVictoriaMetrics) Enabled() bool { } // NewDataSourceVictoriaMetrics makes new data source for victoria metrics. -func NewDataSourceVictoriaMetrics(config DSConfigVM, l *logrus.Entry) (DataSource, error) { +func NewDataSourceVictoriaMetrics(config DSConfigVM, l *logrus.Entry) (DataSource, error) { //nolint:ireturn,nolintlint if !config.Enabled { return &dataSourceVictoriaMetrics{ l: l, diff --git a/managed/services/telemetry/datasources.go b/managed/services/telemetry/datasources.go index 39eaa3ad61..b239b55bff 100644 --- a/managed/services/telemetry/datasources.go +++ b/managed/services/telemetry/datasources.go @@ -36,7 +36,7 @@ type dataSourceRegistry struct { } // NewDataSourceRegistry makes new data source registry. -func NewDataSourceRegistry(config ServiceConfig, l *logrus.Entry) (DataSourceLocator, error) { //nolint:ireturn +func NewDataSourceRegistry(config ServiceConfig, l *logrus.Entry) (DataSourceLocator, error) { //nolint:ireturn,nolintlint pmmDB, err := NewDsPmmDBSelect(*config.DataSources.PmmDBSelect, l) if err != nil { return nil, err @@ -69,7 +69,7 @@ func NewDataSourceRegistry(config ServiceConfig, l *logrus.Entry) (DataSourceLoc } // LocateTelemetryDataSource returns data source by name. -func (r *dataSourceRegistry) LocateTelemetryDataSource(name string) (DataSource, error) { //nolint:ireturn +func (r *dataSourceRegistry) LocateTelemetryDataSource(name string) (DataSource, error) { //nolint:ireturn,nolintlint ds, ok := r.dataSources[DataSourceName(name)] if !ok { return nil, errors.Errorf("data source [%s] is not supported", name) diff --git a/managed/services/telemetry/distribution_util_test.go b/managed/services/telemetry/distribution_util_test.go index cfd1ac5ae8..8d9247dc1a 100644 --- a/managed/services/telemetry/distribution_util_test.go +++ b/managed/services/telemetry/distribution_util_test.go @@ -147,7 +147,7 @@ func writeToTmpFile(t *testing.T, tmpDistributionFile string, s string) (*os.Fil if err != nil { return nil, err } - _, err = f.Write([]byte(s)) + _, err = f.WriteString(s) if err != nil { return nil, err } diff --git a/managed/services/victoriametrics/victoriametrics.go b/managed/services/victoriametrics/victoriametrics.go index 3e56210e35..0a1b34db13 100644 --- a/managed/services/victoriametrics/victoriametrics.go +++ b/managed/services/victoriametrics/victoriametrics.go @@ -176,7 +176,7 @@ func (svc *Service) reload(ctx context.Context) error { if err != nil { return errors.WithStack(err) } - defer resp.Body.Close() //nolint:errcheck,gosec + defer resp.Body.Close() //nolint:errcheck,gosec,nolintlint b, err := io.ReadAll(resp.Body) svc.l.Debugf("VM reload: %s", b) @@ -440,7 +440,7 @@ func (svc *Service) IsReady(ctx context.Context) error { if err != nil { return errors.WithStack(err) } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := io.ReadAll(resp.Body) svc.l.Debugf("VM health: %s", b) diff --git a/managed/services/vmalert/vmalert.go b/managed/services/vmalert/vmalert.go index 382821243f..9d9eef66a2 100644 --- a/managed/services/vmalert/vmalert.go +++ b/managed/services/vmalert/vmalert.go @@ -159,7 +159,7 @@ func (svc *Service) reload(ctx context.Context) error { if err != nil { return errors.WithStack(err) } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := io.ReadAll(resp.Body) svc.l.Debugf("VMAlert reload: %s", b) @@ -185,7 +185,7 @@ func (svc *Service) IsReady(ctx context.Context) error { if err != nil { return errors.WithStack(err) } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint b, err := io.ReadAll(resp.Body) svc.l.Debugf("VMAlert health: %s", b) diff --git a/managed/utils/clean/clean_test.go b/managed/utils/clean/clean_test.go index 95e2d6881e..f8108b0a85 100644 --- a/managed/utils/clean/clean_test.go +++ b/managed/utils/clean/clean_test.go @@ -75,7 +75,7 @@ func TestCleaner(t *testing.T) { t.Helper() assert.NoError(t, models.CleanupOldActionResults(db.Querier, models.Now())) } - return + return //nolint:nakedret } t.Run("CheckActionResultByID", func(t *testing.T) { diff --git a/managed/utils/platform/client.go b/managed/utils/platform/client.go index 685c044d92..0956f789bd 100644 --- a/managed/utils/platform/client.go +++ b/managed/utils/platform/client.go @@ -259,7 +259,7 @@ func (c *Client) makeRequest(ctx context.Context, accessToken, method, path stri return nil, err } - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint bodyBytes, err := io.ReadAll(resp.Body) if err != nil { diff --git a/qan-api2/models/data_ingestion.go b/qan-api2/models/data_ingestion.go index d6eda35ba5..3817c52ca0 100644 --- a/qan-api2/models/data_ingestion.go +++ b/qan-api2/models/data_ingestion.go @@ -605,7 +605,7 @@ func (mb *MetricsBucket) insertBatch(timeout time.Duration) (err error) { req, ok := <-mb.requestsCh if !ok { mb.l.Warn("Requests channel closed, nothing to store.") - return + return //nolint:nakedret } var buckets int @@ -630,15 +630,15 @@ func (mb *MetricsBucket) insertBatch(timeout time.Duration) (err error) { var tx *sqlx.Tx if tx, err = mb.db.Beginx(); err != nil { err = errors.Wrap(err, "failed to begin transaction") - return + return //nolint:nakedret } defer func() { - if err != nil { + if err == nil { + if err = tx.Commit(); err != nil { + err = errors.Wrap(err, "failed to commit transaction") + } + } else { _ = tx.Rollback() - return - } - if err = tx.Commit(); err != nil { - err = errors.Wrap(err, "failed to commit transaction") } }() @@ -646,7 +646,7 @@ func (mb *MetricsBucket) insertBatch(timeout time.Duration) (err error) { var stmt *sqlx.NamedStmt if stmt, err = tx.PrepareNamed(insertSQL); err != nil { err = errors.Wrap(err, "failed to prepare statement") - return + return //nolint:nakedret } defer func() { if e := stmt.Close(); e != nil && err == nil { @@ -695,7 +695,7 @@ func (mb *MetricsBucket) insertBatch(timeout time.Duration) (err error) { if _, err = stmt.Exec(q); err != nil { err = errors.Wrap(err, "failed to exec") - return + return //nolint:nakedret } } @@ -704,10 +704,10 @@ func (mb *MetricsBucket) insertBatch(timeout time.Duration) (err error) { case req, ok = <-mb.requestsCh: if !ok { mb.l.Warn("Requests channel closed, exiting.") - return + return //nolint:nakedret } case <-timeoutCh: - return + return //nolint:nakedret } } } diff --git a/vmproxy/proxy/proxy_test.go b/vmproxy/proxy/proxy_test.go index 4252796010..6cafeb7c9e 100644 --- a/vmproxy/proxy/proxy_test.go +++ b/vmproxy/proxy/proxy_test.go @@ -65,7 +65,7 @@ func TestProxy(t *testing.T) { handler.ServeHTTP(rec, req) resp := rec.Result() - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint require.Equal(t, resp.StatusCode, http.StatusOK) }) @@ -138,7 +138,7 @@ func TestProxy(t *testing.T) { handler.ServeHTTP(rec, req) resp := rec.Result() - defer resp.Body.Close() //nolint:gosec,errcheck + defer resp.Body.Close() //nolint:gosec,errcheck,nolintlint require.Equal(t, tc.expectedStatus, resp.StatusCode) }) From f1305fec33068e10033d41c4f7311e5f484d02d5 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Wed, 20 Dec 2023 13:15:14 +0200 Subject: [PATCH 23/28] PMM-7 Update golangci-lint (#2716) --- .github/workflows/main.yml | 2 +- Makefile.include | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 26b355823d..c6774f9b6c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -89,7 +89,7 @@ jobs: fail_on_error: true cache: false golangci_lint_flags: "-c=.golangci.yml" - golangci_lint_version: v1.54.2 # Version should match specified in Makefile + golangci_lint_version: v1.55.2 # Version should match specified in Makefile - name: Run go-consistent env: diff --git a/Makefile.include b/Makefile.include index 7ee186f337..cd81c5f994 100644 --- a/Makefile.include +++ b/Makefile.include @@ -20,7 +20,7 @@ init: ## Install tools cd tools && go generate -x -tags=tools # Install golangci-lint - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.54.2 # Version should match specified in CI + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.55.2 # Version should match specified in CI release: ## Build release versions of all components make -C agent release From 650bc6b3dc30d71aee9cc398334fdf321887445f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 11:37:42 +0000 Subject: [PATCH 24/28] Bump github.com/daixiang0/gci from 0.11.0 to 0.12.0 in /tools (#2687) Bumps [github.com/daixiang0/gci](https://github.com/daixiang0/gci) from 0.11.0 to 0.12.0. - [Release notes](https://github.com/daixiang0/gci/releases) - [Commits](https://github.com/daixiang0/gci/compare/v0.11.0...v0.12.0) --- updated-dependencies: - dependency-name: github.com/daixiang0/gci dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tools/go.mod | 2 +- tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index c6a4f3e04a..afc5defc45 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -9,7 +9,7 @@ require ( github.com/Percona-Lab/swagger-order v0.0.0-20191002141859-166b3973d026 github.com/apache/skywalking-eyes v0.5.0 github.com/bufbuild/buf v1.28.0 - github.com/daixiang0/gci v0.11.0 + github.com/daixiang0/gci v0.12.0 github.com/envoyproxy/protoc-gen-validate v1.0.2 github.com/go-delve/delve v1.21.0 github.com/go-openapi/runtime v0.25.0 diff --git a/tools/go.sum b/tools/go.sum index 2daef83425..692cd1509f 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -172,8 +172,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= -github.com/daixiang0/gci v0.11.0 h1:XeQbFKkCRxvVyn06EOuNY6LPGBLVuB/W130c8FrnX6A= -github.com/daixiang0/gci v0.11.0/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI= +github.com/daixiang0/gci v0.12.0 h1:EQTG7FfKPlO4Ste+oN0kvz+gP4XswKx29D4fLrmwbiU= +github.com/daixiang0/gci v0.12.0/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From 41101ba485f16fc4ad9e9c7ae875d863f5f16fd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 12:15:16 +0000 Subject: [PATCH 25/28] Bump golang.org/x/crypto from 0.16.0 to 0.17.0 in /tools (#2708) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.16.0 to 0.17.0. - [Commits](https://github.com/golang/crypto/compare/v0.16.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- tools/go.mod | 2 +- tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index afc5defc45..827f7ce9fd 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -204,7 +204,7 @@ require ( go.uber.org/zap v1.26.0 // indirect golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4 // indirect golang.org/x/build v0.0.0-20230905185615-7f65e2bc812a // indirect - golang.org/x/crypto v0.16.0 // indirect + golang.org/x/crypto v0.17.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect golang.org/x/mod v0.14.0 // indirect diff --git a/tools/go.sum b/tools/go.sum index 692cd1509f..0b18292f72 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -866,8 +866,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= From 9ef767c29e56b514dcd5cca024a96a8384f394d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Dec 2023 12:45:53 +0200 Subject: [PATCH 26/28] Bump github.com/vektra/mockery/v2 from 2.36.0 to 2.39.1 in /tools (#2720) * Bump github.com/vektra/mockery/v2 from 2.36.0 to 2.39.1 in /tools Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.36.0 to 2.39.1. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.36.0...v2.39.1) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Regenerate --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Artem Gavrilov --- .../pmm/server/docker/mock_functions_test.go | 62 ++++++++- agent/agentlocal/mock_client_test.go | 14 ++- agent/agentlocal/mock_supervisor_test.go | 10 +- agent/client/mock_connection_checker_test.go | 6 +- agent/client/mock_service_info_broker_test.go | 6 +- agent/client/mock_supervisor_test.go | 18 ++- agent/versioner/mock_exec_functions_test.go | 10 +- .../backup/mock_agent_service_test.go | 6 +- .../backup/mock_compatibility_service_test.go | 10 +- .../services/backup/mock_jobs_service_test.go | 22 +++- .../backup/mock_pbm_pitr_service_test.go | 10 +- .../backup/mock_removal_service_test.go | 10 +- managed/services/backup/mock_storage_test.go | 18 ++- .../services/backup/mock_versioner_test.go | 6 +- .../checks/mock_agents_registry_test.go | 38 +++++- .../client/mock_kube_client_connector.go | 118 +++++++++++++++++- .../grafana/mock_aws_instance_checker_test.go | 6 +- .../inventory/mock_agent_service_test.go | 6 +- .../inventory/mock_agents_registry_test.go | 6 +- .../mock_agents_state_updater_test.go | 2 +- .../inventory/mock_connection_checker_test.go | 6 +- .../inventory/mock_inventory_metrics_test.go | 14 ++- .../inventory/mock_prometheus_service_test.go | 2 +- .../mock_service_info_broker_test.go | 6 +- .../inventory/mock_version_cache_test.go | 2 +- .../alerting/mock_grafana_client_test.go | 14 ++- .../management/backup/mock_aws_s3_test.go | 14 ++- .../backup/mock_backup_service_test.go | 14 ++- .../backup/mock_pbm_pitr_service_test.go | 6 +- .../backup/mock_removal_service_test.go | 6 +- .../backup/mock_schedule_service_test.go | 14 ++- .../dbaas/mock_components_service_test.go | 26 +++- .../dbaas/mock_dbaas_client_test.go | 38 +++++- .../dbaas/mock_grafana_client_test.go | 14 ++- .../dbaas/mock_kube_storage_manager_test.go | 10 +- .../dbaas/mock_kubernetes_client_test.go | 106 +++++++++++++++- .../dbaas/mock_version_service_test.go | 30 ++++- .../management/dump/mock_dump_service_test.go | 14 ++- .../management/ia/mock_alert_manager_test.go | 18 ++- .../ia/mock_templates_service_test.go | 6 +- .../management/ia/mock_vm_alert_test.go | 2 +- .../management/mock_agents_registry_test.go | 6 +- .../mock_agents_state_updater_test.go | 2 +- .../management/mock_api_key_provider_test.go | 10 +- .../management/mock_checks_service_test.go | 38 +++++- .../mock_connection_checker_test.go | 6 +- .../management/mock_grafana_client_test.go | 6 +- .../management/mock_jobs_service_test.go | 6 +- .../mock_prometheus_service_test.go | 2 +- .../mock_service_info_broker_test.go | 6 +- .../management/mock_version_cache_test.go | 2 +- .../mock_victoria_metrics_client_test.go | 6 +- .../qan/mock_qan_collector_client_test.go | 6 +- .../scheduler/mock_backup_service_test.go | 6 +- .../server/mock_agents_state_updater_test.go | 6 +- .../server/mock_alertmanager_service_test.go | 6 +- .../server/mock_checks_service_test.go | 6 +- managed/services/server/mock_emailer_test.go | 6 +- .../server/mock_grafana_client_test.go | 6 +- .../server/mock_prometheus_service_test.go | 6 +- .../server/mock_rules_service_test.go | 6 +- .../server/mock_supervisord_service_test.go | 30 ++++- .../server/mock_telemetry_service_test.go | 10 +- .../server/mock_templates_service_test.go | 2 +- .../mock_vm_alert_external_rules_test.go | 18 ++- .../mock_data_source_locator_test.go | 6 +- .../telemetry/mock_data_source_test.go | 18 ++- .../mock_distribution_util_service_test.go | 6 +- .../services/telemetry/mock_sender_test.go | 6 +- .../versioncache/mock_versioner_test.go | 6 +- tools/go.mod | 4 +- tools/go.sum | 8 +- 72 files changed, 928 insertions(+), 76 deletions(-) diff --git a/admin/commands/pmm/server/docker/mock_functions_test.go b/admin/commands/pmm/server/docker/mock_functions_test.go index 021064c634..028e561f94 100644 --- a/admin/commands/pmm/server/docker/mock_functions_test.go +++ b/admin/commands/pmm/server/docker/mock_functions_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package docker @@ -25,6 +25,10 @@ type MockFunctions struct { func (_m *MockFunctions) ChangeServerPassword(ctx context.Context, containerID string, newPassword string) error { ret := _m.Called(ctx, containerID, newPassword) + if len(ret) == 0 { + panic("no return value specified for ChangeServerPassword") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok { r0 = rf(ctx, containerID, newPassword) @@ -39,6 +43,10 @@ func (_m *MockFunctions) ChangeServerPassword(ctx context.Context, containerID s func (_m *MockFunctions) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) { ret := _m.Called(ctx, containerID) + if len(ret) == 0 { + panic("no return value specified for ContainerInspect") + } + var r0 types.ContainerJSON var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (types.ContainerJSON, error)); ok { @@ -63,6 +71,10 @@ func (_m *MockFunctions) ContainerInspect(ctx context.Context, containerID strin func (_m *MockFunctions) ContainerStop(ctx context.Context, containerID string, timeout *int) error { ret := _m.Called(ctx, containerID, timeout) + if len(ret) == 0 { + panic("no return value specified for ContainerStop") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, *int) error); ok { r0 = rf(ctx, containerID, timeout) @@ -77,6 +89,10 @@ func (_m *MockFunctions) ContainerStop(ctx context.Context, containerID string, func (_m *MockFunctions) ContainerUpdate(ctx context.Context, containerID string, updateConfig container.UpdateConfig) (container.ContainerUpdateOKBody, error) { ret := _m.Called(ctx, containerID, updateConfig) + if len(ret) == 0 { + panic("no return value specified for ContainerUpdate") + } + var r0 container.ContainerUpdateOKBody var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, container.UpdateConfig) (container.ContainerUpdateOKBody, error)); ok { @@ -101,6 +117,10 @@ func (_m *MockFunctions) ContainerUpdate(ctx context.Context, containerID string func (_m *MockFunctions) ContainerWait(ctx context.Context, containerID string, condition container.WaitCondition) (<-chan container.WaitResponse, <-chan error) { ret := _m.Called(ctx, containerID, condition) + if len(ret) == 0 { + panic("no return value specified for ContainerWait") + } + var r0 <-chan container.WaitResponse var r1 <-chan error if rf, ok := ret.Get(0).(func(context.Context, string, container.WaitCondition) (<-chan container.WaitResponse, <-chan error)); ok { @@ -129,6 +149,10 @@ func (_m *MockFunctions) ContainerWait(ctx context.Context, containerID string, func (_m *MockFunctions) CreateVolume(ctx context.Context, volumeName string, labels map[string]string) (*volume.Volume, error) { ret := _m.Called(ctx, volumeName, labels) + if len(ret) == 0 { + panic("no return value specified for CreateVolume") + } + var r0 *volume.Volume var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, map[string]string) (*volume.Volume, error)); ok { @@ -155,6 +179,10 @@ func (_m *MockFunctions) CreateVolume(ctx context.Context, volumeName string, la func (_m *MockFunctions) FindServerContainers(ctx context.Context) ([]types.Container, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for FindServerContainers") + } + var r0 []types.Container var r1 error if rf, ok := ret.Get(0).(func(context.Context) ([]types.Container, error)); ok { @@ -181,6 +209,10 @@ func (_m *MockFunctions) FindServerContainers(ctx context.Context) ([]types.Cont func (_m *MockFunctions) GetDockerClient() *client.Client { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetDockerClient") + } + var r0 *client.Client if rf, ok := ret.Get(0).(func() *client.Client); ok { r0 = rf() @@ -197,6 +229,10 @@ func (_m *MockFunctions) GetDockerClient() *client.Client { func (_m *MockFunctions) HaveDockerAccess(ctx context.Context) bool { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for HaveDockerAccess") + } + var r0 bool if rf, ok := ret.Get(0).(func(context.Context) bool); ok { r0 = rf(ctx) @@ -211,6 +247,10 @@ func (_m *MockFunctions) HaveDockerAccess(ctx context.Context) bool { func (_m *MockFunctions) InstallDocker(ctx context.Context) error { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for InstallDocker") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context) error); ok { r0 = rf(ctx) @@ -225,6 +265,10 @@ func (_m *MockFunctions) InstallDocker(ctx context.Context) error { func (_m *MockFunctions) IsDockerInstalled() (bool, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for IsDockerInstalled") + } + var r0 bool var r1 error if rf, ok := ret.Get(0).(func() (bool, error)); ok { @@ -249,6 +293,10 @@ func (_m *MockFunctions) IsDockerInstalled() (bool, error) { func (_m *MockFunctions) ParsePullImageProgress(r io.Reader, p *tea.Program) (<-chan struct{}, <-chan error) { ret := _m.Called(r, p) + if len(ret) == 0 { + panic("no return value specified for ParsePullImageProgress") + } + var r0 <-chan struct{} var r1 <-chan error if rf, ok := ret.Get(0).(func(io.Reader, *tea.Program) (<-chan struct{}, <-chan error)); ok { @@ -277,6 +325,10 @@ func (_m *MockFunctions) ParsePullImageProgress(r io.Reader, p *tea.Program) (<- func (_m *MockFunctions) PullImage(ctx context.Context, dockerImage string, opts types.ImagePullOptions) (io.Reader, error) { ret := _m.Called(ctx, dockerImage, opts) + if len(ret) == 0 { + panic("no return value specified for PullImage") + } + var r0 io.Reader var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, types.ImagePullOptions) (io.Reader, error)); ok { @@ -303,6 +355,10 @@ func (_m *MockFunctions) PullImage(ctx context.Context, dockerImage string, opts func (_m *MockFunctions) RunContainer(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, containerName string) (string, error) { ret := _m.Called(ctx, config, hostConfig, containerName) + if len(ret) == 0 { + panic("no return value specified for RunContainer") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, *container.Config, *container.HostConfig, string) (string, error)); ok { @@ -327,6 +383,10 @@ func (_m *MockFunctions) RunContainer(ctx context.Context, config *container.Con func (_m *MockFunctions) WaitForHealthyContainer(ctx context.Context, containerID string) <-chan pkgdocker.WaitHealthyResponse { ret := _m.Called(ctx, containerID) + if len(ret) == 0 { + panic("no return value specified for WaitForHealthyContainer") + } + var r0 <-chan pkgdocker.WaitHealthyResponse if rf, ok := ret.Get(0).(func(context.Context, string) <-chan pkgdocker.WaitHealthyResponse); ok { r0 = rf(ctx, containerID) diff --git a/agent/agentlocal/mock_client_test.go b/agent/agentlocal/mock_client_test.go index e4e0e47cad..dfa57c8e84 100644 --- a/agent/agentlocal/mock_client_test.go +++ b/agent/agentlocal/mock_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package agentlocal @@ -30,6 +30,10 @@ func (_m *mockClient) Describe(_a0 chan<- *prometheus.Desc) { func (_m *mockClient) GetConnectionUpTime() float32 { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetConnectionUpTime") + } + var r0 float32 if rf, ok := ret.Get(0).(func() float32); ok { r0 = rf() @@ -44,6 +48,10 @@ func (_m *mockClient) GetConnectionUpTime() float32 { func (_m *mockClient) GetNetworkInformation() (time.Duration, time.Duration, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetNetworkInformation") + } + var r0 time.Duration var r1 time.Duration var r2 error @@ -75,6 +83,10 @@ func (_m *mockClient) GetNetworkInformation() (time.Duration, time.Duration, err func (_m *mockClient) GetServerConnectMetadata() *agentpb.ServerConnectMetadata { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetServerConnectMetadata") + } + var r0 *agentpb.ServerConnectMetadata if rf, ok := ret.Get(0).(func() *agentpb.ServerConnectMetadata); ok { r0 = rf() diff --git a/agent/agentlocal/mock_supervisor_test.go b/agent/agentlocal/mock_supervisor_test.go index 6201748dbf..aea0b4a37b 100644 --- a/agent/agentlocal/mock_supervisor_test.go +++ b/agent/agentlocal/mock_supervisor_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package agentlocal @@ -17,6 +17,10 @@ type mockSupervisor struct { func (_m *mockSupervisor) AgentsList() []*agentlocalpb.AgentInfo { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for AgentsList") + } + var r0 []*agentlocalpb.AgentInfo if rf, ok := ret.Get(0).(func() []*agentlocalpb.AgentInfo); ok { r0 = rf() @@ -33,6 +37,10 @@ func (_m *mockSupervisor) AgentsList() []*agentlocalpb.AgentInfo { func (_m *mockSupervisor) AgentsLogs() map[string][]string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for AgentsLogs") + } + var r0 map[string][]string if rf, ok := ret.Get(0).(func() map[string][]string); ok { r0 = rf() diff --git a/agent/client/mock_connection_checker_test.go b/agent/client/mock_connection_checker_test.go index 610ab654c1..82fbf51c2c 100644 --- a/agent/client/mock_connection_checker_test.go +++ b/agent/client/mock_connection_checker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package client @@ -19,6 +19,10 @@ type mockConnectionChecker struct { func (_m *mockConnectionChecker) Check(ctx context.Context, req *agentpb.CheckConnectionRequest, id uint32) *agentpb.CheckConnectionResponse { ret := _m.Called(ctx, req, id) + if len(ret) == 0 { + panic("no return value specified for Check") + } + var r0 *agentpb.CheckConnectionResponse if rf, ok := ret.Get(0).(func(context.Context, *agentpb.CheckConnectionRequest, uint32) *agentpb.CheckConnectionResponse); ok { r0 = rf(ctx, req, id) diff --git a/agent/client/mock_service_info_broker_test.go b/agent/client/mock_service_info_broker_test.go index 9123c456fc..34c16a522b 100644 --- a/agent/client/mock_service_info_broker_test.go +++ b/agent/client/mock_service_info_broker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package client @@ -19,6 +19,10 @@ type mockServiceInfoBroker struct { func (_m *mockServiceInfoBroker) GetInfoFromService(ctx context.Context, req *agentpb.ServiceInfoRequest, id uint32) *agentpb.ServiceInfoResponse { ret := _m.Called(ctx, req, id) + if len(ret) == 0 { + panic("no return value specified for GetInfoFromService") + } + var r0 *agentpb.ServiceInfoResponse if rf, ok := ret.Get(0).(func(context.Context, *agentpb.ServiceInfoRequest, uint32) *agentpb.ServiceInfoResponse); ok { r0 = rf(ctx, req, id) diff --git a/agent/client/mock_supervisor_test.go b/agent/client/mock_supervisor_test.go index 1a53dbbae8..2654fd4bee 100644 --- a/agent/client/mock_supervisor_test.go +++ b/agent/client/mock_supervisor_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package client @@ -19,6 +19,10 @@ type mockSupervisor struct { func (_m *mockSupervisor) AgentLogByID(_a0 string) ([]string, uint) { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for AgentLogByID") + } + var r0 []string var r1 uint if rf, ok := ret.Get(0).(func(string) ([]string, uint)); ok { @@ -45,6 +49,10 @@ func (_m *mockSupervisor) AgentLogByID(_a0 string) ([]string, uint) { func (_m *mockSupervisor) AgentsList() []*agentlocalpb.AgentInfo { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for AgentsList") + } + var r0 []*agentlocalpb.AgentInfo if rf, ok := ret.Get(0).(func() []*agentlocalpb.AgentInfo); ok { r0 = rf() @@ -61,6 +69,10 @@ func (_m *mockSupervisor) AgentsList() []*agentlocalpb.AgentInfo { func (_m *mockSupervisor) Changes() <-chan *agentpb.StateChangedRequest { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Changes") + } + var r0 <-chan *agentpb.StateChangedRequest if rf, ok := ret.Get(0).(func() <-chan *agentpb.StateChangedRequest); ok { r0 = rf() @@ -92,6 +104,10 @@ func (_m *mockSupervisor) Describe(_a0 chan<- *prometheus.Desc) { func (_m *mockSupervisor) QANRequests() <-chan *agentpb.QANCollectRequest { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for QANRequests") + } + var r0 <-chan *agentpb.QANCollectRequest if rf, ok := ret.Get(0).(func() <-chan *agentpb.QANCollectRequest); ok { r0 = rf() diff --git a/agent/versioner/mock_exec_functions_test.go b/agent/versioner/mock_exec_functions_test.go index 4912d643ba..a6100a0014 100644 --- a/agent/versioner/mock_exec_functions_test.go +++ b/agent/versioner/mock_exec_functions_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package versioner @@ -24,6 +24,10 @@ func (_m *MockExecFunctions) CommandContext(ctx context.Context, name string, ar _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for CommandContext") + } + var r0 CombinedOutputer if rf, ok := ret.Get(0).(func(context.Context, string, ...string) CombinedOutputer); ok { r0 = rf(ctx, name, arg...) @@ -40,6 +44,10 @@ func (_m *MockExecFunctions) CommandContext(ctx context.Context, name string, ar func (_m *MockExecFunctions) LookPath(file string) (string, error) { ret := _m.Called(file) + if len(ret) == 0 { + panic("no return value specified for LookPath") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(string) (string, error)); ok { diff --git a/managed/services/backup/mock_agent_service_test.go b/managed/services/backup/mock_agent_service_test.go index 7f3940e50b..a434a89a05 100644 --- a/managed/services/backup/mock_agent_service_test.go +++ b/managed/services/backup/mock_agent_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -17,6 +17,10 @@ type mockAgentService struct { func (_m *mockAgentService) PBMSwitchPITR(pmmAgentID string, dsn string, files map[string]string, tdp *models.DelimiterPair, enabled bool) error { ret := _m.Called(pmmAgentID, dsn, files, tdp, enabled) + if len(ret) == 0 { + panic("no return value specified for PBMSwitchPITR") + } + var r0 error if rf, ok := ret.Get(0).(func(string, string, map[string]string, *models.DelimiterPair, bool) error); ok { r0 = rf(pmmAgentID, dsn, files, tdp, enabled) diff --git a/managed/services/backup/mock_compatibility_service_test.go b/managed/services/backup/mock_compatibility_service_test.go index a7db3db17c..e4280076f0 100644 --- a/managed/services/backup/mock_compatibility_service_test.go +++ b/managed/services/backup/mock_compatibility_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -17,6 +17,10 @@ type mockCompatibilityService struct { func (_m *mockCompatibilityService) CheckArtifactCompatibility(artifactID string, targetDBVersion string) error { ret := _m.Called(artifactID, targetDBVersion) + if len(ret) == 0 { + panic("no return value specified for CheckArtifactCompatibility") + } + var r0 error if rf, ok := ret.Get(0).(func(string, string) error); ok { r0 = rf(artifactID, targetDBVersion) @@ -31,6 +35,10 @@ func (_m *mockCompatibilityService) CheckArtifactCompatibility(artifactID string func (_m *mockCompatibilityService) CheckSoftwareCompatibilityForService(ctx context.Context, serviceID string) (string, error) { ret := _m.Called(ctx, serviceID) + if len(ret) == 0 { + panic("no return value specified for CheckSoftwareCompatibilityForService") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (string, error)); ok { diff --git a/managed/services/backup/mock_jobs_service_test.go b/managed/services/backup/mock_jobs_service_test.go index cc048818f3..830fbb6f02 100644 --- a/managed/services/backup/mock_jobs_service_test.go +++ b/managed/services/backup/mock_jobs_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -19,6 +19,10 @@ type mockJobsService struct { func (_m *mockJobsService) StartMongoDBBackupJob(service *models.Service, jobID string, pmmAgentID string, timeout time.Duration, name string, dbConfig *models.DBConfig, mode models.BackupMode, dataModel models.DataModel, locationConfig *models.BackupLocationConfig, folder string) error { ret := _m.Called(service, jobID, pmmAgentID, timeout, name, dbConfig, mode, dataModel, locationConfig, folder) + if len(ret) == 0 { + panic("no return value specified for StartMongoDBBackupJob") + } + var r0 error if rf, ok := ret.Get(0).(func(*models.Service, string, string, time.Duration, string, *models.DBConfig, models.BackupMode, models.DataModel, *models.BackupLocationConfig, string) error); ok { r0 = rf(service, jobID, pmmAgentID, timeout, name, dbConfig, mode, dataModel, locationConfig, folder) @@ -33,6 +37,10 @@ func (_m *mockJobsService) StartMongoDBBackupJob(service *models.Service, jobID func (_m *mockJobsService) StartMongoDBRestoreBackupJob(service *models.Service, jobID string, pmmAgentID string, timeout time.Duration, name string, pbmBackupName string, dbConfig *models.DBConfig, dataModel models.DataModel, locationConfig *models.BackupLocationConfig, pitrTimestamp time.Time, folder string) error { ret := _m.Called(service, jobID, pmmAgentID, timeout, name, pbmBackupName, dbConfig, dataModel, locationConfig, pitrTimestamp, folder) + if len(ret) == 0 { + panic("no return value specified for StartMongoDBRestoreBackupJob") + } + var r0 error if rf, ok := ret.Get(0).(func(*models.Service, string, string, time.Duration, string, string, *models.DBConfig, models.DataModel, *models.BackupLocationConfig, time.Time, string) error); ok { r0 = rf(service, jobID, pmmAgentID, timeout, name, pbmBackupName, dbConfig, dataModel, locationConfig, pitrTimestamp, folder) @@ -47,6 +55,10 @@ func (_m *mockJobsService) StartMongoDBRestoreBackupJob(service *models.Service, func (_m *mockJobsService) StartMySQLBackupJob(jobID string, pmmAgentID string, timeout time.Duration, name string, dbConfig *models.DBConfig, locationConfig *models.BackupLocationConfig, folder string) error { ret := _m.Called(jobID, pmmAgentID, timeout, name, dbConfig, locationConfig, folder) + if len(ret) == 0 { + panic("no return value specified for StartMySQLBackupJob") + } + var r0 error if rf, ok := ret.Get(0).(func(string, string, time.Duration, string, *models.DBConfig, *models.BackupLocationConfig, string) error); ok { r0 = rf(jobID, pmmAgentID, timeout, name, dbConfig, locationConfig, folder) @@ -61,6 +73,10 @@ func (_m *mockJobsService) StartMySQLBackupJob(jobID string, pmmAgentID string, func (_m *mockJobsService) StartMySQLRestoreBackupJob(jobID string, pmmAgentID string, serviceID string, timeout time.Duration, name string, locationConfig *models.BackupLocationConfig, folder string) error { ret := _m.Called(jobID, pmmAgentID, serviceID, timeout, name, locationConfig, folder) + if len(ret) == 0 { + panic("no return value specified for StartMySQLRestoreBackupJob") + } + var r0 error if rf, ok := ret.Get(0).(func(string, string, string, time.Duration, string, *models.BackupLocationConfig, string) error); ok { r0 = rf(jobID, pmmAgentID, serviceID, timeout, name, locationConfig, folder) @@ -75,6 +91,10 @@ func (_m *mockJobsService) StartMySQLRestoreBackupJob(jobID string, pmmAgentID s func (_m *mockJobsService) StopJob(jobID string) error { ret := _m.Called(jobID) + if len(ret) == 0 { + panic("no return value specified for StopJob") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(jobID) diff --git a/managed/services/backup/mock_pbm_pitr_service_test.go b/managed/services/backup/mock_pbm_pitr_service_test.go index c0255e8763..fc3274e3b0 100644 --- a/managed/services/backup/mock_pbm_pitr_service_test.go +++ b/managed/services/backup/mock_pbm_pitr_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -20,6 +20,10 @@ type mockPbmPITRService struct { func (_m *mockPbmPITRService) GetPITRFiles(ctx context.Context, locationClient Storage, location *models.BackupLocation, artifact *models.Artifact, until *time.Time) ([]*oplogChunk, error) { ret := _m.Called(ctx, locationClient, location, artifact, until) + if len(ret) == 0 { + panic("no return value specified for GetPITRFiles") + } + var r0 []*oplogChunk var r1 error if rf, ok := ret.Get(0).(func(context.Context, Storage, *models.BackupLocation, *models.Artifact, *time.Time) ([]*oplogChunk, error)); ok { @@ -46,6 +50,10 @@ func (_m *mockPbmPITRService) GetPITRFiles(ctx context.Context, locationClient S func (_m *mockPbmPITRService) ListPITRTimeranges(ctx context.Context, locationClient Storage, location *models.BackupLocation, artifact *models.Artifact) ([]Timeline, error) { ret := _m.Called(ctx, locationClient, location, artifact) + if len(ret) == 0 { + panic("no return value specified for ListPITRTimeranges") + } + var r0 []Timeline var r1 error if rf, ok := ret.Get(0).(func(context.Context, Storage, *models.BackupLocation, *models.Artifact) ([]Timeline, error)); ok { diff --git a/managed/services/backup/mock_removal_service_test.go b/managed/services/backup/mock_removal_service_test.go index c3364c75c9..e106e6267a 100644 --- a/managed/services/backup/mock_removal_service_test.go +++ b/managed/services/backup/mock_removal_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -13,6 +13,10 @@ type mockRemovalService struct { func (_m *mockRemovalService) DeleteArtifact(storage Storage, artifactID string, removeFiles bool) error { ret := _m.Called(storage, artifactID, removeFiles) + if len(ret) == 0 { + panic("no return value specified for DeleteArtifact") + } + var r0 error if rf, ok := ret.Get(0).(func(Storage, string, bool) error); ok { r0 = rf(storage, artifactID, removeFiles) @@ -27,6 +31,10 @@ func (_m *mockRemovalService) DeleteArtifact(storage Storage, artifactID string, func (_m *mockRemovalService) TrimPITRArtifact(storage Storage, artifactID string, firstN int) error { ret := _m.Called(storage, artifactID, firstN) + if len(ret) == 0 { + panic("no return value specified for TrimPITRArtifact") + } + var r0 error if rf, ok := ret.Get(0).(func(Storage, string, int) error); ok { r0 = rf(storage, artifactID, firstN) diff --git a/managed/services/backup/mock_storage_test.go b/managed/services/backup/mock_storage_test.go index 150f5a7c21..8915b3d768 100644 --- a/managed/services/backup/mock_storage_test.go +++ b/managed/services/backup/mock_storage_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -19,6 +19,10 @@ type MockStorage struct { func (_m *MockStorage) FileStat(ctx context.Context, endpoint string, accessKey string, secretKey string, bucketName string, name string) (minio.FileInfo, error) { ret := _m.Called(ctx, endpoint, accessKey, secretKey, bucketName, name) + if len(ret) == 0 { + panic("no return value specified for FileStat") + } + var r0 minio.FileInfo var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string, string) (minio.FileInfo, error)); ok { @@ -43,6 +47,10 @@ func (_m *MockStorage) FileStat(ctx context.Context, endpoint string, accessKey func (_m *MockStorage) List(ctx context.Context, endpoint string, accessKey string, secretKey string, bucketName string, prefix string, suffix string) ([]minio.FileInfo, error) { ret := _m.Called(ctx, endpoint, accessKey, secretKey, bucketName, prefix, suffix) + if len(ret) == 0 { + panic("no return value specified for List") + } + var r0 []minio.FileInfo var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, string) ([]minio.FileInfo, error)); ok { @@ -69,6 +77,10 @@ func (_m *MockStorage) List(ctx context.Context, endpoint string, accessKey stri func (_m *MockStorage) Remove(ctx context.Context, endpoint string, accessKey string, secretKey string, bucketName string, objectName string) error { ret := _m.Called(ctx, endpoint, accessKey, secretKey, bucketName, objectName) + if len(ret) == 0 { + panic("no return value specified for Remove") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string, string) error); ok { r0 = rf(ctx, endpoint, accessKey, secretKey, bucketName, objectName) @@ -83,6 +95,10 @@ func (_m *MockStorage) Remove(ctx context.Context, endpoint string, accessKey st func (_m *MockStorage) RemoveRecursive(ctx context.Context, endpoint string, accessKey string, secretKey string, bucketName string, prefix string) error { ret := _m.Called(ctx, endpoint, accessKey, secretKey, bucketName, prefix) + if len(ret) == 0 { + panic("no return value specified for RemoveRecursive") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string, string) error); ok { r0 = rf(ctx, endpoint, accessKey, secretKey, bucketName, prefix) diff --git a/managed/services/backup/mock_versioner_test.go b/managed/services/backup/mock_versioner_test.go index bb1443d3c1..f7db4355bd 100644 --- a/managed/services/backup/mock_versioner_test.go +++ b/managed/services/backup/mock_versioner_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -17,6 +17,10 @@ type mockVersioner struct { func (_m *mockVersioner) GetVersions(pmmAgentID string, softwares []agents.Software) ([]agents.Version, error) { ret := _m.Called(pmmAgentID, softwares) + if len(ret) == 0 { + panic("no return value specified for GetVersions") + } + var r0 []agents.Version var r1 error if rf, ok := ret.Get(0).(func(string, []agents.Software) ([]agents.Version, error)); ok { diff --git a/managed/services/checks/mock_agents_registry_test.go b/managed/services/checks/mock_agents_registry_test.go index 52d0f05d89..369685f13b 100644 --- a/managed/services/checks/mock_agents_registry_test.go +++ b/managed/services/checks/mock_agents_registry_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package checks @@ -19,6 +19,10 @@ type mockAgentsRegistry struct { func (_m *mockAgentsRegistry) StartMongoDBQueryBuildInfoAction(ctx context.Context, id string, pmmAgentID string, dsn string, files map[string]string, tdp *models.DelimiterPair) error { ret := _m.Called(ctx, id, pmmAgentID, dsn, files, tdp) + if len(ret) == 0 { + panic("no return value specified for StartMongoDBQueryBuildInfoAction") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, map[string]string, *models.DelimiterPair) error); ok { r0 = rf(ctx, id, pmmAgentID, dsn, files, tdp) @@ -33,6 +37,10 @@ func (_m *mockAgentsRegistry) StartMongoDBQueryBuildInfoAction(ctx context.Conte func (_m *mockAgentsRegistry) StartMongoDBQueryGetCmdLineOptsAction(ctx context.Context, id string, pmmAgentID string, dsn string, files map[string]string, tdp *models.DelimiterPair) error { ret := _m.Called(ctx, id, pmmAgentID, dsn, files, tdp) + if len(ret) == 0 { + panic("no return value specified for StartMongoDBQueryGetCmdLineOptsAction") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, map[string]string, *models.DelimiterPair) error); ok { r0 = rf(ctx, id, pmmAgentID, dsn, files, tdp) @@ -47,6 +55,10 @@ func (_m *mockAgentsRegistry) StartMongoDBQueryGetCmdLineOptsAction(ctx context. func (_m *mockAgentsRegistry) StartMongoDBQueryGetDiagnosticDataAction(ctx context.Context, id string, pmmAgentID string, dsn string, files map[string]string, tdp *models.DelimiterPair) error { ret := _m.Called(ctx, id, pmmAgentID, dsn, files, tdp) + if len(ret) == 0 { + panic("no return value specified for StartMongoDBQueryGetDiagnosticDataAction") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, map[string]string, *models.DelimiterPair) error); ok { r0 = rf(ctx, id, pmmAgentID, dsn, files, tdp) @@ -61,6 +73,10 @@ func (_m *mockAgentsRegistry) StartMongoDBQueryGetDiagnosticDataAction(ctx conte func (_m *mockAgentsRegistry) StartMongoDBQueryGetParameterAction(ctx context.Context, id string, pmmAgentID string, dsn string, files map[string]string, tdp *models.DelimiterPair) error { ret := _m.Called(ctx, id, pmmAgentID, dsn, files, tdp) + if len(ret) == 0 { + panic("no return value specified for StartMongoDBQueryGetParameterAction") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, map[string]string, *models.DelimiterPair) error); ok { r0 = rf(ctx, id, pmmAgentID, dsn, files, tdp) @@ -75,6 +91,10 @@ func (_m *mockAgentsRegistry) StartMongoDBQueryGetParameterAction(ctx context.Co func (_m *mockAgentsRegistry) StartMongoDBQueryReplSetGetStatusAction(ctx context.Context, id string, pmmAgentID string, dsn string, files map[string]string, tdp *models.DelimiterPair) error { ret := _m.Called(ctx, id, pmmAgentID, dsn, files, tdp) + if len(ret) == 0 { + panic("no return value specified for StartMongoDBQueryReplSetGetStatusAction") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, map[string]string, *models.DelimiterPair) error); ok { r0 = rf(ctx, id, pmmAgentID, dsn, files, tdp) @@ -89,6 +109,10 @@ func (_m *mockAgentsRegistry) StartMongoDBQueryReplSetGetStatusAction(ctx contex func (_m *mockAgentsRegistry) StartMySQLQuerySelectAction(ctx context.Context, id string, pmmAgentID string, dsn string, query string, files map[string]string, tdp *models.DelimiterPair, tlsSkipVerify bool) error { ret := _m.Called(ctx, id, pmmAgentID, dsn, query, files, tdp, tlsSkipVerify) + if len(ret) == 0 { + panic("no return value specified for StartMySQLQuerySelectAction") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string, map[string]string, *models.DelimiterPair, bool) error); ok { r0 = rf(ctx, id, pmmAgentID, dsn, query, files, tdp, tlsSkipVerify) @@ -103,6 +127,10 @@ func (_m *mockAgentsRegistry) StartMySQLQuerySelectAction(ctx context.Context, i func (_m *mockAgentsRegistry) StartMySQLQueryShowAction(ctx context.Context, id string, pmmAgentID string, dsn string, query string, files map[string]string, tdp *models.DelimiterPair, tlsSkipVerify bool) error { ret := _m.Called(ctx, id, pmmAgentID, dsn, query, files, tdp, tlsSkipVerify) + if len(ret) == 0 { + panic("no return value specified for StartMySQLQueryShowAction") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string, map[string]string, *models.DelimiterPair, bool) error); ok { r0 = rf(ctx, id, pmmAgentID, dsn, query, files, tdp, tlsSkipVerify) @@ -117,6 +145,10 @@ func (_m *mockAgentsRegistry) StartMySQLQueryShowAction(ctx context.Context, id func (_m *mockAgentsRegistry) StartPostgreSQLQuerySelectAction(ctx context.Context, id string, pmmAgentID string, dsn string, query string) error { ret := _m.Called(ctx, id, pmmAgentID, dsn, query) + if len(ret) == 0 { + panic("no return value specified for StartPostgreSQLQuerySelectAction") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string) error); ok { r0 = rf(ctx, id, pmmAgentID, dsn, query) @@ -131,6 +163,10 @@ func (_m *mockAgentsRegistry) StartPostgreSQLQuerySelectAction(ctx context.Conte func (_m *mockAgentsRegistry) StartPostgreSQLQueryShowAction(ctx context.Context, id string, pmmAgentID string, dsn string) error { ret := _m.Called(ctx, id, pmmAgentID, dsn) + if len(ret) == 0 { + panic("no return value specified for StartPostgreSQLQueryShowAction") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string) error); ok { r0 = rf(ctx, id, pmmAgentID, dsn) diff --git a/managed/services/dbaas/kubernetes/client/mock_kube_client_connector.go b/managed/services/dbaas/kubernetes/client/mock_kube_client_connector.go index 8bddf6fb1e..94addfdb5c 100644 --- a/managed/services/dbaas/kubernetes/client/mock_kube_client_connector.go +++ b/managed/services/dbaas/kubernetes/client/mock_kube_client_connector.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package client @@ -30,6 +30,10 @@ type MockKubeClientConnector struct { func (_m *MockKubeClientConnector) ApplyFile(fileBytes []byte) error { ret := _m.Called(fileBytes) + if len(ret) == 0 { + panic("no return value specified for ApplyFile") + } + var r0 error if rf, ok := ret.Get(0).(func([]byte) error); ok { r0 = rf(fileBytes) @@ -44,6 +48,10 @@ func (_m *MockKubeClientConnector) ApplyFile(fileBytes []byte) error { func (_m *MockKubeClientConnector) ApplyObject(obj runtime.Object) error { ret := _m.Called(obj) + if len(ret) == 0 { + panic("no return value specified for ApplyObject") + } + var r0 error if rf, ok := ret.Get(0).(func(runtime.Object) error); ok { r0 = rf(obj) @@ -58,6 +66,10 @@ func (_m *MockKubeClientConnector) ApplyObject(obj runtime.Object) error { func (_m *MockKubeClientConnector) CreateOperatorGroup(ctx context.Context, namespace string, name string) (*v1.OperatorGroup, error) { ret := _m.Called(ctx, namespace, name) + if len(ret) == 0 { + panic("no return value specified for CreateOperatorGroup") + } + var r0 *v1.OperatorGroup var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string) (*v1.OperatorGroup, error)); ok { @@ -84,6 +96,10 @@ func (_m *MockKubeClientConnector) CreateOperatorGroup(ctx context.Context, name func (_m *MockKubeClientConnector) CreateSubscriptionForCatalog(ctx context.Context, namespace string, name string, catalogNamespace string, catalog string, packageName string, channel string, startingCSV string, approval v1alpha1.Approval) (*v1alpha1.Subscription, error) { ret := _m.Called(ctx, namespace, name, catalogNamespace, catalog, packageName, channel, startingCSV, approval) + if len(ret) == 0 { + panic("no return value specified for CreateSubscriptionForCatalog") + } + var r0 *v1alpha1.Subscription var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, string, string, v1alpha1.Approval) (*v1alpha1.Subscription, error)); ok { @@ -110,6 +126,10 @@ func (_m *MockKubeClientConnector) CreateSubscriptionForCatalog(ctx context.Cont func (_m *MockKubeClientConnector) DeleteObject(obj runtime.Object) error { ret := _m.Called(obj) + if len(ret) == 0 { + panic("no return value specified for DeleteObject") + } + var r0 error if rf, ok := ret.Get(0).(func(runtime.Object) error); ok { r0 = rf(obj) @@ -124,6 +144,10 @@ func (_m *MockKubeClientConnector) DeleteObject(obj runtime.Object) error { func (_m *MockKubeClientConnector) DoCSVWait(ctx context.Context, key types.NamespacedName) error { ret := _m.Called(ctx, key) + if len(ret) == 0 { + panic("no return value specified for DoCSVWait") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, types.NamespacedName) error); ok { r0 = rf(ctx, key) @@ -138,6 +162,10 @@ func (_m *MockKubeClientConnector) DoCSVWait(ctx context.Context, key types.Name func (_m *MockKubeClientConnector) DoRolloutWait(ctx context.Context, key types.NamespacedName) error { ret := _m.Called(ctx, key) + if len(ret) == 0 { + panic("no return value specified for DoRolloutWait") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, types.NamespacedName) error); ok { r0 = rf(ctx, key) @@ -152,6 +180,10 @@ func (_m *MockKubeClientConnector) DoRolloutWait(ctx context.Context, key types. func (_m *MockKubeClientConnector) GenerateKubeConfig(secret *corev1.Secret) ([]byte, error) { ret := _m.Called(secret) + if len(ret) == 0 { + panic("no return value specified for GenerateKubeConfig") + } + var r0 []byte var r1 error if rf, ok := ret.Get(0).(func(*corev1.Secret) ([]byte, error)); ok { @@ -178,6 +210,10 @@ func (_m *MockKubeClientConnector) GenerateKubeConfig(secret *corev1.Secret) ([] func (_m *MockKubeClientConnector) GetDatabaseCluster(ctx context.Context, name string) (*apiv1.DatabaseCluster, error) { ret := _m.Called(ctx, name) + if len(ret) == 0 { + panic("no return value specified for GetDatabaseCluster") + } + var r0 *apiv1.DatabaseCluster var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (*apiv1.DatabaseCluster, error)); ok { @@ -204,6 +240,10 @@ func (_m *MockKubeClientConnector) GetDatabaseCluster(ctx context.Context, name func (_m *MockKubeClientConnector) GetDeployment(ctx context.Context, name string) (*appsv1.Deployment, error) { ret := _m.Called(ctx, name) + if len(ret) == 0 { + panic("no return value specified for GetDeployment") + } + var r0 *appsv1.Deployment var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (*appsv1.Deployment, error)); ok { @@ -230,6 +270,10 @@ func (_m *MockKubeClientConnector) GetDeployment(ctx context.Context, name strin func (_m *MockKubeClientConnector) GetEvents(ctx context.Context, name string) (string, error) { ret := _m.Called(ctx, name) + if len(ret) == 0 { + panic("no return value specified for GetEvents") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (string, error)); ok { @@ -254,6 +298,10 @@ func (_m *MockKubeClientConnector) GetEvents(ctx context.Context, name string) ( func (_m *MockKubeClientConnector) GetInstallPlan(ctx context.Context, namespace string, name string) (*v1alpha1.InstallPlan, error) { ret := _m.Called(ctx, namespace, name) + if len(ret) == 0 { + panic("no return value specified for GetInstallPlan") + } + var r0 *v1alpha1.InstallPlan var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string) (*v1alpha1.InstallPlan, error)); ok { @@ -280,6 +328,10 @@ func (_m *MockKubeClientConnector) GetInstallPlan(ctx context.Context, namespace func (_m *MockKubeClientConnector) GetLogs(ctx context.Context, pod string, container string) (string, error) { ret := _m.Called(ctx, pod, container) + if len(ret) == 0 { + panic("no return value specified for GetLogs") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string) (string, error)); ok { @@ -304,6 +356,10 @@ func (_m *MockKubeClientConnector) GetLogs(ctx context.Context, pod string, cont func (_m *MockKubeClientConnector) GetNodes(ctx context.Context) (*corev1.NodeList, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for GetNodes") + } + var r0 *corev1.NodeList var r1 error if rf, ok := ret.Get(0).(func(context.Context) (*corev1.NodeList, error)); ok { @@ -330,6 +386,10 @@ func (_m *MockKubeClientConnector) GetNodes(ctx context.Context) (*corev1.NodeLi func (_m *MockKubeClientConnector) GetOperatorGroup(ctx context.Context, namespace string, name string) (*v1.OperatorGroup, error) { ret := _m.Called(ctx, namespace, name) + if len(ret) == 0 { + panic("no return value specified for GetOperatorGroup") + } + var r0 *v1.OperatorGroup var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string) (*v1.OperatorGroup, error)); ok { @@ -356,6 +416,10 @@ func (_m *MockKubeClientConnector) GetOperatorGroup(ctx context.Context, namespa func (_m *MockKubeClientConnector) GetPersistentVolumes(ctx context.Context) (*corev1.PersistentVolumeList, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for GetPersistentVolumes") + } + var r0 *corev1.PersistentVolumeList var r1 error if rf, ok := ret.Get(0).(func(context.Context) (*corev1.PersistentVolumeList, error)); ok { @@ -382,6 +446,10 @@ func (_m *MockKubeClientConnector) GetPersistentVolumes(ctx context.Context) (*c func (_m *MockKubeClientConnector) GetPods(ctx context.Context, namespace string, labelSelector *metav1.LabelSelector) (*corev1.PodList, error) { ret := _m.Called(ctx, namespace, labelSelector) + if len(ret) == 0 { + panic("no return value specified for GetPods") + } + var r0 *corev1.PodList var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, *metav1.LabelSelector) (*corev1.PodList, error)); ok { @@ -408,6 +476,10 @@ func (_m *MockKubeClientConnector) GetPods(ctx context.Context, namespace string func (_m *MockKubeClientConnector) GetSecret(ctx context.Context, name string) (*corev1.Secret, error) { ret := _m.Called(ctx, name) + if len(ret) == 0 { + panic("no return value specified for GetSecret") + } + var r0 *corev1.Secret var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (*corev1.Secret, error)); ok { @@ -434,6 +506,10 @@ func (_m *MockKubeClientConnector) GetSecret(ctx context.Context, name string) ( func (_m *MockKubeClientConnector) GetSecretsForServiceAccount(ctx context.Context, accountName string) (*corev1.Secret, error) { ret := _m.Called(ctx, accountName) + if len(ret) == 0 { + panic("no return value specified for GetSecretsForServiceAccount") + } + var r0 *corev1.Secret var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (*corev1.Secret, error)); ok { @@ -460,6 +536,10 @@ func (_m *MockKubeClientConnector) GetSecretsForServiceAccount(ctx context.Conte func (_m *MockKubeClientConnector) GetServerVersion() (*version.Info, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetServerVersion") + } + var r0 *version.Info var r1 error if rf, ok := ret.Get(0).(func() (*version.Info, error)); ok { @@ -486,6 +566,10 @@ func (_m *MockKubeClientConnector) GetServerVersion() (*version.Info, error) { func (_m *MockKubeClientConnector) GetStorageClasses(ctx context.Context) (*storagev1.StorageClassList, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for GetStorageClasses") + } + var r0 *storagev1.StorageClassList var r1 error if rf, ok := ret.Get(0).(func(context.Context) (*storagev1.StorageClassList, error)); ok { @@ -512,6 +596,10 @@ func (_m *MockKubeClientConnector) GetStorageClasses(ctx context.Context) (*stor func (_m *MockKubeClientConnector) GetSubscription(ctx context.Context, namespace string, name string) (*v1alpha1.Subscription, error) { ret := _m.Called(ctx, namespace, name) + if len(ret) == 0 { + panic("no return value specified for GetSubscription") + } + var r0 *v1alpha1.Subscription var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string) (*v1alpha1.Subscription, error)); ok { @@ -538,6 +626,10 @@ func (_m *MockKubeClientConnector) GetSubscription(ctx context.Context, namespac func (_m *MockKubeClientConnector) GetSubscriptionCSV(ctx context.Context, subKey types.NamespacedName) (types.NamespacedName, error) { ret := _m.Called(ctx, subKey) + if len(ret) == 0 { + panic("no return value specified for GetSubscriptionCSV") + } + var r0 types.NamespacedName var r1 error if rf, ok := ret.Get(0).(func(context.Context, types.NamespacedName) (types.NamespacedName, error)); ok { @@ -562,6 +654,10 @@ func (_m *MockKubeClientConnector) GetSubscriptionCSV(ctx context.Context, subKe func (_m *MockKubeClientConnector) ListCRDs(ctx context.Context, labelSelector *metav1.LabelSelector) (*apiextensionsv1.CustomResourceDefinitionList, error) { ret := _m.Called(ctx, labelSelector) + if len(ret) == 0 { + panic("no return value specified for ListCRDs") + } + var r0 *apiextensionsv1.CustomResourceDefinitionList var r1 error if rf, ok := ret.Get(0).(func(context.Context, *metav1.LabelSelector) (*apiextensionsv1.CustomResourceDefinitionList, error)); ok { @@ -588,6 +684,10 @@ func (_m *MockKubeClientConnector) ListCRDs(ctx context.Context, labelSelector * func (_m *MockKubeClientConnector) ListCRs(ctx context.Context, namespace string, gvr schema.GroupVersionResource, labelSelector *metav1.LabelSelector) (*unstructured.UnstructuredList, error) { ret := _m.Called(ctx, namespace, gvr, labelSelector) + if len(ret) == 0 { + panic("no return value specified for ListCRs") + } + var r0 *unstructured.UnstructuredList var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, schema.GroupVersionResource, *metav1.LabelSelector) (*unstructured.UnstructuredList, error)); ok { @@ -614,6 +714,10 @@ func (_m *MockKubeClientConnector) ListCRs(ctx context.Context, namespace string func (_m *MockKubeClientConnector) ListDatabaseClusters(ctx context.Context) (*apiv1.DatabaseClusterList, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for ListDatabaseClusters") + } + var r0 *apiv1.DatabaseClusterList var r1 error if rf, ok := ret.Get(0).(func(context.Context) (*apiv1.DatabaseClusterList, error)); ok { @@ -640,6 +744,10 @@ func (_m *MockKubeClientConnector) ListDatabaseClusters(ctx context.Context) (*a func (_m *MockKubeClientConnector) ListSecrets(ctx context.Context) (*corev1.SecretList, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for ListSecrets") + } + var r0 *corev1.SecretList var r1 error if rf, ok := ret.Get(0).(func(context.Context) (*corev1.SecretList, error)); ok { @@ -666,6 +774,10 @@ func (_m *MockKubeClientConnector) ListSecrets(ctx context.Context) (*corev1.Sec func (_m *MockKubeClientConnector) ListSubscriptions(ctx context.Context, namespace string) (*v1alpha1.SubscriptionList, error) { ret := _m.Called(ctx, namespace) + if len(ret) == 0 { + panic("no return value specified for ListSubscriptions") + } + var r0 *v1alpha1.SubscriptionList var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (*v1alpha1.SubscriptionList, error)); ok { @@ -692,6 +804,10 @@ func (_m *MockKubeClientConnector) ListSubscriptions(ctx context.Context, namesp func (_m *MockKubeClientConnector) UpdateInstallPlan(ctx context.Context, namespace string, installPlan *v1alpha1.InstallPlan) (*v1alpha1.InstallPlan, error) { ret := _m.Called(ctx, namespace, installPlan) + if len(ret) == 0 { + panic("no return value specified for UpdateInstallPlan") + } + var r0 *v1alpha1.InstallPlan var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, *v1alpha1.InstallPlan) (*v1alpha1.InstallPlan, error)); ok { diff --git a/managed/services/grafana/mock_aws_instance_checker_test.go b/managed/services/grafana/mock_aws_instance_checker_test.go index 6fc2958b5c..f462d263f6 100644 --- a/managed/services/grafana/mock_aws_instance_checker_test.go +++ b/managed/services/grafana/mock_aws_instance_checker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package grafana @@ -13,6 +13,10 @@ type mockAwsInstanceChecker struct { func (_m *mockAwsInstanceChecker) MustCheck() bool { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for MustCheck") + } + var r0 bool if rf, ok := ret.Get(0).(func() bool); ok { r0 = rf() diff --git a/managed/services/inventory/mock_agent_service_test.go b/managed/services/inventory/mock_agent_service_test.go index 9f84a3a905..79591e67b7 100644 --- a/managed/services/inventory/mock_agent_service_test.go +++ b/managed/services/inventory/mock_agent_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package inventory @@ -17,6 +17,10 @@ type mockAgentService struct { func (_m *mockAgentService) Logs(ctx context.Context, pmmAgentID string, agentID string, limit uint32) ([]string, uint32, error) { ret := _m.Called(ctx, pmmAgentID, agentID, limit) + if len(ret) == 0 { + panic("no return value specified for Logs") + } + var r0 []string var r1 uint32 var r2 error diff --git a/managed/services/inventory/mock_agents_registry_test.go b/managed/services/inventory/mock_agents_registry_test.go index 63a6e4a727..98a66fbcdc 100644 --- a/managed/services/inventory/mock_agents_registry_test.go +++ b/managed/services/inventory/mock_agents_registry_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package inventory @@ -17,6 +17,10 @@ type mockAgentsRegistry struct { func (_m *mockAgentsRegistry) IsConnected(pmmAgentID string) bool { ret := _m.Called(pmmAgentID) + if len(ret) == 0 { + panic("no return value specified for IsConnected") + } + var r0 bool if rf, ok := ret.Get(0).(func(string) bool); ok { r0 = rf(pmmAgentID) diff --git a/managed/services/inventory/mock_agents_state_updater_test.go b/managed/services/inventory/mock_agents_state_updater_test.go index 368ec148e5..a407357807 100644 --- a/managed/services/inventory/mock_agents_state_updater_test.go +++ b/managed/services/inventory/mock_agents_state_updater_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package inventory diff --git a/managed/services/inventory/mock_connection_checker_test.go b/managed/services/inventory/mock_connection_checker_test.go index d110f2d021..986c9f12ce 100644 --- a/managed/services/inventory/mock_connection_checker_test.go +++ b/managed/services/inventory/mock_connection_checker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package inventory @@ -20,6 +20,10 @@ type mockConnectionChecker struct { func (_m *mockConnectionChecker) CheckConnectionToService(ctx context.Context, q *reform.Querier, service *models.Service, agent *models.Agent) error { ret := _m.Called(ctx, q, service, agent) + if len(ret) == 0 { + panic("no return value specified for CheckConnectionToService") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, *reform.Querier, *models.Service, *models.Agent) error); ok { r0 = rf(ctx, q, service, agent) diff --git a/managed/services/inventory/mock_inventory_metrics_test.go b/managed/services/inventory/mock_inventory_metrics_test.go index 8696dcf22c..7cbae013bb 100644 --- a/managed/services/inventory/mock_inventory_metrics_test.go +++ b/managed/services/inventory/mock_inventory_metrics_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package inventory @@ -17,6 +17,10 @@ type mockInventoryMetrics struct { func (_m *mockInventoryMetrics) GetAgentMetrics(ctx context.Context) ([]Metric, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for GetAgentMetrics") + } + var r0 []Metric var r1 error if rf, ok := ret.Get(0).(func(context.Context) ([]Metric, error)); ok { @@ -43,6 +47,10 @@ func (_m *mockInventoryMetrics) GetAgentMetrics(ctx context.Context) ([]Metric, func (_m *mockInventoryMetrics) GetNodeMetrics(ctx context.Context) ([]Metric, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for GetNodeMetrics") + } + var r0 []Metric var r1 error if rf, ok := ret.Get(0).(func(context.Context) ([]Metric, error)); ok { @@ -69,6 +77,10 @@ func (_m *mockInventoryMetrics) GetNodeMetrics(ctx context.Context) ([]Metric, e func (_m *mockInventoryMetrics) GetServiceMetrics(ctx context.Context) ([]Metric, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for GetServiceMetrics") + } + var r0 []Metric var r1 error if rf, ok := ret.Get(0).(func(context.Context) ([]Metric, error)); ok { diff --git a/managed/services/inventory/mock_prometheus_service_test.go b/managed/services/inventory/mock_prometheus_service_test.go index b28b989a14..19337f99f4 100644 --- a/managed/services/inventory/mock_prometheus_service_test.go +++ b/managed/services/inventory/mock_prometheus_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package inventory diff --git a/managed/services/inventory/mock_service_info_broker_test.go b/managed/services/inventory/mock_service_info_broker_test.go index b3e711ade0..bf0bc79916 100644 --- a/managed/services/inventory/mock_service_info_broker_test.go +++ b/managed/services/inventory/mock_service_info_broker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package inventory @@ -20,6 +20,10 @@ type mockServiceInfoBroker struct { func (_m *mockServiceInfoBroker) GetInfoFromService(ctx context.Context, q *reform.Querier, service *models.Service, agent *models.Agent) error { ret := _m.Called(ctx, q, service, agent) + if len(ret) == 0 { + panic("no return value specified for GetInfoFromService") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, *reform.Querier, *models.Service, *models.Agent) error); ok { r0 = rf(ctx, q, service, agent) diff --git a/managed/services/inventory/mock_version_cache_test.go b/managed/services/inventory/mock_version_cache_test.go index d72ad3d0d3..e363197cef 100644 --- a/managed/services/inventory/mock_version_cache_test.go +++ b/managed/services/inventory/mock_version_cache_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package inventory diff --git a/managed/services/management/alerting/mock_grafana_client_test.go b/managed/services/management/alerting/mock_grafana_client_test.go index 8373945736..944b722e0d 100644 --- a/managed/services/management/alerting/mock_grafana_client_test.go +++ b/managed/services/management/alerting/mock_grafana_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package alerting @@ -20,6 +20,10 @@ type mockGrafanaClient struct { func (_m *mockGrafanaClient) CreateAlertRule(ctx context.Context, folderName string, groupName string, rule *services.Rule) error { ret := _m.Called(ctx, folderName, groupName, rule) + if len(ret) == 0 { + panic("no return value specified for CreateAlertRule") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, *services.Rule) error); ok { r0 = rf(ctx, folderName, groupName, rule) @@ -34,6 +38,10 @@ func (_m *mockGrafanaClient) CreateAlertRule(ctx context.Context, folderName str func (_m *mockGrafanaClient) GetDatasourceUIDByID(ctx context.Context, id int64) (string, error) { ret := _m.Called(ctx, id) + if len(ret) == 0 { + panic("no return value specified for GetDatasourceUIDByID") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, int64) (string, error)); ok { @@ -58,6 +66,10 @@ func (_m *mockGrafanaClient) GetDatasourceUIDByID(ctx context.Context, id int64) func (_m *mockGrafanaClient) GetFolderByUID(ctx context.Context, uid string) (*gapi.Folder, error) { ret := _m.Called(ctx, uid) + if len(ret) == 0 { + panic("no return value specified for GetFolderByUID") + } + var r0 *gapi.Folder var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (*gapi.Folder, error)); ok { diff --git a/managed/services/management/backup/mock_aws_s3_test.go b/managed/services/management/backup/mock_aws_s3_test.go index 1247a97643..df5e9b7013 100644 --- a/managed/services/management/backup/mock_aws_s3_test.go +++ b/managed/services/management/backup/mock_aws_s3_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -17,6 +17,10 @@ type mockAwsS3 struct { func (_m *mockAwsS3) BucketExists(ctx context.Context, host string, accessKey string, secretKey string, name string) (bool, error) { ret := _m.Called(ctx, host, accessKey, secretKey, name) + if len(ret) == 0 { + panic("no return value specified for BucketExists") + } + var r0 bool var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string) (bool, error)); ok { @@ -41,6 +45,10 @@ func (_m *mockAwsS3) BucketExists(ctx context.Context, host string, accessKey st func (_m *mockAwsS3) GetBucketLocation(ctx context.Context, host string, accessKey string, secretKey string, name string) (string, error) { ret := _m.Called(ctx, host, accessKey, secretKey, name) + if len(ret) == 0 { + panic("no return value specified for GetBucketLocation") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string) (string, error)); ok { @@ -65,6 +73,10 @@ func (_m *mockAwsS3) GetBucketLocation(ctx context.Context, host string, accessK func (_m *mockAwsS3) RemoveRecursive(ctx context.Context, endpoint string, accessKey string, secretKey string, bucketName string, prefix string) error { ret := _m.Called(ctx, endpoint, accessKey, secretKey, bucketName, prefix) + if len(ret) == 0 { + panic("no return value specified for RemoveRecursive") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string, string) error); ok { r0 = rf(ctx, endpoint, accessKey, secretKey, bucketName, prefix) diff --git a/managed/services/management/backup/mock_backup_service_test.go b/managed/services/management/backup/mock_backup_service_test.go index 87354324b2..26dbcc8f3b 100644 --- a/managed/services/management/backup/mock_backup_service_test.go +++ b/managed/services/management/backup/mock_backup_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -20,6 +20,10 @@ type mockBackupService struct { func (_m *mockBackupService) PerformBackup(ctx context.Context, params servicesbackup.PerformBackupParams) (string, error) { ret := _m.Called(ctx, params) + if len(ret) == 0 { + panic("no return value specified for PerformBackup") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, servicesbackup.PerformBackupParams) (string, error)); ok { @@ -44,6 +48,10 @@ func (_m *mockBackupService) PerformBackup(ctx context.Context, params servicesb func (_m *mockBackupService) RestoreBackup(ctx context.Context, serviceID string, artifactID string, pitrTimestamp time.Time) (string, error) { ret := _m.Called(ctx, serviceID, artifactID, pitrTimestamp) + if len(ret) == 0 { + panic("no return value specified for RestoreBackup") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string, time.Time) (string, error)); ok { @@ -68,6 +76,10 @@ func (_m *mockBackupService) RestoreBackup(ctx context.Context, serviceID string func (_m *mockBackupService) SwitchMongoPITR(ctx context.Context, serviceID string, enabled bool) error { ret := _m.Called(ctx, serviceID, enabled) + if len(ret) == 0 { + panic("no return value specified for SwitchMongoPITR") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, bool) error); ok { r0 = rf(ctx, serviceID, enabled) diff --git a/managed/services/management/backup/mock_pbm_pitr_service_test.go b/managed/services/management/backup/mock_pbm_pitr_service_test.go index aa853c4746..96b8309fec 100644 --- a/managed/services/management/backup/mock_pbm_pitr_service_test.go +++ b/managed/services/management/backup/mock_pbm_pitr_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -20,6 +20,10 @@ type mockPbmPITRService struct { func (_m *mockPbmPITRService) ListPITRTimeranges(ctx context.Context, locationClient servicesbackup.Storage, location *models.BackupLocation, artifact *models.Artifact) ([]servicesbackup.Timeline, error) { ret := _m.Called(ctx, locationClient, location, artifact) + if len(ret) == 0 { + panic("no return value specified for ListPITRTimeranges") + } + var r0 []servicesbackup.Timeline var r1 error if rf, ok := ret.Get(0).(func(context.Context, servicesbackup.Storage, *models.BackupLocation, *models.Artifact) ([]servicesbackup.Timeline, error)); ok { diff --git a/managed/services/management/backup/mock_removal_service_test.go b/managed/services/management/backup/mock_removal_service_test.go index 84786c689c..e165ffd4a2 100644 --- a/managed/services/management/backup/mock_removal_service_test.go +++ b/managed/services/management/backup/mock_removal_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -17,6 +17,10 @@ type mockRemovalService struct { func (_m *mockRemovalService) DeleteArtifact(storage servicesbackup.Storage, artifactID string, removeFiles bool) error { ret := _m.Called(storage, artifactID, removeFiles) + if len(ret) == 0 { + panic("no return value specified for DeleteArtifact") + } + var r0 error if rf, ok := ret.Get(0).(func(servicesbackup.Storage, string, bool) error); ok { r0 = rf(storage, artifactID, removeFiles) diff --git a/managed/services/management/backup/mock_schedule_service_test.go b/managed/services/management/backup/mock_schedule_service_test.go index e85951c13f..c92dd3f981 100644 --- a/managed/services/management/backup/mock_schedule_service_test.go +++ b/managed/services/management/backup/mock_schedule_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package backup @@ -20,6 +20,10 @@ type mockScheduleService struct { func (_m *mockScheduleService) Add(task scheduler.Task, params scheduler.AddParams) (*models.ScheduledTask, error) { ret := _m.Called(task, params) + if len(ret) == 0 { + panic("no return value specified for Add") + } + var r0 *models.ScheduledTask var r1 error if rf, ok := ret.Get(0).(func(scheduler.Task, scheduler.AddParams) (*models.ScheduledTask, error)); ok { @@ -46,6 +50,10 @@ func (_m *mockScheduleService) Add(task scheduler.Task, params scheduler.AddPara func (_m *mockScheduleService) Remove(id string) error { ret := _m.Called(id) + if len(ret) == 0 { + panic("no return value specified for Remove") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(id) @@ -65,6 +73,10 @@ func (_m *mockScheduleService) Run(ctx context.Context) { func (_m *mockScheduleService) Update(id string, params models.ChangeScheduledTaskParams) error { ret := _m.Called(id, params) + if len(ret) == 0 { + panic("no return value specified for Update") + } + var r0 error if rf, ok := ret.Get(0).(func(string, models.ChangeScheduledTaskParams) error); ok { r0 = rf(id, params) diff --git a/managed/services/management/dbaas/mock_components_service_test.go b/managed/services/management/dbaas/mock_components_service_test.go index 37b3f231a6..781f5084a5 100644 --- a/managed/services/management/dbaas/mock_components_service_test.go +++ b/managed/services/management/dbaas/mock_components_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package dbaas @@ -19,6 +19,10 @@ type mockComponentsService struct { func (_m *mockComponentsService) ChangePSMDBComponents(_a0 context.Context, _a1 *dbaasv1beta1.ChangePSMDBComponentsRequest) (*dbaasv1beta1.ChangePSMDBComponentsResponse, error) { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for ChangePSMDBComponents") + } + var r0 *dbaasv1beta1.ChangePSMDBComponentsResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *dbaasv1beta1.ChangePSMDBComponentsRequest) (*dbaasv1beta1.ChangePSMDBComponentsResponse, error)); ok { @@ -45,6 +49,10 @@ func (_m *mockComponentsService) ChangePSMDBComponents(_a0 context.Context, _a1 func (_m *mockComponentsService) ChangePXCComponents(_a0 context.Context, _a1 *dbaasv1beta1.ChangePXCComponentsRequest) (*dbaasv1beta1.ChangePXCComponentsResponse, error) { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for ChangePXCComponents") + } + var r0 *dbaasv1beta1.ChangePXCComponentsResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *dbaasv1beta1.ChangePXCComponentsRequest) (*dbaasv1beta1.ChangePXCComponentsResponse, error)); ok { @@ -71,6 +79,10 @@ func (_m *mockComponentsService) ChangePXCComponents(_a0 context.Context, _a1 *d func (_m *mockComponentsService) CheckForOperatorUpdate(_a0 context.Context, _a1 *dbaasv1beta1.CheckForOperatorUpdateRequest) (*dbaasv1beta1.CheckForOperatorUpdateResponse, error) { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for CheckForOperatorUpdate") + } + var r0 *dbaasv1beta1.CheckForOperatorUpdateResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *dbaasv1beta1.CheckForOperatorUpdateRequest) (*dbaasv1beta1.CheckForOperatorUpdateResponse, error)); ok { @@ -97,6 +109,10 @@ func (_m *mockComponentsService) CheckForOperatorUpdate(_a0 context.Context, _a1 func (_m *mockComponentsService) GetPSMDBComponents(_a0 context.Context, _a1 *dbaasv1beta1.GetPSMDBComponentsRequest) (*dbaasv1beta1.GetPSMDBComponentsResponse, error) { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for GetPSMDBComponents") + } + var r0 *dbaasv1beta1.GetPSMDBComponentsResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *dbaasv1beta1.GetPSMDBComponentsRequest) (*dbaasv1beta1.GetPSMDBComponentsResponse, error)); ok { @@ -123,6 +139,10 @@ func (_m *mockComponentsService) GetPSMDBComponents(_a0 context.Context, _a1 *db func (_m *mockComponentsService) GetPXCComponents(_a0 context.Context, _a1 *dbaasv1beta1.GetPXCComponentsRequest) (*dbaasv1beta1.GetPXCComponentsResponse, error) { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for GetPXCComponents") + } + var r0 *dbaasv1beta1.GetPXCComponentsResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *dbaasv1beta1.GetPXCComponentsRequest) (*dbaasv1beta1.GetPXCComponentsResponse, error)); ok { @@ -149,6 +169,10 @@ func (_m *mockComponentsService) GetPXCComponents(_a0 context.Context, _a1 *dbaa func (_m *mockComponentsService) InstallOperator(_a0 context.Context, _a1 *dbaasv1beta1.InstallOperatorRequest) (*dbaasv1beta1.InstallOperatorResponse, error) { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for InstallOperator") + } + var r0 *dbaasv1beta1.InstallOperatorResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *dbaasv1beta1.InstallOperatorRequest) (*dbaasv1beta1.InstallOperatorResponse, error)); ok { diff --git a/managed/services/management/dbaas/mock_dbaas_client_test.go b/managed/services/management/dbaas/mock_dbaas_client_test.go index e4f9f4162d..da1bd160f8 100644 --- a/managed/services/management/dbaas/mock_dbaas_client_test.go +++ b/managed/services/management/dbaas/mock_dbaas_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package dbaas @@ -19,6 +19,10 @@ type mockDbaasClient struct { func (_m *mockDbaasClient) Connect(ctx context.Context) error { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for Connect") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context) error); ok { r0 = rf(ctx) @@ -33,6 +37,10 @@ func (_m *mockDbaasClient) Connect(ctx context.Context) error { func (_m *mockDbaasClient) Disconnect() error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Disconnect") + } + var r0 error if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() @@ -54,6 +62,10 @@ func (_m *mockDbaasClient) GetKubeConfig(ctx context.Context, in *controllerv1be _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for GetKubeConfig") + } + var r0 *controllerv1beta1.GetKubeconfigResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *controllerv1beta1.GetKubeconfigRequest, ...grpc.CallOption) (*controllerv1beta1.GetKubeconfigResponse, error)); ok { @@ -87,6 +99,10 @@ func (_m *mockDbaasClient) GetLogs(ctx context.Context, in *controllerv1beta1.Ge _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for GetLogs") + } + var r0 *controllerv1beta1.GetLogsResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *controllerv1beta1.GetLogsRequest, ...grpc.CallOption) (*controllerv1beta1.GetLogsResponse, error)); ok { @@ -120,6 +136,10 @@ func (_m *mockDbaasClient) GetResources(ctx context.Context, in *controllerv1bet _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for GetResources") + } + var r0 *controllerv1beta1.GetResourcesResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *controllerv1beta1.GetResourcesRequest, ...grpc.CallOption) (*controllerv1beta1.GetResourcesResponse, error)); ok { @@ -153,6 +173,10 @@ func (_m *mockDbaasClient) InstallPSMDBOperator(ctx context.Context, in *control _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for InstallPSMDBOperator") + } + var r0 *controllerv1beta1.InstallPSMDBOperatorResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *controllerv1beta1.InstallPSMDBOperatorRequest, ...grpc.CallOption) (*controllerv1beta1.InstallPSMDBOperatorResponse, error)); ok { @@ -186,6 +210,10 @@ func (_m *mockDbaasClient) InstallPXCOperator(ctx context.Context, in *controlle _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for InstallPXCOperator") + } + var r0 *controllerv1beta1.InstallPXCOperatorResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *controllerv1beta1.InstallPXCOperatorRequest, ...grpc.CallOption) (*controllerv1beta1.InstallPXCOperatorResponse, error)); ok { @@ -219,6 +247,10 @@ func (_m *mockDbaasClient) StartMonitoring(ctx context.Context, in *controllerv1 _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for StartMonitoring") + } + var r0 *controllerv1beta1.StartMonitoringResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *controllerv1beta1.StartMonitoringRequest, ...grpc.CallOption) (*controllerv1beta1.StartMonitoringResponse, error)); ok { @@ -252,6 +284,10 @@ func (_m *mockDbaasClient) StopMonitoring(ctx context.Context, in *controllerv1b _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for StopMonitoring") + } + var r0 *controllerv1beta1.StopMonitoringResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *controllerv1beta1.StopMonitoringRequest, ...grpc.CallOption) (*controllerv1beta1.StopMonitoringResponse, error)); ok { diff --git a/managed/services/management/dbaas/mock_grafana_client_test.go b/managed/services/management/dbaas/mock_grafana_client_test.go index 0f4e05622c..dd40fd82b2 100644 --- a/managed/services/management/dbaas/mock_grafana_client_test.go +++ b/managed/services/management/dbaas/mock_grafana_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package dbaas @@ -17,6 +17,10 @@ type mockGrafanaClient struct { func (_m *mockGrafanaClient) CreateAdminAPIKey(ctx context.Context, name string) (int64, string, error) { ret := _m.Called(ctx, name) + if len(ret) == 0 { + panic("no return value specified for CreateAdminAPIKey") + } + var r0 int64 var r1 string var r2 error @@ -48,6 +52,10 @@ func (_m *mockGrafanaClient) CreateAdminAPIKey(ctx context.Context, name string) func (_m *mockGrafanaClient) DeleteAPIKeyByID(ctx context.Context, id int64) error { ret := _m.Called(ctx, id) + if len(ret) == 0 { + panic("no return value specified for DeleteAPIKeyByID") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, int64) error); ok { r0 = rf(ctx, id) @@ -62,6 +70,10 @@ func (_m *mockGrafanaClient) DeleteAPIKeyByID(ctx context.Context, id int64) err func (_m *mockGrafanaClient) DeleteAPIKeysWithPrefix(ctx context.Context, name string) error { ret := _m.Called(ctx, name) + if len(ret) == 0 { + panic("no return value specified for DeleteAPIKeysWithPrefix") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string) error); ok { r0 = rf(ctx, name) diff --git a/managed/services/management/dbaas/mock_kube_storage_manager_test.go b/managed/services/management/dbaas/mock_kube_storage_manager_test.go index 82b07583e1..c5300a7f53 100644 --- a/managed/services/management/dbaas/mock_kube_storage_manager_test.go +++ b/managed/services/management/dbaas/mock_kube_storage_manager_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package dbaas @@ -13,6 +13,10 @@ type mockKubeStorageManager struct { func (_m *mockKubeStorageManager) DeleteClient(name string) error { ret := _m.Called(name) + if len(ret) == 0 { + panic("no return value specified for DeleteClient") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(name) @@ -27,6 +31,10 @@ func (_m *mockKubeStorageManager) DeleteClient(name string) error { func (_m *mockKubeStorageManager) GetOrSetClient(name string) (kubernetesClient, error) { ret := _m.Called(name) + if len(ret) == 0 { + panic("no return value specified for GetOrSetClient") + } + var r0 kubernetesClient var r1 error if rf, ok := ret.Get(0).(func(string) (kubernetesClient, error)); ok { diff --git a/managed/services/management/dbaas/mock_kubernetes_client_test.go b/managed/services/management/dbaas/mock_kubernetes_client_test.go index 8cd32a79ef..18eb140f70 100644 --- a/managed/services/management/dbaas/mock_kubernetes_client_test.go +++ b/managed/services/management/dbaas/mock_kubernetes_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package dbaas @@ -25,6 +25,10 @@ type mockKubernetesClient struct { func (_m *mockKubernetesClient) CreateDatabaseCluster(_a0 *v1.DatabaseCluster) error { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for CreateDatabaseCluster") + } + var r0 error if rf, ok := ret.Get(0).(func(*v1.DatabaseCluster) error); ok { r0 = rf(_a0) @@ -39,6 +43,10 @@ func (_m *mockKubernetesClient) CreateDatabaseCluster(_a0 *v1.DatabaseCluster) e func (_m *mockKubernetesClient) CreatePMMSecret(_a0 string, _a1 map[string][]byte) error { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for CreatePMMSecret") + } + var r0 error if rf, ok := ret.Get(0).(func(string, map[string][]byte) error); ok { r0 = rf(_a0, _a1) @@ -53,6 +61,10 @@ func (_m *mockKubernetesClient) CreatePMMSecret(_a0 string, _a1 map[string][]byt func (_m *mockKubernetesClient) CreateRestore(_a0 *v1.DatabaseClusterRestore) error { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for CreateRestore") + } + var r0 error if rf, ok := ret.Get(0).(func(*v1.DatabaseClusterRestore) error); ok { r0 = rf(_a0) @@ -67,6 +79,10 @@ func (_m *mockKubernetesClient) CreateRestore(_a0 *v1.DatabaseClusterRestore) er func (_m *mockKubernetesClient) DeleteDatabaseCluster(_a0 context.Context, _a1 string) error { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for DeleteDatabaseCluster") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string) error); ok { r0 = rf(_a0, _a1) @@ -81,6 +97,10 @@ func (_m *mockKubernetesClient) DeleteDatabaseCluster(_a0 context.Context, _a1 s func (_m *mockKubernetesClient) GetAllClusterResources(_a0 context.Context, _a1 kubernetes.ClusterType, _a2 *corev1.PersistentVolumeList) (uint64, uint64, uint64, error) { ret := _m.Called(_a0, _a1, _a2) + if len(ret) == 0 { + panic("no return value specified for GetAllClusterResources") + } + var r0 uint64 var r1 uint64 var r2 uint64 @@ -119,6 +139,10 @@ func (_m *mockKubernetesClient) GetAllClusterResources(_a0 context.Context, _a1 func (_m *mockKubernetesClient) GetClusterType(_a0 context.Context) (kubernetes.ClusterType, error) { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for GetClusterType") + } + var r0 kubernetes.ClusterType var r1 error if rf, ok := ret.Get(0).(func(context.Context) (kubernetes.ClusterType, error)); ok { @@ -143,6 +167,10 @@ func (_m *mockKubernetesClient) GetClusterType(_a0 context.Context) (kubernetes. func (_m *mockKubernetesClient) GetConsumedCPUAndMemory(_a0 context.Context, _a1 string) (uint64, uint64, error) { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for GetConsumedCPUAndMemory") + } + var r0 uint64 var r1 uint64 var r2 error @@ -174,6 +202,10 @@ func (_m *mockKubernetesClient) GetConsumedCPUAndMemory(_a0 context.Context, _a1 func (_m *mockKubernetesClient) GetConsumedDiskBytes(_a0 context.Context, _a1 kubernetes.ClusterType, _a2 *corev1.PersistentVolumeList) (uint64, error) { ret := _m.Called(_a0, _a1, _a2) + if len(ret) == 0 { + panic("no return value specified for GetConsumedDiskBytes") + } + var r0 uint64 var r1 error if rf, ok := ret.Get(0).(func(context.Context, kubernetes.ClusterType, *corev1.PersistentVolumeList) (uint64, error)); ok { @@ -198,6 +230,10 @@ func (_m *mockKubernetesClient) GetConsumedDiskBytes(_a0 context.Context, _a1 ku func (_m *mockKubernetesClient) GetDatabaseCluster(_a0 context.Context, _a1 string) (*v1.DatabaseCluster, error) { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for GetDatabaseCluster") + } + var r0 *v1.DatabaseCluster var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (*v1.DatabaseCluster, error)); ok { @@ -224,6 +260,10 @@ func (_m *mockKubernetesClient) GetDatabaseCluster(_a0 context.Context, _a1 stri func (_m *mockKubernetesClient) GetDefaultStorageClassName(_a0 context.Context) (string, error) { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for GetDefaultStorageClassName") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context) (string, error)); ok { @@ -248,6 +288,10 @@ func (_m *mockKubernetesClient) GetDefaultStorageClassName(_a0 context.Context) func (_m *mockKubernetesClient) GetPSMDBOperatorVersion(_a0 context.Context) (string, error) { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for GetPSMDBOperatorVersion") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context) (string, error)); ok { @@ -272,6 +316,10 @@ func (_m *mockKubernetesClient) GetPSMDBOperatorVersion(_a0 context.Context) (st func (_m *mockKubernetesClient) GetPXCOperatorVersion(_a0 context.Context) (string, error) { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for GetPXCOperatorVersion") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context) (string, error)); ok { @@ -296,6 +344,10 @@ func (_m *mockKubernetesClient) GetPXCOperatorVersion(_a0 context.Context) (stri func (_m *mockKubernetesClient) GetPersistentVolumes(ctx context.Context) (*corev1.PersistentVolumeList, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for GetPersistentVolumes") + } + var r0 *corev1.PersistentVolumeList var r1 error if rf, ok := ret.Get(0).(func(context.Context) (*corev1.PersistentVolumeList, error)); ok { @@ -322,6 +374,10 @@ func (_m *mockKubernetesClient) GetPersistentVolumes(ctx context.Context) (*core func (_m *mockKubernetesClient) GetSecret(_a0 context.Context, _a1 string) (*corev1.Secret, error) { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for GetSecret") + } + var r0 *corev1.Secret var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (*corev1.Secret, error)); ok { @@ -348,6 +404,10 @@ func (_m *mockKubernetesClient) GetSecret(_a0 context.Context, _a1 string) (*cor func (_m *mockKubernetesClient) GetServerVersion() (*version.Info, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetServerVersion") + } + var r0 *version.Info var r1 error if rf, ok := ret.Get(0).(func() (*version.Info, error)); ok { @@ -374,6 +434,10 @@ func (_m *mockKubernetesClient) GetServerVersion() (*version.Info, error) { func (_m *mockKubernetesClient) GetStorageClasses(ctx context.Context) (*storagev1.StorageClassList, error) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for GetStorageClasses") + } + var r0 *storagev1.StorageClassList var r1 error if rf, ok := ret.Get(0).(func(context.Context) (*storagev1.StorageClassList, error)); ok { @@ -400,6 +464,10 @@ func (_m *mockKubernetesClient) GetStorageClasses(ctx context.Context) (*storage func (_m *mockKubernetesClient) InstallOLMOperator(ctx context.Context) error { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for InstallOLMOperator") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context) error); ok { r0 = rf(ctx) @@ -414,6 +482,10 @@ func (_m *mockKubernetesClient) InstallOLMOperator(ctx context.Context) error { func (_m *mockKubernetesClient) InstallOperator(ctx context.Context, req kubernetes.InstallOperatorRequest) error { ret := _m.Called(ctx, req) + if len(ret) == 0 { + panic("no return value specified for InstallOperator") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, kubernetes.InstallOperatorRequest) error); ok { r0 = rf(ctx, req) @@ -428,6 +500,10 @@ func (_m *mockKubernetesClient) InstallOperator(ctx context.Context, req kuberne func (_m *mockKubernetesClient) ListDatabaseClusters(_a0 context.Context) (*v1.DatabaseClusterList, error) { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for ListDatabaseClusters") + } + var r0 *v1.DatabaseClusterList var r1 error if rf, ok := ret.Get(0).(func(context.Context) (*v1.DatabaseClusterList, error)); ok { @@ -454,6 +530,10 @@ func (_m *mockKubernetesClient) ListDatabaseClusters(_a0 context.Context) (*v1.D func (_m *mockKubernetesClient) ListSecrets(_a0 context.Context) (*corev1.SecretList, error) { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for ListSecrets") + } + var r0 *corev1.SecretList var r1 error if rf, ok := ret.Get(0).(func(context.Context) (*corev1.SecretList, error)); ok { @@ -480,6 +560,10 @@ func (_m *mockKubernetesClient) ListSecrets(_a0 context.Context) (*corev1.Secret func (_m *mockKubernetesClient) ListSubscriptions(ctx context.Context, namespace string) (*v1alpha1.SubscriptionList, error) { ret := _m.Called(ctx, namespace) + if len(ret) == 0 { + panic("no return value specified for ListSubscriptions") + } + var r0 *v1alpha1.SubscriptionList var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (*v1alpha1.SubscriptionList, error)); ok { @@ -506,6 +590,10 @@ func (_m *mockKubernetesClient) ListSubscriptions(ctx context.Context, namespace func (_m *mockKubernetesClient) ListTemplates(ctx context.Context, engine string, namespace string) ([]*dbaasv1beta1.Template, error) { ret := _m.Called(ctx, engine, namespace) + if len(ret) == 0 { + panic("no return value specified for ListTemplates") + } + var r0 []*dbaasv1beta1.Template var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string) ([]*dbaasv1beta1.Template, error)); ok { @@ -532,6 +620,10 @@ func (_m *mockKubernetesClient) ListTemplates(ctx context.Context, engine string func (_m *mockKubernetesClient) PatchDatabaseCluster(_a0 *v1.DatabaseCluster) error { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for PatchDatabaseCluster") + } + var r0 error if rf, ok := ret.Get(0).(func(*v1.DatabaseCluster) error); ok { r0 = rf(_a0) @@ -546,6 +638,10 @@ func (_m *mockKubernetesClient) PatchDatabaseCluster(_a0 *v1.DatabaseCluster) er func (_m *mockKubernetesClient) RestartDatabaseCluster(_a0 context.Context, _a1 string) error { ret := _m.Called(_a0, _a1) + if len(ret) == 0 { + panic("no return value specified for RestartDatabaseCluster") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string) error); ok { r0 = rf(_a0, _a1) @@ -560,6 +656,10 @@ func (_m *mockKubernetesClient) RestartDatabaseCluster(_a0 context.Context, _a1 func (_m *mockKubernetesClient) SetKubeconfig(_a0 string) error { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for SetKubeconfig") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(_a0) @@ -574,6 +674,10 @@ func (_m *mockKubernetesClient) SetKubeconfig(_a0 string) error { func (_m *mockKubernetesClient) UpgradeOperator(ctx context.Context, namespace string, name string) error { ret := _m.Called(ctx, namespace, name) + if len(ret) == 0 { + panic("no return value specified for UpgradeOperator") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok { r0 = rf(ctx, namespace, name) diff --git a/managed/services/management/dbaas/mock_version_service_test.go b/managed/services/management/dbaas/mock_version_service_test.go index 5b6b387f8f..dff5c5d1af 100644 --- a/managed/services/management/dbaas/mock_version_service_test.go +++ b/managed/services/management/dbaas/mock_version_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package dbaas @@ -18,6 +18,10 @@ type mockVersionService struct { func (_m *mockVersionService) GetNextDatabaseImage(ctx context.Context, operatorType string, operatorVersion string, installedDBVersion string) (string, error) { ret := _m.Called(ctx, operatorType, operatorVersion, installedDBVersion) + if len(ret) == 0 { + panic("no return value specified for GetNextDatabaseImage") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string) (string, error)); ok { @@ -42,6 +46,10 @@ func (_m *mockVersionService) GetNextDatabaseImage(ctx context.Context, operator func (_m *mockVersionService) GetVersionServiceURL() string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetVersionServiceURL") + } + var r0 string if rf, ok := ret.Get(0).(func() string); ok { r0 = rf() @@ -56,6 +64,10 @@ func (_m *mockVersionService) GetVersionServiceURL() string { func (_m *mockVersionService) IsDatabaseVersionSupportedByOperator(ctx context.Context, operatorType string, operatorVersion string, databaseVersion string) (bool, error) { ret := _m.Called(ctx, operatorType, operatorVersion, databaseVersion) + if len(ret) == 0 { + panic("no return value specified for IsDatabaseVersionSupportedByOperator") + } + var r0 bool var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string, string) (bool, error)); ok { @@ -80,6 +92,10 @@ func (_m *mockVersionService) IsDatabaseVersionSupportedByOperator(ctx context.C func (_m *mockVersionService) LatestOperatorVersion(ctx context.Context, pmmVersion string) (*version.Version, *version.Version, error) { ret := _m.Called(ctx, pmmVersion) + if len(ret) == 0 { + panic("no return value specified for LatestOperatorVersion") + } + var r0 *version.Version var r1 *version.Version var r2 error @@ -115,6 +131,10 @@ func (_m *mockVersionService) LatestOperatorVersion(ctx context.Context, pmmVers func (_m *mockVersionService) Matrix(ctx context.Context, params componentsParams) (*VersionServiceResponse, error) { ret := _m.Called(ctx, params) + if len(ret) == 0 { + panic("no return value specified for Matrix") + } + var r0 *VersionServiceResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, componentsParams) (*VersionServiceResponse, error)); ok { @@ -141,6 +161,10 @@ func (_m *mockVersionService) Matrix(ctx context.Context, params componentsParam func (_m *mockVersionService) NextOperatorVersion(ctx context.Context, operatorType string, installedVersion string) (*version.Version, error) { ret := _m.Called(ctx, operatorType, installedVersion) + if len(ret) == 0 { + panic("no return value specified for NextOperatorVersion") + } + var r0 *version.Version var r1 error if rf, ok := ret.Get(0).(func(context.Context, string, string) (*version.Version, error)); ok { @@ -167,6 +191,10 @@ func (_m *mockVersionService) NextOperatorVersion(ctx context.Context, operatorT func (_m *mockVersionService) SupportedOperatorVersionsList(ctx context.Context, pmmVersion string) (map[string][]string, error) { ret := _m.Called(ctx, pmmVersion) + if len(ret) == 0 { + panic("no return value specified for SupportedOperatorVersionsList") + } + var r0 map[string][]string var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) (map[string][]string, error)); ok { diff --git a/managed/services/management/dump/mock_dump_service_test.go b/managed/services/management/dump/mock_dump_service_test.go index 051bfa8db8..fedf81e426 100644 --- a/managed/services/management/dump/mock_dump_service_test.go +++ b/managed/services/management/dump/mock_dump_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package dump @@ -17,6 +17,10 @@ type mockDumpService struct { func (_m *mockDumpService) DeleteDump(dumpID string) error { ret := _m.Called(dumpID) + if len(ret) == 0 { + panic("no return value specified for DeleteDump") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(dumpID) @@ -31,6 +35,10 @@ func (_m *mockDumpService) DeleteDump(dumpID string) error { func (_m *mockDumpService) GetFilePathsForDumps(dumpIDs []string) (map[string]string, error) { ret := _m.Called(dumpIDs) + if len(ret) == 0 { + panic("no return value specified for GetFilePathsForDumps") + } + var r0 map[string]string var r1 error if rf, ok := ret.Get(0).(func([]string) (map[string]string, error)); ok { @@ -57,6 +65,10 @@ func (_m *mockDumpService) GetFilePathsForDumps(dumpIDs []string) (map[string]st func (_m *mockDumpService) StartDump(params *servicesdump.Params) (string, error) { ret := _m.Called(params) + if len(ret) == 0 { + panic("no return value specified for StartDump") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(*servicesdump.Params) (string, error)); ok { diff --git a/managed/services/management/ia/mock_alert_manager_test.go b/managed/services/management/ia/mock_alert_manager_test.go index 6860754429..69d37d4a86 100644 --- a/managed/services/management/ia/mock_alert_manager_test.go +++ b/managed/services/management/ia/mock_alert_manager_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package ia @@ -20,6 +20,10 @@ type mockAlertManager struct { func (_m *mockAlertManager) FindAlertsByID(ctx context.Context, params *services.FilterParams, ids []string) ([]*ammodels.GettableAlert, error) { ret := _m.Called(ctx, params, ids) + if len(ret) == 0 { + panic("no return value specified for FindAlertsByID") + } + var r0 []*ammodels.GettableAlert var r1 error if rf, ok := ret.Get(0).(func(context.Context, *services.FilterParams, []string) ([]*ammodels.GettableAlert, error)); ok { @@ -46,6 +50,10 @@ func (_m *mockAlertManager) FindAlertsByID(ctx context.Context, params *services func (_m *mockAlertManager) GetAlerts(ctx context.Context, params *services.FilterParams) ([]*ammodels.GettableAlert, error) { ret := _m.Called(ctx, params) + if len(ret) == 0 { + panic("no return value specified for GetAlerts") + } + var r0 []*ammodels.GettableAlert var r1 error if rf, ok := ret.Get(0).(func(context.Context, *services.FilterParams) ([]*ammodels.GettableAlert, error)); ok { @@ -77,6 +85,10 @@ func (_m *mockAlertManager) RequestConfigurationUpdate() { func (_m *mockAlertManager) SilenceAlerts(ctx context.Context, alerts []*ammodels.GettableAlert) error { ret := _m.Called(ctx, alerts) + if len(ret) == 0 { + panic("no return value specified for SilenceAlerts") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, []*ammodels.GettableAlert) error); ok { r0 = rf(ctx, alerts) @@ -91,6 +103,10 @@ func (_m *mockAlertManager) SilenceAlerts(ctx context.Context, alerts []*ammodel func (_m *mockAlertManager) UnsilenceAlerts(ctx context.Context, alerts []*ammodels.GettableAlert) error { ret := _m.Called(ctx, alerts) + if len(ret) == 0 { + panic("no return value specified for UnsilenceAlerts") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, []*ammodels.GettableAlert) error); ok { r0 = rf(ctx, alerts) diff --git a/managed/services/management/ia/mock_templates_service_test.go b/managed/services/management/ia/mock_templates_service_test.go index 96279fdd8c..f65fc87009 100644 --- a/managed/services/management/ia/mock_templates_service_test.go +++ b/managed/services/management/ia/mock_templates_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package ia @@ -17,6 +17,10 @@ type mockTemplatesService struct { func (_m *mockTemplatesService) GetTemplates() map[string]models.Template { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetTemplates") + } + var r0 map[string]models.Template if rf, ok := ret.Get(0).(func() map[string]models.Template); ok { r0 = rf() diff --git a/managed/services/management/ia/mock_vm_alert_test.go b/managed/services/management/ia/mock_vm_alert_test.go index 192f27e333..e4c6503d87 100644 --- a/managed/services/management/ia/mock_vm_alert_test.go +++ b/managed/services/management/ia/mock_vm_alert_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package ia diff --git a/managed/services/management/mock_agents_registry_test.go b/managed/services/management/mock_agents_registry_test.go index 2432241b46..f236ad096c 100644 --- a/managed/services/management/mock_agents_registry_test.go +++ b/managed/services/management/mock_agents_registry_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management @@ -17,6 +17,10 @@ type mockAgentsRegistry struct { func (_m *mockAgentsRegistry) IsConnected(pmmAgentID string) bool { ret := _m.Called(pmmAgentID) + if len(ret) == 0 { + panic("no return value specified for IsConnected") + } + var r0 bool if rf, ok := ret.Get(0).(func(string) bool); ok { r0 = rf(pmmAgentID) diff --git a/managed/services/management/mock_agents_state_updater_test.go b/managed/services/management/mock_agents_state_updater_test.go index a4b409e07c..25905e3945 100644 --- a/managed/services/management/mock_agents_state_updater_test.go +++ b/managed/services/management/mock_agents_state_updater_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management diff --git a/managed/services/management/mock_api_key_provider_test.go b/managed/services/management/mock_api_key_provider_test.go index b85f9fc04c..ef91fa18e4 100644 --- a/managed/services/management/mock_api_key_provider_test.go +++ b/managed/services/management/mock_api_key_provider_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management @@ -18,6 +18,10 @@ type mockApiKeyProvider struct { func (_m *mockApiKeyProvider) CreateAdminAPIKey(ctx context.Context, name string) (int64, string, error) { ret := _m.Called(ctx, name) + if len(ret) == 0 { + panic("no return value specified for CreateAdminAPIKey") + } + var r0 int64 var r1 string var r2 error @@ -49,6 +53,10 @@ func (_m *mockApiKeyProvider) CreateAdminAPIKey(ctx context.Context, name string func (_m *mockApiKeyProvider) IsAPIKeyAuth(headers http.Header) bool { ret := _m.Called(headers) + if len(ret) == 0 { + panic("no return value specified for IsAPIKeyAuth") + } + var r0 bool if rf, ok := ret.Get(0).(func(http.Header) bool); ok { r0 = rf(headers) diff --git a/managed/services/management/mock_checks_service_test.go b/managed/services/management/mock_checks_service_test.go index f6e0f6a91a..3723a54db9 100644 --- a/managed/services/management/mock_checks_service_test.go +++ b/managed/services/management/mock_checks_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management @@ -20,6 +20,10 @@ type mockChecksService struct { func (_m *mockChecksService) ChangeInterval(params map[string]check.Interval) error { ret := _m.Called(params) + if len(ret) == 0 { + panic("no return value specified for ChangeInterval") + } + var r0 error if rf, ok := ret.Get(0).(func(map[string]check.Interval) error); ok { r0 = rf(params) @@ -34,6 +38,10 @@ func (_m *mockChecksService) ChangeInterval(params map[string]check.Interval) er func (_m *mockChecksService) DisableChecks(checkNames []string) error { ret := _m.Called(checkNames) + if len(ret) == 0 { + panic("no return value specified for DisableChecks") + } + var r0 error if rf, ok := ret.Get(0).(func([]string) error); ok { r0 = rf(checkNames) @@ -48,6 +56,10 @@ func (_m *mockChecksService) DisableChecks(checkNames []string) error { func (_m *mockChecksService) EnableChecks(checkNames []string) error { ret := _m.Called(checkNames) + if len(ret) == 0 { + panic("no return value specified for EnableChecks") + } + var r0 error if rf, ok := ret.Get(0).(func([]string) error); ok { r0 = rf(checkNames) @@ -62,6 +74,10 @@ func (_m *mockChecksService) EnableChecks(checkNames []string) error { func (_m *mockChecksService) GetAdvisors() ([]check.Advisor, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetAdvisors") + } + var r0 []check.Advisor var r1 error if rf, ok := ret.Get(0).(func() ([]check.Advisor, error)); ok { @@ -88,6 +104,10 @@ func (_m *mockChecksService) GetAdvisors() ([]check.Advisor, error) { func (_m *mockChecksService) GetChecks() (map[string]check.Check, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetChecks") + } + var r0 map[string]check.Check var r1 error if rf, ok := ret.Get(0).(func() (map[string]check.Check, error)); ok { @@ -114,6 +134,10 @@ func (_m *mockChecksService) GetChecks() (map[string]check.Check, error) { func (_m *mockChecksService) GetChecksResults(ctx context.Context, serviceID string) ([]services.CheckResult, error) { ret := _m.Called(ctx, serviceID) + if len(ret) == 0 { + panic("no return value specified for GetChecksResults") + } + var r0 []services.CheckResult var r1 error if rf, ok := ret.Get(0).(func(context.Context, string) ([]services.CheckResult, error)); ok { @@ -140,6 +164,10 @@ func (_m *mockChecksService) GetChecksResults(ctx context.Context, serviceID str func (_m *mockChecksService) GetDisabledChecks() ([]string, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetDisabledChecks") + } + var r0 []string var r1 error if rf, ok := ret.Get(0).(func() ([]string, error)); ok { @@ -166,6 +194,10 @@ func (_m *mockChecksService) GetDisabledChecks() ([]string, error) { func (_m *mockChecksService) GetSecurityCheckResults() ([]services.CheckResult, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetSecurityCheckResults") + } + var r0 []services.CheckResult var r1 error if rf, ok := ret.Get(0).(func() ([]services.CheckResult, error)); ok { @@ -192,6 +224,10 @@ func (_m *mockChecksService) GetSecurityCheckResults() ([]services.CheckResult, func (_m *mockChecksService) StartChecks(checkNames []string) error { ret := _m.Called(checkNames) + if len(ret) == 0 { + panic("no return value specified for StartChecks") + } + var r0 error if rf, ok := ret.Get(0).(func([]string) error); ok { r0 = rf(checkNames) diff --git a/managed/services/management/mock_connection_checker_test.go b/managed/services/management/mock_connection_checker_test.go index dd82f7775f..ed986d8f9f 100644 --- a/managed/services/management/mock_connection_checker_test.go +++ b/managed/services/management/mock_connection_checker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management @@ -20,6 +20,10 @@ type mockConnectionChecker struct { func (_m *mockConnectionChecker) CheckConnectionToService(ctx context.Context, q *reform.Querier, service *models.Service, agent *models.Agent) error { ret := _m.Called(ctx, q, service, agent) + if len(ret) == 0 { + panic("no return value specified for CheckConnectionToService") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, *reform.Querier, *models.Service, *models.Agent) error); ok { r0 = rf(ctx, q, service, agent) diff --git a/managed/services/management/mock_grafana_client_test.go b/managed/services/management/mock_grafana_client_test.go index c7c14095e6..3dcb1c4198 100644 --- a/managed/services/management/mock_grafana_client_test.go +++ b/managed/services/management/mock_grafana_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management @@ -18,6 +18,10 @@ type mockGrafanaClient struct { func (_m *mockGrafanaClient) CreateAnnotation(_a0 context.Context, _a1 []string, _a2 time.Time, _a3 string, _a4 string) (string, error) { ret := _m.Called(_a0, _a1, _a2, _a3, _a4) + if len(ret) == 0 { + panic("no return value specified for CreateAnnotation") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, []string, time.Time, string, string) (string, error)); ok { diff --git a/managed/services/management/mock_jobs_service_test.go b/managed/services/management/mock_jobs_service_test.go index 51f1f55ade..0b08f85e95 100644 --- a/managed/services/management/mock_jobs_service_test.go +++ b/managed/services/management/mock_jobs_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management @@ -13,6 +13,10 @@ type mockJobsService struct { func (_m *mockJobsService) StopJob(jobID string) error { ret := _m.Called(jobID) + if len(ret) == 0 { + panic("no return value specified for StopJob") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(jobID) diff --git a/managed/services/management/mock_prometheus_service_test.go b/managed/services/management/mock_prometheus_service_test.go index 3a4447fe25..5112b1ebf7 100644 --- a/managed/services/management/mock_prometheus_service_test.go +++ b/managed/services/management/mock_prometheus_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management diff --git a/managed/services/management/mock_service_info_broker_test.go b/managed/services/management/mock_service_info_broker_test.go index c626e893d4..d352cae39d 100644 --- a/managed/services/management/mock_service_info_broker_test.go +++ b/managed/services/management/mock_service_info_broker_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management @@ -20,6 +20,10 @@ type mockServiceInfoBroker struct { func (_m *mockServiceInfoBroker) GetInfoFromService(ctx context.Context, q *reform.Querier, service *models.Service, agent *models.Agent) error { ret := _m.Called(ctx, q, service, agent) + if len(ret) == 0 { + panic("no return value specified for GetInfoFromService") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, *reform.Querier, *models.Service, *models.Agent) error); ok { r0 = rf(ctx, q, service, agent) diff --git a/managed/services/management/mock_version_cache_test.go b/managed/services/management/mock_version_cache_test.go index bc45f23e4f..3bd020e457 100644 --- a/managed/services/management/mock_version_cache_test.go +++ b/managed/services/management/mock_version_cache_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management diff --git a/managed/services/management/mock_victoria_metrics_client_test.go b/managed/services/management/mock_victoria_metrics_client_test.go index b19d56ef8b..89fa8b67b0 100644 --- a/managed/services/management/mock_victoria_metrics_client_test.go +++ b/managed/services/management/mock_victoria_metrics_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package management @@ -27,6 +27,10 @@ func (_m *mockVictoriaMetricsClient) Query(ctx context.Context, query string, ts _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for Query") + } + var r0 model.Value var r1 v1.Warnings var r2 error diff --git a/managed/services/qan/mock_qan_collector_client_test.go b/managed/services/qan/mock_qan_collector_client_test.go index 05f0fa6fb4..0494befc64 100644 --- a/managed/services/qan/mock_qan_collector_client_test.go +++ b/managed/services/qan/mock_qan_collector_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package qan @@ -27,6 +27,10 @@ func (_m *mockQanCollectorClient) Collect(ctx context.Context, in *qanv1beta1.Co _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for Collect") + } + var r0 *qanv1beta1.CollectResponse var r1 error if rf, ok := ret.Get(0).(func(context.Context, *qanv1beta1.CollectRequest, ...grpc.CallOption) (*qanv1beta1.CollectResponse, error)); ok { diff --git a/managed/services/scheduler/mock_backup_service_test.go b/managed/services/scheduler/mock_backup_service_test.go index db100056e9..4e8378e862 100644 --- a/managed/services/scheduler/mock_backup_service_test.go +++ b/managed/services/scheduler/mock_backup_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package scheduler @@ -19,6 +19,10 @@ type mockBackupService struct { func (_m *mockBackupService) PerformBackup(ctx context.Context, params backup.PerformBackupParams) (string, error) { ret := _m.Called(ctx, params) + if len(ret) == 0 { + panic("no return value specified for PerformBackup") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func(context.Context, backup.PerformBackupParams) (string, error)); ok { diff --git a/managed/services/server/mock_agents_state_updater_test.go b/managed/services/server/mock_agents_state_updater_test.go index 9242bd4f73..b33b21a678 100644 --- a/managed/services/server/mock_agents_state_updater_test.go +++ b/managed/services/server/mock_agents_state_updater_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server @@ -17,6 +17,10 @@ type mockAgentsStateUpdater struct { func (_m *mockAgentsStateUpdater) UpdateAgentsState(ctx context.Context) error { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for UpdateAgentsState") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context) error); ok { r0 = rf(ctx) diff --git a/managed/services/server/mock_alertmanager_service_test.go b/managed/services/server/mock_alertmanager_service_test.go index fe2984bd70..2e09cd797d 100644 --- a/managed/services/server/mock_alertmanager_service_test.go +++ b/managed/services/server/mock_alertmanager_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server @@ -17,6 +17,10 @@ type mockAlertmanagerService struct { func (_m *mockAlertmanagerService) IsReady(ctx context.Context) error { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for IsReady") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context) error); ok { r0 = rf(ctx) diff --git a/managed/services/server/mock_checks_service_test.go b/managed/services/server/mock_checks_service_test.go index acb7e72b2a..33e24ab092 100644 --- a/managed/services/server/mock_checks_service_test.go +++ b/managed/services/server/mock_checks_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server @@ -28,6 +28,10 @@ func (_m *mockChecksService) CollectAdvisors(ctx context.Context) { func (_m *mockChecksService) StartChecks(checkNames []string) error { ret := _m.Called(checkNames) + if len(ret) == 0 { + panic("no return value specified for StartChecks") + } + var r0 error if rf, ok := ret.Get(0).(func([]string) error); ok { r0 = rf(checkNames) diff --git a/managed/services/server/mock_emailer_test.go b/managed/services/server/mock_emailer_test.go index 8ac8f95bd9..c64f0d58a8 100644 --- a/managed/services/server/mock_emailer_test.go +++ b/managed/services/server/mock_emailer_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server @@ -19,6 +19,10 @@ type mockEmailer struct { func (_m *mockEmailer) Send(ctx context.Context, settings *models.EmailAlertingSettings, emailTo string) error { ret := _m.Called(ctx, settings, emailTo) + if len(ret) == 0 { + panic("no return value specified for Send") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, *models.EmailAlertingSettings, string) error); ok { r0 = rf(ctx, settings, emailTo) diff --git a/managed/services/server/mock_grafana_client_test.go b/managed/services/server/mock_grafana_client_test.go index f7c18124f2..ea9d5f7495 100644 --- a/managed/services/server/mock_grafana_client_test.go +++ b/managed/services/server/mock_grafana_client_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server @@ -17,6 +17,10 @@ type mockGrafanaClient struct { func (_m *mockGrafanaClient) IsReady(ctx context.Context) error { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for IsReady") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context) error); ok { r0 = rf(ctx) diff --git a/managed/services/server/mock_prometheus_service_test.go b/managed/services/server/mock_prometheus_service_test.go index b11015fc30..3213c9ba77 100644 --- a/managed/services/server/mock_prometheus_service_test.go +++ b/managed/services/server/mock_prometheus_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server @@ -17,6 +17,10 @@ type mockPrometheusService struct { func (_m *mockPrometheusService) IsReady(ctx context.Context) error { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for IsReady") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context) error); ok { r0 = rf(ctx) diff --git a/managed/services/server/mock_rules_service_test.go b/managed/services/server/mock_rules_service_test.go index 8d5be04c2e..9e95e8be21 100644 --- a/managed/services/server/mock_rules_service_test.go +++ b/managed/services/server/mock_rules_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server @@ -13,6 +13,10 @@ type mockRulesService struct { func (_m *mockRulesService) RemoveVMAlertRulesFiles() error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for RemoveVMAlertRulesFiles") + } + var r0 error if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() diff --git a/managed/services/server/mock_supervisord_service_test.go b/managed/services/server/mock_supervisord_service_test.go index 64195d9f88..ac778ad82a 100644 --- a/managed/services/server/mock_supervisord_service_test.go +++ b/managed/services/server/mock_supervisord_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server @@ -21,6 +21,10 @@ type mockSupervisordService struct { func (_m *mockSupervisordService) ForceCheckUpdates(ctx context.Context) error { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for ForceCheckUpdates") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context) error); ok { r0 = rf(ctx) @@ -35,6 +39,10 @@ func (_m *mockSupervisordService) ForceCheckUpdates(ctx context.Context) error { func (_m *mockSupervisordService) InstalledPMMVersion(ctx context.Context) *version.PackageInfo { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for InstalledPMMVersion") + } + var r0 *version.PackageInfo if rf, ok := ret.Get(0).(func(context.Context) *version.PackageInfo); ok { r0 = rf(ctx) @@ -51,6 +59,10 @@ func (_m *mockSupervisordService) InstalledPMMVersion(ctx context.Context) *vers func (_m *mockSupervisordService) LastCheckUpdatesResult(ctx context.Context) (*version.UpdateCheckResult, time.Time) { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for LastCheckUpdatesResult") + } + var r0 *version.UpdateCheckResult var r1 time.Time if rf, ok := ret.Get(0).(func(context.Context) (*version.UpdateCheckResult, time.Time)); ok { @@ -77,6 +89,10 @@ func (_m *mockSupervisordService) LastCheckUpdatesResult(ctx context.Context) (* func (_m *mockSupervisordService) StartUpdate() (uint32, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for StartUpdate") + } + var r0 uint32 var r1 error if rf, ok := ret.Get(0).(func() (uint32, error)); ok { @@ -101,6 +117,10 @@ func (_m *mockSupervisordService) StartUpdate() (uint32, error) { func (_m *mockSupervisordService) UpdateConfiguration(settings *models.Settings, ssoDetails *models.PerconaSSODetails) error { ret := _m.Called(settings, ssoDetails) + if len(ret) == 0 { + panic("no return value specified for UpdateConfiguration") + } + var r0 error if rf, ok := ret.Get(0).(func(*models.Settings, *models.PerconaSSODetails) error); ok { r0 = rf(settings, ssoDetails) @@ -115,6 +135,10 @@ func (_m *mockSupervisordService) UpdateConfiguration(settings *models.Settings, func (_m *mockSupervisordService) UpdateLog(offset uint32) ([]string, uint32, error) { ret := _m.Called(offset) + if len(ret) == 0 { + panic("no return value specified for UpdateLog") + } + var r0 []string var r1 uint32 var r2 error @@ -148,6 +172,10 @@ func (_m *mockSupervisordService) UpdateLog(offset uint32) ([]string, uint32, er func (_m *mockSupervisordService) UpdateRunning() bool { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for UpdateRunning") + } + var r0 bool if rf, ok := ret.Get(0).(func() bool); ok { r0 = rf() diff --git a/managed/services/server/mock_telemetry_service_test.go b/managed/services/server/mock_telemetry_service_test.go index e8d72eb101..6b9ada9ad1 100644 --- a/managed/services/server/mock_telemetry_service_test.go +++ b/managed/services/server/mock_telemetry_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server @@ -17,6 +17,10 @@ type mockTelemetryService struct { func (_m *mockTelemetryService) DistributionMethod() serverpb.DistributionMethod { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for DistributionMethod") + } + var r0 serverpb.DistributionMethod if rf, ok := ret.Get(0).(func() serverpb.DistributionMethod); ok { r0 = rf() @@ -31,6 +35,10 @@ func (_m *mockTelemetryService) DistributionMethod() serverpb.DistributionMethod func (_m *mockTelemetryService) GetSummaries() []string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for GetSummaries") + } + var r0 []string if rf, ok := ret.Get(0).(func() []string); ok { r0 = rf() diff --git a/managed/services/server/mock_templates_service_test.go b/managed/services/server/mock_templates_service_test.go index f9625aa42e..14b1abbaf9 100644 --- a/managed/services/server/mock_templates_service_test.go +++ b/managed/services/server/mock_templates_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server diff --git a/managed/services/server/mock_vm_alert_external_rules_test.go b/managed/services/server/mock_vm_alert_external_rules_test.go index 1c4d605dec..df5056dd65 100644 --- a/managed/services/server/mock_vm_alert_external_rules_test.go +++ b/managed/services/server/mock_vm_alert_external_rules_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package server @@ -17,6 +17,10 @@ type mockVmAlertExternalRules struct { func (_m *mockVmAlertExternalRules) ReadRules() (string, error) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for ReadRules") + } + var r0 string var r1 error if rf, ok := ret.Get(0).(func() (string, error)); ok { @@ -41,6 +45,10 @@ func (_m *mockVmAlertExternalRules) ReadRules() (string, error) { func (_m *mockVmAlertExternalRules) RemoveRulesFile() error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for RemoveRulesFile") + } + var r0 error if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() @@ -55,6 +63,10 @@ func (_m *mockVmAlertExternalRules) RemoveRulesFile() error { func (_m *mockVmAlertExternalRules) ValidateRules(ctx context.Context, rules string) error { ret := _m.Called(ctx, rules) + if len(ret) == 0 { + panic("no return value specified for ValidateRules") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, string) error); ok { r0 = rf(ctx, rules) @@ -69,6 +81,10 @@ func (_m *mockVmAlertExternalRules) ValidateRules(ctx context.Context, rules str func (_m *mockVmAlertExternalRules) WriteRules(rules string) error { ret := _m.Called(rules) + if len(ret) == 0 { + panic("no return value specified for WriteRules") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(rules) diff --git a/managed/services/telemetry/mock_data_source_locator_test.go b/managed/services/telemetry/mock_data_source_locator_test.go index 4d4acc6924..e55479816b 100644 --- a/managed/services/telemetry/mock_data_source_locator_test.go +++ b/managed/services/telemetry/mock_data_source_locator_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package telemetry @@ -13,6 +13,10 @@ type MockDataSourceLocator struct { func (_m *MockDataSourceLocator) LocateTelemetryDataSource(name string) (DataSource, error) { ret := _m.Called(name) + if len(ret) == 0 { + panic("no return value specified for LocateTelemetryDataSource") + } + var r0 DataSource var r1 error if rf, ok := ret.Get(0).(func(string) (DataSource, error)); ok { diff --git a/managed/services/telemetry/mock_data_source_test.go b/managed/services/telemetry/mock_data_source_test.go index 6d6fad1407..6c7facc9e5 100644 --- a/managed/services/telemetry/mock_data_source_test.go +++ b/managed/services/telemetry/mock_data_source_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package telemetry @@ -18,6 +18,10 @@ type MockDataSource struct { func (_m *MockDataSource) Dispose(ctx context.Context) error { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for Dispose") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context) error); ok { r0 = rf(ctx) @@ -32,6 +36,10 @@ func (_m *MockDataSource) Dispose(ctx context.Context) error { func (_m *MockDataSource) Enabled() bool { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Enabled") + } + var r0 bool if rf, ok := ret.Get(0).(func() bool); ok { r0 = rf() @@ -46,6 +54,10 @@ func (_m *MockDataSource) Enabled() bool { func (_m *MockDataSource) FetchMetrics(ctx context.Context, config Config) ([]*pmmv1.ServerMetric_Metric, error) { ret := _m.Called(ctx, config) + if len(ret) == 0 { + panic("no return value specified for FetchMetrics") + } + var r0 []*pmmv1.ServerMetric_Metric var r1 error if rf, ok := ret.Get(0).(func(context.Context, Config) ([]*pmmv1.ServerMetric_Metric, error)); ok { @@ -72,6 +84,10 @@ func (_m *MockDataSource) FetchMetrics(ctx context.Context, config Config) ([]*p func (_m *MockDataSource) Init(ctx context.Context) error { ret := _m.Called(ctx) + if len(ret) == 0 { + panic("no return value specified for Init") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context) error); ok { r0 = rf(ctx) diff --git a/managed/services/telemetry/mock_distribution_util_service_test.go b/managed/services/telemetry/mock_distribution_util_service_test.go index fcc2a75f9b..09c703053a 100644 --- a/managed/services/telemetry/mock_distribution_util_service_test.go +++ b/managed/services/telemetry/mock_distribution_util_service_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package telemetry @@ -18,6 +18,10 @@ type mockDistributionUtilService struct { func (_m *mockDistributionUtilService) getDistributionMethodAndOS() (serverpb.DistributionMethod, pmmv1.DistributionMethod, string) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for getDistributionMethodAndOS") + } + var r0 serverpb.DistributionMethod var r1 pmmv1.DistributionMethod var r2 string diff --git a/managed/services/telemetry/mock_sender_test.go b/managed/services/telemetry/mock_sender_test.go index 21dc086eb3..f6c36c843e 100644 --- a/managed/services/telemetry/mock_sender_test.go +++ b/managed/services/telemetry/mock_sender_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package telemetry @@ -18,6 +18,10 @@ type mockSender struct { func (_m *mockSender) SendTelemetry(ctx context.Context, report *reporterv1.ReportRequest) error { ret := _m.Called(ctx, report) + if len(ret) == 0 { + panic("no return value specified for SendTelemetry") + } + var r0 error if rf, ok := ret.Get(0).(func(context.Context, *reporterv1.ReportRequest) error); ok { r0 = rf(ctx, report) diff --git a/managed/services/versioncache/mock_versioner_test.go b/managed/services/versioncache/mock_versioner_test.go index b1f487374c..02a3ad6b98 100644 --- a/managed/services/versioncache/mock_versioner_test.go +++ b/managed/services/versioncache/mock_versioner_test.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.39.1. DO NOT EDIT. package versioncache @@ -17,6 +17,10 @@ type MockVersioner struct { func (_m *MockVersioner) GetVersions(pmmAgentID string, softwares []agents.Software) ([]agents.Version, error) { ret := _m.Called(pmmAgentID, softwares) + if len(ret) == 0 { + panic("no return value specified for GetVersions") + } + var r0 []agents.Version var r1 error if rf, ok := ret.Get(0).(func(string, []agents.Software) ([]agents.Version, error)); ok { diff --git a/tools/go.mod b/tools/go.mod index 827f7ce9fd..5a8c1b4011 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -20,7 +20,7 @@ require ( github.com/quasilyte/go-consistent v0.6.0 github.com/reviewdog/reviewdog v0.15.0 github.com/vburenin/ifacemaker v1.2.1 - github.com/vektra/mockery/v2 v2.36.0 + github.com/vektra/mockery/v2 v2.39.1 golang.org/x/perf v0.0.0-20230717203022-1ba3a21238c9 golang.org/x/tools v0.16.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 @@ -54,7 +54,7 @@ require ( github.com/bradleyfalzon/ghinstallation/v2 v2.6.0 // indirect github.com/bufbuild/protocompile v0.6.1-0.20231027200301-089712432bdc // indirect github.com/bufbuild/protovalidate-go v0.4.0 // indirect - github.com/chigopher/pathlib v0.15.0 // indirect + github.com/chigopher/pathlib v0.19.1 // indirect github.com/cilium/ebpf v0.7.0 // indirect github.com/cloudflare/circl v1.3.3 // indirect github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect diff --git a/tools/go.sum b/tools/go.sum index 0b18292f72..dda3efe684 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -136,8 +136,8 @@ github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7N github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chigopher/pathlib v0.15.0 h1:1pg96WL3iC1/YyWV4UJSl3E0GBf4B+h5amBtsbAAieY= -github.com/chigopher/pathlib v0.15.0/go.mod h1:3+YPPV21mU9vyw8Mjp+F33CyCfE6iOzinpiqBcccv7I= +github.com/chigopher/pathlib v0.19.1 h1:RoLlUJc0CqBGwq239cilyhxPNLXTK+HXoASGyGznx5A= +github.com/chigopher/pathlib v0.19.1/go.mod h1:tzC1dZLW8o33UQpWkNkhvPwL5n4yyFRFm/jL1YGWFvY= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -788,8 +788,8 @@ github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinC github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk= github.com/vburenin/ifacemaker v1.2.1 h1:3Vq8B/bfBgjWTkv+jDg4dVL1KHt3k1K4lO7XRxYA2sk= github.com/vburenin/ifacemaker v1.2.1/go.mod h1:5WqrzX2aD7/hi+okBjcaEQJMg4lDGrpuEX3B8L4Wgrs= -github.com/vektra/mockery/v2 v2.36.0 h1:TO4tST9f7lm4DHybPI2MC4Vb74bL89PtWvRhpNPAVo4= -github.com/vektra/mockery/v2 v2.36.0/go.mod h1:diB13hxXG6QrTR0ol2Rk8s2dRMftzvExSvPDKr+IYKk= +github.com/vektra/mockery/v2 v2.39.1 h1:zgnW69s+351ZF/L+O5pO64MpVP96aDtw8jwOGvGXzwU= +github.com/vektra/mockery/v2 v2.39.1/go.mod h1:dPzGtjT0/Uu4hqpF6QNHwz+GLago7lq1bxdj9wHbGKo= github.com/vvakame/sdlog v1.2.0 h1:gwZRXZ0EmhJQJN/Do/+PTQigcmFiSqZ07aDjxqGOLT8= github.com/vvakame/sdlog v1.2.0/go.mod h1:gFYv2g/iR3pJSxkJz0YnkNmhNbXT5R3PzWsfZKGQADY= github.com/xanzy/go-gitlab v0.91.1 h1:gnV57IPGYywWer32oXKBcdmc8dVxeKl3AauV8Bu17rw= From 6ed69a80d99afd17b3affdba027504749c6a0fa8 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Fri, 22 Dec 2023 10:48:11 +0300 Subject: [PATCH 27/28] PMM-12473 do not mangle the query string for external exporters (#2636) * PMM-12473 do not mangle the query string for external exporters * PMM-12473 fix setup.py * PMM-12473 get away with less variables --- .devcontainer/setup.py | 5 ++- managed/models/agent_model.go | 17 ++++++++--- managed/models/agent_model_test.go | 49 ++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 10 deletions(-) diff --git a/.devcontainer/setup.py b/.devcontainer/setup.py index f57267ac07..35d0ece5b2 100755 --- a/.devcontainer/setup.py +++ b/.devcontainer/setup.py @@ -89,7 +89,7 @@ def setup(): # Having fsync off in dev environment is fine. "sed -i -e \"s/#fsync = on/fsync = off/\" /srv/postgres14/postgresql.conf", "echo 'host all all 0.0.0.0/0 trust' >> /srv/postgres14/pg_hba.conf", - "supervisorctl restart postgresql", + # "supervisorctl restart postgresql", ]) @@ -99,8 +99,7 @@ def main(): make_init() # do basic setup - # TODO: fix the setup and revert - # setup() + setup() MARKER = "/tmp/devcontainer-setup-done" diff --git a/managed/models/agent_model.go b/managed/models/agent_model.go index d77909d3a5..0233183e77 100644 --- a/managed/models/agent_model.go +++ b/managed/models/agent_model.go @@ -308,7 +308,7 @@ type DSNParams struct { PostgreSQLSupportsSSLSNI bool } -// DSN returns DSN string for accessing given Service with this Agent (and implicit driver). +// DSN returns a DSN string for accessing a given Service with this Agent (and an implicit driver). func (s *Agent) DSN(service *Service, dsnParams DSNParams, tdp *DelimiterPair) string { //nolint:cyclop,maintidx host := pointer.GetString(service.Address) port := pointer.GetUint16(service.Port) @@ -516,9 +516,9 @@ func (s *Agent) DSN(service *Service, dsnParams DSNParams, tdp *DelimiterPair) s if socket == "" { address = net.JoinHostPort(host, strconv.Itoa(int(port))) } else { - // Set socket dirrectory as host URI parameter. + // Set socket directory as host URI parameter. q.Set("host", socket) - // In case of empty url.URL.Host we need to identify a start of a path (database name). + // In case of empty url.URL.Host we need to identify the start of the path (database name). database = "/" + database } @@ -563,11 +563,20 @@ func (s *Agent) ExporterURL(q *reform.Querier) (string, error) { } address := net.JoinHostPort(host, strconv.Itoa(listenPort)) + // We have to split MetricsPath into the path and the query because it may contain both. + // Example: "/metrics?format=prometheus&output=json" + p := strings.Split(path, "?") + u := &url.URL{ Scheme: scheme, Host: address, - Path: path, + Path: p[0], + } + + if len(p) > 1 { + u.RawQuery = p[1] } + switch { case password != "": u.User = url.UserPassword(username, password) diff --git a/managed/models/agent_model_test.go b/managed/models/agent_model_test.go index a328bcff88..72a5885c4d 100644 --- a/managed/models/agent_model_test.go +++ b/managed/models/agent_model_test.go @@ -401,6 +401,13 @@ func TestExporterURL(t *testing.T) { Address: "redis_exporter", }, + &models.Node{ + NodeID: "ExporterServerlessNodeID2", + NodeType: models.RemoteNodeType, + NodeName: "Node 2 for Serverless Exporter", + Address: "nomad_exporter", + }, + &models.Service{ ServiceID: "external", ServiceType: models.ExternalServiceType, @@ -417,6 +424,14 @@ func TestExporterURL(t *testing.T) { ExternalGroup: "redis", }, + &models.Service{ + ServiceID: "nomad_exporter-external", + ServiceType: models.ExternalServiceType, + ServiceName: "Service on ExporterServerlessNode 2", + NodeID: "ExporterServerlessNodeID2", + ExternalGroup: "nomad", + }, + &models.Agent{ AgentID: "ExporterAgentPush", AgentType: models.ExternalExporterType, @@ -453,6 +468,32 @@ func TestExporterURL(t *testing.T) { Username: pointer.ToString("user"), Password: pointer.ToString("secret"), }, + + &models.Agent{ + AgentID: "ExporterServerlessWithQueryParams", + AgentType: models.ExternalExporterType, + RunsOnNodeID: pointer.ToString("ExporterServerlessNodeID2"), + ServiceID: pointer.ToString("nomad_exporter-external"), + MetricsScheme: pointer.ToString("http"), + PushMetrics: false, + ListenPort: pointer.ToUint16(9121), + MetricsPath: pointer.ToString("/metrics?format=prometheus&output=json"), + Username: pointer.ToString("user"), + Password: pointer.ToString("secret"), + }, + + &models.Agent{ + AgentID: "ExporterServerlessWithEmptyMetricsPath", + AgentType: models.ExternalExporterType, + RunsOnNodeID: pointer.ToString("ExporterServerlessNodeID2"), + ServiceID: pointer.ToString("nomad_exporter-external"), + MetricsScheme: pointer.ToString("http"), + PushMetrics: false, + ListenPort: pointer.ToUint16(9121), + MetricsPath: pointer.ToString("/"), + Username: pointer.ToString("user"), + Password: pointer.ToString("secret"), + }, } { require.NoError(t, q.Insert(str), "failed to INSERT %+v", str) } @@ -469,9 +510,11 @@ func TestExporterURL(t *testing.T) { defer teardown(t) for agentID, expected := range map[string]string{ - "ExporterAgentPush": "http://127.0.0.1:9121/metrics", - "ExporterAgentPull": "http://user:secret@172.20.0.4:9121/metrics", - "ExporterServerless": "http://user:secret@redis_exporter:9121/metrics", + "ExporterAgentPush": "http://127.0.0.1:9121/metrics", + "ExporterAgentPull": "http://user:secret@172.20.0.4:9121/metrics", + "ExporterServerless": "http://user:secret@redis_exporter:9121/metrics", + "ExporterServerlessWithQueryParams": "http://user:secret@nomad_exporter:9121/metrics?format=prometheus&output=json", + "ExporterServerlessWithEmptyMetricsPath": "http://user:secret@nomad_exporter:9121/", } { t.Run(agentID, func(t *testing.T) { agent, err := models.FindAgentByID(q, agentID) From 804a30c8367b3bac45696b437658e8c34b4c5300 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 11:12:05 +0000 Subject: [PATCH 28/28] Bump google.golang.org/protobuf from 1.31.1-0.20231027082548-f4a6c1f6e5c1 to 1.32.0 in /tools (#2723) * Bump google.golang.org/protobuf in /tools Bumps google.golang.org/protobuf from 1.31.1-0.20231027082548-f4a6c1f6e5c1 to 1.32.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Regenerate --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Artem Gavrilov --- api/agentlocalpb/agentlocal.pb.go | 2 +- api/agentpb/agent.pb.go | 2 +- api/agentpb/collector.pb.go | 2 +- api/inventorypb/agent_status.pb.go | 2 +- api/inventorypb/agents.pb.go | 2 +- api/inventorypb/log_level.pb.go | 2 +- api/inventorypb/nodes.pb.go | 2 +- api/inventorypb/services.pb.go | 2 +- api/managementpb/actions.pb.go | 2 +- api/managementpb/agent/agent.pb.go | 2 +- api/managementpb/alerting/alerting.pb.go | 2 +- api/managementpb/alerting/params.pb.go | 2 +- api/managementpb/annotation.pb.go | 2 +- api/managementpb/azure/azure.pb.go | 2 +- api/managementpb/backup/artifacts.pb.go | 2 +- api/managementpb/backup/backups.pb.go | 2 +- api/managementpb/backup/common.pb.go | 2 +- api/managementpb/backup/errors.pb.go | 2 +- api/managementpb/backup/locations.pb.go | 2 +- api/managementpb/backup/restores.pb.go | 2 +- api/managementpb/boolean_flag.pb.go | 2 +- api/managementpb/checks.pb.go | 2 +- api/managementpb/dbaas/components.pb.go | 2 +- api/managementpb/dbaas/db_clusters.pb.go | 2 +- api/managementpb/dbaas/dbaas.pb.go | 2 +- api/managementpb/dbaas/kubernetes.pb.go | 2 +- api/managementpb/dbaas/logs.pb.go | 2 +- api/managementpb/dbaas/psmdb_clusters.pb.go | 2 +- api/managementpb/dbaas/pxc_clusters.pb.go | 2 +- api/managementpb/dbaas/templates.pb.go | 2 +- api/managementpb/dump/dump.pb.go | 2 +- api/managementpb/external.pb.go | 2 +- api/managementpb/haproxy.pb.go | 2 +- api/managementpb/ia/alerts.pb.go | 2 +- api/managementpb/ia/channels.pb.go | 2 +- api/managementpb/ia/rules.pb.go | 2 +- api/managementpb/ia/status.pb.go | 2 +- api/managementpb/metrics.pb.go | 2 +- api/managementpb/mongodb.pb.go | 2 +- api/managementpb/mysql.pb.go | 2 +- api/managementpb/node.pb.go | 2 +- api/managementpb/node/node.pb.go | 2 +- api/managementpb/pagination.pb.go | 2 +- api/managementpb/postgresql.pb.go | 2 +- api/managementpb/proxysql.pb.go | 2 +- api/managementpb/rds.pb.go | 2 +- api/managementpb/role/role.pb.go | 2 +- api/managementpb/service.pb.go | 2 +- api/managementpb/service/service.pb.go | 2 +- api/managementpb/severity.pb.go | 2 +- api/platformpb/platform.pb.go | 2 +- api/qanpb/collector.pb.go | 2 +- api/qanpb/filters.pb.go | 2 +- api/qanpb/metrics_names.pb.go | 2 +- api/qanpb/object_details.pb.go | 2 +- api/qanpb/profile.pb.go | 2 +- api/qanpb/qan.pb.go | 2 +- api/serverpb/httperror.pb.go | 2 +- api/serverpb/server.pb.go | 2 +- api/uieventspb/server.pb.go | 2 +- api/userpb/user.pb.go | 2 +- tools/go.mod | 2 +- tools/go.sum | 4 ++-- 63 files changed, 64 insertions(+), 64 deletions(-) diff --git a/api/agentlocalpb/agentlocal.pb.go b/api/agentlocalpb/agentlocal.pb.go index 00817be2a2..3eca3b9440 100644 --- a/api/agentlocalpb/agentlocal.pb.go +++ b/api/agentlocalpb/agentlocal.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: agentlocalpb/agentlocal.proto diff --git a/api/agentpb/agent.pb.go b/api/agentpb/agent.pb.go index 0dd500cc3f..0004713e2b 100644 --- a/api/agentpb/agent.pb.go +++ b/api/agentpb/agent.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: agentpb/agent.proto diff --git a/api/agentpb/collector.pb.go b/api/agentpb/collector.pb.go index 61a9b3ba9f..1c31e346a0 100644 --- a/api/agentpb/collector.pb.go +++ b/api/agentpb/collector.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: agentpb/collector.proto diff --git a/api/inventorypb/agent_status.pb.go b/api/inventorypb/agent_status.pb.go index af461d3762..e6e67d8587 100644 --- a/api/inventorypb/agent_status.pb.go +++ b/api/inventorypb/agent_status.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: inventorypb/agent_status.proto diff --git a/api/inventorypb/agents.pb.go b/api/inventorypb/agents.pb.go index 0e8869ec2b..d54e69668f 100644 --- a/api/inventorypb/agents.pb.go +++ b/api/inventorypb/agents.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: inventorypb/agents.proto diff --git a/api/inventorypb/log_level.pb.go b/api/inventorypb/log_level.pb.go index 13a88902f9..d1bb1fca65 100644 --- a/api/inventorypb/log_level.pb.go +++ b/api/inventorypb/log_level.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: inventorypb/log_level.proto diff --git a/api/inventorypb/nodes.pb.go b/api/inventorypb/nodes.pb.go index 920858c6a6..a317e5b200 100644 --- a/api/inventorypb/nodes.pb.go +++ b/api/inventorypb/nodes.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: inventorypb/nodes.proto diff --git a/api/inventorypb/services.pb.go b/api/inventorypb/services.pb.go index 62e7941f52..ad06d293b3 100644 --- a/api/inventorypb/services.pb.go +++ b/api/inventorypb/services.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: inventorypb/services.proto diff --git a/api/managementpb/actions.pb.go b/api/managementpb/actions.pb.go index 79018277fd..a9221fe4e4 100644 --- a/api/managementpb/actions.pb.go +++ b/api/managementpb/actions.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/actions.proto diff --git a/api/managementpb/agent/agent.pb.go b/api/managementpb/agent/agent.pb.go index 1d9ba3c909..f3d9acb53d 100644 --- a/api/managementpb/agent/agent.pb.go +++ b/api/managementpb/agent/agent.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/agent/agent.proto diff --git a/api/managementpb/alerting/alerting.pb.go b/api/managementpb/alerting/alerting.pb.go index aa2690c6ae..4d7f20be77 100644 --- a/api/managementpb/alerting/alerting.pb.go +++ b/api/managementpb/alerting/alerting.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/alerting/alerting.proto diff --git a/api/managementpb/alerting/params.pb.go b/api/managementpb/alerting/params.pb.go index f9bd4e42fc..cd015cfa99 100644 --- a/api/managementpb/alerting/params.pb.go +++ b/api/managementpb/alerting/params.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/alerting/params.proto diff --git a/api/managementpb/annotation.pb.go b/api/managementpb/annotation.pb.go index f7d007adcf..022e50050d 100644 --- a/api/managementpb/annotation.pb.go +++ b/api/managementpb/annotation.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/annotation.proto diff --git a/api/managementpb/azure/azure.pb.go b/api/managementpb/azure/azure.pb.go index c76145f187..8177a5f7be 100644 --- a/api/managementpb/azure/azure.pb.go +++ b/api/managementpb/azure/azure.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/azure/azure.proto diff --git a/api/managementpb/backup/artifacts.pb.go b/api/managementpb/backup/artifacts.pb.go index de8a508537..4306cad2d5 100644 --- a/api/managementpb/backup/artifacts.pb.go +++ b/api/managementpb/backup/artifacts.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/backup/artifacts.proto diff --git a/api/managementpb/backup/backups.pb.go b/api/managementpb/backup/backups.pb.go index d2fc2bcddf..bd9cde245a 100644 --- a/api/managementpb/backup/backups.pb.go +++ b/api/managementpb/backup/backups.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/backup/backups.proto diff --git a/api/managementpb/backup/common.pb.go b/api/managementpb/backup/common.pb.go index d0b2c6352a..6cc0a362cd 100644 --- a/api/managementpb/backup/common.pb.go +++ b/api/managementpb/backup/common.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/backup/common.proto diff --git a/api/managementpb/backup/errors.pb.go b/api/managementpb/backup/errors.pb.go index 8cb1a25932..a9161625c7 100644 --- a/api/managementpb/backup/errors.pb.go +++ b/api/managementpb/backup/errors.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/backup/errors.proto diff --git a/api/managementpb/backup/locations.pb.go b/api/managementpb/backup/locations.pb.go index bb20aeffb7..29d5a325e9 100644 --- a/api/managementpb/backup/locations.pb.go +++ b/api/managementpb/backup/locations.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/backup/locations.proto diff --git a/api/managementpb/backup/restores.pb.go b/api/managementpb/backup/restores.pb.go index 7d4e0f861e..f01283a2c8 100644 --- a/api/managementpb/backup/restores.pb.go +++ b/api/managementpb/backup/restores.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/backup/restores.proto diff --git a/api/managementpb/boolean_flag.pb.go b/api/managementpb/boolean_flag.pb.go index a6e403fdaa..1c11ba383a 100644 --- a/api/managementpb/boolean_flag.pb.go +++ b/api/managementpb/boolean_flag.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/boolean_flag.proto diff --git a/api/managementpb/checks.pb.go b/api/managementpb/checks.pb.go index c517c94959..edeea3b607 100644 --- a/api/managementpb/checks.pb.go +++ b/api/managementpb/checks.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/checks.proto diff --git a/api/managementpb/dbaas/components.pb.go b/api/managementpb/dbaas/components.pb.go index cee54379d0..c0fe5e2768 100644 --- a/api/managementpb/dbaas/components.pb.go +++ b/api/managementpb/dbaas/components.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/dbaas/components.proto diff --git a/api/managementpb/dbaas/db_clusters.pb.go b/api/managementpb/dbaas/db_clusters.pb.go index 8a23c0650f..4b875c1d69 100644 --- a/api/managementpb/dbaas/db_clusters.pb.go +++ b/api/managementpb/dbaas/db_clusters.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/dbaas/db_clusters.proto diff --git a/api/managementpb/dbaas/dbaas.pb.go b/api/managementpb/dbaas/dbaas.pb.go index f0ebd70992..fe5feaabda 100644 --- a/api/managementpb/dbaas/dbaas.pb.go +++ b/api/managementpb/dbaas/dbaas.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/dbaas/dbaas.proto diff --git a/api/managementpb/dbaas/kubernetes.pb.go b/api/managementpb/dbaas/kubernetes.pb.go index 0f5d89a1a5..77677b373a 100644 --- a/api/managementpb/dbaas/kubernetes.pb.go +++ b/api/managementpb/dbaas/kubernetes.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/dbaas/kubernetes.proto diff --git a/api/managementpb/dbaas/logs.pb.go b/api/managementpb/dbaas/logs.pb.go index 8f7aa06663..dda53e3465 100644 --- a/api/managementpb/dbaas/logs.pb.go +++ b/api/managementpb/dbaas/logs.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/dbaas/logs.proto diff --git a/api/managementpb/dbaas/psmdb_clusters.pb.go b/api/managementpb/dbaas/psmdb_clusters.pb.go index d52c92f463..efa0ae6ada 100644 --- a/api/managementpb/dbaas/psmdb_clusters.pb.go +++ b/api/managementpb/dbaas/psmdb_clusters.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/dbaas/psmdb_clusters.proto diff --git a/api/managementpb/dbaas/pxc_clusters.pb.go b/api/managementpb/dbaas/pxc_clusters.pb.go index 0b70eeac0f..ab927e3819 100644 --- a/api/managementpb/dbaas/pxc_clusters.pb.go +++ b/api/managementpb/dbaas/pxc_clusters.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/dbaas/pxc_clusters.proto diff --git a/api/managementpb/dbaas/templates.pb.go b/api/managementpb/dbaas/templates.pb.go index cefb4d9b1b..6f50672530 100644 --- a/api/managementpb/dbaas/templates.pb.go +++ b/api/managementpb/dbaas/templates.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/dbaas/templates.proto diff --git a/api/managementpb/dump/dump.pb.go b/api/managementpb/dump/dump.pb.go index 19e895a780..66f9ee5832 100644 --- a/api/managementpb/dump/dump.pb.go +++ b/api/managementpb/dump/dump.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/dump/dump.proto diff --git a/api/managementpb/external.pb.go b/api/managementpb/external.pb.go index 27250cfb55..7d09b4dcfb 100644 --- a/api/managementpb/external.pb.go +++ b/api/managementpb/external.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/external.proto diff --git a/api/managementpb/haproxy.pb.go b/api/managementpb/haproxy.pb.go index 6ff1a866f1..0541c2496e 100644 --- a/api/managementpb/haproxy.pb.go +++ b/api/managementpb/haproxy.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/haproxy.proto diff --git a/api/managementpb/ia/alerts.pb.go b/api/managementpb/ia/alerts.pb.go index ac3aad33d7..6d2186ffe7 100644 --- a/api/managementpb/ia/alerts.pb.go +++ b/api/managementpb/ia/alerts.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/ia/alerts.proto diff --git a/api/managementpb/ia/channels.pb.go b/api/managementpb/ia/channels.pb.go index f433a16c76..e8223c42cd 100644 --- a/api/managementpb/ia/channels.pb.go +++ b/api/managementpb/ia/channels.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/ia/channels.proto diff --git a/api/managementpb/ia/rules.pb.go b/api/managementpb/ia/rules.pb.go index cc72d00369..57b7cd940e 100644 --- a/api/managementpb/ia/rules.pb.go +++ b/api/managementpb/ia/rules.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/ia/rules.proto diff --git a/api/managementpb/ia/status.pb.go b/api/managementpb/ia/status.pb.go index 521084f600..abef38a767 100644 --- a/api/managementpb/ia/status.pb.go +++ b/api/managementpb/ia/status.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/ia/status.proto diff --git a/api/managementpb/metrics.pb.go b/api/managementpb/metrics.pb.go index f9f2666365..c98b36cd18 100644 --- a/api/managementpb/metrics.pb.go +++ b/api/managementpb/metrics.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/metrics.proto diff --git a/api/managementpb/mongodb.pb.go b/api/managementpb/mongodb.pb.go index 952c3f4a4a..92e02d18b9 100644 --- a/api/managementpb/mongodb.pb.go +++ b/api/managementpb/mongodb.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/mongodb.proto diff --git a/api/managementpb/mysql.pb.go b/api/managementpb/mysql.pb.go index f7b132acf2..f478edd4b9 100644 --- a/api/managementpb/mysql.pb.go +++ b/api/managementpb/mysql.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/mysql.proto diff --git a/api/managementpb/node.pb.go b/api/managementpb/node.pb.go index 06c25b7718..f49a1fb596 100644 --- a/api/managementpb/node.pb.go +++ b/api/managementpb/node.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/node.proto diff --git a/api/managementpb/node/node.pb.go b/api/managementpb/node/node.pb.go index 8f3110d903..fd4bb758a2 100644 --- a/api/managementpb/node/node.pb.go +++ b/api/managementpb/node/node.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/node/node.proto diff --git a/api/managementpb/pagination.pb.go b/api/managementpb/pagination.pb.go index aa84f71c43..f7f5c8e011 100644 --- a/api/managementpb/pagination.pb.go +++ b/api/managementpb/pagination.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/pagination.proto diff --git a/api/managementpb/postgresql.pb.go b/api/managementpb/postgresql.pb.go index 184ebf14e3..35a1058917 100644 --- a/api/managementpb/postgresql.pb.go +++ b/api/managementpb/postgresql.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/postgresql.proto diff --git a/api/managementpb/proxysql.pb.go b/api/managementpb/proxysql.pb.go index b7ec36ffe4..226d165be5 100644 --- a/api/managementpb/proxysql.pb.go +++ b/api/managementpb/proxysql.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/proxysql.proto diff --git a/api/managementpb/rds.pb.go b/api/managementpb/rds.pb.go index 84f06f0dcd..e77a001e09 100644 --- a/api/managementpb/rds.pb.go +++ b/api/managementpb/rds.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/rds.proto diff --git a/api/managementpb/role/role.pb.go b/api/managementpb/role/role.pb.go index ab686b7558..bd246884da 100644 --- a/api/managementpb/role/role.pb.go +++ b/api/managementpb/role/role.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/role/role.proto diff --git a/api/managementpb/service.pb.go b/api/managementpb/service.pb.go index f56c3bb435..6285fdea0d 100644 --- a/api/managementpb/service.pb.go +++ b/api/managementpb/service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/service.proto diff --git a/api/managementpb/service/service.pb.go b/api/managementpb/service/service.pb.go index fad74d8f91..58428f7799 100644 --- a/api/managementpb/service/service.pb.go +++ b/api/managementpb/service/service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/service/service.proto diff --git a/api/managementpb/severity.pb.go b/api/managementpb/severity.pb.go index ab93988409..cb8af63f07 100644 --- a/api/managementpb/severity.pb.go +++ b/api/managementpb/severity.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: managementpb/severity.proto diff --git a/api/platformpb/platform.pb.go b/api/platformpb/platform.pb.go index 334f5d5061..f65138ae3e 100644 --- a/api/platformpb/platform.pb.go +++ b/api/platformpb/platform.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: platformpb/platform.proto diff --git a/api/qanpb/collector.pb.go b/api/qanpb/collector.pb.go index 7df520bbce..560df94e47 100644 --- a/api/qanpb/collector.pb.go +++ b/api/qanpb/collector.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: qanpb/collector.proto diff --git a/api/qanpb/filters.pb.go b/api/qanpb/filters.pb.go index 179aaaa4e6..cfeeac82aa 100644 --- a/api/qanpb/filters.pb.go +++ b/api/qanpb/filters.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: qanpb/filters.proto diff --git a/api/qanpb/metrics_names.pb.go b/api/qanpb/metrics_names.pb.go index cdc2265f6f..b466715337 100644 --- a/api/qanpb/metrics_names.pb.go +++ b/api/qanpb/metrics_names.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: qanpb/metrics_names.proto diff --git a/api/qanpb/object_details.pb.go b/api/qanpb/object_details.pb.go index 60c0fb9b2c..ccb598cb01 100644 --- a/api/qanpb/object_details.pb.go +++ b/api/qanpb/object_details.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: qanpb/object_details.proto diff --git a/api/qanpb/profile.pb.go b/api/qanpb/profile.pb.go index 768ebc0f64..2843a86a92 100644 --- a/api/qanpb/profile.pb.go +++ b/api/qanpb/profile.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: qanpb/profile.proto diff --git a/api/qanpb/qan.pb.go b/api/qanpb/qan.pb.go index b457d685f6..eb1fb80d7d 100644 --- a/api/qanpb/qan.pb.go +++ b/api/qanpb/qan.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: qanpb/qan.proto diff --git a/api/serverpb/httperror.pb.go b/api/serverpb/httperror.pb.go index 35b03ea5a0..e238075af4 100644 --- a/api/serverpb/httperror.pb.go +++ b/api/serverpb/httperror.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: serverpb/httperror.proto diff --git a/api/serverpb/server.pb.go b/api/serverpb/server.pb.go index de00b6bce7..53dd8740d8 100644 --- a/api/serverpb/server.pb.go +++ b/api/serverpb/server.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: serverpb/server.proto diff --git a/api/uieventspb/server.pb.go b/api/uieventspb/server.pb.go index 63584ecfa7..d1da9792ae 100644 --- a/api/uieventspb/server.pb.go +++ b/api/uieventspb/server.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: uieventspb/server.proto diff --git a/api/userpb/user.pb.go b/api/userpb/user.pb.go index b18eb40739..9628723644 100644 --- a/api/userpb/user.pb.go +++ b/api/userpb/user.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0-devel +// protoc-gen-go v1.32.0 // protoc (unknown) // source: userpb/user.proto diff --git a/tools/go.mod b/tools/go.mod index 5a8c1b4011..b4ba004ffc 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -24,7 +24,7 @@ require ( golang.org/x/perf v0.0.0-20230717203022-1ba3a21238c9 golang.org/x/tools v0.16.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 - google.golang.org/protobuf v1.31.1-0.20231027082548-f4a6c1f6e5c1 + google.golang.org/protobuf v1.32.0 gopkg.in/reform.v1 v1.5.1 mvdan.cc/gofumpt v0.5.0 ) diff --git a/tools/go.sum b/tools/go.sum index dda3efe684..3003f056bf 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1284,8 +1284,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.1-0.20231027082548-f4a6c1f6e5c1 h1:fk72uXZyuZiTtW5tgd63jyVK6582lF61nRC/kGv6vCA= -google.golang.org/protobuf v1.31.1-0.20231027082548-f4a6c1f6e5c1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=