Introduce puku and sync go.mod

.circleci/config.yml

@@ -124,27 +124,28 @@ jobs:
    build-darwin-arm64:
      working_directory: ~/please
      macos:
-       xcode: "13.4.1"
+       xcode: "14.3.1"
+     resource_class: macos.m1.medium.gen1
      steps:
        - checkout
        - attach_workspace:
            at: /tmp/workspace
        - restore_cache:
-           key: go-darwin-arm64-v4-{{ checksum "third_party/go/BUILD" }}
+           key: go-darwin-arm64-v5-{{ checksum "third_party/go/BUILD" }}
        - run:
-           name: Extract plz
-           command: tar -xzf /tmp/workspace/darwin_amd64/please_*.tar.gz
+           name: Install deps
+           command: ./.circleci/setup_osx.sh arm64
        - run:
-           name: Cross-compile
-           command: ./please/please build -p --profile ci --arch darwin_arm64 -o plugin.go.cgoenabled:1 -o plugin.go.cctool:clang -o "plugin.go.cflags:-target arm64-apple-macos11" //package:release_files
+           name: Build release
+           command: go run src/please.go build -p --profile ci //package:release_files
        - persist_to_workspace:
            root: plz-out/pkg
            paths:
              - darwin_arm64/*
        - store_artifacts:
            path: plz-out/log
        - save_cache:
-           key: go-darwin-arm64-v4-{{ checksum "third_party/go/BUILD" }}
+           key: go-darwin-arm64-v5-{{ checksum "third_party/go/BUILD" }}
            paths: [ ".plz-cache/third_party/go" ]
 
    build-freebsd:
@@ -201,7 +202,7 @@ jobs:
            paths: [ ".plz-cache/third_party/go" ]
    build-darwin:
       macos:
-        xcode: "13.4.1"
+        xcode: "14.3.1"
       environment:
         PLZ_ARGS: "-p --profile ci --exclude pip --exclude embed"
       steps:
@@ -214,7 +215,7 @@ jobs:
            key: python-darwin-v3-{{ checksum "third_party/python/BUILD" }}
        - run:
            name: Install deps
-           command: ./.circleci/setup_osx.sh
+           command: ./.circleci/setup_osx.sh amd64
        - run:
            name: Bootstrap & Build
            command: ./bootstrap.sh --test_results_file plz-out/results/please/test_results.xml

.circleci/setup_osx.sh

@@ -4,12 +4,12 @@ set -eu
 
 # /usr/local/go might get cached.
 if [ ! -d "/usr/local/go" ]; then
-    curl -fsSL https://dl.google.com/go/go1.19.darwin-amd64.tar.gz | sudo tar -xz -C /usr/local
+    curl -fsSL https://dl.google.com/go/go1.21.3.darwin-$1.tar.gz | sudo tar -xz -C /usr/local
 fi
 sudo ln -s /usr/local/go/bin/go /usr/local/bin/go
 
 # xz might also.
 if [ ! -f "/usr/local/bin/xz" ]; then
-    curl -fsSL https://get.please.build/third_party/binary/xz-5.2.4-darwin_amd64 -o /usr/local/bin/xz
+    curl -fsSL https://get.please.build/third_party/binary/xz-5.2.4-darwin_$1 -o /usr/local/bin/xz
     chmod +x /usr/local/bin/xz
 fi

.plzconfig

@@ -10,6 +10,8 @@ Target = //plugins:go
 importpath = github.com/thought-machine/please
 gotool = //third_party/go:toolchain|go
 FeatureFlags = go_get
+ModFile = //:mod
+RequireLicences = true
 
 [Plugin "cc"]
 target = //plugins:cc
@@ -58,9 +60,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
@@ -85,5 +88,7 @@ accept = MPL-2.0
 accept = LGPL
 accept = Artistic License
 accept = ISC
+accept = CC0-1.0
+accept = LGPL-3.0
 # Not really a licence, but Bazel projects commonly describe things this way.
-accept = notice
+accept = notice

BUILD

@@ -44,3 +44,9 @@ filegroup(
     srcs = ["default.pgo"],
     visibility = ["//src/..."],
 )
+
+filegroup(
+    name = "mod",
+    srcs = ["go.mod"],
+    visibility = ["//third_party/go/..."],
+)

go.mod

@@ -1,105 +1,115 @@
 module github.com/thought-machine/please
 
+go 1.21
+
 require (
-	cloud.google.com/go/longrunning v0.4.1
-	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
+	cloud.google.com/go/longrunning v0.5.4
+	github.com/Masterminds/semver/v3 v3.2.1
+	github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c
+	github.com/alessio/shellescape v1.4.2
 	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
-	github.com/coreos/go-semver v0.3.0
+	github.com/coreos/go-semver v0.3.1
 	github.com/davecgh/go-spew v1.1.1
 	github.com/djherbis/atime v1.1.0
-	github.com/dustin/go-humanize v1.0.0
-	github.com/fsnotify/fsnotify v1.5.1
-	github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
-	github.com/google/uuid v1.3.0
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+	github.com/dustin/go-humanize v1.0.1
+	github.com/fsnotify/fsnotify v1.7.0
+	github.com/golang/protobuf v1.5.3
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
+	github.com/google/uuid v1.4.0
+	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/go-retryablehttp v0.7.2
-	github.com/jstemmer/go-junit-report/v2 v2.0.0
-	github.com/karrick/godirwalk v1.16.1
-	github.com/manifoldco/promptui v0.8.0
-	github.com/peterebden/go-cli-init/v5 v5.2.0
-	github.com/peterebden/go-deferred-regex v1.0.0
+	github.com/hashicorp/go-retryablehttp v0.7.5
+	github.com/jstemmer/go-junit-report/v2 v2.1.0
+	github.com/karrick/godirwalk v1.17.0
+	github.com/manifoldco/promptui v0.9.0
+	github.com/peterebden/go-cli-init/v5 v5.2.1
+	github.com/peterebden/go-deferred-regex v1.1.0
 	github.com/peterebden/go-sri v1.1.1
 	github.com/peterebden/tools v0.0.0-20190805132753-b2a0db951d2a
-	github.com/pkg/xattr v0.4.4
+	github.com/pkg/xattr v0.4.9
+	github.com/please-build/buildtools v0.0.0-20231122153602-22bdf3fe4f1d
 	github.com/please-build/gcfg v1.6.1-0.20220308170049-10ea9d657afb
-	github.com/prometheus/client_golang v1.13.0
-	github.com/prometheus/common v0.37.0
-	github.com/shirou/gopsutil/v3 v3.21.8
-	github.com/sigstore/sigstore v1.5.0
-	github.com/sourcegraph/go-diff v0.6.1
+	github.com/prometheus/client_golang v1.17.0
+	github.com/prometheus/common v0.45.0
+	github.com/shirou/gopsutil/v3 v3.23.10
+	github.com/sigstore/sigstore/pkg/signature/kms/gcp v1.7.5
+	github.com/sourcegraph/go-diff v0.7.0
 	github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d
-	github.com/sourcegraph/jsonrpc2 v0.1.0
-	github.com/stretchr/testify v1.8.1
+	github.com/sourcegraph/jsonrpc2 v0.2.0
+	github.com/stretchr/testify v1.8.4
 	github.com/texttheater/golang-levenshtein v1.0.1
-	github.com/thought-machine/go-flags v1.6.2
-	github.com/ulikunitz/xz v0.5.10
+	github.com/thought-machine/go-flags v1.6.3
+	github.com/ulikunitz/xz v0.5.11
 	github.com/zeebo/blake3 v0.2.3
-	go.uber.org/automaxprocs v1.4.0
-	golang.org/x/exp v0.0.0-20230116083435-1de6713980de
-	golang.org/x/net v0.17.0
-	golang.org/x/sync v0.1.0
-	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/protobuf v1.30.0
+	go.uber.org/automaxprocs v1.5.3
+	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
+	golang.org/x/net v0.18.0
+	golang.org/x/sync v0.5.0
+	golang.org/x/sys v0.14.0
+	golang.org/x/term v0.14.0
+	golang.org/x/tools v0.15.0
+	google.golang.org/genproto/googleapis/bytestream v0.0.0-20231120223509-83a465c0220f
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f
+	google.golang.org/grpc v1.59.0
+	google.golang.org/protobuf v1.31.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.23.3 // 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
-	github.com/StackExchange/wmi v1.2.1 // indirect
+	cloud.google.com/go/iam v1.1.5 // indirect
+	cloud.google.com/go/kms v1.15.5 // 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/chzyer/readline v1.5.1 // indirect
+	github.com/cloudflare/circl v1.3.6 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/golang/glog v1.2.0 // 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/google/go-containerregistry v0.16.1 // indirect
+	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
+	github.com/googlecodelabs/tools/claat v0.0.0-20231009173428-9f2b585333fc // 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
-	github.com/juju/ansiterm v0.0.0-20210706145210-9283cdf370b5 // indirect
-	github.com/klauspost/compress v1.15.11 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.12 // indirect
-	github.com/letsencrypt/boulder v0.0.0-20221109233200-85aa52084eaf // indirect
-	github.com/lunixbochs/vtclean v1.0.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/mostynb/zstdpool-syncpool v0.0.7 // indirect
+	github.com/jellydator/ttlcache/v3 v3.1.0 // indirect
+	github.com/klauspost/compress v1.17.3 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/letsencrypt/boulder v0.0.0-20231122214517-54c25f9152c3 // indirect
+	github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+	github.com/mostynb/zstdpool-syncpool v0.0.13 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/pborman/uuid v1.2.0 // indirect
+	github.com/pborman/uuid v1.2.1 // indirect
 	github.com/pkg/errors v0.9.1 // 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
-	github.com/theupdateframework/go-tuf v0.5.2-0.20220930112810-3890c1e7ace4 // indirect
+	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
+	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/sigstore/sigstore v1.7.5 // indirect
+	github.com/stoewer/go-strcase v1.2.0 // indirect
 	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/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/x1ddos/csslex v0.0.0-20160125172232-7894d8ab8bfe // indirect
+	github.com/yuin/goldmark v1.4.13 // indirect
+	github.com/yusufpapurcu/wmi v1.2.3 // 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/appengine v1.6.7 // indirect
-	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/oauth2 v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.4.0 // indirect
+	google.golang.org/api v0.151.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
+	gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-go 1.18