Skip to content

Commit c8caec6

Browse files
ademidoffademidoff
committed
Merge branch 'main' into v3
2 parents f9ce3d8 + 44c7803 commit c8caec6

File tree

14 files changed

+87
-3815
lines changed

14 files changed

+87
-3815
lines changed

‎.github/workflows/clean.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
go:
16-
- version: 1.21.x
16+
- version: 1.22.x
1717
may-fail: false
1818
- version: tip
1919
may-fail: true

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This Dockerfile is used only for API tests.
22

3-
FROM golang:1.21
3+
FROM golang:1.22
44

55
RUN export GOPATH=$(go env GOPATH) && \
66
mkdir -p $GOPATH/src/github.com/percona/pmm

‎build/docker/rpmbuild/Dockerfile.el9

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN yum update -y && \
2525
yum clean all && rm -rf /var/cache/yum
2626

2727
# keep that format for easier search
28-
ENV GO_VERSION 1.21.7
28+
ENV GO_VERSION 1.22.0
2929
ENV GO_RELEASER_VERSION 1.24.0
3030

3131
RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \

‎build/scripts/vars

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ pmm_branch=$(git rev-parse --abbrev-ref HEAD)
1616

1717
pmm_base_version=$(cat ${root_dir}/VERSION)
1818
full_pmm_version=${pmm_base_version}-${pmm_branch}-$(git rev-parse --short HEAD)
19+
# Replace '/' with '-' to prevent sed from failing on dependabot-authored PRs
20+
full_pmm_version=${full_pmm_version//\//-}
1921

2022
# TODO Maybe it makes sense to use variable from job here
2123
if [[ ${pmm_branch} =~ release-* || \

‎cli-tests/package-lock.json

+52-52
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cli-tests/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
"devDependencies": {
2525
"@types/promise-retry": "^1.1.3",
2626
"@types/shelljs": "^0.8.12",
27-
"@typescript-eslint/eslint-plugin": "^7.0.1",
28-
"@typescript-eslint/parser": "^7.0.1",
27+
"@typescript-eslint/eslint-plugin": "^7.1.0",
28+
"@typescript-eslint/parser": "^7.1.0",
2929
"eslint": "8.56",
3030
"eslint-config-airbnb-base": "^15.0.0",
3131
"eslint-config-airbnb-typescript": "^17.1.0",
3232
"eslint-plugin-import": "^2.29.0",
33-
"eslint-plugin-playwright": "^1.1.0"
33+
"eslint-plugin-playwright": "^1.4.0"
3434
}
3535
}

‎devcontainer.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG PMM_SERVER_IMAGE="perconalab/pmm-server:3-dev-latest"
22
FROM $PMM_SERVER_IMAGE
33

44
ARG PMM_SERVER_IMAGE
5-
ARG GO_VERSION="1.21.x"
5+
ARG GO_VERSION="1.22.x"
66

77
USER root
88

‎go.mod

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/percona/pmm
22

3-
go 1.21
3+
go 1.22
4+
5+
toolchain go1.22.0
46

57
// Update saas with
68
// go get -v github.com/percona-platform/saas@latest
@@ -31,7 +33,7 @@ require (
3133
github.com/davecgh/go-spew v1.1.1
3234
github.com/docker/docker v25.0.1+incompatible
3335
github.com/docker/go-connections v0.5.0
34-
github.com/envoyproxy/protoc-gen-validate v1.0.2
36+
github.com/envoyproxy/protoc-gen-validate v1.0.4
3537
github.com/go-co-op/gocron v1.37.0
3638
github.com/go-openapi/errors v0.21.0
3739
github.com/go-openapi/runtime v0.26.0
@@ -75,9 +77,9 @@ require (
7577
golang.org/x/sys v0.17.0
7678
golang.org/x/text v0.14.0
7779
golang.org/x/tools v0.18.0
78-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917
79-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917
80-
google.golang.org/grpc v1.61.0
80+
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80
81+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80
82+
google.golang.org/grpc v1.62.0
8183
google.golang.org/protobuf v1.32.0
8284
gopkg.in/alecthomas/kingpin.v2 v2.2.6
8385
gopkg.in/reform.v1 v1.5.1
@@ -109,7 +111,7 @@ require (
109111
go.opentelemetry.io/otel/metric v1.22.0 // indirect
110112
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
111113
go.uber.org/atomic v1.11.0 // indirect
112-
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
114+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
113115
gopkg.in/ini.v1 v1.67.0 // indirect
114116
)
115117

‎go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
165165
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
166166
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
167167
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
168-
github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
169-
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
168+
github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
169+
github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
170170
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
171171
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
172172
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
@@ -946,12 +946,12 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc
946946
google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
947947
google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
948948
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
949-
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 h1:YJ5pD9rF8o9Qtta0Cmy9rdBwkSjrTCT6XTiUQVOtIos=
950-
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0/go.mod h1:l/k7rMz0vFTBPy+tFSGvXEd3z+BcoG1k7EHbqm+YBsY=
951-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 h1:rcS6EyEaoCO52hQDupoSfrxI3R6C2Tq741is7X8OvnM=
952-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917/go.mod h1:CmlNWB9lSezaYELKS5Ym1r44VrrbPUa7JTvw+6MbpJ0=
953-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ=
954-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU=
949+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
950+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro=
951+
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU=
952+
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA=
953+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
954+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
955955
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
956956
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
957957
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -964,8 +964,8 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa
964964
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
965965
google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
966966
google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
967-
google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0=
968-
google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
967+
google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk=
968+
google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
969969
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
970970
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
971971
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

0 commit comments

Comments
 (0)