From b50be00dc6dc067786eedc577c2c6ccd08cc5879 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Wed, 8 Nov 2023 20:41:11 -0800 Subject: [PATCH] Restore go_repository order to the initial Signed-off-by: Sergii Tkachenko --- bazel/dependency_imports.bzl | 37 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl index f4131666..64034714 100644 --- a/bazel/dependency_imports.bzl +++ b/bazel/dependency_imports.bzl @@ -28,16 +28,15 @@ def xds_dependency_imports(go_version = GO_VERSION): # These repos also have transient dependencies - `build_external` allows them to use them. # TODO(phlax): remove `build_external` and pin all transients go_repository( - name = "org_golang_google_grpc", - build_file_proto_mode = "disable", - importpath = "google.golang.org/grpc", - sum = "h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=", - version = "v1.34.0", + name = "com_github_iancoleman_strcase", + importpath = "github.com/iancoleman/strcase", + sum = "h1:ux/56T2xqZO/3cP1I2F86qpeoYPCOzk+KF/UH/Ar+lk=", + version = "v0.0.0-20180726023541-3605ed457bf7", build_external = "external", - # project_url = "https://pkg.go.dev/google.golang.org/grpc", - # last_update = "2020-12-02" + # project_url = "https://pkg.go.dev/github.com/iancoleman/strcase", + # last_update = "2020-11-22" # use_category = ["api"], - # cpe = "cpe:2.3:a:grpc:grpc:*", + # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L23-L28" ) go_repository( name = "org_golang_x_net", @@ -68,13 +67,6 @@ def xds_dependency_imports(go_version = GO_VERSION): version = "v1.28.1", build_external = "external", ) - go_repository( - name = "com_github_cncf_xds_go", - importpath = "github.com/cncf/xds/go", - sum = "h1:B/lvg4tQ5hfFZd4V2hcSfFVfUvAK6GSFKxIIzwnkv8g=", - version = "v0.0.0-20220520190051-1e77728a1eaa", - build_external = "external", - ) go_repository( name = "com_github_spf13_afero", importpath = "github.com/spf13/afero", @@ -98,15 +90,16 @@ def xds_dependency_imports(go_version = GO_VERSION): # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.10.1/dependencies.bzl#L35-L40" ) go_repository( - name = "com_github_iancoleman_strcase", - importpath = "github.com/iancoleman/strcase", - sum = "h1:ux/56T2xqZO/3cP1I2F86qpeoYPCOzk+KF/UH/Ar+lk=", - version = "v0.0.0-20180726023541-3605ed457bf7", + name = "org_golang_google_grpc", + build_file_proto_mode = "disable", + importpath = "google.golang.org/grpc", + sum = "h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=", + version = "v1.34.0", build_external = "external", - # project_url = "https://pkg.go.dev/github.com/iancoleman/strcase", - # last_update = "2020-11-22" + # project_url = "https://pkg.go.dev/google.golang.org/grpc", + # last_update = "2020-12-02" # use_category = ["api"], - # source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L23-L28" + # cpe = "cpe:2.3:a:grpc:grpc:*", )