Run gofmt on compliance
Test: builds
Change-Id: I404b138faac0db9a92201be6163b19d9e6bff810
diff --git a/tools/compliance/cmd/bom_test.go b/tools/compliance/cmd/bom_test.go
index b0d61e1..9c12671 100644
--- a/tools/compliance/cmd/bom_test.go
+++ b/tools/compliance/cmd/bom_test.go
@@ -31,9 +31,9 @@
expectedOut []string
}{
{
- condition: "firstparty",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "firstparty",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
stripPrefix: "out/target/product/fictional",
expectedOut: []string{
"/system/apex/highest.apex",
@@ -44,9 +44,9 @@
},
},
{
- condition: "firstparty",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "firstparty",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
stripPrefix: "out/target/product/fictional/data/",
expectedOut: []string{
"container.zip",
@@ -57,23 +57,23 @@
},
},
{
- condition: "firstparty",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "firstparty",
+ name: "application",
+ roots: []string{"application.meta_lic"},
stripPrefix: "out/target/product/fictional/bin/",
expectedOut: []string{"application"},
},
{
- condition: "firstparty",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "firstparty",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
stripPrefix: "out/target/product/fictional/system/",
expectedOut: []string{"bin/bin1"},
},
{
- condition: "firstparty",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "firstparty",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
stripPrefix: "out/target/product/fictional/system/",
expectedOut: []string{"lib/libd.so"},
},
@@ -102,27 +102,27 @@
},
},
{
- condition: "notice",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "notice",
+ name: "application",
+ roots: []string{"application.meta_lic"},
expectedOut: []string{"out/target/product/fictional/bin/application"},
},
{
- condition: "notice",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "notice",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{"out/target/product/fictional/system/bin/bin1"},
},
{
- condition: "notice",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "notice",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{"out/target/product/fictional/system/lib/libd.so"},
},
{
- condition: "reciprocal",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "reciprocal",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
stripPrefix: "out/target/product/fictional/system/apex/",
expectedOut: []string{
"highest.apex",
@@ -133,9 +133,9 @@
},
},
{
- condition: "reciprocal",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "reciprocal",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
stripPrefix: "out/target/product/fictional/data/",
expectedOut: []string{
"container.zip",
@@ -146,30 +146,30 @@
},
},
{
- condition: "reciprocal",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "reciprocal",
+ name: "application",
+ roots: []string{"application.meta_lic"},
stripPrefix: "out/target/product/fictional/bin/",
expectedOut: []string{"application"},
},
{
- condition: "reciprocal",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "reciprocal",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
stripPrefix: "out/target/product/fictional/system/",
expectedOut: []string{"bin/bin1"},
},
{
- condition: "reciprocal",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "reciprocal",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
stripPrefix: "out/target/product/fictional/system/",
expectedOut: []string{"lib/libd.so"},
},
{
- condition: "restricted",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "restricted",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
stripPrefix: "out/target/product/fictional/system/apex/",
expectedOut: []string{
"highest.apex",
@@ -180,9 +180,9 @@
},
},
{
- condition: "restricted",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "restricted",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
stripPrefix: "out/target/product/fictional/data/",
expectedOut: []string{
"container.zip",
@@ -193,30 +193,30 @@
},
},
{
- condition: "restricted",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "restricted",
+ name: "application",
+ roots: []string{"application.meta_lic"},
stripPrefix: "out/target/product/fictional/bin/",
expectedOut: []string{"application"},
},
{
- condition: "restricted",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "restricted",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
stripPrefix: "out/target/product/fictional/system/",
expectedOut: []string{"bin/bin1"},
},
{
- condition: "restricted",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "restricted",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
stripPrefix: "out/target/product/fictional/system/",
expectedOut: []string{"lib/libd.so"},
},
{
- condition: "proprietary",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "proprietary",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
stripPrefix: "out/target/product/fictional/system/apex/",
expectedOut: []string{
"highest.apex",
@@ -227,9 +227,9 @@
},
},
{
- condition: "proprietary",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "proprietary",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
stripPrefix: "out/target/product/fictional/data/",
expectedOut: []string{
"container.zip",
@@ -240,23 +240,23 @@
},
},
{
- condition: "proprietary",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "proprietary",
+ name: "application",
+ roots: []string{"application.meta_lic"},
stripPrefix: "out/target/product/fictional/bin/",
expectedOut: []string{"application"},
},
{
- condition: "proprietary",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "proprietary",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
stripPrefix: "out/target/product/fictional/system/",
expectedOut: []string{"bin/bin1"},
},
{
- condition: "proprietary",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "proprietary",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
stripPrefix: "out/target/product/fictional/system/",
expectedOut: []string{"lib/libd.so"},
},
diff --git a/tools/compliance/cmd/checkshare.go b/tools/compliance/cmd/checkshare.go
index 5114a28..e2735c3 100644
--- a/tools/compliance/cmd/checkshare.go
+++ b/tools/compliance/cmd/checkshare.go
@@ -46,12 +46,11 @@
}
var (
- failConflicts = fmt.Errorf("conflicts")
+ failConflicts = fmt.Errorf("conflicts")
failNoneRequested = fmt.Errorf("\nNo metadata files requested")
- failNoLicenses = fmt.Errorf("No licenses")
+ failNoLicenses = fmt.Errorf("No licenses")
)
-
// byError orders conflicts by error string
type byError []compliance.SourceSharePrivacyConflict
diff --git a/tools/compliance/cmd/dumpgraph.go b/tools/compliance/cmd/dumpgraph.go
index 1ee63b2..76fdff3 100644
--- a/tools/compliance/cmd/dumpgraph.go
+++ b/tools/compliance/cmd/dumpgraph.go
@@ -31,7 +31,7 @@
stripPrefix = flag.String("strip_prefix", "", "Prefix to remove from paths. i.e. path to root")
failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
- failNoLicenses = fmt.Errorf("No licenses found")
+ failNoLicenses = fmt.Errorf("No licenses found")
)
type context struct {
diff --git a/tools/compliance/cmd/dumpresolutions.go b/tools/compliance/cmd/dumpresolutions.go
index 318cd91..fc8c47c 100644
--- a/tools/compliance/cmd/dumpresolutions.go
+++ b/tools/compliance/cmd/dumpresolutions.go
@@ -32,7 +32,7 @@
stripPrefix = flag.String("strip_prefix", "", "Prefix to remove from paths. i.e. path to root")
failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
- failNoLicenses = fmt.Errorf("No licenses found")
+ failNoLicenses = fmt.Errorf("No licenses found")
)
type context struct {
diff --git a/tools/compliance/cmd/dumpresolutions_test.go b/tools/compliance/cmd/dumpresolutions_test.go
index d904671..a3a298e 100644
--- a/tools/compliance/cmd/dumpresolutions_test.go
+++ b/tools/compliance/cmd/dumpresolutions_test.go
@@ -97,7 +97,7 @@
name: "apex_trimmed_share",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: compliance.ImpliesShared.AsList(),
+ conditions: compliance.ImpliesShared.AsList(),
stripPrefix: "testdata/firstparty/",
},
expectedOut: []string{},
@@ -107,7 +107,7 @@
name: "apex_trimmed_private",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: compliance.ImpliesPrivate.AsList(),
+ conditions: compliance.ImpliesPrivate.AsList(),
stripPrefix: "testdata/firstparty/",
},
expectedOut: []string{},
@@ -117,7 +117,7 @@
name: "apex_trimmed_share_private",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: append(compliance.ImpliesPrivate.AsList(),compliance.ImpliesShared.AsList()...),
+ conditions: append(compliance.ImpliesPrivate.AsList(), compliance.ImpliesShared.AsList()...),
stripPrefix: "testdata/firstparty/",
},
expectedOut: []string{},
@@ -255,7 +255,7 @@
name: "apex_trimmed_share",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: compliance.ImpliesShared.AsList(),
+ conditions: compliance.ImpliesShared.AsList(),
stripPrefix: "testdata/notice/",
},
expectedOut: []string{},
@@ -265,7 +265,7 @@
name: "apex_trimmed_private",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: compliance.ImpliesPrivate.AsList(),
+ conditions: compliance.ImpliesPrivate.AsList(),
stripPrefix: "testdata/notice/",
},
expectedOut: []string{},
@@ -275,7 +275,7 @@
name: "apex_trimmed_share_private",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: append(compliance.ImpliesShared.AsList(),compliance.ImpliesPrivate.AsList()...),
+ conditions: append(compliance.ImpliesShared.AsList(), compliance.ImpliesPrivate.AsList()...),
stripPrefix: "testdata/notice/",
},
expectedOut: []string{},
@@ -408,7 +408,7 @@
name: "apex_trimmed_share",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: compliance.ImpliesShared.AsList(),
+ conditions: compliance.ImpliesShared.AsList(),
stripPrefix: "testdata/reciprocal/",
},
expectedOut: []string{
@@ -424,7 +424,7 @@
name: "apex_trimmed_private",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: compliance.ImpliesPrivate.AsList(),
+ conditions: compliance.ImpliesPrivate.AsList(),
stripPrefix: "testdata/reciprocal/",
},
expectedOut: []string{},
@@ -434,7 +434,7 @@
name: "apex_trimmed_share_private",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: append(compliance.ImpliesShared.AsList(),compliance.ImpliesPrivate.AsList()...),
+ conditions: append(compliance.ImpliesShared.AsList(), compliance.ImpliesPrivate.AsList()...),
stripPrefix: "testdata/reciprocal/",
},
expectedOut: []string{
@@ -573,7 +573,7 @@
name: "apex_trimmed_share",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: compliance.ImpliesShared.AsList(),
+ conditions: compliance.ImpliesShared.AsList(),
stripPrefix: "testdata/restricted/",
},
expectedOut: []string{
@@ -597,7 +597,7 @@
name: "apex_trimmed_private",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: compliance.ImpliesPrivate.AsList(),
+ conditions: compliance.ImpliesPrivate.AsList(),
stripPrefix: "testdata/restricted/",
},
expectedOut: []string{},
@@ -607,7 +607,7 @@
name: "apex_trimmed_share_private",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: append(compliance.ImpliesShared.AsList(),compliance.ImpliesPrivate.AsList()...),
+ conditions: append(compliance.ImpliesShared.AsList(), compliance.ImpliesPrivate.AsList()...),
stripPrefix: "testdata/restricted/",
},
expectedOut: []string{
@@ -754,7 +754,7 @@
name: "apex_trimmed_share",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: compliance.ImpliesShared.AsList(),
+ conditions: compliance.ImpliesShared.AsList(),
stripPrefix: "testdata/proprietary/",
},
expectedOut: []string{
@@ -771,7 +771,7 @@
name: "apex_trimmed_private",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: compliance.ImpliesPrivate.AsList(),
+ conditions: compliance.ImpliesPrivate.AsList(),
stripPrefix: "testdata/proprietary/",
},
expectedOut: []string{
@@ -789,7 +789,7 @@
name: "apex_trimmed_share_private",
roots: []string{"highest.apex.meta_lic"},
ctx: context{
- conditions: append(compliance.ImpliesShared.AsList(),compliance.ImpliesPrivate.AsList()...),
+ conditions: append(compliance.ImpliesShared.AsList(), compliance.ImpliesPrivate.AsList()...),
stripPrefix: "testdata/proprietary/",
},
expectedOut: []string{
@@ -930,7 +930,7 @@
}
// newTestCondition constructs a test license condition in the license graph.
-func newTestCondition(lg *compliance.LicenseGraph, conditionName... string) compliance.LicenseConditionSet {
+func newTestCondition(lg *compliance.LicenseGraph, conditionName ...string) compliance.LicenseConditionSet {
cs := compliance.NewLicenseConditionSet()
for _, name := range conditionName {
cs = cs.Plus(compliance.RecognizedConditionNames[name])
diff --git a/tools/compliance/cmd/listshare.go b/tools/compliance/cmd/listshare.go
index 5c58dc4..ae9382e 100644
--- a/tools/compliance/cmd/listshare.go
+++ b/tools/compliance/cmd/listshare.go
@@ -41,7 +41,7 @@
var (
failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
- failNoLicenses = fmt.Errorf("No licenses found")
+ failNoLicenses = fmt.Errorf("No licenses found")
)
func main() {
diff --git a/tools/compliance/cmd/shippedlibs.go b/tools/compliance/cmd/shippedlibs.go
index f25d729..290ced6 100644
--- a/tools/compliance/cmd/shippedlibs.go
+++ b/tools/compliance/cmd/shippedlibs.go
@@ -26,16 +26,16 @@
)
var (
- outputFile = flag.String("o", "-", "Where to write the library list. (default stdout)")
+ outputFile = flag.String("o", "-", "Where to write the library list. (default stdout)")
failNoneRequested = fmt.Errorf("\nNo license metadata files requested")
failNoLicenses = fmt.Errorf("No licenses found")
)
type context struct {
- stdout io.Writer
- stderr io.Writer
- rootFS fs.FS
+ stdout io.Writer
+ stderr io.Writer
+ rootFS fs.FS
}
func init() {
diff --git a/tools/compliance/cmd/shippedlibs_test.go b/tools/compliance/cmd/shippedlibs_test.go
index 69ec817..4b2e4ee 100644
--- a/tools/compliance/cmd/shippedlibs_test.go
+++ b/tools/compliance/cmd/shippedlibs_test.go
@@ -30,153 +30,153 @@
expectedOut []string
}{
{
- condition: "firstparty",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "firstparty",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{"Android"},
},
{
- condition: "firstparty",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "firstparty",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
expectedOut: []string{"Android"},
},
{
- condition: "firstparty",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "firstparty",
+ name: "application",
+ roots: []string{"application.meta_lic"},
expectedOut: []string{"Android"},
},
{
- condition: "firstparty",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "firstparty",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{"Android"},
},
{
- condition: "firstparty",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "firstparty",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{"Android"},
},
{
- condition: "notice",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "notice",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "notice",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "notice",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "notice",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "notice",
+ name: "application",
+ roots: []string{"application.meta_lic"},
expectedOut: []string{"Android", "Device"},
},
{
- condition: "notice",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "notice",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "notice",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "notice",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{"External"},
},
{
- condition: "reciprocal",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "reciprocal",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "reciprocal",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "reciprocal",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "reciprocal",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "reciprocal",
+ name: "application",
+ roots: []string{"application.meta_lic"},
expectedOut: []string{"Android", "Device"},
},
{
- condition: "reciprocal",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "reciprocal",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "reciprocal",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "reciprocal",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{"External"},
},
{
- condition: "restricted",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "restricted",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "restricted",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "restricted",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "restricted",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "restricted",
+ name: "application",
+ roots: []string{"application.meta_lic"},
expectedOut: []string{"Android", "Device"},
},
{
- condition: "restricted",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "restricted",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "restricted",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "restricted",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{"External"},
},
{
- condition: "proprietary",
- name: "apex",
- roots: []string{"highest.apex.meta_lic"},
+ condition: "proprietary",
+ name: "apex",
+ roots: []string{"highest.apex.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "proprietary",
- name: "container",
- roots: []string{"container.zip.meta_lic"},
+ condition: "proprietary",
+ name: "container",
+ roots: []string{"container.zip.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "proprietary",
- name: "application",
- roots: []string{"application.meta_lic"},
+ condition: "proprietary",
+ name: "application",
+ roots: []string{"application.meta_lic"},
expectedOut: []string{"Android", "Device"},
},
{
- condition: "proprietary",
- name: "binary",
- roots: []string{"bin/bin1.meta_lic"},
+ condition: "proprietary",
+ name: "binary",
+ roots: []string{"bin/bin1.meta_lic"},
expectedOut: []string{"Android", "Device", "External"},
},
{
- condition: "proprietary",
- name: "library",
- roots: []string{"lib/libd.so.meta_lic"},
+ condition: "proprietary",
+ name: "library",
+ roots: []string{"lib/libd.so.meta_lic"},
expectedOut: []string{"External"},
},
}