Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bufbuild/buf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.27.1
Choose a base ref
...
head repository: bufbuild/buf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.27.2
Choose a head ref
  • 7 commits
  • 14 files changed
  • 8 contributors

Commits on Oct 17, 2023

  1. Back to development (#2503)

    @saquibmian
    saquibmian authored Oct 17, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7edd4f5 View commit details

Commits on Oct 18, 2023

  1. Add workaround for macOS archive xattrs (#2504) 

    This commit introduces a workaround for an issue with .tar archives
created with libarchive on Darwin/macOS. When encountering a file that
has extended attributes, such as the com.apple.provenance attribute, it
will add a corresponding AppleDouble file with the prefix "._" in the
same directory. Because these files have the same filename otherwise,
the buf tool will see these when they correspond to proto files and
subsequently fail to parse them as protobuf IDL.

Due to the fact that libarchive is used by default with the version of
tar that ships with macOS, and the provenance extended attribute is set
by macOS under many conditions when SIP is enabled, archives with these
files are likely to occur on macOS.

.zip archives created by libarchive do not seem to have this issue.
However, .zip archives created by Archive Utility.app have a very
similar behavior when encountering extended attributes: it will place
AppleDouble files in a separate directory tree under the MACOSX
directory, but also with the "._" prefix. Since this can be handled by
the same logic, this behavior is extended to ZIP files as well.

Closes #2387.
    @jchadwick-buf
    jchadwick-buf authored Oct 18, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    df619b4 View commit details

Commits on Oct 23, 2023

  1. Bump bufbuild/buf-setup-action from 1.26.1 to 1.27.1 (#2508)

    @dependabot
    dependabot[bot] authored Oct 23, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    66f4c6d View commit details

  2. Bump github.com/klauspost/compress from 1.17.1 to 1.17.2 (#2509)

    @dependabot
    dependabot[bot] authored Oct 23, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2f0328f View commit details

  3. Fix shutdown_finished duration field (#2510) 

    As written, the duration value is calculated when the defer function is
registered. We should update it to be calculated when the defer is
executed instead.
    @pkwarren
    pkwarren authored Oct 23, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    90d79c5 View commit details

Commits on Oct 24, 2023

  1. Add integration guide url to buf plugin config (#2511)

    @mfridman
    mfridman authored Oct 24, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c29e78d View commit details

Commits on Oct 27, 2023

  1. Release v1.27.2 (#2518) 

    Release prepared for 1.27.2

Reminder: Update the changelog

---------

Co-authored-by: doriable <doriable@users.noreply.github.com>
Co-authored-by: Doria Keung <doria.keung@gmail.com>
    @buf-release-bot @doriable
    3 people authored Oct 27, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a987d2d View commit details
6 changes: 3 additions & 3 deletions .github/workflows/buf.yaml
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.26.1
- uses: bufbuild/buf-setup-action@v1.27.1
with:
github_token: ${{ github.token }}
- uses: bufbuild/buf-lint-action@v1.1.0
@@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.26.1
- uses: bufbuild/buf-setup-action@v1.27.1
with:
github_token: ${{ github.token }}
- uses: bufbuild/buf-breaking-action@v1.1.3
@@ -33,7 +33,7 @@ jobs:
- breaking
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.26.1
- uses: bufbuild/buf-setup-action@v1.27.1
with:
github_token: ${{ github.token }}
- uses: bufbuild/buf-push-action@v1.1.1
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## [v1.27.2] - 2023-10-27

- Fix issue where `buf build` and other commands may fail when handling certain
archives created on macOS that contain files with extended attributes.

## [v1.27.1] - 2023-10-16

- Fix issue in v1.27.0 where `--path` did not work with workspaces under certain scenarios.
@@ -960,6 +965,7 @@ buf check breaking proto --against .git#branch=master,subdir=proto

Initial beta release.

[v1.27.2]: https://github.com/bufbuild/buf/compare/v1.27.1...v1.27.2
[v1.27.1]: https://github.com/bufbuild/buf/compare/v1.27.0...v1.27.1
[v1.27.0]: https://github.com/bufbuild/buf/compare/v1.26.1...v1.27.0
[v1.26.1]: https://github.com/bufbuild/buf/compare/v1.26.0...v1.26.1
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ require (
github.com/google/go-containerregistry v0.16.1
github.com/jdx/go-netrc v1.0.0
github.com/jhump/protoreflect v1.15.3
github.com/klauspost/compress v1.17.1
github.com/klauspost/compress v1.17.2
github.com/klauspost/pgzip v1.2.6
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
github.com/pkg/profile v1.7.0
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -69,8 +69,8 @@ github.com/jhump/protoreflect v1.15.3 h1:6SFRuqU45u9hIZPJAoZ8c28T3nK64BNdp9w6jFo
github.com/jhump/protoreflect v1.15.3/go.mod h1:4ORHmSBmlCW8fh3xHmJMGyul1zNqZK4Elxc8qKP+p1k=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.17.1 h1:NE3C767s2ak2bweCZo3+rdP4U/HoyVXLv/X9f2gPS5g=
github.com/klauspost/compress v1.17.1/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
2 changes: 1 addition & 1 deletion private/buf/bufcli/bufcli.go
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ import (

const (
// Version is the CLI version of buf.
Version = "1.27.1"
Version = "1.27.2"

inputHTTPSUsernameEnvKey = "BUF_INPUT_HTTPS_USERNAME"
inputHTTPSPasswordEnvKey = "BUF_INPUT_HTTPS_PASSWORD"
1 change: 1 addition & 0 deletions private/buf/cmd/buf/command/beta/registry/plugin/pluginpush/pluginpush.go
View file
Original file line number Diff line number Diff line change
@@ -355,6 +355,7 @@ func createCuratedPluginRequest(
SpdxLicenseId: pluginConfig.SPDXLicenseID,
LicenseUrl: pluginConfig.LicenseURL,
Visibility: visibility,
IntegrationGuideUrl: pluginConfig.IntegrationGuideURL,
}, nil
}

24 changes: 14 additions & 10 deletions private/bufpkg/bufplugin/bufpluginconfig/bufpluginconfig.go
View file
Original file line number Diff line number Diff line change
@@ -78,6 +78,9 @@ type Config struct {
SPDXLicenseID string
// LicenseURL specifies where the plugin's license can be found.
LicenseURL string
// IntegrationGuideURL is an optional attribute used to specify where
// the the plugin integration guide can be found.
IntegrationGuideURL string
}

// RegistryConfig is the configuration for the registry of a plugin.
@@ -330,16 +333,17 @@ func OptionsSliceToPluginOptions(options []string) map[string]string {
// ExternalConfig represents the on-disk representation
// of the plugin configuration at version v1.
type ExternalConfig struct {
Version string `json:"version,omitempty" yaml:"version,omitempty"`
Name string `json:"name,omitempty" yaml:"name,omitempty"`
PluginVersion string `json:"plugin_version,omitempty" yaml:"plugin_version,omitempty"`
SourceURL string `json:"source_url,omitempty" yaml:"source_url,omitempty"`
Description string `json:"description,omitempty" yaml:"description,omitempty"`
Deps []ExternalDependency `json:"deps,omitempty" yaml:"deps,omitempty"`
OutputLanguages []string `json:"output_languages,omitempty" yaml:"output_languages,omitempty"`
Registry ExternalRegistryConfig `json:"registry,omitempty" yaml:"registry,omitempty"`
SPDXLicenseID string `json:"spdx_license_id,omitempty" yaml:"spdx_license_id,omitempty"`
LicenseURL string `json:"license_url,omitempty" yaml:"license_url,omitempty"`
Version string `json:"version,omitempty" yaml:"version,omitempty"`
Name string `json:"name,omitempty" yaml:"name,omitempty"`
PluginVersion string `json:"plugin_version,omitempty" yaml:"plugin_version,omitempty"`
SourceURL string `json:"source_url,omitempty" yaml:"source_url,omitempty"`
Description string `json:"description,omitempty" yaml:"description,omitempty"`
Deps []ExternalDependency `json:"deps,omitempty" yaml:"deps,omitempty"`
OutputLanguages []string `json:"output_languages,omitempty" yaml:"output_languages,omitempty"`
Registry ExternalRegistryConfig `json:"registry,omitempty" yaml:"registry,omitempty"`
SPDXLicenseID string `json:"spdx_license_id,omitempty" yaml:"spdx_license_id,omitempty"`
LicenseURL string `json:"license_url,omitempty" yaml:"license_url,omitempty"`
IntegrationGuideURL string `json:"integration_guide_url,omitempty" yaml:"integration_guide_url,omitempty"`
}

// ExternalDependency represents a dependency on another plugin.
10 changes: 6 additions & 4 deletions private/bufpkg/bufplugin/bufpluginconfig/bufpluginconfig_test.go
View file
Original file line number Diff line number Diff line change
@@ -65,8 +65,9 @@ func TestGetConfigForBucket(t *testing.T) {
"separate_package": "true",
},
},
SPDXLicenseID: "Apache-2.0",
LicenseURL: "https://github.com/grpc/grpc-go/blob/master/LICENSE",
SPDXLicenseID: "Apache-2.0",
LicenseURL: "https://github.com/grpc/grpc-go/blob/master/LICENSE",
IntegrationGuideURL: "https://grpc.io/docs/languages/go/quickstart",
},
pluginConfig,
)
@@ -105,8 +106,9 @@ func TestParsePluginConfigGoYAML(t *testing.T) {
"separate_package": "true",
},
},
SPDXLicenseID: "Apache-2.0",
LicenseURL: "https://github.com/grpc/grpc-go/blob/master/LICENSE",
SPDXLicenseID: "Apache-2.0",
LicenseURL: "https://github.com/grpc/grpc-go/blob/master/LICENSE",
IntegrationGuideURL: "https://grpc.io/docs/languages/go/quickstart",
},
pluginConfig,
)
19 changes: 10 additions & 9 deletions private/bufpkg/bufplugin/bufpluginconfig/config.go
View file
Original file line number Diff line number Diff line change
@@ -72,15 +72,16 @@ func newConfig(externalConfig ExternalConfig, options []ConfigOption) (*Config,
}
}
return &Config{
Name: pluginIdentity,
PluginVersion: pluginVersion,
Dependencies: dependencies,
Registry: registryConfig,
SourceURL: externalConfig.SourceURL,
Description: externalConfig.Description,
OutputLanguages: externalConfig.OutputLanguages,
SPDXLicenseID: spdxLicenseID,
LicenseURL: externalConfig.LicenseURL,
Name: pluginIdentity,
PluginVersion: pluginVersion,
Dependencies: dependencies,
Registry: registryConfig,
SourceURL: externalConfig.SourceURL,
Description: externalConfig.Description,
OutputLanguages: externalConfig.OutputLanguages,
SPDXLicenseID: spdxLicenseID,
LicenseURL: externalConfig.LicenseURL,
IntegrationGuideURL: externalConfig.IntegrationGuideURL,
}, nil
}

1 change: 1 addition & 0 deletions private/bufpkg/bufplugin/bufpluginconfig/testdata/success/go/buf.plugin.yaml
View file
Original file line number Diff line number Diff line change
@@ -17,3 +17,4 @@ registry:
- separate_package=true
spdx_license_id: Apache-2.0
license_url: https://github.com/grpc/grpc-go/blob/master/LICENSE
integration_guide_url: https://grpc.io/docs/languages/go/quickstart
Loading