From a0be5b06eb798200292e05dc3af30802af61fecd Mon Sep 17 00:00:00 2001 From: Jon Poole Date: Sun, 26 Nov 2023 17:17:20 +0000 Subject: [PATCH] Introduce puku and sync go.mod --- .plzconfig | 10 +- BUILD | 6 + go.mod | 22 ++-- go.sum | 35 ++++++ src/build/BUILD | 3 - src/cli/BUILD | 1 + src/cmap/BUILD | 2 +- src/core/BUILD | 1 + src/format/BUILD | 2 +- src/format/fmt.go | 2 +- src/fs/BUILD | 1 + src/parse/asp/BUILD | 1 - src/remote/BUILD | 4 +- src/test/BUILD | 4 +- src/tool/BUILD | 1 + src/update/test/BUILD | 1 - test/entry_point/test_repo/puku.json | 3 + test/keep_going/BUILD | 2 +- test/plz_exec/test_repo/puku.json | 3 + test/proto_plugin/test_repo/puku.json | 3 + test/text_file/BUILD | 7 +- third_party/binary/BUILD | 7 +- third_party/go/BUILD | 119 ++++++++++-------- tools/build_langserver/lsp/BUILD | 3 +- tools/build_langserver/lsp/lsp_test.go | 2 +- .../build_langserver/lsp/test_data/puku.json | 3 + tools/build_langserver/lsp/text.go | 2 +- 27 files changed, 154 insertions(+), 96 deletions(-) create mode 100644 test/entry_point/test_repo/puku.json create mode 100644 test/plz_exec/test_repo/puku.json create mode 100644 test/proto_plugin/test_repo/puku.json create mode 100644 tools/build_langserver/lsp/test_data/puku.json diff --git a/.plzconfig b/.plzconfig index 1feec49d87..ccd6eff3c5 100644 --- a/.plzconfig +++ b/.plzconfig @@ -10,6 +10,7 @@ Target = //plugins:go importpath = github.com/thought-machine/please gotool = //third_party/go:toolchain|go FeatureFlags = go_get +ModFile = //:mod [Plugin "cc"] target = //plugins:cc @@ -58,9 +59,10 @@ positionallabels = true desc = Runs the linters for this repo cmd = run //tools/misc:lint -p -- -[alias "go-get"] -desc = Runs the go deps tool to install new dependencies into the repo -cmd = run ///go//tools/go_get_migrator -- +[Alias "puku"] +Cmd = run //third_party/binary:puku -- +PositionalLabels = true +Desc = A tool to update BUILD files in Go packages [licences] accept = MIT @@ -86,4 +88,4 @@ accept = LGPL accept = Artistic License accept = ISC # Not really a licence, but Bazel projects commonly describe things this way. -accept = notice +accept = notice \ No newline at end of file diff --git a/BUILD b/BUILD index d44763a0b8..e69561d2f9 100644 --- a/BUILD +++ b/BUILD @@ -44,3 +44,9 @@ filegroup( srcs = ["default.pgo"], visibility = ["//src/..."], ) + +filegroup( + name = "mod", + srcs = ["go.mod"], + visibility = ["//third_party/go/..."], +) \ No newline at end of file diff --git a/go.mod b/go.mod index fd85b9d04d..4af88674c0 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,10 @@ module github.com/thought-machine/please require ( - cloud.google.com/go/longrunning v0.4.1 + cloud.google.com/go/longrunning v0.4.0 github.com/Masterminds/semver/v3 v3.1.1 github.com/ProtonMail/go-crypto v0.0.0-20210920135941-2c5829bbf927 github.com/alessio/shellescape v1.4.1 - github.com/bazelbuild/buildtools v0.0.0-20230510134650-37bd1811516d github.com/bazelbuild/remote-apis v0.0.0-20210718193713-0ecef08215cf github.com/bazelbuild/remote-apis-sdks v0.0.0-20221114180157-e62cf9b8696a github.com/cespare/xxhash/v2 v2.2.0 @@ -47,28 +46,28 @@ require ( golang.org/x/sys v0.13.0 golang.org/x/term v0.13.0 golang.org/x/tools v0.6.0 - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 - google.golang.org/grpc v1.56.3 + google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2 + google.golang.org/grpc v1.53.0-dev google.golang.org/protobuf v1.30.0 gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 ) require ( - cloud.google.com/go/compute v1.19.1 // indirect + cloud.google.com/go/compute v1.18.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.13.0 // indirect - cloud.google.com/go/kms v1.10.1 // indirect + cloud.google.com/go/iam v0.10.0 // indirect + cloud.google.com/go/kms v1.8.0 // indirect github.com/StackExchange/wmi v1.2.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect github.com/go-ole/go-ole v1.2.5 // indirect - github.com/golang/glog v1.1.0 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/go-containerregistry v0.12.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.7.1 // indirect + github.com/googleapis/gax-go/v2 v2.7.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/jellydator/ttlcache/v2 v2.11.1 // indirect @@ -84,6 +83,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/pborman/uuid v1.2.0 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/please-build/buildtools v0.0.0-20231122153602-22bdf3fe4f1d // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect @@ -91,11 +91,13 @@ require ( github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect github.com/tklauser/go-sysconf v0.3.9 // indirect github.com/tklauser/numcpus v0.3.0 // indirect + github.com/x1ddos/csslex v0.0.0-20160125172232-7894d8ab8bfe // indirect + github.com/yuin/goldmark v1.6.0 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.14.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect golang.org/x/text v0.13.0 // indirect - google.golang.org/api v0.114.0 // indirect + google.golang.org/api v0.109.0 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/go.sum b/go.sum index 520eae01d4..7baab466b9 100644 --- a/go.sum +++ b/go.sum @@ -20,16 +20,23 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/iam v0.10.0 h1:fpP/gByFs6US1ma53v7VxhvbJpO2Aapng6wabJ99MuI= +cloud.google.com/go/iam v0.10.0/go.mod h1:nXAECrMt2qHpF6RZUZseteD6QyanL68reN4OXPw0UWM= cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/kms v1.8.0 h1:VrJLOsMRzW7IqTTYn+OYupqF3iKSE060Nrn+PECrYjg= +cloud.google.com/go/kms v1.8.0/go.mod h1:4xFEhYFqvW+4VMELtZyxomGSYtSQKzM178ylFW4jMAg= cloud.google.com/go/kms v1.10.1 h1:7hm1bRqGCA1GBRQUrp831TwJ9TWhP+tvLuP497CQS2g= cloud.google.com/go/kms v1.10.1/go.mod h1:rIWk/TryCkR59GMC3YtHtXeLzd634lBbKenvyySAyYI= +cloud.google.com/go/longrunning v0.4.0 h1:v+X4EwhHl6xE+TG1XgXj4T1XpKKs7ZevcAJ3FOu0YmY= +cloud.google.com/go/longrunning v0.4.0/go.mod h1:eF3Qsw58iX/bkKtVjMTYpH0LRjQ2goDkjkNQTlzq/ZM= cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -148,6 +155,7 @@ github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= @@ -222,6 +230,7 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9 github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A= github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= @@ -342,6 +351,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/xattr v0.4.4 h1:FSoblPdYobYoKCItkqASqcrKCxRn9Bgurz0sCBwzO5g= github.com/pkg/xattr v0.4.4/go.mod h1:sBD3RAqlr8Q+RC3FutZcikpT8nyDrIEEBw2J744gVWs= +github.com/please-build/buildtools v0.0.0-20231122153602-22bdf3fe4f1d h1:99mz9ZcfxGKHq/RuNIwh35A3J4LFsKfqQfauJSINwPI= +github.com/please-build/buildtools v0.0.0-20231122153602-22bdf3fe4f1d/go.mod h1:vEiPuY8tSDDAeN/vtAXZVM30f+osH2lwqqdLiRWeFc4= github.com/please-build/gcfg v1.6.1-0.20220308170049-10ea9d657afb h1:6HKarWPya5mPR1xHqTqRNAN+Xox2jndkqVKJRJqu2V8= github.com/please-build/gcfg v1.6.1-0.20220308170049-10ea9d657afb/go.mod h1:qwx/xbr5eBETgfBLP9eXDgXQ5VzLQM5dIjcseh3pkVk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -418,10 +429,15 @@ github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= +github.com/x1ddos/csslex v0.0.0-20160125172232-7894d8ab8bfe h1:SX7lFdwn40ahL78CxofAh548P+dcWjdRNpirU7+sKiE= +github.com/x1ddos/csslex v0.0.0-20160125172232-7894d8ab8bfe/go.mod h1:SwmD4V+Y0RjNqvt8hW2FpZNkQnoFVNtBF9qEnevUueU= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68= +github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY= github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg= @@ -451,6 +467,7 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -487,6 +504,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -523,6 +542,8 @@ golang.org/x/net v0.0.0-20210505214959-0714010a04ed/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -545,6 +566,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -596,11 +618,15 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -611,6 +637,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -662,6 +689,8 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210112230658-8b4aab62c064/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -684,6 +713,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.109.0 h1:sW9hgHyX497PP5//NUM7nqfV8D0iDfBApqq7sOh1XR8= +google.golang.org/api v0.109.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -725,6 +756,8 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210506142907-4a47615972c2/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= +google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2 h1:O97sLx/Xmb/KIZHB/2/BzofxBs5QmmR0LcihPtllmbc= +google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -742,6 +775,8 @@ google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.53.0-dev h1:Bi96+XIrXJLXPJUff19tRXb7mIijir7agn12zNMaPAg= +google.golang.org/grpc v1.53.0-dev/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/src/build/BUILD b/src/build/BUILD index 146e9f1486..5ca4b7d9ae 100644 --- a/src/build/BUILD +++ b/src/build/BUILD @@ -43,13 +43,10 @@ go_test( srcs = ["build_step_stress_test.go"], external = True, deps = [ - ":build", "///third_party/go/github.com_stretchr_testify//assert", - "///third_party/go/github.com_stretchr_testify//require", "//src/cli/logging", "//src/core", "//src/fs", - "//src/output", "//src/plz", ], ) diff --git a/src/cli/BUILD b/src/cli/BUILD index d3529aa52c..666d64eb77 100644 --- a/src/cli/BUILD +++ b/src/cli/BUILD @@ -9,6 +9,7 @@ go_library( "replacements.go", "suggest.go", "winch_other.go", + "winch_windows.go", "window.go", ], pgo_file = "//:pgo", diff --git a/src/cmap/BUILD b/src/cmap/BUILD index 0f7d583e7f..f205571b52 100644 --- a/src/cmap/BUILD +++ b/src/cmap/BUILD @@ -38,6 +38,6 @@ go_benchmark( srcs = ["hash_test.go"], deps = [ ":cmap", - "///third_party/go/github.com_stretchr_testify//assert", + "///third_party/go/github.com_cespare_xxhash_v2//:v2", ], ) diff --git a/src/core/BUILD b/src/core/BUILD index 38ddceb09c..0b0b133ccb 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -41,6 +41,7 @@ go_test( "///third_party/go/github.com_stretchr_testify//require", "///third_party/go/github.com_thought-machine_go-flags//:go-flags", "//src/cli", + "//src/fs", ], ) diff --git a/src/format/BUILD b/src/format/BUILD index 39a5f16802..1a6fbed019 100644 --- a/src/format/BUILD +++ b/src/format/BUILD @@ -4,7 +4,7 @@ go_library( pgo_file = "//:pgo", visibility = ["//src/..."], deps = [ - "///third_party/go/github.com_bazelbuild_buildtools//build", + "///third_party/go/github.com_please-build_buildtools//build", "///third_party/go/golang.org_x_sync//errgroup", "//src/cli/logging", "//src/core", diff --git a/src/format/fmt.go b/src/format/fmt.go index cd15c50c9e..8a038cfe55 100644 --- a/src/format/fmt.go +++ b/src/format/fmt.go @@ -9,7 +9,7 @@ import ( "os" "sync/atomic" - "github.com/bazelbuild/buildtools/build" + "github.com/please-build/buildtools/build" "golang.org/x/sync/errgroup" "github.com/thought-machine/please/src/cli/logging" diff --git a/src/fs/BUILD b/src/fs/BUILD index f5ac802f78..021182c9cd 100644 --- a/src/fs/BUILD +++ b/src/fs/BUILD @@ -50,6 +50,7 @@ go_test( srcs = ["glob_integration_test.go"], # This must remain a glob because the tests rely on data being loaded in via globs data = glob(["test_data/**"]), + deps = [":fs"], ) go_benchmark( diff --git a/src/parse/asp/BUILD b/src/parse/asp/BUILD index fa7900c0ed..1ce33ea0ed 100644 --- a/src/parse/asp/BUILD +++ b/src/parse/asp/BUILD @@ -24,7 +24,6 @@ go_library( "///third_party/go/github.com_manifoldco_promptui//:promptui", "///third_party/go/github.com_please-build_gcfg//types", "///third_party/go/golang.org_x_exp//slices", - "//rules", "//src/cli", "//src/cli/logging", "//src/cmap", diff --git a/src/remote/BUILD b/src/remote/BUILD index 6f8594ec77..9e0a6ef740 100644 --- a/src/remote/BUILD +++ b/src/remote/BUILD @@ -33,13 +33,12 @@ go_library( "///third_party/go/google.golang.org_protobuf//proto", "///third_party/go/google.golang.org_protobuf//types/known/durationpb", "//src/build", - "//src/cache", "//src/cli/logging", "//src/core", "//src/fs", - "//src/remote/fs", "//src/metrics", "//src/process", + "//src/remote/fs", ], ) @@ -70,6 +69,7 @@ go_test( "///third_party/go/google.golang.org_protobuf//reflect/protoreflect", "///third_party/go/google.golang.org_protobuf//types/known/anypb", "///third_party/go/google.golang.org_protobuf//types/known/timestamppb", + "//src/cache", "//src/core", "//src/fs", ], diff --git a/src/test/BUILD b/src/test/BUILD index faa574b73d..bb77e8e314 100644 --- a/src/test/BUILD +++ b/src/test/BUILD @@ -50,9 +50,7 @@ go_test( name = "go_test_panic", srcs = ["go_test_panic.go"], labels = ["manual"], - deps = [ - "///third_party/go/github.com_stretchr_testify//assert", - ], + deps = [":test"], ) # This test runs the test above (go_test_panic), which panics, and checks that diff --git a/src/tool/BUILD b/src/tool/BUILD index 81ae4ef21e..cc2ba89cf4 100644 --- a/src/tool/BUILD +++ b/src/tool/BUILD @@ -18,5 +18,6 @@ go_test( ":tool", "///third_party/go/github.com_stretchr_testify//assert", "//src/core", + "//src/fs", ], ) diff --git a/src/update/test/BUILD b/src/update/test/BUILD index 1e073c0efe..b5cd456b3f 100644 --- a/src/update/test/BUILD +++ b/src/update/test/BUILD @@ -6,5 +6,4 @@ go_binary( definitions = {"main.pleaseVersion": VERSION}, test_only = True, visibility = ["//src/update:all"], - deps = ["//src/core"], ) diff --git a/test/entry_point/test_repo/puku.json b/test/entry_point/test_repo/puku.json new file mode 100644 index 0000000000..b9e6241d00 --- /dev/null +++ b/test/entry_point/test_repo/puku.json @@ -0,0 +1,3 @@ +{ + "stop": true +} \ No newline at end of file diff --git a/test/keep_going/BUILD b/test/keep_going/BUILD index d5520fdcc4..bb9b1f3b77 100644 --- a/test/keep_going/BUILD +++ b/test/keep_going/BUILD @@ -33,4 +33,4 @@ please_repo_e2e_test( expected_failure = True, plz_command = "plz build --keep_going //package:all //package2:all", repo = "test_repo", -) \ No newline at end of file +) diff --git a/test/plz_exec/test_repo/puku.json b/test/plz_exec/test_repo/puku.json new file mode 100644 index 0000000000..b9e6241d00 --- /dev/null +++ b/test/plz_exec/test_repo/puku.json @@ -0,0 +1,3 @@ +{ + "stop": true +} \ No newline at end of file diff --git a/test/proto_plugin/test_repo/puku.json b/test/proto_plugin/test_repo/puku.json new file mode 100644 index 0000000000..b9e6241d00 --- /dev/null +++ b/test/proto_plugin/test_repo/puku.json @@ -0,0 +1,3 @@ +{ + "stop": true +} \ No newline at end of file diff --git a/test/text_file/BUILD b/test/text_file/BUILD index 280e5eefc3..b885e232cd 100644 --- a/test/text_file/BUILD +++ b/test/text_file/BUILD @@ -38,12 +38,7 @@ gentest( labels = ["rex"], no_test_output = True, test_cmd = """ - $TOOL $(location :multilines_file) \ - 'This is a multi lines file,' \ - 'use strip option to remove first empty newline' \ - 'and all empty spaces on the left of the text.' \ - 't - t should not be stripped' \ - '\ - nor backslash' + $TOOL $(location :multilines_file) 'This is a multi lines file,' 'use strip option to remove first empty newline' 'and all empty spaces on the left of the text.' 't - t should not be stripped' '\\ - nor backslash' """, test_tools = ["//test/build_defs:content_checker"], ) diff --git a/third_party/binary/BUILD b/third_party/binary/BUILD index 5ebb605db4..0a1c274cbc 100644 --- a/third_party/binary/BUILD +++ b/third_party/binary/BUILD @@ -20,11 +20,10 @@ remote_file( ), ) -GO_DEPS_VERSION = "v1.4.1" +version = "1.1.1" -# TODO(jpoole): this should support other platforms than just linux_amd64 remote_file( - name = "go-deps", + name = "puku", binary = True, - url = f"https://github.com/Tatskaari/go-deps/releases/download/{GO_DEPS_VERSION}/go_deps_{GO_DEPS_VERSION}_{CONFIG.OS}_{CONFIG.ARCH}", + url = f"https://github.com/please-build/puku/releases/download/v{version}/puku-{version}-{CONFIG.OS}_{CONFIG.ARCH}", ) diff --git a/third_party/go/BUILD b/third_party/go/BUILD index caa4b79de6..d94129f851 100644 --- a/third_party/go/BUILD +++ b/third_party/go/BUILD @@ -19,17 +19,6 @@ go_stdlib( name = "std", ) -go_mod_download( - name = "build_tools_dl", - module = "github.com/please-build/buildtools", - version = "24cce64e067d6147dcfff2a7059fa00c28537597", -) - -go_repo( - download = ":build_tools_dl", - module = "github.com/bazelbuild/buildtools", -) - go_repo( module = "gopkg.in/op/go-logging.v1", version = "v1.0.0-20160211212156-b2cb9fa56473", @@ -37,17 +26,17 @@ go_repo( go_repo( module = "golang.org/x/text", - version = "v0.3.7", + version = "v0.13.0", ) go_repo( module = "golang.org/x/tools", - version = "v0.1.5", + version = "v0.6.0", ) go_repo( module = "github.com/yuin/goldmark", - version = "v1.2.1", + version = "v1.6.0", ) go_repo( @@ -93,12 +82,12 @@ go_repo( go_repo( module = "gopkg.in/yaml.v3", - version = "v3.0.0-20210107192922-496545a6307b", + version = "v3.0.1", ) go_repo( module = "github.com/klauspost/compress", - version = "v1.13.6", + version = "v1.15.11", ) go_repo( @@ -108,12 +97,12 @@ go_repo( go_repo( module = "github.com/please-build/gcfg", - version = "9b4d14cddd6148920e11c8bb7ee19369473b1019", + version = "v1.6.1-0.20220308170049-10ea9d657afb", ) go_repo( module = "github.com/ProtonMail/go-crypto", - version = "3900d675f39ba9686203d137886d74fad620ae87", + version = "v0.0.0-20210920135941-2c5829bbf927", ) go_repo( @@ -123,7 +112,7 @@ go_repo( go_repo( module = "github.com/prometheus/client_model", - version = "v0.2.0", + version = "v0.3.0", ) go_repo( @@ -143,12 +132,12 @@ go_repo( go_repo( module = "github.com/theupdateframework/go-tuf", - version = "v0.5.1", + version = "v0.5.2-0.20220930112810-3890c1e7ace4", ) go_repo( module = "golang.org/x/oauth2", - version = "v0.4.0", + version = "v0.7.0", ) go_repo( @@ -168,7 +157,7 @@ go_repo( go_repo( module = "google.golang.org/genproto", - version = "v0.0.0-20221206210731-b1a01be3a5f6", + version = "v0.0.0-20230124163310-31e0e69b6fc2", ) go_repo( @@ -178,7 +167,7 @@ go_repo( go_repo( module = "github.com/hashicorp/go-retryablehttp", - version = "v0.7.0", + version = "v0.7.2", ) go_repo( @@ -203,12 +192,12 @@ go_repo( go_repo( module = "github.com/mattn/go-isatty", - version = "v0.0.14", + version = "v0.0.16", ) go_repo( module = "github.com/google/go-containerregistry", - version = "v0.12.0", + version = "v0.12.1", ) go_repo( @@ -218,7 +207,7 @@ go_repo( go_repo( module = "github.com/prometheus/client_golang", - version = "v1.11.0", + version = "v1.13.0", ) go_repo( @@ -228,12 +217,12 @@ go_repo( go_repo( module = "golang.org/x/term", - version = "v0.0.0-20210615171337-6886f2dfbf5b", + version = "v0.13.0", ) go_repo( module = "github.com/google/go-cmp", - version = "b1c9c4891a6525d98001fea424c8926c6d77bb56", + version = "v0.5.9", ) go_repo( @@ -273,7 +262,7 @@ go_repo( go_repo( module = "github.com/golang/groupcache", - version = "v0.0.0-20200121045136-8c9f03a8e57e", + version = "v0.0.0-20210331224755-41bb18bfe9da", ) go_repo( @@ -283,7 +272,7 @@ go_repo( go_repo( module = "github.com/golang/protobuf", - version = "v1.5.2", + version = "v1.5.3", ) go_repo( @@ -303,7 +292,7 @@ go_repo( go_repo( module = "github.com/googleapis/enterprise-certificate-proxy", - version = "v0.2.0", + version = "v0.2.3", ) go_repo( @@ -323,7 +312,7 @@ go_repo( go_repo( module = "github.com/mattn/go-colorable", - version = "v0.1.8", + version = "v0.1.13", ) go_repo( @@ -348,12 +337,7 @@ go_repo( go_repo( module = "github.com/juju/ansiterm", - requirements = [ - "github.com/lunixbochs/vtclean", - "github.com/mattn/go-colorable", - "github.com/mattn/go-isatty", - ], - version = "720a0952cc2ac777afc295d9861263e2a4cf96a1", + version = "v0.0.0-20210706145210-9283cdf370b5", ) go_repo( @@ -363,7 +347,7 @@ go_repo( go_repo( module = "golang.org/x/sys", - version = "v0.0.0-20220315194320-039c03cc5b86", + version = "v0.13.0", ) go_repo( @@ -383,7 +367,7 @@ go_repo( go_repo( module = "google.golang.org/grpc", - version = "v1.51.0", + version = "v1.53.0-dev", ) go_repo( @@ -398,7 +382,7 @@ go_repo( go_repo( module = "github.com/cespare/xxhash/v2", - version = "v2.1.2", + version = "v2.2.0", ) go_repo( @@ -408,7 +392,7 @@ go_repo( go_repo( module = "github.com/klauspost/cpuid/v2", - version = "v2.2.1", + version = "v2.0.12", ) go_repo( @@ -433,12 +417,12 @@ go_repo( go_repo( module = "golang.org/x/crypto", - version = "v0.5.0", + version = "v0.14.0", ) go_repo( module = "google.golang.org/protobuf", - version = "v1.25.0", + version = "v1.30.0", ) go_repo( @@ -454,12 +438,12 @@ go_repo( go_repo( module = "github.com/pkg/xattr", - version = "v0.4.3", + version = "v0.4.4", ) go_repo( module = "cloud.google.com/go/iam", - version = "v0.8.0", + version = "v0.10.0", ) go_repo( @@ -480,17 +464,17 @@ go_repo( go_repo( module = "github.com/prometheus/common", - version = "v0.30.0", + version = "v0.37.0", ) go_repo( module = "github.com/titanous/rocacheck", - version = "afe73141d399b0c79c3d6412d4bdcf4c672c496a", + version = "v0.0.0-20171023193734-afe73141d399", ) go_repo( module = "google.golang.org/api", - version = "v0.106.0", + version = "v0.109.0", ) go_repo( @@ -510,12 +494,12 @@ go_repo( go_repo( module = "github.com/prometheus/procfs", - version = "v0.6.0", + version = "v0.8.0", ) go_repo( module = "github.com/manifoldco/promptui", - version = "v0.7.0", + version = "v0.8.0", ) go_repo( @@ -525,12 +509,12 @@ go_repo( go_repo( module = "github.com/google/uuid", - version = "v1.1.2", + version = "v1.3.0", ) go_repo( module = "github.com/letsencrypt/boulder", - version = "cfa524a7a139bd4cf21c4c09ab47b994a96fd11f", + version = "v0.0.0-20221109233200-85aa52084eaf", ) go_repo( @@ -540,7 +524,7 @@ go_repo( go_repo( module = "github.com/bazelbuild/remote-apis", - version = "3e816456ee28f01ab2e0abf72306c1f340c7b229", + version = "v0.0.0-20210718193713-0ecef08215cf", ) go_repo( @@ -560,10 +544,35 @@ go_repo( go_repo( module = "golang.org/x/exp", - version = "1de6713980dea447778ef6e71194d5eb54288072", + version = "v0.0.0-20230116083435-1de6713980de", ) go_repo( module = "github.com/jstemmer/go-junit-report/v2", version = "v2.0.0", ) + +go_repo( + module = "cloud.google.com/go/compute", + version = "v1.18.0", +) + +go_repo( + module = "github.com/StackExchange/wmi", + version = "v1.2.1", +) + +go_repo( + module = "github.com/go-ole/go-ole", + version = "v1.2.5", +) + +go_repo( + module = "google.golang.org/appengine", + version = "v1.6.7", +) + +go_repo( + module = "github.com/please-build/buildtools", + version = "v0.0.0-20231122153602-22bdf3fe4f1d", +) diff --git a/tools/build_langserver/lsp/BUILD b/tools/build_langserver/lsp/BUILD index b7c34291c1..f8c5f3485c 100644 --- a/tools/build_langserver/lsp/BUILD +++ b/tools/build_langserver/lsp/BUILD @@ -10,7 +10,7 @@ go_library( ], visibility = ["//tools/build_langserver/..."], deps = [ - "///third_party/go/github.com_bazelbuild_buildtools//build", + "///third_party/go/github.com_please-build_buildtools//build", "///third_party/go/github.com_sourcegraph_go-lsp//:go-lsp", "///third_party/go/github.com_sourcegraph_jsonrpc2//:jsonrpc2", "///third_party/go/gopkg.in_op_go-logging.v1//:go-logging.v1", @@ -34,6 +34,7 @@ go_test( data = ["test_data"], deps = [ ":lsp", + "///third_party/go/github.com_please-build_buildtools//build", "///third_party/go/github.com_sourcegraph_go-lsp//:go-lsp", "///third_party/go/github.com_sourcegraph_jsonrpc2//:jsonrpc2", "///third_party/go/github.com_stretchr_testify//assert", diff --git a/tools/build_langserver/lsp/lsp_test.go b/tools/build_langserver/lsp/lsp_test.go index 1af186a055..1d66b54a9d 100644 --- a/tools/build_langserver/lsp/lsp_test.go +++ b/tools/build_langserver/lsp/lsp_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/bazelbuild/buildtools/build" + "github.com/please-build/buildtools/build" "github.com/sourcegraph/go-lsp" "github.com/sourcegraph/jsonrpc2" "github.com/stretchr/testify/assert" diff --git a/tools/build_langserver/lsp/test_data/puku.json b/tools/build_langserver/lsp/test_data/puku.json new file mode 100644 index 0000000000..b9e6241d00 --- /dev/null +++ b/tools/build_langserver/lsp/test_data/puku.json @@ -0,0 +1,3 @@ +{ + "stop": true +} \ No newline at end of file diff --git a/tools/build_langserver/lsp/text.go b/tools/build_langserver/lsp/text.go index f6b6bb3cb3..4af19483e0 100644 --- a/tools/build_langserver/lsp/text.go +++ b/tools/build_langserver/lsp/text.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/bazelbuild/buildtools/build" + "github.com/please-build/buildtools/build" "github.com/sourcegraph/go-lsp" "github.com/thought-machine/please/src/parse/asp"