Skip to content

Commit 012a61c

Browse files
ademidoffademidoff
committed
PMM-7 Fix bug.gen.yml plugin use
1 parent 5f7fee9 commit 012a61c

25 files changed

+39
-79
lines changed

‎agent/agents/mysql/perfschema/models.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package perfschema
1616

1717
import "gopkg.in/reform.v1/parse"
1818

19-
//go:generate ../../../../bin/reform
19+
//go:generate go tool reform
2020

2121
// eventsStatementsSummaryByDigest represents a row in performance_schema.events_statements_summary_by_digest table.
2222
//

‎agent/agents/postgres/pgstatmonitor/models.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package pgstatmonitor
1616

1717
import "fmt"
1818

19-
//go:generate ../../../../bin/reform
19+
//go:generate go tool reform
2020

2121
// pgStatDatabase represents a row in pg_stat_database view.
2222
//

‎agent/agents/postgres/pgstatstatements/models.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package pgstatstatements
1616

17-
//go:generate ../../../../bin/reform
17+
//go:generate go tool reform
1818

1919
// pgStatDatabase represents a row in pg_stat_database view.
2020
//

‎api/README.md‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@ make serve
1414

1515
1. Edit `.proto` files. Do not edit Swagger, `.pb.go`, `.pb.gw.go`. You can use `make clean` to remove all generated files.
1616

17-
2. Install required tools (once):
18-
```
19-
make init
20-
```
21-
22-
3. Generate files:
17+
2. Generate files:
2318
```
2419
make gen
2520
```

‎api/buf.gen.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ managed:
1212
- file_option: go_package_prefix
1313
value: github.com/percona/pmm/api
1414
plugins:
15-
- local: go tool protoc-gen-go
15+
- local: ["go", "run", "google.golang.org/protobuf/cmd/protoc-gen-go"]
1616
out: .
1717
opt: paths=source_relative
18-
- local: go tool protoc-gen-go-grpc
18+
- local: ["go", "run", "google.golang.org/grpc/cmd/protoc-gen-go-grpc"]
1919
out: .
2020
opt: paths=source_relative
21-
- local: go tool protoc-gen-grpc-gateway
21+
- local: ["go", "run", "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway"]
2222
out: .
2323
opt: paths=source_relative
24-
- local: go tool protoc-gen-validate
24+
- local: ["go", "run", "github.com/envoyproxy/protoc-gen-validate"]
2525
out: .
2626
opt:
2727
- paths=source_relative
2828
- lang=go
29-
- local: go tool protoc-gen-openapiv2
29+
- local: ["go", "run", "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2"]
3030
out: .
3131
opt:
3232
- simple_operation_ids=true

