From d299f92a83bd180c88e5700f05560e050aebe00e Mon Sep 17 00:00:00 2001 From: Lukas Vogel Date: Thu, 9 Jan 2020 16:27:01 +0100 Subject: [PATCH] fix lint --- go.mod | 4 ---- go.sum | 8 ------- go/lib/infra/modules/trust/BUILD.bazel | 2 +- go/tools/scion-pki/internal/certs/chain.go | 2 +- go/tools/scion-pki/internal/certs/issuer.go | 2 +- go/tools/scion-pki/internal/certs/loader.go | 2 +- go/tools/scion-pki/internal/keys/priv.go | 2 +- go/tools/scion-pki/internal/keys/priv_test.go | 2 +- go/tools/scion-pki/internal/keys/pub_test.go | 2 +- go/tools/scion-pki/internal/tmpl/cmd.go | 2 +- go/tools/scion-pki/internal/tmpl/topo.go | 2 +- go/tools/scion-pki/internal/tmpl/topo_test.go | 2 +- go/tools/scion-pki/internal/trcs/loader.go | 2 +- go/tools/scion-pki/internal/trcs/prototype.go | 2 +- go/tools/scion-pki/internal/trcs/sign.go | 2 +- go_deps.bzl | 24 ------------------- 16 files changed, 13 insertions(+), 49 deletions(-) diff --git a/go.mod b/go.mod index 3ea373cc59..5a91cf522c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( github.com/cloudflare/sidh v0.0.0-20181111220428-fc8e6378752b // indirect github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect github.com/dchest/cmac v0.0.0-20150527144652-62ff55a1048c - github.com/go-ini/ini v1.32.0 github.com/golang/mock v1.2.1-0.20190329180013-73dc87cad333 github.com/google/go-cmp v0.3.0 github.com/google/go-querystring v1.0.1-0.20190318165438-c8c88dbee036 // indirect @@ -27,8 +26,6 @@ require ( github.com/onsi/gomega v1.7.1 // indirect github.com/opentracing/opentracing-go v1.1.0 github.com/patrickmn/go-cache v2.1.1-0.20180815053127-5633e0862627+incompatible - github.com/pierrec/lz4 v1.0.1 - github.com/pierrec/xxHash v0.0.0-20170714082455-a0006b13c722 // indirect github.com/pkg/errors v0.8.2-0.20190227000051-27936f6d90f9 // indirect github.com/prometheus/client_golang v1.1.0 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect @@ -47,7 +44,6 @@ require ( golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/net v0.0.0-20191105084925-a882066a44e0 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c - gopkg.in/ini.v1 v1.51.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 gopkg.in/restruct.v1 v1.0.0-20151213023948-80ede2e57cc2 gopkg.in/yaml.v2 v2.2.4 diff --git a/go.sum b/go.sum index 83f9c2d0af..5a3e8ee269 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,6 @@ github.com/dchest/cmac v0.0.0-20150527144652-62ff55a1048c h1:qoavXEzRRUfup81LsDQ github.com/dchest/cmac v0.0.0-20150527144652-62ff55a1048c/go.mod h1:vWqNmss2I/DL9JKC95Lkwp+lzw+v8hwsQs7hQKyQpwk= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/go-ini/ini v1.32.0 h1:/MArBHSS0TFR28yPPDK1vPIjt4wUnPBfb81i6iiyKvA= -github.com/go-ini/ini v1.32.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -97,10 +95,6 @@ github.com/patrickmn/go-cache v2.1.1-0.20180815053127-5633e0862627+incompatible github.com/patrickmn/go-cache v2.1.1-0.20180815053127-5633e0862627+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/pierrec/lz4 v1.0.1 h1:w6GMGWSsCI04fTM8wQRdnW74MuJISakuUU0onU0TYB4= -github.com/pierrec/lz4 v1.0.1/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/xxHash v0.0.0-20170714082455-a0006b13c722 h1:nDDVHJzMIpkkKZpBBhV60OLwII/BvZSn4PijkMEKdTo= -github.com/pierrec/xxHash v0.0.0-20170714082455-a0006b13c722/go.mod h1:w2waW5Zoa/Wc4Yqe0wgrIYAGKqRMf7czn2HNKXmuL+I= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.2-0.20190227000051-27936f6d90f9 h1:PCj9X21C4pet4sEcElTfAi6LSl5ShkjE8doieLc+cbU= github.com/pkg/errors v0.8.2-0.20190227000051-27936f6d90f9/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -194,8 +188,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 h1:AFxeG48hTWHhDTQDk/m2gorfVHUEa9vo3tp3D7TzwjI= gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/restruct.v1 v1.0.0-20151213023948-80ede2e57cc2 h1:pqzOumCQ6icMR4sIIYRe2w7xCERvcPOFx22W9jSRsWg= diff --git a/go/lib/infra/modules/trust/BUILD.bazel b/go/lib/infra/modules/trust/BUILD.bazel index f9d6cd38d4..b9b537f10f 100644 --- a/go/lib/infra/modules/trust/BUILD.bazel +++ b/go/lib/infra/modules/trust/BUILD.bazel @@ -62,7 +62,7 @@ go_test( ], data = [ "//go/lib/infra/modules/trust/testdata:crypto_tar", - ], + ], embed = [":go_default_library"], deps = [ "//go/lib/addr:go_default_library", diff --git a/go/tools/scion-pki/internal/certs/chain.go b/go/tools/scion-pki/internal/certs/chain.go index 2132721051..9ff707f248 100644 --- a/go/tools/scion-pki/internal/certs/chain.go +++ b/go/tools/scion-pki/internal/certs/chain.go @@ -25,9 +25,9 @@ import ( "github.com/scionproto/scion/go/lib/scrypto" "github.com/scionproto/scion/go/lib/scrypto/cert" "github.com/scionproto/scion/go/lib/serrors" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" "github.com/scionproto/scion/go/tools/scion-pki/internal/keys" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) type chainMeta struct { diff --git a/go/tools/scion-pki/internal/certs/issuer.go b/go/tools/scion-pki/internal/certs/issuer.go index 778cbc0176..999d4227c2 100644 --- a/go/tools/scion-pki/internal/certs/issuer.go +++ b/go/tools/scion-pki/internal/certs/issuer.go @@ -24,9 +24,9 @@ import ( "github.com/scionproto/scion/go/lib/scrypto/cert" "github.com/scionproto/scion/go/lib/scrypto/trc" "github.com/scionproto/scion/go/lib/serrors" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" "github.com/scionproto/scion/go/tools/scion-pki/internal/keys" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) type issMeta struct { diff --git a/go/tools/scion-pki/internal/certs/loader.go b/go/tools/scion-pki/internal/certs/loader.go index 1329eb864f..bc426ea6f7 100644 --- a/go/tools/scion-pki/internal/certs/loader.go +++ b/go/tools/scion-pki/internal/certs/loader.go @@ -23,8 +23,8 @@ import ( "github.com/scionproto/scion/go/lib/addr" "github.com/scionproto/scion/go/lib/scrypto" "github.com/scionproto/scion/go/lib/serrors" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) var errNoFilesFound = serrors.New("no config files found") diff --git a/go/tools/scion-pki/internal/keys/priv.go b/go/tools/scion-pki/internal/keys/priv.go index 66fc353b06..22f1f4daf1 100644 --- a/go/tools/scion-pki/internal/keys/priv.go +++ b/go/tools/scion-pki/internal/keys/priv.go @@ -28,8 +28,8 @@ import ( "github.com/scionproto/scion/go/lib/scrypto/cert" "github.com/scionproto/scion/go/lib/scrypto/trc" "github.com/scionproto/scion/go/lib/serrors" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) type privGen struct { diff --git a/go/tools/scion-pki/internal/keys/priv_test.go b/go/tools/scion-pki/internal/keys/priv_test.go index 2b6f0a5aa6..26aa373eab 100644 --- a/go/tools/scion-pki/internal/keys/priv_test.go +++ b/go/tools/scion-pki/internal/keys/priv_test.go @@ -33,8 +33,8 @@ import ( "github.com/scionproto/scion/go/lib/scrypto/trc" "github.com/scionproto/scion/go/lib/util" "github.com/scionproto/scion/go/lib/xtest" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) var ia110 = xtest.MustParseIA("1-ff00:0:110") diff --git a/go/tools/scion-pki/internal/keys/pub_test.go b/go/tools/scion-pki/internal/keys/pub_test.go index 8b2307301d..8cbd91bdab 100644 --- a/go/tools/scion-pki/internal/keys/pub_test.go +++ b/go/tools/scion-pki/internal/keys/pub_test.go @@ -32,8 +32,8 @@ import ( "github.com/scionproto/scion/go/lib/keyconf" "github.com/scionproto/scion/go/lib/scrypto" "github.com/scionproto/scion/go/lib/xtest" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) func TestPubGenRun(t *testing.T) { diff --git a/go/tools/scion-pki/internal/tmpl/cmd.go b/go/tools/scion-pki/internal/tmpl/cmd.go index fe679d757a..bbf44490a4 100644 --- a/go/tools/scion-pki/internal/tmpl/cmd.go +++ b/go/tools/scion-pki/internal/tmpl/cmd.go @@ -23,8 +23,8 @@ import ( "github.com/scionproto/scion/go/lib/serrors" "github.com/scionproto/scion/go/lib/util" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) var Cmd = &cobra.Command{ diff --git a/go/tools/scion-pki/internal/tmpl/topo.go b/go/tools/scion-pki/internal/tmpl/topo.go index ba53bb75af..90103b35d0 100644 --- a/go/tools/scion-pki/internal/tmpl/topo.go +++ b/go/tools/scion-pki/internal/tmpl/topo.go @@ -25,8 +25,8 @@ import ( "github.com/scionproto/scion/go/lib/scrypto/cert" "github.com/scionproto/scion/go/lib/scrypto/trc" "github.com/scionproto/scion/go/lib/serrors" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) var ( diff --git a/go/tools/scion-pki/internal/tmpl/topo_test.go b/go/tools/scion-pki/internal/tmpl/topo_test.go index bc8fc22a9f..14945b13bd 100644 --- a/go/tools/scion-pki/internal/tmpl/topo_test.go +++ b/go/tools/scion-pki/internal/tmpl/topo_test.go @@ -27,8 +27,8 @@ import ( "github.com/scionproto/scion/go/lib/scrypto/trc" "github.com/scionproto/scion/go/lib/util" "github.com/scionproto/scion/go/lib/xtest" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) var ( diff --git a/go/tools/scion-pki/internal/trcs/loader.go b/go/tools/scion-pki/internal/trcs/loader.go index e44ded4d87..273e158bd8 100644 --- a/go/tools/scion-pki/internal/trcs/loader.go +++ b/go/tools/scion-pki/internal/trcs/loader.go @@ -24,8 +24,8 @@ import ( "github.com/scionproto/scion/go/lib/scrypto" "github.com/scionproto/scion/go/lib/scrypto/trc" "github.com/scionproto/scion/go/lib/serrors" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) type loader struct { diff --git a/go/tools/scion-pki/internal/trcs/prototype.go b/go/tools/scion-pki/internal/trcs/prototype.go index 5871574f33..8daba1a720 100644 --- a/go/tools/scion-pki/internal/trcs/prototype.go +++ b/go/tools/scion-pki/internal/trcs/prototype.go @@ -25,9 +25,9 @@ import ( "github.com/scionproto/scion/go/lib/scrypto" "github.com/scionproto/scion/go/lib/scrypto/trc" "github.com/scionproto/scion/go/lib/serrors" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" "github.com/scionproto/scion/go/tools/scion-pki/internal/keys" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) // signedMeta keeps track of the TRC version. diff --git a/go/tools/scion-pki/internal/trcs/sign.go b/go/tools/scion-pki/internal/trcs/sign.go index cc58edb885..937c4ddad9 100644 --- a/go/tools/scion-pki/internal/trcs/sign.go +++ b/go/tools/scion-pki/internal/trcs/sign.go @@ -20,9 +20,9 @@ import ( "github.com/scionproto/scion/go/lib/scrypto" "github.com/scionproto/scion/go/lib/scrypto/trc" "github.com/scionproto/scion/go/lib/serrors" - "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" "github.com/scionproto/scion/go/tools/scion-pki/internal/conf" "github.com/scionproto/scion/go/tools/scion-pki/internal/keys" + "github.com/scionproto/scion/go/tools/scion-pki/internal/pkicmn" ) type signatureGen struct { diff --git a/go_deps.bzl b/go_deps.bzl index bb00fdad54..f16c67f37d 100644 --- a/go_deps.bzl +++ b/go_deps.bzl @@ -80,12 +80,6 @@ def go_deps(): sum = "h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=", version = "v1.4.7", ) - go_repository( - name = "com_github_go_ini_ini", - importpath = "github.com/go-ini/ini", - sum = "h1:/MArBHSS0TFR28yPPDK1vPIjt4wUnPBfb81i6iiyKvA=", - version = "v1.32.0", - ) go_repository( name = "com_github_go_kit_kit", importpath = "github.com/go-kit/kit", @@ -302,18 +296,6 @@ def go_deps(): sum = "h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ=", version = "v1.0.0", ) - go_repository( - name = "com_github_pierrec_lz4", - importpath = "github.com/pierrec/lz4", - sum = "h1:w6GMGWSsCI04fTM8wQRdnW74MuJISakuUU0onU0TYB4=", - version = "v1.0.1", - ) - go_repository( - name = "com_github_pierrec_xxhash", - importpath = "github.com/pierrec/xxHash", - sum = "h1:nDDVHJzMIpkkKZpBBhV60OLwII/BvZSn4PijkMEKdTo=", - version = "v0.0.0-20170714082455-a0006b13c722", - ) go_repository( name = "com_github_pkg_errors", importpath = "github.com/pkg/errors", @@ -465,12 +447,6 @@ def go_deps(): sum = "h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=", version = "v1.4.7", ) - go_repository( - name = "in_gopkg_ini_v1", - importpath = "gopkg.in/ini.v1", - sum = "h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=", - version = "v1.51.0", - ) go_repository( name = "in_gopkg_natefinch_lumberjack_v2", importpath = "gopkg.in/natefinch/lumberjack.v2",