From dd63a401c4cd16ad4277c93ccd382132242473e2 Mon Sep 17 00:00:00 2001 From: Andrew Chan Date: Sun, 17 Nov 2019 16:35:06 -0800 Subject: [PATCH] Update Go version and Gopkg.toml (#14) * Update Gopkg.toml * bump go version * copying changes from admin * lint * lint spelling --- .travis.yml | 2 +- Dockerfile | 4 +- Gopkg.lock | 457 ++++++++++++------ Gopkg.toml | 62 ++- Makefile | 1 + boilerplate/lyft/golang_test_targets/Makefile | 17 +- pkg/manager/impl/artifact_manager.go | 6 +- .../impl/validators/partition_validator.go | 2 +- 8 files changed, 385 insertions(+), 166 deletions(-) diff --git a/.travis.yml b/.travis.yml index a988672150..b139364b7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: required language: go go: - - "1.10" + - "1.13" services: - docker jobs: diff --git a/Dockerfile b/Dockerfile index 8129304d34..f8e063536b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst # Using go1.10.4 -FROM golang:1.10.4-alpine3.8 as builder +FROM golang:1.13.3-alpine3.10 as builder RUN apk add git openssh-client make curl dep # COPY only the dep files for efficient caching @@ -25,7 +25,7 @@ RUN make linux_compile ENV PATH="/artifacts:${PATH}" # This will eventually move to centurylink/ca-certs:latest for minimum possible image size -FROM alpine:3.8 +FROM alpine:3.10 COPY --from=builder /artifacts /bin RUN apk --update add ca-certificates diff --git a/Gopkg.lock b/Gopkg.lock index f582f67f54..ce225b1343 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,15 +2,46 @@ [[projects]] - digest = "1:920e6fa9e64d9a7524a4bb535f0a95fff8492d73ed26c81177ba381bd5d32aa2" + digest = "1:26ee1e365ea8f312ee11e170fc6675bac0dd3d4adf2406e753d0a43527e1afb8" + name = "cloud.google.com/go" + packages = ["compute/metadata"] + pruneopts = "UT" + revision = "5d03b9fdabc3f75630183d940a54b0047106bf8a" + version = "v0.48.0" + +[[projects]] + digest = "1:94d4ae958b3d2ab476bef4bed53c1dcc3cb0fb2639bd45dd08b40e57139192e5" + name = "github.com/Azure/azure-sdk-for-go" + packages = ["storage"] + pruneopts = "UT" + revision = "2d49bb8f2cee530cc16f1f1a9f0aae763dee257d" + version = "v10.2.1-beta" + +[[projects]] + digest = "1:dcf25ae752511462b05f08dc4be431e0c3231941071669c9230939a3600aa2b9" + name = "github.com/Azure/go-autorest" + packages = [ + "autorest", + "autorest/adal", + "autorest/azure", + "autorest/date", + "logger", + "tracing", + ] + pruneopts = "UT" + revision = "3492b2aff5036c67228ab3c7dba3577c871db200" + version = "v13.3.0" + +[[projects]] + digest = "1:7e704bce17074e862cfe9e4c2849320c2628fc3501b7d0795c589a427ef2bf50" name = "github.com/Selvatico/go-mocket" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "c368d4162be502eea110ae12fb85e98567b0f1e6" version = "v1.0.7" [[projects]] - digest = "1:baf8d1f197a20ab6b3b92c63cb194ee8e4570d381d7a3299e0f5163252ba6df4" + digest = "1:c7d1f6b7a19b1573edc26f6380582ff9e6dfef7846d58bd4594d7cb2016bfcf1" name = "github.com/aws/aws-sdk-go" packages = [ "aws", @@ -34,6 +65,7 @@ "internal/ini", "internal/s3err", "internal/sdkio", + "internal/sdkmath", "internal/sdkrand", "internal/sdkuri", "internal/shareddefaults", @@ -47,34 +79,36 @@ "private/protocol/restxml", "private/protocol/xml/xmlutil", "service/s3", + "service/s3/s3iface", + "service/s3/s3manager", "service/sts", "service/sts/stsiface", ] - pruneopts = "NUT" - revision = "3d64de9191c7cf300083c8ff3049bf079c5b67ba" - version = "v1.21.3" + pruneopts = "UT" + revision = "7ac2b6f1d3c9c64a4cbb06212e33b5965d83e3e2" + version = "v1.25.36" [[projects]] - digest = "1:707ebe952a8b3d00b343c01536c79c73771d100f63ec6babeaed5c79e2b8a8dd" + digest = "1:d6afaeed1502aa28e80a4ed0981d570ad91b2579193404256ce672ed0a609e0d" name = "github.com/beorn7/perks" packages = ["quantile"] - pruneopts = "NUT" - revision = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46" - version = "v1.0.0" + pruneopts = "UT" + revision = "37c8de3658fcb183f997c4e13e8337516ab753e6" + version = "v1.0.1" [[projects]] - digest = "1:0c31fa2fb2c809d61d640e28cc400087fe205df6ec9623dd1eb91a7de8d4f5d6" + digest = "1:61406f6571eeb97717bdfaac37fa0bc5260621c4cbf3ce7635e9828dcbb5258a" name = "github.com/cespare/xxhash" packages = ["."] - pruneopts = "NUT" - revision = "3b82fb7d186719faeedd0c2864f868c74fbf79a1" - version = "v2.0.0" + pruneopts = "UT" + revision = "d7df74196a9e781ede915320c11c378c1b2f3a1f" + version = "v2.1.1" [[projects]] - digest = "1:6f502d622502fc4a896b69acdf0837c550d7b3657d124c9870f5fcc681f15b53" + digest = "1:00eb5d8bd96289512920ac43367d5bee76bbca2062da34862a98b26b92741896" name = "github.com/coocood/freecache" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "3c79a0a23c1940ab4479332fb3e0127265650ce3" version = "v1.1.0" @@ -82,36 +116,52 @@ digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" name = "github.com/davecgh/go-spew" packages = ["spew"] - pruneopts = "NUT" + pruneopts = "UT" revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" version = "v1.1.1" [[projects]] - digest = "1:ade392a843b2035effb4b4a2efa2c3bab3eb29b992e98bacf9c898b0ecb54e45" + digest = "1:76dc72490af7174349349838f2fe118996381b31ea83243812a97e5a0fd5ed55" + name = "github.com/dgrijalva/jwt-go" + packages = ["."] + pruneopts = "UT" + revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" + version = "v3.2.0" + +[[projects]] + digest = "1:865079840386857c809b72ce300be7580cb50d3d3129ce11bf9aa6ca2bc1934a" name = "github.com/fatih/color" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" version = "v1.7.0" [[projects]] branch = "master" - digest = "1:91bbc8ba11c3bbee849fc48e6816e03b827d9847249c00a976c2fef2f58be59e" + digest = "1:925a2ad8acf10a486cdae4366eaf45847b16d6d7448e654814d8f1d51adeefe4" name = "github.com/fsnotify/fsnotify" packages = ["."] - pruneopts = "NUT" - revision = "1485a34d5d5723fea214f5710708e19a831720e4" + pruneopts = "UT" + revision = "4bf2d1fec78374803a39307bfb8d340688f4f28e" [[projects]] branch = "master" - digest = "1:e2b86e41f3d669fc36b50d31d32d22c8ac656c75aa5ea89717ce7177e134ff2a" + digest = "1:1ba1d79f2810270045c328ae5d674321db34e3aae468eb4233883b473c5c0467" name = "github.com/golang/glog" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" [[projects]] - digest = "1:3ea3429061d04eff320611732c74432f1e8fb0e61f69a86bce7d7c73de99e4f2" + branch = "master" + digest = "1:b7cb6054d3dff43b38ad2e92492f220f57ae6087ee797dca298139776749ace8" + name = "github.com/golang/groupcache" + packages = ["lru"] + pruneopts = "UT" + revision = "611e8accdfc92c4187d399e95ce826046d4c8d73" + +[[projects]] + digest = "1:07f4fafe81587b642166199f41c3edcca12929fcfcc0261b00be5dea2f968f44" name = "github.com/golang/protobuf" packages = [ "proto", @@ -121,23 +171,35 @@ "ptypes/struct", "ptypes/timestamp", ] - pruneopts = "NUT" - revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" - version = "v1.3.1" + pruneopts = "UT" + revision = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7" + version = "v1.3.2" + +[[projects]] + digest = "1:766102087520f9d54f2acc72bd6637045900ac735b4a419b128d216f0c5c4876" + name = "github.com/googleapis/gax-go" + packages = ["v2"] + pruneopts = "UT" + revision = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2" + version = "v2.0.5" [[projects]] - digest = "1:3c7231e9eb47d3b907d205991a5659fa30b4abed804eee7612d19c2da131f398" + digest = "1:16e1cbd76f0d4152b5573f08f38b451748f74ec59b99a004a7481342b3fc05af" name = "github.com/graymeta/stow" packages = [ ".", + "azure", + "google", "local", + "oracle", "s3", + "swift", ] - pruneopts = "NUT" - revision = "77c84b1dd69c41b74fe0a94ca8ee257d85947327" + pruneopts = "UT" + revision = "903027f87de7054953efcdb8ba70d5dc02df38c7" [[projects]] - digest = "1:11c6c696067d3127ecf332b10f89394d386d9083f82baf71f40f2da31841a009" + digest = "1:c0d19ab64b32ce9fe5cf4ddceba78d5bc9807f0016db6b1183599da3dcc24d10" name = "github.com/hashicorp/hcl" packages = [ ".", @@ -151,55 +213,55 @@ "json/scanner", "json/token", ] - pruneopts = "NUT" + pruneopts = "UT" revision = "8cb6e5b959231cc1119e43259c4a608f9c51a241" version = "v1.0.0" [[projects]] - digest = "1:406338ad39ab2e37b7f4452906442a3dbf0eb3379dd1f06aafb5c07e769a5fbb" + digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" name = "github.com/inconshreveable/mousetrap" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" version = "v1.0" [[projects]] - digest = "1:8481b0bd2fa016025fe683e5b84d1051ebfbf356ae2d6aad5374f23edb21c10a" + digest = "1:3e7866d10bf2bfd05794822c8428582eaf3d419186748cd0e099edf54a4cbec1" name = "github.com/jinzhu/gorm" packages = [ ".", "dialects/postgres", "dialects/sqlite", ] - pruneopts = "NUT" - revision = "836fb2c19d84dac7b0272958dfb9af7cf0d0ade4" - version = "v1.9.10" + pruneopts = "UT" + revision = "81c17a7e2529c59efc4e74c5b32c1fb71fb12fa2" + version = "v1.9.11" [[projects]] - digest = "1:802f75230c29108e787d40679f9bf5da1a5673eaf5c10eb89afd993e18972909" + digest = "1:01ed62f8f4f574d8aff1d88caee113700a2b44c42351943fa73cc1808f736a50" name = "github.com/jinzhu/inflection" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "f5c5f50e6090ae76a29240b61ae2a90dd810112e" version = "v1.0.0" [[projects]] - digest = "1:1f2aebae7e7c856562355ec0198d8ca2fa222fb05e5b1b66632a1fce39631885" + digest = "1:bb81097a5b62634f3e9fec1014657855610c82d19b9a40c17612e32651e35dca" name = "github.com/jmespath/go-jmespath" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "c2b33e84" [[projects]] - digest = "1:58999a98719fddbac6303cb17e8d85b945f60b72f48e3a2df6b950b97fa926f1" + digest = "1:31e761d97c76151dde79e9d28964a812c46efc5baee4085b86f68f0c654450de" name = "github.com/konsorten/go-windows-terminal-sequences" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e" version = "v1.0.2" [[projects]] - digest = "1:d8d85b5aace516f6897fcc81d3ad2da280e1d4d2ccd22c7270649bf44715d7a9" + digest = "1:0ead8e64fe356bd9221605e3ec40b4438509868018cbbbaaaff3ebae1b69b78b" name = "github.com/lib/pq" packages = [ ".", @@ -207,20 +269,21 @@ "oid", "scram", ] - pruneopts = "NUT" + pruneopts = "UT" revision = "3427c32cb71afc948325f299f040e53c1dd78979" version = "v1.2.0" [[projects]] - digest = "1:87d447239dd6752a762a4f94652b69c46cb53ca3d32dc52898857f7d1776c701" + digest = "1:0e145bc30c61a1576a6198a0e7f07df424c018b7815e94039a51ebfb7068f6a8" name = "github.com/lyft/flyteidl" packages = ["gen/pb-go/flyteidl/core"] - pruneopts = "T" - revision = "793b09d190148236f41ad8160b5cec9a3325c16f" - version = "v0.1.0" + pruneopts = "UT" + revision = "03aa3a0b237eea7e1aeda1f7e407e9ab95efd4a9" + source = "https://github.com/lyft/flyteidl" + version = "v0.16.1" [[projects]] - digest = "1:ef46e605151d1cacde38e96f3dac8d458d5380d3be4b58cae9e7c8220c8fffd2" + digest = "1:d70c8b78f651ad023f0d748b310e4a1b16fe4a488e5322e5a67e8b55482aefed" name = "github.com/lyft/flytestdlib" packages = [ "atomic", @@ -228,6 +291,7 @@ "config/files", "config/viper", "contextutils", + "errors", "ioutils", "logger", "profutils", @@ -236,71 +300,80 @@ "storage", "version", ] - pruneopts = "NUT" - revision = "2577ff228d559b8fdf687f6cfad196bfbf1bd50a" - version = "v0.2.10" + pruneopts = "UT" + revision = "f9214671dc3b5e86ff029bd514fc18be38c1c3f0" + source = "https://github.com/lyft/flytestdlib" + version = "v0.2.28" [[projects]] - digest = "1:802689c84994b7f2e41ffe7e39d29a8d8227f2121938dc025db44dfaa9633b15" + digest = "1:5a0ef768465592efca0412f7e838cdc0826712f8447e70e6ccc52eb441e9ab13" name = "github.com/magiconair/properties" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "de8848e004dd33dc07a2947b3d76f618a7fc7ef1" version = "v1.8.1" [[projects]] - digest = "1:08c231ec84231a7e23d67e4b58f975e1423695a32467a362ee55a803f9de8061" + digest = "1:c658e84ad3916da105a761660dcaeb01e63416c8ec7bc62256a9b411a05fcd67" name = "github.com/mattn/go-colorable" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072" version = "v0.0.9" [[projects]] - digest = "1:666428435471609937bd13f56e2e31501b5660ffc44a786cf2217dc53291a604" + digest = "1:d62282425ffb75047679d7e2c3b980eea7f82c05ef5fb9142ee617ebac6e7432" name = "github.com/mattn/go-isatty" packages = ["."] - pruneopts = "NUT" - revision = "1311e847b0cb909da63b5fecfb5370aa66236465" - version = "v0.0.8" + pruneopts = "UT" + revision = "88ba11cfdc67c7588b30042edf244b2875f892b6" + version = "v0.0.10" [[projects]] - digest = "1:c9724c929d27a14475a45b17a267dbc60671c0bc2c5c05ed21f011f7b5bc9fb5" + digest = "1:49c2ac4246176b09f99f36fefa4a48aae5c405fcc5a412eea6ff1d9efe1ba26b" name = "github.com/mattn/go-sqlite3" packages = ["."] - pruneopts = "NUT" - revision = "c7c4067b79cc51e6dfdcef5c702e74b1e0fa7c75" - version = "v1.10.0" + pruneopts = "UT" + revision = "3f45aefa8dc8bbdd97619dd2765f864972f3310e" + version = "v1.12.0" [[projects]] - digest = "1:5985ef4caf91ece5d54817c11ea25f182697534f8ae6521eadcd628c142ac4b6" + digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc" name = "github.com/matttproud/golang_protobuf_extensions" packages = ["pbutil"] - pruneopts = "NUT" + pruneopts = "UT" revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" version = "v1.0.1" [[projects]] - digest = "1:a45ae66dea4c899d79fceb116accfa1892105c251f0dcd9a217ddc276b42ec68" + digest = "1:53bc4cd4914cd7cd52139990d5170d6dc99067ae31c56530621b18b35fc30318" name = "github.com/mitchellh/mapstructure" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "3536a929edddb9a5b34bd6861dc4a9647cb459fe" version = "v1.1.2" [[projects]] - digest = "1:4e9827f31d4fc1ddd732a0e3af4e863d281dd405adb2bfb96a25cc5346a77caf" + branch = "master" + digest = "1:2339820c575323b56a7f94146a2549fd344c51c637fa5b8bafae9695ffa6e1a5" + name = "github.com/ncw/swift" + packages = ["."] + pruneopts = "UT" + revision = "27a552ee74bcec40cfd6072b40c536fdf52509f6" + +[[projects]] + digest = "1:6eea828983c70075ca297bb915ffbcfd3e34c5a50affd94428a65df955c0ff9c" name = "github.com/pelletier/go-toml" packages = ["."] - pruneopts = "NUT" - revision = "728039f679cbcd4f6a54e080d2219a4c4928c546" - version = "v1.4.0" + pruneopts = "UT" + revision = "903d9455db9ff1d7ac1ab199062eca7266dd11a3" + version = "v1.6.0" [[projects]] - digest = "1:14715f705ff5dfe0ffd6571d7d201dd8e921030f8070321a79380d8ca4ec1a24" + digest = "1:cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b" name = "github.com/pkg/errors" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" version = "v0.8.1" @@ -308,19 +381,19 @@ digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" name = "github.com/pmezard/go-difflib" packages = ["difflib"] - pruneopts = "NUT" + pruneopts = "UT" revision = "792786c7400a136282c1664665ae0a8db921c6c2" version = "v1.0.0" [[projects]] - digest = "1:3d7ad9c93ee2e43dc7dd48b76f96804c365be7fe30e75f7405028c4e633d189a" + digest = "1:e89f2cdede55684adbe44b5566f55838ad2aee1dff348d14b73ccf733607b671" name = "github.com/prometheus/client_golang" packages = [ "prometheus", "prometheus/internal", "prometheus/promhttp", ] - pruneopts = "NUT" + pruneopts = "UT" revision = "2641b987480bca71fb39738eb8c8b0d577cb1d76" version = "v0.9.4" @@ -329,114 +402,150 @@ digest = "1:2d5cd61daa5565187e1d96bae64dbbc6080dacf741448e9629c64fd93203b0d4" name = "github.com/prometheus/client_model" packages = ["go"] - pruneopts = "NUT" - revision = "fd36f4220a901265f90734c3183c5f0c91daa0b8" + pruneopts = "UT" + revision = "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016" [[projects]] - digest = "1:d03ca24670416dc8fccc78b05d6736ec655416ca7db0a028e8fb92cfdfe3b55e" + digest = "1:f119e3205d3a1f0f19dbd7038eb37528e2c6f0933269dc344e305951fb87d632" name = "github.com/prometheus/common" packages = [ "expfmt", "internal/bitbucket.org/ww/goautoneg", "model", ] - pruneopts = "NUT" - revision = "31bed53e4047fd6c510e43a941f90cb31be0972a" - version = "v0.6.0" + pruneopts = "UT" + revision = "287d3e634a1e550c9e463dd7e5a75a422c614505" + version = "v0.7.0" [[projects]] - digest = "1:19305fc369377c111c865a7a01e11c675c57c52a932353bbd4ea360bd5b72d99" + digest = "1:d595a2d569e6dc765a657fb7ce3f65c840d9deefe4654e50ebb0cf2e356c1738" name = "github.com/prometheus/procfs" packages = [ ".", "internal/fs", + "internal/util", ] - pruneopts = "NUT" - revision = "3f98efb27840a48a7a2898ec80be07674d19f9c8" - version = "v0.0.3" + pruneopts = "UT" + revision = "3a8122e6a950185a58d8d6a909450a575602becd" + version = "v0.0.7" [[projects]] - digest = "1:f4aaa07a6c33f2b354726d0571acbc8ca118837c75709f6353203ae1a3f8eeab" + digest = "1:274f67cb6fed9588ea2521ecdac05a6d62a8c51c074c1fccc6a49a40ba80e925" + name = "github.com/satori/uuid" + packages = ["."] + pruneopts = "UT" + revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" + version = "v1.2.0" + +[[projects]] + digest = "1:04457f9f6f3ffc5fea48e71d62f2ca256637dee0a04d710288e27e05c8b41976" name = "github.com/sirupsen/logrus" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "839c75faf7f98a33d445d181f3018b5c3409a45e" version = "v1.4.2" [[projects]] - digest = "1:6792bb72ea0e7112157d02e4e175cd421b43d004a853f56316a19beca6e0c074" + digest = "1:bb495ec276ab82d3dd08504bbc0594a65de8c3b22c6f2aaa92d05b73fbf3a82e" name = "github.com/spf13/afero" packages = [ ".", "mem", ] - pruneopts = "NUT" + pruneopts = "UT" revision = "588a75ec4f32903aa5e39a2619ba6a4631e28424" version = "v1.2.2" [[projects]] - digest = "1:c5e6b121ef3d2043505edaf4c80e5a008cec2513dc8804795eb0479d1555bcf7" + digest = "1:08d65904057412fc0270fc4812a1c90c594186819243160dc779a402d4b6d0bc" name = "github.com/spf13/cast" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "8c9545af88b134710ab1cd196795e7f2388358d7" version = "v1.3.0" [[projects]] - digest = "1:343d44e06621142ab09ae0c76c1799104cdfddd3ffb445d78b1adf8dc3ffaf3d" + digest = "1:e096613fb7cf34743d49af87d197663cfccd61876e2219853005a57baedfa562" name = "github.com/spf13/cobra" packages = ["."] - pruneopts = "NUT" - revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" - version = "v0.0.3" + pruneopts = "UT" + revision = "f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5" + version = "v0.0.5" [[projects]] - digest = "1:3d72352adb74e79d6d5a43d6f51bfd2d0bd0c9b5f3c00cf5a4b1636d8d3b9d92" + digest = "1:1b753ec16506f5864d26a28b43703c58831255059644351bbcb019b843950900" name = "github.com/spf13/jwalterweatherman" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1" version = "v1.1.0" [[projects]] - digest = "1:9d8420bbf131d1618bde6530af37c3799340d3762cc47210c1d9532a4c3a2779" + digest = "1:524b71991fc7d9246cc7dc2d9e0886ccb97648091c63e30eef619e6862c955dd" name = "github.com/spf13/pflag" packages = ["."] - pruneopts = "NUT" - revision = "298182f68c66c05229eb03ac171abe6e309ee79a" - version = "v1.0.3" + pruneopts = "UT" + revision = "2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab" + version = "v1.0.5" [[projects]] - digest = "1:7e1a17cfd0ad758abc27d10beeda550f5bb1e1b8746f0d67040a45775931c226" + digest = "1:2532daa308722c7b65f4566e634dac2ddfaa0a398a17d8418e96ef2af3939e37" name = "github.com/spf13/viper" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "ae103d7e593e371c69e832d5eb3347e2b80cbbc9" [[projects]] - digest = "1:60a46e2410edbf02b419f833372dd1d24d7aa1b916a990a7370e792fada1eadd" + digest = "1:ac83cf90d08b63ad5f7e020ef480d319ae890c208f8524622a2f3136e2686b02" name = "github.com/stretchr/objx" packages = ["."] - pruneopts = "NUT" + pruneopts = "UT" revision = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c" version = "v0.1.1" [[projects]] - digest = "1:4fec2fe9ce617252d634de83ca8dd5f9c7c391637540896542c80ab63f071f51" + digest = "1:ad527ce5c6b2426790449db7663fe53f8bb647f9387295406794c8be001238da" name = "github.com/stretchr/testify" packages = [ "assert", "mock", ] - pruneopts = "NUT" - revision = "ffdc059bfe9ce6a4e144ba849dbedead332c6053" - version = "v1.3.0" + pruneopts = "UT" + revision = "221dbe5ed46703ee255b1da0dec05086f5035f62" + version = "v1.4.0" + +[[projects]] + digest = "1:7b6ca9454e8d16e34b251f181a4ae430a25805acca64ea46b0448583b44fcfe6" + name = "go.opencensus.io" + packages = [ + ".", + "internal", + "internal/tagencoding", + "metric/metricdata", + "metric/metricproducer", + "plugin/ochttp", + "plugin/ochttp/propagation/b3", + "resource", + "stats", + "stats/internal", + "stats/view", + "tag", + "trace", + "trace/internal", + "trace/propagation", + "trace/tracestate", + ] + pruneopts = "UT" + revision = "aad2c527c5defcf89b5afab7f37274304195a6b2" + version = "v0.22.2" [[projects]] branch = "master" - digest = "1:bafd5fe279fd563e58b661da3c7c258beb33b55d48294446a8870caeecefd3a1" + digest = "1:ecff0c65c627299ff316258a094c11f8e0582e3484563d6fe8eadfbf72abc137" name = "golang.org/x/net" packages = [ + "context", + "context/ctxhttp", "http/httpguts", "http2", "http2/hpack", @@ -444,25 +553,41 @@ "internal/timeseries", "trace", ] - pruneopts = "NUT" - revision = "1f3472d942ba824034fb77cab6a6cfc1bc8a2c3c" + pruneopts = "UT" + revision = "2180aed2234323691e9fd264fb1d32d20ff04b27" [[projects]] branch = "master" - digest = "1:f632c225ef300cb47bb7363bc1006ca57601af35f03b8fe41d03ed67b581c4fc" + digest = "1:31e33f76456ccf54819ab4a646cf01271d1a99d7712ab84bf1a9e7b61cd2031b" + name = "golang.org/x/oauth2" + packages = [ + ".", + "google", + "internal", + "jws", + "jwt", + ] + pruneopts = "UT" + revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33" + +[[projects]] + branch = "master" + digest = "1:3b81f20605df873608343956a1f707bc63fe76bbc9ab3adb644ce95b4502a525" name = "golang.org/x/sys" packages = ["unix"] - pruneopts = "NUT" - revision = "e8e3143a4f4a00f1fafef0dd82ba78223281b01b" + pruneopts = "UT" + revision = "52ab431487773bc9dd1b0766228b1cf3944126bf" [[projects]] - digest = "1:e7071ed636b5422cc51c0e3a6cebc229d6c9fffc528814b519a980641422d619" + digest = "1:8d8faad6b12a3a4c819a3f9618cb6ee1fa1cfc33253abeeea8b55336721e3405" name = "golang.org/x/text" packages = [ "collate", "collate/build", "internal/colltab", "internal/gen", + "internal/language", + "internal/language/compact", "internal/tag", "internal/triegen", "internal/ucd", @@ -474,31 +599,69 @@ "unicode/norm", "unicode/rangetable", ] - pruneopts = "NUT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" + pruneopts = "UT" + revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" + version = "v0.3.2" [[projects]] branch = "master" - digest = "1:9fdc2b55e8e0fafe4b41884091e51e77344f7dc511c5acedcfd98200003bff90" + digest = "1:a2f668c709f9078828e99cb1768cb02e876cb81030545046a32b54b2ac2a9ea8" name = "golang.org/x/time" packages = ["rate"] - pruneopts = "NUT" - revision = "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef" + pruneopts = "UT" + revision = "555d28b269f0569763d25dbe1a237ae74c6bcc82" + +[[projects]] + branch = "master" + digest = "1:73740b1d1cb765a464a57667253863185376e28558fbafe13e94f1cfc6259af9" + name = "google.golang.org/api" + packages = [ + "googleapi", + "googleapi/transport", + "internal", + "internal/gensupport", + "internal/third_party/uritemplates", + "option", + "storage/v1", + "transport/http", + "transport/http/internal/propagation", + ] + pruneopts = "UT" + revision = "9be9b80238d8df282648ab12b51efd20faa8fa37" + +[[projects]] + digest = "1:3c03b58f57452764a4499c55c582346c0ee78c8a5033affe5bdfd9efd3da5bd1" + name = "google.golang.org/appengine" + packages = [ + ".", + "internal", + "internal/app_identity", + "internal/base", + "internal/datastore", + "internal/log", + "internal/modules", + "internal/remote_api", + "internal/urlfetch", + "urlfetch", + ] + pruneopts = "UT" + revision = "971852bfffca25b069c31162ae8f247a3dba083b" + version = "v1.6.5" [[projects]] branch = "master" - digest = "1:c3076e7defee87de1236f1814beb588f40a75544c60121e6eb38b3b3721783e2" + digest = "1:583a0c80f5e3a9343d33aea4aead1e1afcc0043db66fdf961ddd1fe8cd3a4faf" name = "google.golang.org/genproto" packages = ["googleapis/rpc/status"] - pruneopts = "NUT" - revision = "e7d98fc518a78c9f8b5ee77be7b0b317475d89e1" + pruneopts = "UT" + revision = "83cc0476cb11ea0da33dacd4c6354ab192de6fe6" [[projects]] - digest = "1:ffb498178a6bbe5a877e715cc85a40d5a712883d85f5bf05acf26dbd6c8f71e2" + digest = "1:b59ce3ddb11daeeccccc9cb3183b58ebf8e9a779f1c853308cd91612e817a301" name = "google.golang.org/grpc" packages = [ ".", + "backoff", "balancer", "balancer/base", "balancer/roundrobin", @@ -514,10 +677,13 @@ "internal/backoff", "internal/balancerload", "internal/binarylog", + "internal/buffer", "internal/channelz", "internal/envconfig", "internal/grpcrand", "internal/grpcsync", + "internal/resolver/dns", + "internal/resolver/passthrough", "internal/syscall", "internal/transport", "keepalive", @@ -525,23 +691,22 @@ "naming", "peer", "resolver", - "resolver/dns", - "resolver/passthrough", + "serviceconfig", "stats", "status", "tap", ] - pruneopts = "NUT" - revision = "25c4f928eaa6d96443009bd842389fb4fa48664e" - version = "v1.20.1" + pruneopts = "UT" + revision = "1a3960e4bd028ac0cec0a2afd27d7d8e67c11514" + version = "v1.25.1" [[projects]] - digest = "1:18108594151654e9e696b27b181b953f9a90b16bf14d253dd1b397b025a1487f" + digest = "1:f26a5d382387e03a40d1471dddfba85dfff9bf05352d7e42d37612677c4d3c5c" name = "gopkg.in/yaml.v2" packages = ["."] - pruneopts = "NUT" - revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" - version = "v2.2.2" + pruneopts = "UT" + revision = "f90ceb4f409096b60e2e9076b38b304b8246e5fa" + version = "v2.2.5" [[projects]] digest = "1:47d558c9776c006fd56b90df0ffddf57d11bedcd4f62a75153f230fe55873a37" @@ -551,7 +716,7 @@ "pkg/util/rand", "pkg/util/runtime", ] - pruneopts = "NUT" + pruneopts = "UT" revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd" version = "kubernetes-1.13.1" @@ -559,17 +724,17 @@ digest = "1:b6412f8acd9a9fc6fb67302c24966618b16501b9d769a20bee42ce61e510c92c" name = "k8s.io/client-go" packages = ["util/workqueue"] - pruneopts = "NUT" + pruneopts = "UT" revision = "8d9ed539ba3134352c586810e749e58df4e94e4f" version = "kubernetes-1.13.1" [[projects]] - digest = "1:43099cc4ed575c40f80277c7ba7168df37d0c663bdc4f541325430bd175cce8a" + digest = "1:93e82f25d75aba18436ad1ac042cb49493f096011f2541075721ed6f9e05c044" name = "k8s.io/klog" packages = ["."] - pruneopts = "NUT" - revision = "d98d8acdac006fb39831f1b25640813fef9c314f" - version = "v0.3.3" + pruneopts = "UT" + revision = "2ca9ad30301bf30a8a6e0fa2110db6b8df699a91" + version = "v1.0.0" [solve-meta] analyzer-name = "dep" diff --git a/Gopkg.toml b/Gopkg.toml index f1d8843b74..9cd0a14116 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -23,12 +23,62 @@ # non-go = false # go-tests = true # unused-packages = true + + +[[constraint]] + name = "github.com/Selvatico/go-mocket" + version = "1.0.7" + +[[constraint]] + branch = "master" + name = "github.com/golang/glog" + +[[constraint]] + name = "github.com/golang/protobuf" + version = "1.3.2" + +[[constraint]] + name = "github.com/jinzhu/gorm" + version = "1.9.11" + +[[constraint]] + name = "github.com/lib/pq" + version = "1.2.0" + +[[override]] + branch = "master" + name = "golang.org/x/net" + +[[override]] + name = "github.com/lyft/flyteidl" + source = "https://github.com/lyft/flyteidl" + version = "^0.16.x" + +[[override]] + name = "github.com/lyft/flytestdlib" + source = "https://github.com/lyft/flytestdlib" + version = "^v0.2.24" + +[[constraint]] + name = "github.com/mitchellh/mapstructure" + version = "1.1.2" + +[[constraint]] + name = "github.com/spf13/cobra" + version = "0.0.5" + +[[constraint]] + name = "github.com/spf13/pflag" + version = "1.0.5" + +[[constraint]] + name = "github.com/stretchr/testify" + version = "1.4.0" + +[[constraint]] + name = "google.golang.org/grpc" + version = "1.25.1" + [prune] go-tests = true unused-packages = true - non-go = true - - [[prune.project]] - name = "github.com/lyft/flyteidl" - non-go = false - unused-packages = false diff --git a/Makefile b/Makefile index 4ef36d1fb7..7a727600d8 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +export GO111MODULE=off export REPOSITORY=datacatalog include boilerplate/lyft/docker_build/Makefile include boilerplate/lyft/golang_test_targets/Makefile diff --git a/boilerplate/lyft/golang_test_targets/Makefile b/boilerplate/lyft/golang_test_targets/Makefile index 6c1e527fd6..2faccf0921 100644 --- a/boilerplate/lyft/golang_test_targets/Makefile +++ b/boilerplate/lyft/golang_test_targets/Makefile @@ -3,12 +3,15 @@ # # TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst -DEP_SHA=1f7c19e5f52f49ffb9f956f64c010be14683468b - .PHONY: lint lint: #lints the package for common code smells - which golangci-lint || curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $$GOPATH/bin v1.16.0 - golangci-lint run --exclude deprecated + which golangci-lint || GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint + # Calling lint twice here is a hack. The first call seem to fail when internally calling `go list...` + # However, that call seem to have some effects (e.g. https://github.com/golang/go/issues/29452) which, for some + # reason, allows the subsequent calls to succeed. + # TODO: Evaluate whether this is still a problem after moving admin dependency system to go modules. + GO111MODULE=off GL_DEBUG=linters_output,loader,env golangci-lint run --exclude deprecated -v || true + GO111MODULE=off GL_DEBUG=linters_output,loader,env golangci-lint run --deadline=5m --exclude deprecated -v # If code is failing goimports linter, this will fix. # skips 'vendor' @@ -18,8 +21,8 @@ goimports: .PHONY: install install: #download dependencies (including test deps) for the package - which dep || (curl "https://raw.githubusercontent.com/golang/dep/${DEP_SHA}/install.sh" | sh) - dep ensure + which dep || (curl "https://raw.githubusercontent.com/golang/dep/master/install.sh" | sh) + dep ensure --vendor-only .PHONY: test_unit test_unit: @@ -35,4 +38,4 @@ test_unit_cover: .PHONY: test_unit_visual test_unit_visual: - go test ./... -coverprofile /tmp/cover.out -covermode=count; go tool cover -html=/tmp/cover.out + go test ./... -coverprofile /tmp/cover.out -covermode=count; go tool cover -html=/tmp/cover.out diff --git a/pkg/manager/impl/artifact_manager.go b/pkg/manager/impl/artifact_manager.go index 46fa4b2ebf..90aaa5774a 100644 --- a/pkg/manager/impl/artifact_manager.go +++ b/pkg/manager/impl/artifact_manager.go @@ -288,8 +288,8 @@ func NewArtifactManager(repo repositories.RepositoryInterface, store *storage.Da scope: artifactScope, createResponseTime: labeled.NewStopWatch("create_duration", "The duration of the create artifact calls.", time.Millisecond, artifactScope, labeled.EmitUnlabeledMetric), getResponseTime: labeled.NewStopWatch("get_duration", "The duration of the get artifact calls.", time.Millisecond, artifactScope, labeled.EmitUnlabeledMetric), - createSuccessCounter: labeled.NewCounter("create_success_count", "The number of times create artifact suceeded", artifactScope, labeled.EmitUnlabeledMetric), - getSuccessCounter: labeled.NewCounter("get_success_count", "The number of times get artifact suceeded", artifactScope, labeled.EmitUnlabeledMetric), + createSuccessCounter: labeled.NewCounter("create_success_count", "The number of times create artifact succeeded", artifactScope, labeled.EmitUnlabeledMetric), + getSuccessCounter: labeled.NewCounter("get_success_count", "The number of times get artifact succeeded", artifactScope, labeled.EmitUnlabeledMetric), createFailureCounter: labeled.NewCounter("create_failure_count", "The number of times create artifact failed", artifactScope, labeled.EmitUnlabeledMetric), getFailureCounter: labeled.NewCounter("get_failure_count", "The number of times get artifact failed", artifactScope, labeled.EmitUnlabeledMetric), createDataFailureCounter: labeled.NewCounter("create_data_failure_count", "The number of times create artifact data failed", artifactScope, labeled.EmitUnlabeledMetric), @@ -298,7 +298,7 @@ func NewArtifactManager(repo repositories.RepositoryInterface, store *storage.Da validationErrorCounter: labeled.NewCounter("validation_failed_count", "The number of times validation failed", artifactScope, labeled.EmitUnlabeledMetric), alreadyExistsCounter: labeled.NewCounter("already_exists_count", "The number of times an artifact already exists", artifactScope, labeled.EmitUnlabeledMetric), doesNotExistCounter: labeled.NewCounter("does_not_exists_count", "The number of times an artifact was not found", artifactScope, labeled.EmitUnlabeledMetric), - listSuccessCounter: labeled.NewCounter("list_success_count", "The number of times list artifact suceeded", artifactScope, labeled.EmitUnlabeledMetric), + listSuccessCounter: labeled.NewCounter("list_success_count", "The number of times list artifact succeeded", artifactScope, labeled.EmitUnlabeledMetric), listFailureCounter: labeled.NewCounter("list_failure_count", "The number of times list artifact failed", artifactScope, labeled.EmitUnlabeledMetric), } diff --git a/pkg/manager/impl/validators/partition_validator.go b/pkg/manager/impl/validators/partition_validator.go index 506a45977a..395511414f 100644 --- a/pkg/manager/impl/validators/partition_validator.go +++ b/pkg/manager/impl/validators/partition_validator.go @@ -76,7 +76,7 @@ func ValidateUniquePartitionKeys(partitionKeys []string) error { } if invalidPartitionKeys { - return NewInvalidArgumentError(partitionKeyName, fmt.Sprintf("Keys are not unique, occurence count: %+v", partitionKeySet)) + return NewInvalidArgumentError(partitionKeyName, fmt.Sprintf("Keys are not unique, occurrence count: %+v", partitionKeySet)) } return nil