Skip to content

Commit 41d6939

Browse files
dimsdims
committed
Switch from glog to klog
Change-Id: I8dcb22debc5c04ff6845cb798386fbb3b2156651
1 parent b4bc4f1 commit 41d6939

File tree

27 files changed

+147
-351
lines changed

27 files changed

+147
-351
lines changed

‎Gopkg.lock

Lines changed: 26 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ required = [
99

1010
[[constraint]]
1111
branch = "master"
12-
name = "github.com/golang/glog"
12+
name = "k8s.io/klog"
1313

1414
[[constraint]]
1515
branch = "master"

‎kazel/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ go_library(
2727
tags = ["automanaged"],
2828
deps = [
2929
"//vendor/github.com/bazelbuild/buildtools/build:go_default_library",
30-
"//vendor/github.com/golang/glog:go_default_library",
30+
"//vendor/k8s.io/klog:go_default_library",
3131
],
3232
)

‎kazel/kazel.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ import (
3131
"strings"
3232

3333
bzl "github.com/bazelbuild/buildtools/build"
34-
"github.com/golang/glog"
34+
35+
"k8s.io/klog"
3536
)
3637

3738
const (
@@ -51,36 +52,36 @@ func main() {
5152
flag.Parse()
5253
flag.Set("alsologtostderr", "true")
5354
if *root == "" {
54-
glog.Fatalf("-root argument is required")
55+
klog.Fatalf("-root argument is required")
5556
}
5657
if *validate {
5758
*dryRun = true
5859
}
5960
v, err := newVendorer(*root, *cfgPath, *dryRun)
6061
if err != nil {
61-
glog.Fatalf("unable to build vendorer: %v", err)
62+
klog.Fatalf("unable to build vendorer: %v", err)
6263
}
6364
if err = os.Chdir(v.root); err != nil {
64-
glog.Fatalf("cannot chdir into root %q: %v", v.root, err)
65+
klog.Fatalf("cannot chdir into root %q: %v", v.root, err)
6566
}
6667

6768
if v.cfg.ManageGoRules {
6869
if err = v.walkVendor(); err != nil {
69-
glog.Fatalf("err walking vendor: %v", err)
70+
klog.Fatalf("err walking vendor: %v", err)
7071
}
7172
if err = v.walkRepo(); err != nil {
72-
glog.Fatalf("err walking repo: %v", err)
73+
klog.Fatalf("err walking repo: %v", err)
7374
}
7475
}
7576
if err = v.walkGenerated(); err != nil {
76-
glog.Fatalf("err walking generated: %v", err)
77+
klog.Fatalf("err walking generated: %v", err)
7778
}
7879
if _, err = v.walkSource("."); err != nil {
79-
glog.Fatalf("err walking source: %v", err)
80+
klog.Fatalf("err walking source: %v", err)
8081
}
8182
written := 0
8283
if written, err = v.reconcileAllRules(); err != nil {
83-
glog.Fatalf("err reconciling rules: %v", err)
84+
klog.Fatalf("err reconciling rules: %v", err)
8485
}
8586
if *validate && written > 0 {
8687
fmt.Fprintf(os.Stderr, "\n%d BUILD files not up-to-date.\n", written)
@@ -546,7 +547,7 @@ func asExpr(e interface{}) bzl.Expr {
546547
}
547548
return &bzl.ListExpr{List: list}
548549
default:
549-
glog.Fatalf("Uh oh")
550+
klog.Fatalf("Uh oh")
550551
return nil
551552
}
552553
}

‎tools/build_tar/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ go_library(
66
importpath = "k8s.io/repo-infra/tools/build_tar",
77
visibility = ["//visibility:private"],
88
deps = [
9-
"//vendor/github.com/golang/glog:go_default_library",
9+
"//vendor/k8s.io/klog:go_default_library",
1010
"//vendor/golang.org/x/build/pargzip:go_default_library",
1111
],
1212
)

‎tools/build_tar/buildtar.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131
"strconv"
3232
"strings"
3333

34-
"github.com/golang/glog"
35-
3634
"golang.org/x/build/pargzip"
35+
36+
"k8s.io/klog"
3737
)
3838

3939
func main() {
@@ -84,53 +84,53 @@ func main() {
8484
if flagfile != "" {
8585
b, err := ioutil.ReadFile(flagfile)
8686
if err != nil {
87-
glog.Fatalf("couldn't read flagfile: %v", err)
87+
klog.Fatalf("couldn't read flagfile: %v", err)
8888
}
8989
cmdline := strings.Split(string(b), "\n")
9090
flag.CommandLine.Parse(cmdline)
9191
}
9292

9393
if output == "" {
94-
glog.Fatalf("--output flag is required")
94+
klog.Fatalf("--output flag is required")
9595
}
9696

9797
meta := newFileMeta(mode, modes, owner, owners, ownerName, ownerNames)
9898

9999
tf, err := newTarFile(output, directory, compression, meta)
100100
if err != nil {
101-
glog.Fatalf("couldn't build tar: %v", err)
101+
klog.Fatalf("couldn't build tar: %v", err)
102102
}
103103
defer tf.Close()
104104

105105
for _, file := range files {
106106
parts := strings.SplitN(file, "=", 2)
107107
if len(parts) != 2 {
108-
glog.Fatalf("bad parts length for file %q", file)
108+
klog.Fatalf("bad parts length for file %q", file)
109109
}
110110
if err := tf.addFile(parts[0], parts[1]); err != nil {
111-
glog.Fatalf("couldn't add file: %v", err)
111+
klog.Fatalf("couldn't add file: %v", err)
112112
}
113113
}
114114

115115
for _, tar := range tars {
116116
if err := tf.addTar(tar); err != nil {
117-
glog.Fatalf("couldn't add tar: %v", err)
117+
klog.Fatalf("couldn't add tar: %v", err)
118118
}
119119
}
120120

121121
for _, deb := range debs {
122122
if err := tf.addDeb(deb); err != nil {
123-
glog.Fatalf("couldn't add deb: %v", err)
123+
klog.Fatalf("couldn't add deb: %v", err)
124124
}
125125
}
126126

127127
for _, link := range links {
128128
parts := strings.SplitN(link, ":", 2)
129129
if len(parts) != 2 {
130-
glog.Fatalf("bad parts length for link %q", link)
130+
klog.Fatalf("bad parts length for link %q", link)
131131
}
132132
if err := tf.addLink(parts[0], parts[1]); err != nil {
133-
glog.Fatalf("couldn't add link: %v", err)
133+
klog.Fatalf("couldn't add link: %v", err)
134134
}
135135
}
136136
}
@@ -390,7 +390,7 @@ func newFileMeta(
390390
if mode != "" {
391391
i, err := strconv.ParseUint(mode, 8, 32)
392392
if err != nil {
393-
glog.Fatalf("couldn't parse mode: %v", mode)
393+
klog.Fatalf("couldn't parse mode: %v", mode)
394394
}
395395
meta.defaultMode = os.FileMode(i)
396396
}
@@ -399,22 +399,22 @@ func newFileMeta(
399399
for _, filemode := range modes {
400400
parts := strings.SplitN(filemode, "=", 2)
401401
if len(parts) != 2 {
402-
glog.Fatalf("expected two parts to %q", filemode)
402+
klog.Fatalf("expected two parts to %q", filemode)
403403
}
404404
if parts[0][0] == '/' {
405405
parts[0] = parts[0][1:]
406406
}
407407
i, err := strconv.ParseUint(parts[1], 8, 32)
408408
if err != nil {
409-
glog.Fatalf("couldn't parse mode: %v", filemode)
409+
klog.Fatalf("couldn't parse mode: %v", filemode)
410410
}
411411
meta.modeMap[parts[0]] = os.FileMode(i)
412412
}
413413

414414
if ownerName != "" {
415415
parts := strings.SplitN(ownerName, ".", 2)
416416
if len(parts) != 2 {
417-
glog.Fatalf("expected two parts to %q", ownerName)
417+
klog.Fatalf("expected two parts to %q", ownerName)
418418
}
419419
meta.defaultUname = parts[0]
420420
meta.defaultGname = parts[1]
@@ -425,13 +425,13 @@ func newFileMeta(
425425
for _, name := range ownerNames {
426426
parts := strings.SplitN(name, "=", 2)
427427
if len(parts) != 2 {
428-
glog.Fatalf("expected two parts to %q %v", name, parts)
428+
klog.Fatalf("expected two parts to %q %v", name, parts)
429429
}
430430
filename, ownername := parts[0], parts[1]
431431

432432
parts = strings.SplitN(ownername, ".", 2)
433433
if len(parts) != 2 {
434-
glog.Fatalf("expected two parts to %q", name)
434+
klog.Fatalf("expected two parts to %q", name)
435435
}
436436
uname, gname := parts[0], parts[1]
437437

@@ -442,15 +442,15 @@ func newFileMeta(
442442
if owner != "" {
443443
parts := strings.SplitN(owner, ".", 2)
444444
if len(parts) != 2 {
445-
glog.Fatalf("expected two parts to %q", owner)
445+
klog.Fatalf("expected two parts to %q", owner)
446446
}
447447
uid, err := strconv.Atoi(parts[0])
448448
if err != nil {
449-
glog.Fatalf("could not parse uid: %q", parts[0])
449+
klog.Fatalf("could not parse uid: %q", parts[0])
450450
}
451451
gid, err := strconv.Atoi(parts[1])
452452
if err != nil {
453-
glog.Fatalf("could not parse gid: %q", parts[1])
453+
klog.Fatalf("could not parse gid: %q", parts[1])
454454
}
455455
meta.defaultUID = uid
456456
meta.defaultGID = gid
@@ -462,21 +462,21 @@ func newFileMeta(
462462
for _, owner := range owners {
463463
parts := strings.SplitN(owner, "=", 2)
464464
if len(parts) != 2 {
465-
glog.Fatalf("expected two parts to %q", owner)
465+
klog.Fatalf("expected two parts to %q", owner)
466466
}
467467
filename, owner := parts[0], parts[1]
468468

469469
parts = strings.SplitN(parts[1], ".", 2)
470470
if len(parts) != 2 {
471-
glog.Fatalf("expected two parts to %q", owner)
471+
klog.Fatalf("expected two parts to %q", owner)
472472
}
473473
uid, err := strconv.Atoi(parts[0])
474474
if err != nil {
475-
glog.Fatalf("could not parse uid: %q", parts[0])
475+
klog.Fatalf("could not parse uid: %q", parts[0])
476476
}
477477
gid, err := strconv.Atoi(parts[1])
478478
if err != nil {
479-
glog.Fatalf("could not parse gid: %q", parts[1])
479+
klog.Fatalf("could not parse gid: %q", parts[1])
480480
}
481481
meta.uidMap[filename] = uid
482482
meta.gidMap[filename] = gid

‎vendor/BUILD.bazel

Whitespace-only changes.

‎vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle/BUILD.bazel

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

‎vendor/github.com/bazelbuild/bazel-gazelle/internal/config/BUILD.bazel

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

0 commit comments

Comments
 (0)