Skip to content

Commit 64c3804

Browse files
update Bazel rules with gazelle and manually
1 parent 86cd73a commit 64c3804

File tree

4 files changed

+30
-21
lines changed

4 files changed

+30
-21
lines changed

BUILD.bazel

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
21
load(
32
"@bazel_gazelle//:def.bzl",
43
"gazelle",
54
)
5+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
66

77
# gazelle:prefix github.com/google/go-jsonnet
88
gazelle(
@@ -13,6 +13,7 @@ go_library(
1313
name = "go_default_library",
1414
srcs = [
1515
"builtins.go",
16+
"debugger.go",
1617
"doc.go",
1718
"error_formatter.go",
1819
"imports.go",
@@ -32,6 +33,7 @@ go_library(
3233
"//internal/errors:go_default_library",
3334
"//internal/parser:go_default_library",
3435
"//internal/program:go_default_library",
36+
"//toolutils:go_default_library",
3537
"@io_k8s_sigs_yaml//:go_default_library",
3638
"@org_golang_x_crypto//sha3:go_default_library",
3739
],

MODULE.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module(name = "jsonnet_go", version = "0.0.0")
22

3-
bazel_dep(name = "gazelle", version = "0.37.0", repo_name = "bazel_gazelle")
3+
bazel_dep(name = "gazelle", version = "0.41.0", repo_name = "bazel_gazelle")
44
bazel_dep(name = "jsonnet", version = "0.20.0", repo_name = "cpp_jsonnet")
55
bazel_dep(name = "rules_go", version = "0.48.0", repo_name = "io_bazel_rules_go")
66

@@ -11,4 +11,5 @@ use_repo(
1111
"com_github_fatih_color",
1212
"com_github_sergi_go_diff",
1313
"io_k8s_sigs_yaml",
14+
"org_golang_x_crypto",
1415
)

bazel/deps.bzl

+15-17
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
load(
2-
"@io_bazel_rules_go//go:deps.bzl",
3-
"go_register_toolchains",
4-
"go_rules_dependencies",
5-
)
61
load(
72
"@bazel_gazelle//:deps.bzl",
83
"gazelle_dependencies",
94
"go_repository",
105
)
6+
load(
7+
"@io_bazel_rules_go//go:deps.bzl",
8+
"go_register_toolchains",
9+
"go_rules_dependencies",
10+
)
1111

1212
def jsonnet_go_dependencies(go_sdk_version = "host"):
13-
go_rules_dependencies()
14-
go_register_toolchains(version = go_sdk_version)
1513
gazelle_dependencies()
14+
go_register_toolchains(version = go_sdk_version)
1615
go_repository(
1716
name = "com_github_davecgh_go_spew",
1817
importpath = "github.com/davecgh/go-spew",
@@ -26,7 +25,6 @@ def jsonnet_go_dependencies(go_sdk_version = "host"):
2625
sum = "h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc=",
2726
version = "v1.12.0",
2827
)
29-
3028
go_repository(
3129
name = "com_github_kr_pretty",
3230
importpath = "github.com/kr/pretty",
@@ -104,31 +102,31 @@ def jsonnet_go_dependencies(go_sdk_version = "host"):
104102
go_repository(
105103
name = "org_golang_x_crypto",
106104
importpath = "golang.org/x/crypto",
107-
sum = "h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=",
108-
version = "v0.9.0",
105+
sum = "h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=",
106+
version = "v0.17.0",
109107
)
110108
go_repository(
111109
name = "org_golang_x_net",
112110
importpath = "golang.org/x/net",
113111
sum = "h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=",
114112
version = "v0.10.0",
115113
)
116-
117114
go_repository(
118115
name = "org_golang_x_sys",
119116
importpath = "golang.org/x/sys",
120-
sum = "h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=",
121-
version = "v0.8.0",
117+
sum = "h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=",
118+
version = "v0.15.0",
122119
)
123120
go_repository(
124121
name = "org_golang_x_term",
125122
importpath = "golang.org/x/term",
126-
sum = "h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=",
127-
version = "v0.8.0",
123+
sum = "h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=",
124+
version = "v0.15.0",
128125
)
129126
go_repository(
130127
name = "org_golang_x_text",
131128
importpath = "golang.org/x/text",
132-
sum = "h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=",
133-
version = "v0.9.0",
129+
sum = "h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=",
130+
version = "v0.14.0",
134131
)
132+
go_rules_dependencies()

formatter/BUILD.bazel

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@io_bazel_rules_go//go:def.bzl", "go_library")
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
22

33
go_library(
44
name = "go_default_library",
@@ -7,7 +7,15 @@ go_library(
77
visibility = ["//visibility:public"],
88
deps = [
99
"//ast:go_default_library",
10-
"//internal/parser:go_default_library",
1110
"//internal/formatter:go_default_library",
11+
"//internal/parser:go_default_library",
1212
],
1313
)
14+
15+
go_test(
16+
name = "go_default_test",
17+
srcs = ["formatter_test.go"],
18+
data = glob(["testdata/**"]),
19+
embed = [":go_default_library"],
20+
deps = ["//internal/testutils:go_default_library"],
21+
)

0 commit comments

Comments
 (0)