github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reformat openapi/def.bzl and pkg/version/def.bzl using latest buildifier rules

pull/8/head
Jeff Grafton 2018-05-21 14:48:06 -07:00
parent 23ceebac22
commit d3a22cbd2f
2 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/generated/openapi/def.bzl
View File

@ -15,31 +15,31 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library") load("@io_bazel_rules_go//go:def.bzl", "go_library")
load("@io_kubernetes_build//defs:go.bzl", "go_genrule") load("@io_kubernetes_build//defs:go.bzl", "go_genrule")
def openapi_library(name, tags, srcs, go_prefix, vendor_prefix="", openapi_targets=[], vendor_targets=[]): def openapi_library(name, tags, srcs, go_prefix, vendor_prefix = "", openapi_targets = [], vendor_targets = []):
deps = [ deps = [
"//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library",
"//vendor/k8s.io/kube-openapi/pkg/common:go_default_library", "//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
] + ["//%s:go_default_library" % target for target in openapi_targets] + ["//vendor/%s:go_default_library" % target for target in vendor_targets] ] + ["//%s:go_default_library" % target for target in openapi_targets] + ["//vendor/%s:go_default_library" % target for target in vendor_targets]
go_library( go_library(
name=name, name = name,
tags=tags, srcs = srcs + [":zz_generated.openapi"],
srcs=srcs + [":zz_generated.openapi"], tags = tags,
deps=deps, deps = deps,
) )
go_genrule( go_genrule(
name = "zz_generated.openapi", name = "zz_generated.openapi",
srcs = srcs + ["//" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt"], srcs = srcs + ["//" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt"],
outs = ["zz_generated.openapi.go"], outs = ["zz_generated.openapi.go"],
cmd = " ".join([ cmd = " ".join([
"$(location //vendor/k8s.io/code-generator/cmd/openapi-gen)", "$(location //vendor/k8s.io/code-generator/cmd/openapi-gen)",
"--v 1", "--v 1",
"--logtostderr", "--logtostderr",
"--go-header-file $(location //" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt)", "--go-header-file $(location //" + vendor_prefix + "hack/boilerplate:boilerplate.go.txt)",
"--output-file-base zz_generated.openapi", "--output-file-base zz_generated.openapi",
"--output-package " + go_prefix + vendor_prefix + "pkg/generated/openapi", "--output-package " + go_prefix + vendor_prefix + "pkg/generated/openapi",
"--input-dirs " + ",".join([go_prefix + target for target in openapi_targets] + [go_prefix + "vendor/" + target for target in vendor_targets]), "--input-dirs " + ",".join([go_prefix + target for target in openapi_targets] + [go_prefix + "vendor/" + target for target in vendor_targets]),
"&& cp " + vendor_prefix + "pkg/generated/openapi/zz_generated.openapi.go $(location :zz_generated.openapi.go)", "&& cp " + vendor_prefix + "pkg/generated/openapi/zz_generated.openapi.go $(location :zz_generated.openapi.go)",
]), ]),
go_deps = deps, go_deps = deps,
tools = ["//vendor/k8s.io/code-generator/cmd/openapi-gen"], tools = ["//vendor/k8s.io/code-generator/cmd/openapi-gen"],
) )

46
pkg/version/def.bzl
View File

@ -14,25 +14,27 @@
# Implements hack/lib/version.sh's kube::version::ldflags() for Bazel. # Implements hack/lib/version.sh's kube::version::ldflags() for Bazel.
def version_x_defs(): def version_x_defs():
# This should match the list of packages in kube::version::ldflag # This should match the list of packages in kube::version::ldflag
stamp_pkgs = [ stamp_pkgs = [
"k8s.io/kubernetes/pkg/version", "k8s.io/kubernetes/pkg/version",
# In hack/lib/version.sh, this has a vendor/ prefix. That isn't needed here? # In hack/lib/version.sh, this has a vendor/ prefix. That isn't needed here?
"k8s.io/client-go/pkg/version", "k8s.io/client-go/pkg/version",
] ]
# This should match the list of vars in kube::version::ldflags
# It should also match the list of vars set in hack/print-workspace-status.sh. # This should match the list of vars in kube::version::ldflags
stamp_vars = [ # It should also match the list of vars set in hack/print-workspace-status.sh.
"buildDate", stamp_vars = [
"gitCommit", "buildDate",
"gitMajor", "gitCommit",
"gitMinor", "gitMajor",
"gitTreeState", "gitMinor",
"gitVersion", "gitTreeState",
] "gitVersion",
# Generate the cross-product. ]
x_defs = {}
for pkg in stamp_pkgs: # Generate the cross-product.
for var in stamp_vars: x_defs = {}
x_defs["%s.%s" % (pkg, var)] = "{%s}" % var for pkg in stamp_pkgs:
return x_defs for var in stamp_vars:
x_defs["%s.%s" % (pkg, var)] = "{%s}" % var
return x_defs