From 768d1cb2943c7c1929c75d91de86d917123c38b4 Mon Sep 17 00:00:00 2001 From: Michael Fridman Date: Fri, 25 Oct 2024 16:07:37 -0400 Subject: [PATCH] Upgrade deps (#1560) --- CONTRIBUTING.md | 1 + go.mod | 6 +++--- go.sum | 12 ++++++------ internal/cmd/dockerbuild/main.go | 3 +-- internal/cmd/dockerpush/main.go | 3 +-- internal/cmd/fetcher/main.go | 2 +- internal/cmd/release/main.go | 3 +-- internal/cmd/restore-release/main.go | 3 +-- 8 files changed, 15 insertions(+), 18 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ecca5416..f7569311 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -122,6 +122,7 @@ Note, although some fields are optional, it is suggested to include as many as p **Optional:** * `source_url`: URL to the source code of the Protobuf plugin. +* `deprecated`: If the plugin is deprecated, set to `true`. * `description`: Description of the plugin. * `output_languages`: The output language types generated by the plugin. See the [PluginLanguage](https://buf.build/bufbuild/buf/docs/main:buf.alpha.registry.v1alpha1#buf.alpha.registry.v1alpha1.PluginLanguage) enum for existing languages. Open a GitHub issue in the [Buf CLI](https://github.com/bufbuild/buf) if the output language isn't found for a plugin. * `spdx_license_id`: The license id for the plugin from https://spdx.org/licenses/. diff --git a/go.mod b/go.mod index 3b62633c..4b8c34e1 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( aead.dev/minisign v0.3.0 - github.com/bufbuild/buf v1.45.0 + github.com/bufbuild/buf v1.45.1-0.20241025180836-9ec774500bdc github.com/google/go-containerregistry v0.20.2 github.com/google/go-github/v66 v66.0.0 github.com/hashicorp/go-retryablehttp v0.7.7 @@ -27,10 +27,10 @@ require ( github.com/docker/docker-credential-helpers v0.8.2 // indirect github.com/felixge/fgprof v0.9.5 // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d // indirect + github.com/google/pprof v0.0.0-20241023014458-598669927662 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/klauspost/compress v1.17.10 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect diff --git a/go.sum b/go.sum index 983c2013..b8af8438 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ aead.dev/minisign v0.3.0 h1:8Xafzy5PEVZqYDNP60yJHARlW1eOQtsKNp/Ph2c0vRA= aead.dev/minisign v0.3.0/go.mod h1:NLvG3Uoq3skkRMDuc3YHpWUTMTrSExqm+Ij73W13F6Y= buf.build/go/spdx v0.2.0 h1:IItqM0/cMxvFJJumcBuP8NrsIzMs/UYjp/6WSpq8LTw= buf.build/go/spdx v0.2.0/go.mod h1:bXdwQFem9Si3nsbNy8aJKGPoaPi5DKwdeEp5/ArZ6w8= -github.com/bufbuild/buf v1.45.0 h1:WdaM5OCjqEURmzOiz3h9gVilFXqWpt6X+zbOVqKti1A= -github.com/bufbuild/buf v1.45.0/go.mod h1:j+GjGIKS+CvubKtPiC0KpEiHAd3wS9/5sn2/U5WlA20= +github.com/bufbuild/buf v1.45.1-0.20241025180836-9ec774500bdc h1:Bc6b+0cyYl6jDJkHB6qhLggPYBOrdnBkg/po1xCySjQ= +github.com/bufbuild/buf v1.45.1-0.20241025180836-9ec774500bdc/go.mod h1:rco9vEgRmxgmli4VUfkXbfpZDOMnNRcljRpx+eDGmj4= github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs= github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= @@ -47,8 +47,8 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d h1:Jaz2JzpQaQXyET0AjLBXShrthbpqMkhGiEfkcQAiAUs= -github.com/google/pprof v0.0.0-20241001023024-f4c0cfd0cf1d/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241023014458-598669927662 h1:SKMkD83p7FwUqKmBsPdLHF5dNyxq3jOWwu9w9UyH5vA= +github.com/google/pprof v0.0.0-20241023014458-598669927662/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= @@ -60,8 +60,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1: github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= -github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= diff --git a/internal/cmd/dockerbuild/main.go b/internal/cmd/dockerbuild/main.go index db8c2790..41cb67b9 100644 --- a/internal/cmd/dockerbuild/main.go +++ b/internal/cmd/dockerbuild/main.go @@ -67,8 +67,7 @@ type command struct { func (c *command) run() error { // Catch ctrl+c to kill the build process - ctx, cancel := interrupt.NotifyContext(context.Background()) - defer cancel() + ctx := interrupt.Handle(context.Background()) allPlugins, err := plugin.FindAll(c.pluginsDir) if err != nil { return err diff --git a/internal/cmd/dockerpush/main.go b/internal/cmd/dockerpush/main.go index 319c64c4..4fdb87ea 100644 --- a/internal/cmd/dockerpush/main.go +++ b/internal/cmd/dockerpush/main.go @@ -26,8 +26,7 @@ func main() { } func run(basedir string, dockerOrg string) error { - ctx, cancel := interrupt.NotifyContext(context.Background()) - defer cancel() + ctx := interrupt.Handle(context.Background()) plugins, err := plugin.FindAll(basedir) if err != nil { return err diff --git a/internal/cmd/fetcher/main.go b/internal/cmd/fetcher/main.go index 81180a66..ad5c54f4 100644 --- a/internal/cmd/fetcher/main.go +++ b/internal/cmd/fetcher/main.go @@ -37,7 +37,7 @@ func main() { os.Exit(2) } root := os.Args[1] - ctx, _ := interrupt.NotifyContext(context.Background()) + ctx := interrupt.Handle(context.Background()) created, err := run(ctx, root) if err != nil { _, _ = fmt.Fprintf(os.Stderr, "failed to fetch versions: %v\n", err) diff --git a/internal/cmd/release/main.go b/internal/cmd/release/main.go index 8f9023f1..448eb958 100644 --- a/internal/cmd/release/main.go +++ b/internal/cmd/release/main.go @@ -81,8 +81,7 @@ type command struct { } func (c *command) run() error { - ctx, cancel := interrupt.NotifyContext(context.Background()) - defer cancel() + ctx := interrupt.Handle(context.Background()) // Create temporary directory tmpDir, err := os.MkdirTemp("", "plugins-release") if err != nil { diff --git a/internal/cmd/restore-release/main.go b/internal/cmd/restore-release/main.go index ef757c45..b5fda081 100644 --- a/internal/cmd/restore-release/main.go +++ b/internal/cmd/restore-release/main.go @@ -51,8 +51,7 @@ type command struct { } func (c *command) run() error { - ctx, cancel := interrupt.NotifyContext(context.Background()) - defer cancel() + ctx := interrupt.Handle(context.Background()) client := release.NewClient(ctx) githubRelease, err := client.GetReleaseByTag(ctx, release.GithubOwnerBufbuild, release.GithubRepoPlugins, c.release) if err != nil {