From 2c348e3ce15a3038a9992551d7b74c9a94eab44e Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 4 Aug 2020 10:21:37 -0700
Subject: [PATCH] Update gRPC v1.30.2 and google-protobuf to 3.12.4
This will help unblock Ruby 2.7 support. We previously had to revert
these due to CentOS 6 build issues, but with
https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/4466 we
are able to work around the compiler limitations.
The upgrade in google-protobuf from v3.8 to v3.9 had a breaking change:
https://github.com/protocolbuffers/protobuf/pull/6166. As
https://apidock.com/rails/Object/as_json mentions, Rails' `as_json` uses
`to_hash`, which no longer exists. Now we need to coerce values to
`to_h` to retain the original behavior.
---
Gemfile | 4 ++--
Gemfile.lock | 14 +++++++-------
.../merge_trains/create_pipeline_service_spec.rb | 2 +-
lib/api/helpers/internal_helpers.rb | 2 +-
lib/gitlab/diff/stats_cache.rb | 2 +-
spec/graphql/mutations/commits/create_spec.rb | 2 +-
spec/lib/gitlab/diff/stats_cache_spec.rb | 5 +++--
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/Gemfile b/Gemfile
index f346bdfac708..9a23c4f7d11d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -464,9 +464,9 @@ end
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 13.3.0-rc1'
-gem 'grpc', '~> 1.24.0'
+gem 'grpc', '~> 1.30.2'
-gem 'google-protobuf', '~> 3.8.0'
+gem 'google-protobuf', '~> 3.12'
gem 'toml-rb', '~> 1.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f4f5252f5a0..257cfb6b52c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -450,9 +450,9 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.12)
- google-protobuf (3.8.0)
- googleapis-common-protos-types (1.0.4)
- google-protobuf (~> 3.0)
+ google-protobuf (3.12.4)
+ googleapis-common-protos-types (1.0.5)
+ google-protobuf (~> 3.11)
googleauth (0.12.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
@@ -491,8 +491,8 @@ GEM
graphql (~> 1.6)
html-pipeline (~> 2.8)
sass (~> 3.4)
- grpc (1.24.0)
- google-protobuf (~> 3.8)
+ grpc (1.30.2)
+ google-protobuf (~> 3.12)
googleapis-common-protos-types (~> 1.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
@@ -1278,7 +1278,7 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.33)
- google-protobuf (~> 3.8.0)
+ google-protobuf (~> 3.12)
gpgme (~> 2.0.19)
grape (= 1.4.0)
grape-entity (~> 0.7.1)
@@ -1287,7 +1287,7 @@ DEPENDENCIES
graphiql-rails (~> 1.4.10)
graphql (~> 1.10.5)
graphql-docs (~> 1.6.0)
- grpc (~> 1.24.0)
+ grpc (~> 1.30.2)
gssapi
guard-rspec
haml_lint (~> 0.34.0)
diff --git a/ee/spec/services/merge_trains/create_pipeline_service_spec.rb b/ee/spec/services/merge_trains/create_pipeline_service_spec.rb
index f28d5f8e13c3..a012acaf2932 100644
--- a/ee/spec/services/merge_trains/create_pipeline_service_spec.rb
+++ b/ee/spec/services/merge_trains/create_pipeline_service_spec.rb
@@ -30,7 +30,7 @@
specify do
expect(subject[:status]).to eq(:error)
- expect(subject[:message]).to eq(expected_reason)
+ expect(subject[:message]).to match(/^#{expected_reason}/)
end
end
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb
index b69930b447cc..b7ce1eba3f9c 100644
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -117,7 +117,7 @@ def gitaly_payload(action)
return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action)
{
- repository: repository.gitaly_repository,
+ repository: repository.gitaly_repository.to_h,
address: Gitlab::GitalyClient.address(repository.shard),
token: Gitlab::GitalyClient.token(repository.shard),
features: Feature::Gitaly.server_feature_flags
diff --git a/lib/gitlab/diff/stats_cache.rb b/lib/gitlab/diff/stats_cache.rb
index a918fc082016..eb0ef4200dcd 100644
--- a/lib/gitlab/diff/stats_cache.rb
+++ b/lib/gitlab/diff/stats_cache.rb
@@ -29,7 +29,7 @@ def write_if_empty(stats)
return if cache.exist?(key)
return unless stats
- cache.write(key, stats.as_json, expires_in: EXPIRATION)
+ cache.write(key, stats.map(&:to_h).as_json, expires_in: EXPIRATION)
clear_memoization(:cached_values)
end
diff --git a/spec/graphql/mutations/commits/create_spec.rb b/spec/graphql/mutations/commits/create_spec.rb
index bb0b8c577b09..fb1baafe7bd4 100644
--- a/spec/graphql/mutations/commits/create_spec.rb
+++ b/spec/graphql/mutations/commits/create_spec.rb
@@ -147,7 +147,7 @@
it 'returns errors' do
expect(mutated_commit).to be_nil
- expect(subject[:errors]).to eq(['3:UserCommitFiles: empty CommitMessage'])
+ expect(subject[:errors].to_s).to match(/3:UserCommitFiles: empty CommitMessage/)
end
end
diff --git a/spec/lib/gitlab/diff/stats_cache_spec.rb b/spec/lib/gitlab/diff/stats_cache_spec.rb
index 451fd52c084e..5b01c1913bf3 100644
--- a/spec/lib/gitlab/diff/stats_cache_spec.rb
+++ b/spec/lib/gitlab/diff/stats_cache_spec.rb
@@ -9,6 +9,7 @@
let(:cachable_key) { 'cachecachecache' }
let(:stat) { Gitaly::DiffStats.new(path: 'temp', additions: 10, deletions: 15) }
let(:stats) { Gitlab::Git::DiffStatsCollection.new([stat]) }
+ let(:serialized_stats) { stats.map(&:to_h).as_json }
let(:cache) { Rails.cache }
describe '#read' do
@@ -38,7 +39,7 @@
it 'writes the stats' do
expect(cache)
.to receive(:write)
- .with(key, stats.as_json, expires_in: described_class::EXPIRATION)
+ .with(key, serialized_stats, expires_in: described_class::EXPIRATION)
.and_call_original
stats_cache.write_if_empty(stats)
@@ -53,7 +54,7 @@
it 'writes the stats' do
expect(cache)
.to receive(:write)
- .with(key, stats.as_json, expires_in: described_class::EXPIRATION)
+ .with(key, serialized_stats, expires_in: described_class::EXPIRATION)
.and_call_original
stats_cache.write_if_empty(stats)
--
GitLab