Fix errors caught by go vet in compliance package
`go test` implicitly runs `go vet` and fails the tests if vet
errors are found. Fix all the issues found by vet.
Test: go test build/make/tools/compliance/...
Change-Id: If0684cf124ece4931af440008cd44a61c22de475
diff --git a/tools/compliance/cmd/bom.go b/tools/compliance/cmd/bom.go
index f6cb72c..ec01603 100644
--- a/tools/compliance/cmd/bom.go
+++ b/tools/compliance/cmd/bom.go
@@ -69,12 +69,12 @@
} else {
dir, err := filepath.Abs(filepath.Dir(*outputFile))
if err != nil {
- fmt.Fprintf(os.Stderr, "cannot determine path to %q: %w\n", *outputFile, err)
+ fmt.Fprintf(os.Stderr, "cannot determine path to %q: %s\n", *outputFile, err)
os.Exit(1)
}
fi, err := os.Stat(dir)
if err != nil {
- fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %w\n", dir, *outputFile, err)
+ fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %s\n", dir, *outputFile, err)
os.Exit(1)
}
if !fi.IsDir() {
@@ -102,7 +102,7 @@
if *outputFile != "-" {
err := os.WriteFile(*outputFile, ofile.(*bytes.Buffer).Bytes(), 0666)
if err != nil {
- fmt.Fprintf(os.Stderr, "could not write output to %q: %w\n", *outputFile, err)
+ fmt.Fprintf(os.Stderr, "could not write output to %q: %s\n", *outputFile, err)
os.Exit(1)
}
}
diff --git a/tools/compliance/cmd/bom_test.go b/tools/compliance/cmd/bom_test.go
index 9c12671..fc61bbf 100644
--- a/tools/compliance/cmd/bom_test.go
+++ b/tools/compliance/cmd/bom_test.go
@@ -275,7 +275,7 @@
err := billOfMaterials(&ctx, rootFiles...)
if err != nil {
- t.Fatalf("bom: error = %w, stderr = %v", err, stderr)
+ t.Fatalf("bom: error = %v, stderr = %v", err, stderr)
return
}
if stderr.Len() > 0 {
diff --git a/tools/compliance/cmd/dumpgraph_test.go b/tools/compliance/cmd/dumpgraph_test.go
index 3055022..6555aab 100644
--- a/tools/compliance/cmd/dumpgraph_test.go
+++ b/tools/compliance/cmd/dumpgraph_test.go
@@ -1217,7 +1217,7 @@
outList := strings.Split(stdout.String(), "\n")
outLine := 0
if outList[outLine] != "strict digraph {" {
- t.Errorf("dumpgraph: got 1st line %v, want strict digraph {")
+ t.Errorf("dumpgraph: got 1st line %v, want strict digraph {", outList[outLine])
}
outLine++
if strings.HasPrefix(strings.TrimLeft(outList[outLine], " \t"), "rankdir") {
diff --git a/tools/compliance/cmd/dumpresolutions_test.go b/tools/compliance/cmd/dumpresolutions_test.go
index a3a298e..1abfac7 100644
--- a/tools/compliance/cmd/dumpresolutions_test.go
+++ b/tools/compliance/cmd/dumpresolutions_test.go
@@ -3305,7 +3305,7 @@
outList := strings.Split(stdout.String(), "\n")
outLine := 0
if outList[outLine] != "strict digraph {" {
- t.Errorf("dumpresolutions: got 1st line %v, want strict digraph {")
+ t.Errorf("dumpresolutions: got 1st line %v, want strict digraph {", outList[outLine])
}
outLine++
if strings.HasPrefix(strings.TrimLeft(outList[outLine], " \t"), "rankdir") {
diff --git a/tools/compliance/cmd/htmlnotice.go b/tools/compliance/cmd/htmlnotice.go
index cff1ff8..3456a49 100644
--- a/tools/compliance/cmd/htmlnotice.go
+++ b/tools/compliance/cmd/htmlnotice.go
@@ -74,12 +74,12 @@
} else {
dir, err := filepath.Abs(filepath.Dir(*outputFile))
if err != nil {
- fmt.Fprintf(os.Stderr, "cannot determine path to %q: %w\n", *outputFile, err)
+ fmt.Fprintf(os.Stderr, "cannot determine path to %q: %s\n", *outputFile, err)
os.Exit(1)
}
fi, err := os.Stat(dir)
if err != nil {
- fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %w\n", dir, *outputFile, err)
+ fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %s\n", dir, *outputFile, err)
os.Exit(1)
}
if !fi.IsDir() {
@@ -107,7 +107,7 @@
if *outputFile != "-" {
err := os.WriteFile(*outputFile, ofile.(*bytes.Buffer).Bytes(), 0666)
if err != nil {
- fmt.Fprintf(os.Stderr, "could not write output to %q: %w\n", *outputFile, err)
+ fmt.Fprintf(os.Stderr, "could not write output to %q: %s\n", *outputFile, err)
os.Exit(1)
}
}
@@ -139,13 +139,13 @@
}
fmt.Fprintln(ctx.stdout, "<!DOCTYPE html>")
- fmt.Fprintln(ctx.stdout, "<html><head>\n")
+ fmt.Fprintln(ctx.stdout, "<html><head>")
fmt.Fprintln(ctx.stdout, "<style type=\"text/css\">")
fmt.Fprintln(ctx.stdout, "body { padding: 2px; margin: 0; }")
fmt.Fprintln(ctx.stdout, "ul { list-style-type: none; margin: 0; padding: 0; }")
fmt.Fprintln(ctx.stdout, "li { padding-left: 1em; }")
fmt.Fprintln(ctx.stdout, ".file-list { margin-left: 1em; }")
- fmt.Fprintln(ctx.stdout, "</style>\n")
+ fmt.Fprintln(ctx.stdout, "</style>")
if 0 < len(ctx.title) {
fmt.Fprintf(ctx.stdout, "<title>%s</title>\n", html.EscapeString(ctx.title))
}
diff --git a/tools/compliance/cmd/htmlnotice_test.go b/tools/compliance/cmd/htmlnotice_test.go
index 8d3ea02..35a25bf 100644
--- a/tools/compliance/cmd/htmlnotice_test.go
+++ b/tools/compliance/cmd/htmlnotice_test.go
@@ -560,7 +560,7 @@
err := htmlNotice(&ctx, rootFiles...)
if err != nil {
- t.Fatalf("htmlnotice: error = %w, stderr = %v", err, stderr)
+ t.Fatalf("htmlnotice: error = %v, stderr = %v", err, stderr)
return
}
if stderr.Len() > 0 {
diff --git a/tools/compliance/cmd/shippedlibs.go b/tools/compliance/cmd/shippedlibs.go
index 290ced6..ee74cad 100644
--- a/tools/compliance/cmd/shippedlibs.go
+++ b/tools/compliance/cmd/shippedlibs.go
@@ -66,12 +66,12 @@
} else {
dir, err := filepath.Abs(filepath.Dir(*outputFile))
if err != nil {
- fmt.Fprintf(os.Stderr, "cannot determine path to %q: %w\n", *outputFile, err)
+ fmt.Fprintf(os.Stderr, "cannot determine path to %q: %s\n", *outputFile, err)
os.Exit(1)
}
fi, err := os.Stat(dir)
if err != nil {
- fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %w\n", dir, *outputFile, err)
+ fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %s\n", dir, *outputFile, err)
os.Exit(1)
}
if !fi.IsDir() {
@@ -99,7 +99,7 @@
if *outputFile != "-" {
err := os.WriteFile(*outputFile, ofile.(*bytes.Buffer).Bytes(), 0666)
if err != nil {
- fmt.Fprintf(os.Stderr, "could not write output to %q: %w\n", *outputFile, err)
+ fmt.Fprintf(os.Stderr, "could not write output to %q: %s\n", *outputFile, err)
os.Exit(1)
}
}
diff --git a/tools/compliance/cmd/shippedlibs_test.go b/tools/compliance/cmd/shippedlibs_test.go
index 4b2e4ee..dbf3274 100644
--- a/tools/compliance/cmd/shippedlibs_test.go
+++ b/tools/compliance/cmd/shippedlibs_test.go
@@ -194,7 +194,7 @@
err := shippedLibs(&ctx, rootFiles...)
if err != nil {
- t.Fatalf("shippedLibs: error = %w, stderr = %v", err, stderr)
+ t.Fatalf("shippedLibs: error = %v, stderr = %v", err, stderr)
return
}
if stderr.Len() > 0 {
diff --git a/tools/compliance/cmd/textnotice.go b/tools/compliance/cmd/textnotice.go
index 91c57b0..658d609 100644
--- a/tools/compliance/cmd/textnotice.go
+++ b/tools/compliance/cmd/textnotice.go
@@ -69,12 +69,12 @@
} else {
dir, err := filepath.Abs(filepath.Dir(*outputFile))
if err != nil {
- fmt.Fprintf(os.Stderr, "cannot determine path to %q: %w\n", *outputFile, err)
+ fmt.Fprintf(os.Stderr, "cannot determine path to %q: %s\n", *outputFile, err)
os.Exit(1)
}
fi, err := os.Stat(dir)
if err != nil {
- fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %w\n", dir, *outputFile, err)
+ fmt.Fprintf(os.Stderr, "cannot read directory %q of %q: %s\n", dir, *outputFile, err)
os.Exit(1)
}
if !fi.IsDir() {
@@ -102,7 +102,7 @@
if *outputFile != "-" {
err := os.WriteFile(*outputFile, ofile.(*bytes.Buffer).Bytes(), 0666)
if err != nil {
- fmt.Fprintf(os.Stderr, "could not write output to %q: %w\n", *outputFile, err)
+ fmt.Fprintf(os.Stderr, "could not write output to %q: %s\n", *outputFile, err)
os.Exit(1)
}
}
diff --git a/tools/compliance/cmd/textnotice_test.go b/tools/compliance/cmd/textnotice_test.go
index 156fb90..8b6a4b5 100644
--- a/tools/compliance/cmd/textnotice_test.go
+++ b/tools/compliance/cmd/textnotice_test.go
@@ -474,7 +474,7 @@
err := textNotice(&ctx, rootFiles...)
if err != nil {
- t.Fatalf("textnotice: error = %w, stderr = %v", err, stderr)
+ t.Fatalf("textnotice: error = %v, stderr = %v", err, stderr)
return
}
if stderr.Len() > 0 {