Skip to content

Commit d57b160

Browse files
refactor: remove google/wire dependency and implement manual DI (aquasecurity#9509)
Co-authored-by: DmitriyLewen <[email protected]>
1 parent 331cf5d commit d57b160

File tree

18 files changed

+294
-772
lines changed

18 files changed

+294
-772
lines changed

go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ require (
5454
github.com/google/go-github/v62 v62.0.0
5555
github.com/google/licenseclassifier/v2 v2.0.0
5656
github.com/google/uuid v1.6.0
57-
github.com/google/wire v0.7.0
5857
github.com/hashicorp/go-getter v1.8.1
5958
github.com/hashicorp/go-multierror v1.1.1
6059
github.com/hashicorp/go-retryablehttp v0.7.8
@@ -299,7 +298,6 @@ require (
299298
github.com/google/pprof v0.0.0-20250607225305-033d6d78b36a // indirect
300299
github.com/google/s2a-go v0.1.9 // indirect
301300
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
302-
github.com/google/subcommands v1.2.0 // indirect
303301
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
304302
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
305303
github.com/gorilla/mux v1.8.1 // indirect
@@ -507,7 +505,6 @@ require (
507505

508506
tool (
509507
github.com/bufbuild/buf/cmd/buf
510-
github.com/google/wire/cmd/wire
511508
github.com/knqyf263/labeler
512509
github.com/magefile/mage
513510
github.com/twitchtv/twirp/protoc-gen-twirp

go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -697,17 +697,13 @@ github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
697697
github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
698698
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 h1:SJ+NtwL6QaZ21U+IrK7d0gGgpjGGvd2kz+FzTHVzdqI=
699699
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2/go.mod h1:Tv1PlzqC9t8wNnpPdctvtSUOPUUg4SHeE6vR1Ir2hmg=
700-
github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
701-
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
702700
github.com/google/tink/go v1.7.0 h1:6Eox8zONGebBFcCBqkVmt60LaWZa6xg1cl/DwAh/J1w=
703701
github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcgTJZStM=
704702
github.com/google/trillian v1.7.2 h1:EPBxc4YWY4Ak8tcuhyFleY+zYlbCDCa4Sn24e1Ka8Js=
705703
github.com/google/trillian v1.7.2/go.mod h1:mfQJW4qRH6/ilABtPYNBerVJAJ/upxHLX81zxNQw05s=
706704
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
707705
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
708706
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
709-
github.com/google/wire v0.7.0 h1:JxUKI6+CVBgCO2WToKy/nQk0sS+amI9z9EjVmdaocj4=
710-
github.com/google/wire v0.7.0/go.mod h1:n6YbUQD9cPKTnHXEBN2DXlOp/mVADhVErcMFb0v3J18=
711707
github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
712708
github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
713709
github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=

magefiles/magefile.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,6 @@ func (Tool) Install() error {
112112
return sh.Run("go", "install", "tool")
113113
}
114114

115-
// Wire generates the wire_gen.go file for each package
116-
func Wire() error {
117-
mg.Deps(Tool{}.Install) // Install wire
118-
return sh.RunV("go", "tool", "wire", "gen", "./pkg/commands/...", "./pkg/rpc/...", "./pkg/k8s/...")
119-
}
120-
121115
type Protoc mg.Namespace
122116

123117
// Generate parses PROTO_FILES and generates the Go code for client/server mode

pkg/commands/artifact/inject.go

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)