buf: 1.7.0 -> 1.8.0

This commit is contained in:
Aaron Jheng 2022-09-20 02:01:51 +00:00
parent 998f0f7924
commit 00e586af2d
No known key found for this signature in database
GPG Key ID: F6A547A869D050A3
2 changed files with 3 additions and 31 deletions

View File

@ -10,26 +10,22 @@
buildGoModule rec {
pname = "buf";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ALqyl5GLOxwsojR0/hfjO4yD3AEkyQK+faa3smMW94c=";
sha256 = "sha256-yU1xPOnSQXrYdF24EsXb/x+IfoQFjIbW1KEt//7Fl5Q=";
};
vendorSha256 = "sha256-K+CAC2OrmjzpRF0DLSYp21BgvkxtJCF2FdpzYx/CqGI=";
vendorSha256 = "sha256-zEcKfMib/4/GfQC7M3f8R3v/hGh9F/KtjFs+pXDzbFk=";
patches = [
# Skip a test that requires networking to be available to work.
./skip_test_requiring_network.patch
# Skip TestWorkspaceGit which requires .git and commits.
./skip_test_requiring_dotgit.patch
# Skips the invalid_upstream test as it is flakey. Based on upstream commit
# 27930caf2eb35c2592a77f59ed5afe4d9e2fb7ea.
# This patch may be removed on the next buf update.
./skip_test_invalid_upstream_flakey.patch
];
nativeBuildInputs = [ installShellFiles ];

View File

@ -1,24 +0,0 @@
diff --git a/private/bufpkg/bufstudioagent/bufstudioagent_test.go b/private/bufpkg/bufstudioagent/bufstudioagent_test.go
index 6e010937..9cacc082 100644
--- a/private/bufpkg/bufstudioagent/bufstudioagent_test.go
+++ b/private/bufpkg/bufstudioagent/bufstudioagent_test.go
@@ -186,6 +186,19 @@ func testPlainPostHandlerErrors(t *testing.T, upstreamServer *httptest.Server) {
})
t.Run("invalid_upstream", func(t *testing.T) {
+ // TODO: unskip this test. This is flaky because of two reasons:
+ //
+ // 1. When a connection is closed, the underlying HTTP client does not
+ // always knows it, since the http handler implementation in go has no way
+ // of changing the connection timeout. See:
+ // https://github.com/golang/go/issues/16100
+ //
+ // 2. The expected status code is `StatusBadGateway` since the issue
+ // happened client-side (a response never came back from the server). This
+ // is not deterministic in the business logic because we're based on the
+ // connect error code that's returned. See
+ // https://linear.app/bufbuild/issue/BSR-383/flaky-test-in-bufstudioagent-testgo
+ t.SkipNow()
listener, err := net.Listen("tcp", "127.0.0.1:")
require.NoError(t, err)
go func() {