Skip to content

Commit c10822b

Browse files
phlaxmathetake
andauthored
Nukes build_external (#43931) (#44353)
Signed-off-by: Takeshi Yoneda <tyoneda@netflix.com> Signed-off-by: Ryan Northey <ryan@synca.io> Co-authored-by: Takeshi Yoneda <t.y.mathetake@gmail.com>
1 parent 103fbef commit c10822b

1 file changed

Lines changed: 8 additions & 15 deletions

File tree

bazel/dependency_imports.bzl

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,13 @@ def envoy_dependency_imports(
9393
protoc_gen_jsonschema_go_dependencies()
9494

9595
# These dependencies, like most of the Go in this repository, exist only for the API.
96-
# These repos also have transient dependencies - `build_external` allows them to use them.
97-
# TODO(phlax): remove `build_external` and pin all transients
96+
# All transitive dependencies are pinned explicitly below to keep builds hermetic.
9897
go_repository(
9998
name = "org_golang_google_grpc",
10099
build_file_proto_mode = "disable",
101100
importpath = "google.golang.org/grpc",
102101
sum = "h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=",
103102
version = "v1.68.0",
104-
build_external = "external",
105103
build_directives = [
106104
"gazelle:resolve go google.golang.org/genproto/googleapis/rpc/status @org_golang_google_genproto_googleapis_rpc//status",
107105
"gazelle:resolve go golang.org/x/net/http2 @org_golang_x_net//http2",
@@ -115,26 +113,30 @@ def envoy_dependency_imports(
115113
importpath = "golang.org/x/net",
116114
sum = "h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=",
117115
version = "v0.34.0",
118-
build_external = "external",
119116
build_directives = [
117+
"gazelle:resolve go golang.org/x/sys/unix @org_golang_x_sys//unix",
120118
"gazelle:resolve go golang.org/x/text/secure/bidirule @org_golang_x_text//secure/bidirule",
121119
"gazelle:resolve go golang.org/x/text/unicode/bidi @org_golang_x_text//unicode/bidi",
122120
"gazelle:resolve go golang.org/x/text/unicode/norm @org_golang_x_text//unicode/norm",
123121
],
124122
)
123+
go_repository(
124+
name = "org_golang_x_sys",
125+
importpath = "golang.org/x/sys",
126+
sum = "h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=",
127+
version = "v0.38.0",
128+
)
125129
go_repository(
126130
name = "org_golang_x_text",
127131
importpath = "golang.org/x/text",
128132
sum = "h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=",
129133
version = "v0.21.0",
130-
build_external = "external",
131134
)
132135
go_repository(
133136
name = "org_golang_google_genproto_googleapis_api",
134137
importpath = "google.golang.org/genproto/googleapis/api",
135138
sum = "h1:+2XxjfsAu6vqFxwGBRcHiMaDCuZiqXGDUDVWVtrFAnE=",
136139
version = "v0.0.0-20251029180050-ab9386a59fda",
137-
build_external = "external",
138140
build_directives = [
139141
"gazelle:resolve go google.golang.org/genproto/googleapis/rpc/status @org_golang_google_genproto_googleapis_rpc//status",
140142
],
@@ -144,22 +146,19 @@ def envoy_dependency_imports(
144146
importpath = "google.golang.org/genproto/googleapis/rpc",
145147
sum = "h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0=",
146148
version = "v0.0.0-20251029180050-ab9386a59fda",
147-
build_external = "external",
148149
)
149150
go_repository(
150151
name = "org_golang_google_protobuf",
151152
build_file_proto_mode = "disable",
152153
importpath = "google.golang.org/protobuf",
153154
sum = "h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=",
154155
version = "v1.36.10",
155-
build_external = "external",
156156
)
157157
go_repository(
158158
name = "com_github_cncf_xds_go",
159159
importpath = "github.com/cncf/xds/go",
160160
sum = "h1:gt7U1Igw0xbJdyaCM5H2CnlAlPSkzrhsebQB6WQWjLA=",
161161
version = "v0.0.0-20251110193048-8bfbf64dc13e",
162-
build_external = "external",
163162
build_directives = [
164163
"gazelle:resolve go google.golang.org/genproto/googleapis/api/expr/v1alpha1 @org_golang_google_genproto_googleapis_api//expr/v1alpha1",
165164
],
@@ -169,14 +168,12 @@ def envoy_dependency_imports(
169168
importpath = "cel.dev/expr",
170169
sum = "h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=",
171170
version = "v0.25.1",
172-
build_external = "external",
173171
)
174172
go_repository(
175173
name = "com_github_spf13_afero",
176174
importpath = "github.com/spf13/afero",
177175
sum = "h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=",
178176
version = "v1.10.0",
179-
build_external = "external",
180177
build_directives = [
181178
"gazelle:resolve go golang.org/x/text/runes @org_golang_x_text//runes",
182179
"gazelle:resolve go golang.org/x/text/transform @org_golang_x_text//transform",
@@ -188,7 +185,6 @@ def envoy_dependency_imports(
188185
importpath = "github.com/lyft/protoc-gen-star/v2",
189186
sum = "h1:sIXJOMrYnQZJu7OB7ANSF4MYri2fTEGIsRLz6LwI4xE=",
190187
version = "v2.0.4-0.20230330145011-496ad1ac90a4",
191-
build_external = "external",
192188
build_directives = [
193189
"gazelle:resolve go github.com/spf13/afero @com_github_spf13_afero//:afero",
194190
"gazelle:resolve go golang.org/x/tools/imports @org_golang_x_tools//imports",
@@ -199,22 +195,19 @@ def envoy_dependency_imports(
199195
importpath = "github.com/iancoleman/strcase",
200196
sum = "h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=",
201197
version = "v0.3.0",
202-
build_external = "external",
203198
)
204199
go_repository(
205200
name = "com_github_planetscale_vtprotobuf",
206201
importpath = "github.com/planetscale/vtprotobuf",
207202
sum = "h1:ujRGEVWJEoaxQ+8+HMl8YEpGaDAgohgZxJ5S+d2TTFQ=",
208203
version = "v0.6.1-0.20240409071808-615f978279ca",
209-
build_external = "external",
210204
)
211205

212206
go_repository(
213207
name = "com_github_envoyproxy_protoc_gen_validate",
214208
importpath = "github.com/envoyproxy/protoc-gen-validate",
215209
sum = "h1:TvGH1wof4H33rezVKWSpqKz5NXWg5VPuZ0uONDT6eb4=",
216210
version = "v1.3.0",
217-
build_external = "external",
218211
)
219212

220213
rules_proto_grpc_toolchains()

0 commit comments

Comments
 (0)