‎go.mod‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/go-openapi/errors v0.22.0
3434
github.com/go-openapi/runtime v0.28.0
3535
github.com/go-openapi/strfmt v0.23.0
36-
github.com/go-openapi/swag v0.24.1
36+
github.com/go-openapi/swag v0.23.0
3737
github.com/go-openapi/validate v0.24.0
3838
github.com/go-sql-driver/mysql v1.9.0
3939
github.com/gogo/status v1.1.1
@@ -200,22 +200,12 @@ require (
200200
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
201201
github.com/go-git/go-billy/v5 v5.6.0 // indirect
202202
github.com/go-git/go-git/v5 v5.13.0 // indirect
203-
github.com/go-kit/kit v0.9.0 // indirect
204-
github.com/go-logfmt/logfmt v0.5.1 // indirect
203+
github.com/go-kit/kit v0.12.0 // indirect
204+
github.com/go-kit/log v0.2.1 // indirect
205+
github.com/go-logfmt/logfmt v0.6.0 // indirect
205206
github.com/go-logr/logr v1.4.3 // indirect
206207
github.com/go-logr/stdr v1.2.2 // indirect
207208
github.com/go-openapi/inflect v0.21.0 // indirect
208-
github.com/go-openapi/swag/cmdutils v0.24.0 // indirect
209-
github.com/go-openapi/swag/conv v0.24.0 // indirect
210-
github.com/go-openapi/swag/fileutils v0.24.0 // indirect
211-
github.com/go-openapi/swag/jsonname v0.24.0 // indirect
212-
github.com/go-openapi/swag/jsonutils v0.24.0 // indirect
213-
github.com/go-openapi/swag/loading v0.24.0 // indirect
214-
github.com/go-openapi/swag/mangling v0.24.0 // indirect
215-
github.com/go-openapi/swag/netutils v0.24.0 // indirect
216-
github.com/go-openapi/swag/stringutils v0.24.0 // indirect
217-
github.com/go-openapi/swag/typeutils v0.24.0 // indirect
218-
github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
219209
github.com/go-swagger/go-swagger v0.32.3 // indirect
220210
github.com/go-toolsmith/astcast v1.1.0 // indirect
221211
github.com/go-toolsmith/astcopy v1.1.0 // indirect

‎go.sum‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -405,14 +405,17 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
405405
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
406406
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
407407
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
408-
github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
409408
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
409+
github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
410+
github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs=
410411
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
412+
github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
413+
github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
411414
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
412415
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
413416
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
414-
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
415-
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
417+
github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
418+
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
416419
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
417420
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
418421
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -434,30 +437,8 @@ github.com/go-openapi/runtime v0.28.0 h1:gpPPmWSNGo214l6n8hzdXYhPuJcGtziTOgUpvsF
434437
github.com/go-openapi/runtime v0.28.0/go.mod h1:QN7OzcS+XuYmkQLw05akXk0jRH/eZ3kb18+1KwW9gyc=
435438
github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c=
436439
github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4=
437-
github.com/go-openapi/swag v0.24.1 h1:DPdYTZKo6AQCRqzwr/kGkxJzHhpKxZ9i/oX0zag+MF8=
438-
github.com/go-openapi/swag v0.24.1/go.mod h1:sm8I3lCPlspsBBwUm1t5oZeWZS0s7m/A+Psg0ooRU0A=
439-
github.com/go-openapi/swag/cmdutils v0.24.0 h1:KlRCffHwXFI6E5MV9n8o8zBRElpY4uK4yWyAMWETo9I=
440-
github.com/go-openapi/swag/cmdutils v0.24.0/go.mod h1:uxib2FAeQMByyHomTlsP8h1TtPd54Msu2ZDU/H5Vuf8=
441-
github.com/go-openapi/swag/conv v0.24.0 h1:ejB9+7yogkWly6pnruRX45D1/6J+ZxRu92YFivx54ik=
442-
github.com/go-openapi/swag/conv v0.24.0/go.mod h1:jbn140mZd7EW2g8a8Y5bwm8/Wy1slLySQQ0ND6DPc2c=
443-
github.com/go-openapi/swag/fileutils v0.24.0 h1:U9pCpqp4RUytnD689Ek/N1d2N/a//XCeqoH508H5oak=
444-
github.com/go-openapi/swag/fileutils v0.24.0/go.mod h1:3SCrCSBHyP1/N+3oErQ1gP+OX1GV2QYFSnrTbzwli90=
445-
github.com/go-openapi/swag/jsonname v0.24.0 h1:2wKS9bgRV/xB8c62Qg16w4AUiIrqqiniJFtZGi3dg5k=
446-
github.com/go-openapi/swag/jsonname v0.24.0/go.mod h1:GXqrPzGJe611P7LG4QB9JKPtUZ7flE4DOVechNaDd7Q=
447-
github.com/go-openapi/swag/jsonutils v0.24.0 h1:F1vE1q4pg1xtO3HTyJYRmEuJ4jmIp2iZ30bzW5XgZts=
448-
github.com/go-openapi/swag/jsonutils v0.24.0/go.mod h1:vBowZtF5Z4DDApIoxcIVfR8v0l9oq5PpYRUuteVu6f0=
449-
github.com/go-openapi/swag/loading v0.24.0 h1:ln/fWTwJp2Zkj5DdaX4JPiddFC5CHQpvaBKycOlceYc=
450-
github.com/go-openapi/swag/loading v0.24.0/go.mod h1:gShCN4woKZYIxPxbfbyHgjXAhO61m88tmjy0lp/LkJk=
451-
github.com/go-openapi/swag/mangling v0.24.0 h1:PGOQpViCOUroIeak/Uj/sjGAq9LADS3mOyjznmHy2pk=
452-
github.com/go-openapi/swag/mangling v0.24.0/go.mod h1:Jm5Go9LHkycsz0wfoaBDkdc4CkpuSnIEf62brzyCbhc=
453-
github.com/go-openapi/swag/netutils v0.24.0 h1:Bz02HRjYv8046Ycg/w80q3g9QCWeIqTvlyOjQPDjD8w=
454-
github.com/go-openapi/swag/netutils v0.24.0/go.mod h1:WRgiHcYTnx+IqfMCtu0hy9oOaPR0HnPbmArSRN1SkZM=
455-
github.com/go-openapi/swag/stringutils v0.24.0 h1:i4Z/Jawf9EvXOLUbT97O0HbPUja18VdBxeadyAqS1FM=
456-
github.com/go-openapi/swag/stringutils v0.24.0/go.mod h1:5nUXB4xA0kw2df5PRipZDslPJgJut+NjL7D25zPZ/4w=
457-
github.com/go-openapi/swag/typeutils v0.24.0 h1:d3szEGzGDf4L2y1gYOSSLeK6h46F+zibnEas2Jm/wIw=
458-
github.com/go-openapi/swag/typeutils v0.24.0/go.mod h1:q8C3Kmk/vh2VhpCLaoR2MVWOGP8y7Jc8l82qCTd1DYI=
459-
github.com/go-openapi/swag/yamlutils v0.24.0 h1:bhw4894A7Iw6ne+639hsBNRHg9iZg/ISrOVr+sJGp4c=
460-
github.com/go-openapi/swag/yamlutils v0.24.0/go.mod h1:DpKv5aYuaGm/sULePoeiG8uwMpZSfReo1HR3Ik0yaG8=
440+
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
441+
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
461442
github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58=
462443
github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ=
463444
github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
@@ -466,7 +447,6 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB
466447
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
467448
github.com/go-sql-driver/mysql v1.9.0 h1:Y0zIbQXhQKmQgTp44Y1dp3wTXcn804QoTptLZT1vtvo=
468449
github.com/go-sql-driver/mysql v1.9.0/go.mod h1:pDetrLJeA3oMujJuvXc8RJoasr589B6A9fwzD3QMrqw=
469-
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
470450
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
471451
github.com/go-swagger/go-swagger v0.32.3 h1:bhAfZ4WaFXyPuw2OrXg34rOcUBR++fpVdonRRYzBK1c=
472452
github.com/go-swagger/go-swagger v0.32.3/go.mod h1:lAwO1nKff3qNRJYVQeTCl1am5pcNiiA2VyDf8TqzS24=

‎managed/models/action_models.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"gopkg.in/reform.v1"
2222
)
2323

24-
//go:generate ../../bin/reform
24+
//go:generate go tool reform
2525

2626
// ActionResult describes an action result which is storing in persistent storage.
2727
//

‎managed/models/agent_model.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"github.com/percona/pmm/version"
3838
)
3939

40-
//go:generate ../../bin/reform
40+
//go:generate go tool reform
4141

4242
// AgentType represents Agent type as stored in databases:
4343
// pmm-managed's PostgreSQL, qan-api's ClickHouse, and VictoriaMetrics.

‎managed/models/artifact_model.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"gopkg.in/reform.v1"
2323
)
2424

25-
//go:generate ../../bin/reform
25+
//go:generate go tool reform
2626

2727
// DataModel represents a data model used for performing a backup.
2828
type DataModel string

0 commit comments

Comments
 (0)