Commit a5cfacc2 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'remove-rugged' into 'master'

Remove Gitlab::Git::Repository#rugged

See merge request gitlab-org/gitlab-ce!22039
parents 2d33579c a99bf447
...@@ -445,7 +445,6 @@ Style/Dir: ...@@ -445,7 +445,6 @@ Style/Dir:
# Cop supports --auto-correct. # Cop supports --auto-correct.
Style/EachWithObject: Style/EachWithObject:
Exclude: Exclude:
- 'config/initializers/gollum.rb'
- 'lib/expand_variables.rb' - 'lib/expand_variables.rb'
- 'lib/gitlab/ci/ansi2html.rb' - 'lib/gitlab/ci/ansi2html.rb'
- 'lib/gitlab/ee_compat_check.rb' - 'lib/gitlab/ee_compat_check.rb'
......
...@@ -80,11 +80,9 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' ...@@ -80,11 +80,9 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
gem 'net-ldap' gem 'net-ldap'
# Git Wiki # Git Wiki
# Required manually in config/initializers/gollum.rb to control load order # Only used to compute wiki page slugs
gem 'gitlab-gollum-lib', '~> 4.2', require: false gem 'gitlab-gollum-lib', '~> 4.2', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
# Language detection # Language detection
gem 'github-linguist', '~> 5.3.3', require: 'linguist' gem 'github-linguist', '~> 5.3.3', require: 'linguist'
...@@ -134,6 +132,7 @@ gem 'seed-fu', '~> 2.3.7' ...@@ -134,6 +132,7 @@ gem 'seed-fu', '~> 2.3.7'
gem 'html-pipeline', '~> 2.8' gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0.0' gem 'deckar01-task_list', '2.0.0'
gem 'gitlab-markup', '~> 1.6.4' gem 'gitlab-markup', '~> 1.6.4'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'redcarpet', '~> 3.4' gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17' gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3.2' gem 'RedCloth', '~> 4.3.2'
......
...@@ -295,9 +295,6 @@ GEM ...@@ -295,9 +295,6 @@ GEM
rouge (~> 3.1) rouge (~> 3.1)
sanitize (~> 4.6.4) sanitize (~> 4.6.4)
stringex (~> 2.6) stringex (~> 2.6)
gitlab-gollum-rugged_adapter (0.4.4.1)
mime-types (>= 1.15)
rugged (~> 0.25)
gitlab-grit (2.8.2) gitlab-grit (2.8.2)
charlock_holmes (~> 0.6) charlock_holmes (~> 0.6)
diff-lcs (~> 1.1) diff-lcs (~> 1.1)
...@@ -1030,9 +1027,9 @@ DEPENDENCIES ...@@ -1030,9 +1027,9 @@ DEPENDENCIES
gettext_i18n_rails_js (~> 1.3) gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 0.118.1) gitaly-proto (~> 0.118.1)
github-linguist (~> 5.3.3) github-linguist (~> 5.3.3)
github-markup (~> 1.7.0)
gitlab-flowdock-git-hook (~> 1.0.1) gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-gollum-lib (~> 4.2) gitlab-gollum-lib (~> 4.2)
gitlab-gollum-rugged_adapter (~> 0.4.4)
gitlab-markup (~> 1.6.4) gitlab-markup (~> 1.6.4)
gitlab-styles (~> 2.4) gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.0.4) gitlab_omniauth-ldap (~> 2.0.4)
......
...@@ -298,9 +298,6 @@ GEM ...@@ -298,9 +298,6 @@ GEM
rouge (~> 3.1) rouge (~> 3.1)
sanitize (~> 4.6.4) sanitize (~> 4.6.4)
stringex (~> 2.6) stringex (~> 2.6)
gitlab-gollum-rugged_adapter (0.4.4.1)
mime-types (>= 1.15)
rugged (~> 0.25)
gitlab-grit (2.8.2) gitlab-grit (2.8.2)
charlock_holmes (~> 0.6) charlock_holmes (~> 0.6)
diff-lcs (~> 1.1) diff-lcs (~> 1.1)
...@@ -1039,9 +1036,9 @@ DEPENDENCIES ...@@ -1039,9 +1036,9 @@ DEPENDENCIES
gettext_i18n_rails_js (~> 1.3) gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 0.118.1) gitaly-proto (~> 0.118.1)
github-linguist (~> 5.3.3) github-linguist (~> 5.3.3)
github-markup (~> 1.7.0)
gitlab-flowdock-git-hook (~> 1.0.1) gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-gollum-lib (~> 4.2) gitlab-gollum-lib (~> 4.2)
gitlab-gollum-rugged_adapter (~> 0.4.4)
gitlab-markup (~> 1.6.4) gitlab-markup (~> 1.6.4)
gitlab-styles (~> 2.4) gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.0.4) gitlab_omniauth-ldap (~> 2.0.4)
......
...@@ -58,7 +58,7 @@ class WikiPage ...@@ -58,7 +58,7 @@ class WikiPage
attr_reader :page attr_reader :page
# The attributes Hash used for storing and validating # The attributes Hash used for storing and validating
# new Page values before writing to the Gollum repository. # new Page values before writing to the raw repository.
attr_accessor :attributes attr_accessor :attributes
def hook_attrs def hook_attrs
...@@ -111,10 +111,7 @@ class WikiPage ...@@ -111,10 +111,7 @@ class WikiPage
# The processed/formatted content of this page. # The processed/formatted content of this page.
def formatted_content def formatted_content
# Assuming @page exists, nil formatted_data means we didn't load it @attributes[:formatted_content] ||= @wiki.page_formatted_data(@page)
# before hand (i.e. page was fetched by Gitaly), so we fetch it separately.
# If the page was fetched by Gollum, formatted_data would've been a String.
@attributes[:formatted_content] ||= @page&.formatted_data || @wiki.page_formatted_data(@page)
end end
# The markup format for the page. # The markup format for the page.
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
# that we can stub it for testing, as it is only called when metrics are # that we can stub it for testing, as it is only called when metrics are
# enabled. # enabled.
# #
# rubocop:disable Metrics/AbcSize
def instrument_classes(instrumentation) def instrument_classes(instrumentation)
instrumentation.instrument_instance_methods(Gitlab::Shell) instrumentation.instrument_instance_methods(Gitlab::Shell)
...@@ -48,16 +47,6 @@ def instrument_classes(instrumentation) ...@@ -48,16 +47,6 @@ def instrument_classes(instrumentation)
instrumentation.instrument_methods(Premailer::Adapter::Nokogiri) instrumentation.instrument_methods(Premailer::Adapter::Nokogiri)
instrumentation.instrument_instance_methods(Premailer::Adapter::Nokogiri) instrumentation.instrument_instance_methods(Premailer::Adapter::Nokogiri)
[
:Blame, :Branch, :BranchCollection, :Blob, :Commit, :Diff, :Repository,
:Tag, :TagCollection, :Tree
].each do |name|
const = Rugged.const_get(name)
instrumentation.instrument_methods(const)
instrumentation.instrument_instance_methods(const)
end
instrumentation.instrument_methods(Banzai::Renderer) instrumentation.instrument_methods(Banzai::Renderer)
instrumentation.instrument_methods(Banzai::Querying) instrumentation.instrument_methods(Banzai::Querying)
...@@ -101,7 +90,6 @@ def instrument_classes(instrumentation) ...@@ -101,7 +90,6 @@ def instrument_classes(instrumentation)
# Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/30224#note_32306159 # Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/30224#note_32306159
instrumentation.instrument_instance_method(MergeRequestDiff, :load_commits) instrumentation.instrument_instance_method(MergeRequestDiff, :load_commits)
end end
# rubocop:enable Metrics/AbcSize
# With prometheus enabled by default this breaks all specs # With prometheus enabled by default this breaks all specs
# that stubs methods using `any_instance_of` for the models reloaded here. # that stubs methods using `any_instance_of` for the models reloaded here.
......
# WARNING changes in this file must be manually propagated to gitaly-ruby.
#
# https://gitlab.com/gitlab-org/gitaly/blob/master/ruby/lib/gitlab/gollum.rb
module Gollum
GIT_ADAPTER = "rugged".freeze
end
require "gollum-lib"
module Gollum
class Page
def text_data(encoding = nil)
data = if raw_data.respond_to?(:encoding)
raw_data.force_encoding(encoding || Encoding::UTF_8)
else
raw_data
end
Gitlab::EncodingHelper.encode!(data)
end
end
end
Rails.application.configure do
config.after_initialize do
Gollum::Page.per_page = Kaminari.config.default_per_page
end
end
# GitLab Developers Guide to Working with Gitaly # GitLab Developers Guide to Working with Gitaly
[Gitaly](https://gitlab.com/gitlab-org/gitaly) is a high-level Git RPC service used by GitLab CE/EE, [Gitaly](https://gitlab.com/gitlab-org/gitaly) is a high-level Git RPC service used by GitLab CE/EE,
Workhorse and GitLab-Shell. All Rugged operations in GitLab CE/EE are currently being phased out to Workhorse and GitLab-Shell.
be replaced by Gitaly API calls.
Visit the [Gitaly Migration Board](https://gitlab.com/gitlab-org/gitaly/boards/331341) for current
status of the migration.
## Developing new Git features ## Developing new Git features
...@@ -52,57 +48,6 @@ comfortable writing Go code. ...@@ -52,57 +48,6 @@ comfortable writing Go code.
There is documentation for this approach in [the Gitaly There is documentation for this approach in [the Gitaly
repo](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/ruby_endpoint.md). repo](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/ruby_endpoint.md).
## Modifying existing Git features
If you modify existing Git features in `lib/gitlab/git` you need to make
sure the changes also work in Gitaly. Because we are still in the
migration process there are a number of subtle pitfalls. Features that
have been migrated have dual implementations (Gitaly and local). The
Gitaly implementation may or may not use a vendored (and therefore
possibly outdated) copy of the local implementation in `lib/gitlab/git`.
To avoid unexpected problems and conflicts, all changes to
`lib/gitlab/git` need to be approved by a member of the Gitaly team.
For the time being, while the Gitaly migration is still in progress,
there should be no Enterprise Edition-only Git code in
`lib/gitlab/git`. Also no mixins.
## Feature Flags
Gitaly makes heavy use of [feature flags](feature_flags.md).
Each Rugged-to-Gitaly migration goes through a [series of phases](https://gitlab.com/gitlab-org/gitaly/blob/master/doc/MIGRATION_PROCESS.md):
* **Opt-In**: by default the Rugged implementation is used.
* Production instances can choose to enable the Gitaly endpoint by enabling the feature flag.
* For testing purposes, you may wish to enable all feature flags by default. This can be done by exporting the following
environment variable: `GITALY_FEATURE_DEFAULT_ON=1`.
* On developer instances (ie, when `Rails.env.development?` is true), the Gitaly endpoint
is enabled by default, but can be _disabled_ using feature flags.
* **Opt-Out**: by default, the Gitaly endpoint is used, but the feature can be explicitly disabled using the feature flag.
* **Mandatory**: The migration is complete and cannot be disabled. The old codepath is removed.
### Enabling and Disabling Feature
In the Rails console, type:
```ruby
Feature.enable(:gitaly_feature_name)
Feature.disable(:gitaly_feature_name)
```
Where `gitaly_feature_name` is the name of the Gitaly feature. This can be determined by finding the appropriate
`gitaly_migrate` code block, for example:
```ruby
gitaly_migrate(:tag_names) do
...
end
```
Since Gitaly features are always prefixed with `gitaly_`, the name of the feature flag in this case would be `gitaly_tag_names`.
## Gitaly-Related Test Failures ## Gitaly-Related Test Failures
If your test-suite is failing with Gitaly issues, as a first step, try running: If your test-suite is failing with Gitaly issues, as a first step, try running:
......
...@@ -69,7 +69,7 @@ The easiest way to check if a method has been instrumented is to check its ...@@ -69,7 +69,7 @@ The easiest way to check if a method has been instrumented is to check its
source location. For example: source location. For example:
```ruby ```ruby
method = Rugged::TagCollection.instance_method(:[]) method = Banzai::Renderer.method(:render)
method.source_location method.source_location
``` ```
...@@ -82,7 +82,7 @@ method (along with its source location), this is easier than running the above ...@@ -82,7 +82,7 @@ method (along with its source location), this is easier than running the above
Ruby code. In case of the above snippet you'd run the following: Ruby code. In case of the above snippet you'd run the following:
``` ```
$ Rugged::TagCollection#[] $ Banzai::Renderer.render
``` ```
This will print out something along the lines of: This will print out something along the lines of:
......
...@@ -53,9 +53,6 @@ module Gitlab ...@@ -53,9 +53,6 @@ module Gitlab
# Already a commit? # Already a commit?
return commit_id if commit_id.is_a?(Gitlab::Git::Commit) return commit_id if commit_id.is_a?(Gitlab::Git::Commit)
# A rugged reference?
commit_id = Gitlab::Git::Ref.dereference_object(commit_id)
# Some weird thing? # Some weird thing?
return nil unless commit_id.is_a?(String) return nil unless commit_id.is_a?(String)
...@@ -127,8 +124,6 @@ module Gitlab ...@@ -127,8 +124,6 @@ module Gitlab
# :topo, or any combination of them (in an array). Commit ordering types # :topo, or any combination of them (in an array). Commit ordering types
# are documented here: # are documented here:
# http://www.rubydoc.info/github/libgit2/rugged/Rugged#SORT_NONE-constant) # http://www.rubydoc.info/github/libgit2/rugged/Rugged#SORT_NONE-constant)
#
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/326
def find_all(repo, options = {}) def find_all(repo, options = {})
repo.wrapped_gitaly_errors do repo.wrapped_gitaly_errors do
Gitlab::GitalyClient::CommitService.new(repo).find_all_commits(options) Gitlab::GitalyClient::CommitService.new(repo).find_all_commits(options)
...@@ -328,7 +323,6 @@ module Gitlab ...@@ -328,7 +323,6 @@ module Gitlab
entry = @repository.gitaly_commit_client.tree_entry(id, path, 1) entry = @repository.gitaly_commit_client.tree_entry(id, path, 1)
return unless entry return unless entry
# To be compatible with the rugged format
entry = entry.to_h entry = entry.to_h
entry.delete(:data) entry.delete(:data)
entry[:name] = File.basename(path) entry[:name] = File.basename(path)
...@@ -346,8 +340,8 @@ module Gitlab ...@@ -346,8 +340,8 @@ module Gitlab
subject: message_split[0] ? message_split[0].chomp.b : "", subject: message_split[0] ? message_split[0].chomp.b : "",
body: raw_commit.message.b, body: raw_commit.message.b,
parent_ids: raw_commit.parent_ids, parent_ids: raw_commit.parent_ids,
author: gitaly_commit_author_from_rugged(raw_commit.author), author: gitaly_commit_author_from_raw(raw_commit.author),
committer: gitaly_commit_author_from_rugged(raw_commit.committer) committer: gitaly_commit_author_from_raw(raw_commit.committer)
) )
end end
...@@ -381,7 +375,7 @@ module Gitlab ...@@ -381,7 +375,7 @@ module Gitlab
SERIALIZE_KEYS SERIALIZE_KEYS
end end
def gitaly_commit_author_from_rugged(author_or_committer) def gitaly_commit_author_from_raw(author_or_committer)
Gitaly::CommitAuthor.new( Gitaly::CommitAuthor.new(
name: author_or_committer[:name].b, name: author_or_committer[:name].b,
email: author_or_committer[:email].b, email: author_or_committer[:email].b,
......
# Gitaly note: JV: probably no RPC's here (just one interaction with Rugged).
module Gitlab module Gitlab
module Git module Git
class Ref class Ref
...@@ -26,13 +24,6 @@ module Gitlab ...@@ -26,13 +24,6 @@ module Gitlab
str.gsub(%r{\Arefs/heads/}, '') str.gsub(%r{\Arefs/heads/}, '')
end end
# Gitaly: this method will probably be migrated indirectly via its call sites.
def self.dereference_object(object)
object = object.target while object.is_a?(Rugged::Tag::Annotation)
object
end
def initialize(repository, name, target, dereferenced_target) def initialize(repository, name, target, dereferenced_target)
@name = Gitlab::Git.ref_name(name) @name = Gitlab::Git.ref_name(name)
@dereferenced_target = dereferenced_target @dereferenced_target = dereferenced_target
......
...@@ -9,14 +9,6 @@ module Gitlab ...@@ -9,14 +9,6 @@ module Gitlab
include Gitlab::EncodingHelper include Gitlab::EncodingHelper
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
ALLOWED_OBJECT_DIRECTORIES_VARIABLES = %w[
GIT_OBJECT_DIRECTORY
GIT_ALTERNATE_OBJECT_DIRECTORIES
].freeze
ALLOWED_OBJECT_RELATIVE_DIRECTORIES_VARIABLES = %w[
GIT_OBJECT_DIRECTORY_RELATIVE
GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE
].freeze
SEARCH_CONTEXT_LINES = 3 SEARCH_CONTEXT_LINES = 3
REV_LIST_COMMIT_LIMIT = 2_000 REV_LIST_COMMIT_LIMIT = 2_000
# In https://gitlab.com/gitlab-org/gitaly/merge_requests/698 # In https://gitlab.com/gitlab-org/gitaly/merge_requests/698
...@@ -104,15 +96,6 @@ module Gitlab ...@@ -104,15 +96,6 @@ module Gitlab
raise Gitlab::Git::CommandError.new(e.message) raise Gitlab::Git::CommandError.new(e.message)
end end
# This method will be removed when Gitaly reaches v1.1.
def rugged
circuit_breaker.perform do
Rugged::Repository.new(path, alternates: alternate_object_directories)
end
rescue Rugged::RepositoryError, Rugged::OSError
raise NoRepository.new('no repository for such path')
end
def circuit_breaker def circuit_breaker
@circuit_breaker ||= Gitlab::Git::Storage::CircuitBreaker.for_storage(storage) @circuit_breaker ||= Gitlab::Git::Storage::CircuitBreaker.for_storage(storage)
end end
...@@ -638,20 +621,6 @@ module Gitlab ...@@ -638,20 +621,6 @@ module Gitlab
end end
end end
AUTOCRLF_VALUES = {
"true" => true,
"false" => false,
"input" => :input
}.freeze
def autocrlf
AUTOCRLF_VALUES[rugged.config['core.autocrlf']]
end
def autocrlf=(value)
rugged.config['core.autocrlf'] = AUTOCRLF_VALUES.invert[value]
end
# Returns result like "git ls-files" , recursive and full file path # Returns result like "git ls-files" , recursive and full file path
# #
# Ex. # Ex.
...@@ -1024,14 +993,6 @@ module Gitlab ...@@ -1024,14 +993,6 @@ module Gitlab
found_module && found_module['url'] found_module && found_module['url']
end end
def alternate_object_directories
relative_object_directories.map { |d| File.join(path, d) }
end
def relative_object_directories
Gitlab::Git::HookEnv.all(gl_repository).values_at(*ALLOWED_OBJECT_RELATIVE_DIRECTORIES_VARIABLES).flatten.compact
end
# Returns true if the given ref name exists # Returns true if the given ref name exists
# #
# Ref names must start with `refs/`. # Ref names must start with `refs/`.
......
# We only need Gollum::Page so let's not load all of gollum-lib.
require 'gollum-lib/pagination'
require 'gollum-lib/wiki'
require 'gollum-lib/page'
module Gitlab module Gitlab
module Git module Git
class Wiki class Wiki
DuplicatePageError = Class.new(StandardError) DuplicatePageError = Class.new(StandardError)
OperationError = Class.new(StandardError) OperationError = Class.new(StandardError)
DEFAULT_PAGINATION = Kaminari.config.default_per_page
CommitDetails = Struct.new(:user_id, :username, :name, :email, :message) do CommitDetails = Struct.new(:user_id, :username, :name, :email, :message) do
def to_h def to_h
{ user_id: user_id, username: username, name: name, email: email, message: message } { user_id: user_id, username: username, name: name, email: email, message: message }
...@@ -74,7 +81,7 @@ module Gitlab ...@@ -74,7 +81,7 @@ module Gitlab
# Gitaly uses gollum-lib to get the versions. Gollum defaults to 20 # Gitaly uses gollum-lib to get the versions. Gollum defaults to 20
# per page, but also fetches 20 if `limit` or `per_page` < 20. # per page, but also fetches 20 if `limit` or `per_page` < 20.
# Slicing returns an array with the expected number of items. # Slicing returns an array with the expected number of items.
slice_bound = options[:limit] || options[:per_page] || Gollum::Page.per_page slice_bound = options[:limit] || options[:per_page] || DEFAULT_PAGINATION
versions[0..slice_bound] versions[0..slice_bound]
end end
...@@ -104,26 +111,6 @@ module Gitlab ...@@ -104,26 +111,6 @@ module Gitlab
private private
def new_page(gollum_page)
Gitlab::Git::WikiPage.new(gollum_page, new_version(gollum_page, gollum_page.version.id))
end
def new_version(gollum_page, commit_id)
Gitlab::Git::WikiPageVersion.new(version(commit_id), gollum_page&.format)
end
def version(commit_id)
commit_find_proc = -> { Gitlab::Git::Commit.find(@repository, commit_id) }
Gitlab::SafeRequestStore.fetch([:wiki_version_commit, commit_id]) { commit_find_proc.call }
end
def assert_type!(object, klass)
unless object.is_a?(klass)
raise ArgumentError, "expected a #{klass}, got #{object.inspect}"
end
end
def gitaly_wiki_client def gitaly_wiki_client
@gitaly_wiki_client ||= Gitlab::GitalyClient::WikiService.new(@repository) @gitaly_wiki_client ||= Gitlab::GitalyClient::WikiService.new(@repository)
end end
......
...@@ -3,17 +3,12 @@ module Gitlab ...@@ -3,17 +3,12 @@ module Gitlab
class WikiFile class WikiFile
attr_reader :mime_type, :raw_data, :name, :path attr_reader :mime_type, :raw_data, :name, :path
# This class is meant to be serializable so that it can be constructed # This class wraps Gitlab::GitalyClient::WikiFile
# by Gitaly and sent over the network to GitLab. def initialize(gitaly_file)
# @mime_type = gitaly_file.mime_type
# Because Gollum::File is not serializable we must get all the data from @raw_data = gitaly_file.raw_data
# 'gollum_file' during initialization, and NOT store it in an instance @name = gitaly_file.name
# variable. @path = gitaly_file.path
def initialize(gollum_file)
@mime_type = gollum_file.mime_type
@raw_data = gollum_file.raw_data
@name = gollum_file.name
@path = gollum_file.path
end end
end end
end end
......
...@@ -3,25 +3,15 @@ module Gitlab ...@@ -3,25 +3,15 @@ module Gitlab
class WikiPage class WikiPage
attr_reader :url_path, :title, :format, :path, :version, :raw_data, :name, :text_data, :historical, :formatted_data attr_reader :url_path, :title, :format, :path, :version, :raw_data, :name, :text_data, :historical, :formatted_data
# This class is meant to be serializable so that it can be constructed # This class abstracts away Gitlab::GitalyClient::WikiPage
# by Gitaly and sent over the network to GitLab. def initialize(gitaly_page, version)
# @url_path = gitaly_page.url_path
# Because Gollum::Page is not serializable we must get all the data from @title = gitaly_page.title
# 'gollum_page' during initialization, and NOT store it in an instance @format = gitaly_page.format
# variable. @path = gitaly_page.path
# @raw_data = gitaly_page.raw_data
# Note that 'version' is a WikiPageVersion instance which it itself @name = gitaly_page.name
# serializable. That means it's OK to store 'version' in an instance @historical = gitaly_page.historical?
# variable.
def initialize(gollum_page, version)
@url_path = gollum_page.url_path
@title = gollum_page.title
@format = gollum_page.format
@path = gollum_page.path
@raw_data = gollum_page.raw_data
@name = gollum_page.name
@historical = gollum_page.historical?
@formatted_data = gollum_page.formatted_data if gollum_page.is_a?(Gollum::Page)
@version = version @version = version
end end
......
...@@ -3,11 +3,6 @@ module Gitlab ...@@ -3,11 +3,6 @@ module Gitlab
class WikiPageVersion class WikiPageVersion
attr_reader :commit, :format attr_reader :commit, :format
# This class is meant to be serializable so that it can be constructed
# by Gitaly and sent over the network to GitLab.
#
# Both 'commit' (a Gitlab::Git::Commit) and 'format' (a string) are
# serializable.
def initialize(commit, format) def initialize(commit, format)
@commit = commit @commit = commit
@format = format @format = format
......
...@@ -110,7 +110,7 @@ module Gitlab ...@@ -110,7 +110,7 @@ module Gitlab
repository: @gitaly_repo, repository: @gitaly_repo,
page_path: encode_binary(page_path), page_path: encode_binary(page_path),
page: options[:page] || 1, page: options[:page] || 1,
per_page: options[:per_page] || Gollum::Page.per_page per_page: options[:per_page] || Gitlab::Git::Wiki::DEFAULT_PAGINATION
) )
stream = GitalyClient.call(@repository.storage, :wiki_service, :wiki_get_page_versions, request, timeout: GitalyClient.medium_timeout) stream = GitalyClient.call(@repository.storage, :wiki_service, :wiki_get_page_versions, request, timeout: GitalyClient.medium_timeout)
......
#!/usr/bin/env ruby #!/usr/bin/env ruby
ALLOWED = [ ALLOWED = [
# Can be fixed once Rugged is no longer used in production. Doesn't make Rugged calls. # Needed to handle repositories that are not in any storage
'config/initializers/8_metrics.rb',
# Can be deleted once wiki's are fully (mandatory) migrated
'config/initializers/gollum.rb',
# Needs to be migrated, https://gitlab.com/gitlab-org/gitaly/issues/953
'lib/gitlab/bare_repository_import/repository.rb', 'lib/gitlab/bare_repository_import/repository.rb',
# Needs to be migrated, https://gitlab.com/gitlab-org/gitaly/issues/954
'lib/tasks/gitlab/cleanup.rake',
# The only place where Rugged code is still allowed in production
'lib/gitlab/git/',
# Needed to avoid using the git binary to validate a branch name # Needed to avoid using the git binary to validate a branch name
'lib/gitlab/git_ref_validator.rb' 'lib/gitlab/git_ref_validator.rb'
].freeze ].freeze
......
...@@ -264,9 +264,9 @@ describe 'GitLab Markdown', :aggregate_failures do ...@@ -264,9 +264,9 @@ describe 'GitLab Markdown', :aggregate_failures do
@project_wiki = @feat.project_wiki @project_wiki = @feat.project_wiki
@project_wiki_page = @feat.project_wiki_page @project_wiki_page = @feat.project_wiki_page
file = Gollum::File.new(@project_wiki.wiki) path = 'images/example.jpg'
expect(file).to receive(:path).and_return('images/example.jpg') gitaly_wiki_file = Gitlab::GitalyClient::WikiFile.new(path: path)
expect(@project_wiki).to receive(:find_file).with('images/example.jpg').and_return(file) expect(@project_wiki).to receive(:find_file).with(path).and_return(Gitlab::Git::WikiFile.new(gitaly_wiki_file))
allow(@project_wiki).to receive(:wiki_base_path) { '/namespace1/gitlabhq/wikis' } allow(@project_wiki).to receive(:wiki_base_path) { '/namespace1/gitlabhq/wikis' }
@html = markdown(@feat.raw_markdown, { pipeline: :wiki, project_wiki: @project_wiki, page_slug: @project_wiki_page.slug }) @html = markdown(@feat.raw_markdown, { pipeline: :wiki, project_wiki: @project_wiki, page_slug: @project_wiki_page.slug })
......
...@@ -83,12 +83,13 @@ describe 'User views a wiki page' do ...@@ -83,12 +83,13 @@ describe 'User views a wiki page' do
end end
it 'shows a file stored in a page' do it 'shows a file stored in a page' do
gollum_file_double = double('Gollum::File', raw_file = Gitlab::GitalyClient::WikiFile.new(
mime_type: 'image/jpeg', mime_type: 'image/jpeg',
name: 'images/image.jpg', name: 'images/image.jpg',
path: 'images/image.jpg', path: 'images/image.jpg',
raw_data: '') raw_data: ''
wiki_file = Gitlab::Git::WikiFile.new(gollum_file_double) )
wiki_file = Gitlab::Git::WikiFile.new(raw_file)
allow(wiki_file).to receive(:mime_type).and_return('image/jpeg') allow(wiki_file).to receive(:mime_type).and_return('image/jpeg')
allow_any_instance_of(ProjectWiki).to receive(:find_file).with('image.jpg', nil).and_return(wiki_file) allow_any_instance_of(ProjectWiki).to receive(:find_file).with('image.jpg', nil).and_return(wiki_file)
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :migration, schema: 20171114162227 do describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :migration, schema: 20171114162227 do
include GitHelpers
let(:merge_request_diffs) { table(:merge_request_diffs) } let(:merge_request_diffs) { table(:merge_request_diffs) }
let(:merge_requests) { table(:merge_requests) } let(:merge_requests) { table(:merge_requests) }
...@@ -9,11 +11,7 @@ describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :m ...@@ -9,11 +11,7 @@ describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :m
let(:merge_request) { merge_requests.create!(iid: 1, target_project_id: project.id, source_project_id: project.id, target_branch: 'feature', source_branch: 'master').becomes(MergeRequest) } let(:merge_request) { merge_requests.create!(iid: 1, target_project_id: project.id, source_project_id: project.id, target_branch: 'feature', source_branch: 'master').becomes(MergeRequest) }
let(:merge_request_diff) { MergeRequest.find(merge_request.id).create_merge_request_diff } let(:merge_request_diff) { MergeRequest.find(merge_request.id).create_merge_request_diff }
let(:updated_merge_request_diff) { MergeRequestDiff.find(merge_request_diff.id) } let(:updated_merge_request_diff) { MergeRequestDiff.find(merge_request_diff.id) }
let(:rugged) do let(:rugged) { rugged_repo(project.repository) }
Gitlab::GitalyClient::StorageSettings.allow_disk_access do
project.repository.rugged
end
end
before do before do
allow_any_instance_of(MergeRequestDiff) allow_any_instance_of(MergeRequestDiff)
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::Conflict::File do describe Gitlab::Conflict::File do
include GitHelpers
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
let(:repository) { project.repository } let(:repository) { project.repository }
let(:rugged) { Gitlab::GitalyClient::StorageSettings.allow_disk_access { repository.rugged } } let(:rugged) { rugged_repo(repository) }
let(:their_commit) { rugged.branches['conflict-start'].target } let(:their_commit) { rugged.branches['conflict-start'].target }
let(:our_commit) { rugged.branches['conflict-resolvable'].target } let(:our_commit) { rugged.branches['conflict-resolvable'].target }
let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start', source_project: project) } let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start', source_project: project) }
......
...@@ -4,6 +4,9 @@ require "spec_helper" ...@@ -4,6 +4,9 @@ require "spec_helper"
describe Gitlab::Git::Blob, :seed_helper do describe Gitlab::Git::Blob, :seed_helper do
let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') } let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') }
let(:rugged) do
Rugged::Repository.new(File.join(TestEnv.repos_path, TEST_REPO_PATH))
end
describe 'initialize' do describe 'initialize' do
let(:blob) { Gitlab::Git::Blob.new(name: 'test') } let(:blob) { Gitlab::Git::Blob.new(name: 'test') }
...@@ -139,9 +142,7 @@ describe Gitlab::Git::Blob, :seed_helper do ...@@ -139,9 +142,7 @@ describe Gitlab::Git::Blob, :seed_helper do
it 'limits the size of a large file' do it 'limits the size of a large file' do
blob_size = Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE + 1 blob_size = Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE + 1
buffer = Array.new(blob_size, 0) buffer = Array.new(blob_size, 0)
rugged_blob = Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged_blob = Rugged::Blob.from_buffer(rugged, buffer.join(''))
Rugged::Blob.from_buffer(repository.rugged, buffer.join(''))
end
blob = Gitlab::Git::Blob.raw(repository, rugged_blob) blob = Gitlab::Git::Blob.raw(repository, rugged_blob)
expect(blob.size).to eq(blob_size) expect(blob.size).to eq(blob_size)
...@@ -156,9 +157,7 @@ describe Gitlab::Git::Blob, :seed_helper do ...@@ -156,9 +157,7 @@ describe Gitlab::Git::Blob, :seed_helper do
context 'when sha references a tree' do context 'when sha references a tree' do
it 'returns nil' do it 'returns nil' do
tree = Gitlab::GitalyClient::StorageSettings.allow_disk_access do tree = rugged.rev_parse('master^{tree}')
repository.rugged.rev_parse('master^{tree}')
end
blob = Gitlab::Git::Blob.raw(repository, tree.oid) blob = Gitlab::Git::Blob.raw(repository, tree.oid)
...@@ -262,11 +261,7 @@ describe Gitlab::Git::Blob, :seed_helper do ...@@ -262,11 +261,7 @@ describe Gitlab::Git::Blob, :seed_helper do
end end
describe '.batch_lfs_pointers' do describe '.batch_lfs_pointers' do
let(:tree_object) do let(:tree_object) { rugged.rev_parse('master^{tree}') }
Gitlab::GitalyClient::StorageSettings.allow_disk_access do
repository.rugged.rev_parse('master^{tree}')
end
end
let(:non_lfs_blob) do let(:non_lfs_blob) do
Gitlab::Git::Blob.find( Gitlab::Git::Blob.find(
......
...@@ -3,9 +3,7 @@ require "spec_helper" ...@@ -3,9 +3,7 @@ require "spec_helper"
describe Gitlab::Git::Branch, :seed_helper do describe Gitlab::Git::Branch, :seed_helper do
let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') } let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') }
let(:rugged) do let(:rugged) do
Gitlab::GitalyClient::StorageSettings.allow_disk_access do Rugged::Repository.new(File.join(TestEnv.repos_path, repository.relative_path))
repository.rugged
end
end end
subject { repository.branches } subject { repository.branches }
...@@ -74,9 +72,7 @@ describe Gitlab::Git::Branch, :seed_helper do ...@@ -74,9 +72,7 @@ describe Gitlab::Git::Branch, :seed_helper do
Gitlab::Git.committer_hash(email: user.email, name: user.name) Gitlab::Git.committer_hash(email: user.email, name: user.name)
end end
let(:params) do let(:params) do
parents = Gitlab::GitalyClient::StorageSettings.allow_disk_access do parents = [rugged.head.target]
[repository.rugged.head.target]
end
tree = parents.first.tree tree = parents.first.tree
{ {
......
require "spec_helper" require "spec_helper"
describe Gitlab::Git::Commit, :seed_helper do describe Gitlab::Git::Commit, :seed_helper do
include GitHelpers
let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') } let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') }
let(:commit) { described_class.find(repository, SeedRepo::Commit::ID) } let(:rugged_repo) do
let(:rugged_commit) do Rugged::Repository.new(File.join(TestEnv.repos_path, TEST_REPO_PATH))
Gitlab::GitalyClient::StorageSettings.allow_disk_access do
repository.rugged.lookup(SeedRepo::Commit::ID)
end
end end
let(:commit) { described_class.find(repository, SeedRepo::Commit::ID) }
let(:rugged_commit) { rugged_repo.lookup(SeedRepo::Commit::ID) }
describe "Commit info" do describe "Commit info" do
before do before do
repo = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '').rugged
end
@committer = { @committer = {
email: 'mike@smith.com', email: 'mike@smith.com',
name: "Mike Smith", name: "Mike Smith",
...@@ -26,12 +24,12 @@ describe Gitlab::Git::Commit, :seed_helper do ...@@ -26,12 +24,12 @@ describe Gitlab::Git::Commit, :seed_helper do
time: Time.now time: Time.now
} }
@parents = [repo.head.target] @parents = [rugged_repo.head.target]
@gitlab_parents = @parents.map { |c| described_class.find(repository, c.oid) } @gitlab_parents = @parents.map { |c| described_class.find(repository, c.oid) }
@tree = @parents.first.tree @tree = @parents.first.tree
sha = Rugged::Commit.create( sha = Rugged::Commit.create(
repo, rugged_repo,
author: @author, author: @author,
committer: @committer, committer: @committer,
tree: @tree, tree: @tree,
...@@ -40,7 +38,7 @@ describe Gitlab::Git::Commit, :seed_helper do ...@@ -40,7 +38,7 @@ describe Gitlab::Git::Commit, :seed_helper do
update_ref: "HEAD" update_ref: "HEAD"
) )
@raw_commit = repo.lookup(sha) @raw_commit = rugged_repo.lookup(sha)
@commit = described_class.find(repository, sha) @commit = described_class.find(repository, sha)
end end
...@@ -61,10 +59,7 @@ describe Gitlab::Git::Commit, :seed_helper do ...@@ -61,10 +59,7 @@ describe Gitlab::Git::Commit, :seed_helper do
after do after do
# Erase the new commit so other tests get the original repo # Erase the new commit so other tests get the original repo
repo = Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged_repo.references.update("refs/heads/master", SeedRepo::LastCommit::ID)
Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '').rugged
end
repo.references.update("refs/heads/master", SeedRepo::LastCommit::ID)
end end
end end
...@@ -120,9 +115,7 @@ describe Gitlab::Git::Commit, :seed_helper do ...@@ -120,9 +115,7 @@ describe Gitlab::Git::Commit, :seed_helper do
describe '.find' do describe '.find' do
it "should return first head commit if without params" do it "should return first head commit if without params" do
expect(described_class.last(repository).id).to eq( expect(described_class.last(repository).id).to eq(
Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged_repo.head.target.oid
repository.rugged.head.target.oid
end
) )
end end
......
...@@ -64,44 +64,8 @@ EOT ...@@ -64,44 +64,8 @@ EOT
end end
end end
context 'using a Rugged::Patch' do
context 'with a small diff' do
let(:diff) { described_class.new(gitaly_diff) }
it 'initializes the diff' do
expect(diff.to_hash).to eq(@raw_diff_hash)
end
it 'does not prune the diff' do
expect(diff).not_to be_too_large
end
end
context 'using a diff that is too large' do
it 'prunes the diff' do
gitaly_diff.too_large = true
diff = described_class.new(gitaly_diff)
expect(diff.diff).to be_empty
expect(diff).to be_too_large
end
end
context 'using a collapsable diff that is too large' do
it 'prunes the diff as a large diff instead of as a collapsed diff' do
gitaly_diff.too_large = true
diff = described_class.new(gitaly_diff, expanded: false)
expect(diff.diff).to be_empty
expect(diff).to be_too_large
expect(diff).not_to be_collapsed
end
end
end
context 'using a GitalyClient::Diff' do context 'using a GitalyClient::Diff' do
let(:diff) do let(:gitaly_diff) do
described_class.new(
Gitlab::GitalyClient::Diff.new( Gitlab::GitalyClient::Diff.new(
to_path: ".gitmodules", to_path: ".gitmodules",
from_path: ".gitmodules", from_path: ".gitmodules",
...@@ -111,8 +75,8 @@ EOT ...@@ -111,8 +75,8 @@ EOT
to_id: '8e5177d718c561d36efde08bad36b43687ee6bf0', to_id: '8e5177d718c561d36efde08bad36b43687ee6bf0',
patch: raw_patch patch: raw_patch
) )
)
end end
let(:diff) { described_class.new(gitaly_diff) }
context 'with a small diff' do context 'with a small diff' do
let(:raw_patch) { @raw_diff_hash[:diff] } let(:raw_patch) { @raw_diff_hash[:diff] }
...@@ -135,6 +99,19 @@ EOT ...@@ -135,6 +99,19 @@ EOT
end end
end end
context 'using a collapsable diff that is too large' do
let(:raw_patch) { 'a' * 204800 }
it 'prunes the diff as a large diff instead of as a collapsed diff' do
gitaly_diff.too_large = true
diff = described_class.new(gitaly_diff, expanded: false)
expect(diff.diff).to be_empty
expect(diff).to be_too_large
expect(diff).not_to be_collapsed
end
end
context 'when the patch passed is not UTF-8-encoded' do context 'when the patch passed is not UTF-8-encoded' do
let(:raw_patch) { @raw_diff_hash[:diff].encode(Encoding::ASCII_8BIT) } let(:raw_patch) { @raw_diff_hash[:diff].encode(Encoding::ASCII_8BIT) }
......
This diff is collapsed.
...@@ -2,6 +2,7 @@ require 'spec_helper' ...@@ -2,6 +2,7 @@ require 'spec_helper'
describe Gitlab::GitAccess do describe Gitlab::GitAccess do
include TermsHelper include TermsHelper
include GitHelpers
let(:user) { create(:user) } let(:user) { create(:user) }
...@@ -736,9 +737,8 @@ describe Gitlab::GitAccess do ...@@ -736,9 +737,8 @@ describe Gitlab::GitAccess do
def merge_into_protected_branch def merge_into_protected_branch
@protected_branch_merge_commit ||= begin @protected_branch_merge_commit ||= begin
Gitlab::GitalyClient::StorageSettings.allow_disk_access do
project.repository.add_branch(user, unprotected_branch, 'feature') project.repository.add_branch(user, unprotected_branch, 'feature')
rugged = project.repository.rugged rugged = rugged_repo(project.repository)
target_branch = rugged.rev_parse('feature') target_branch = rugged.rev_parse('feature')
source_branch = project.repository.create_file( source_branch = project.repository.create_file(
user, user,
...@@ -752,7 +752,6 @@ describe Gitlab::GitAccess do ...@@ -752,7 +752,6 @@ describe Gitlab::GitAccess do
Rugged::Commit.create(rugged, author: author, committer: author, message: "commit message", parents: [target_branch, source_branch], tree: merge_index.write_tree(rugged)) Rugged::Commit.create(rugged, author: author, committer: author, message: "commit message", parents: [target_branch, source_branch], tree: merge_index.write_tree(rugged))
end end
end end
end
def self.run_permission_checks(permissions_matrix) def self.run_permission_checks(permissions_matrix)
permissions_matrix.each_pair do |role, matrix| permissions_matrix.each_pair do |role, matrix|
......
...@@ -39,6 +39,10 @@ describe Gitlab::GitalyClient::WikiService do ...@@ -39,6 +39,10 @@ describe Gitlab::GitalyClient::WikiService do
expect(wiki_page.title).to eq('My Page') expect(wiki_page.title).to eq('My Page')
expect(wiki_page.raw_data).to eq('ab') expect(wiki_page.raw_data).to eq('ab')
expect(wiki_page_version.format).to eq('markdown') expect(wiki_page_version.format).to eq('markdown')
expect(wiki_page.title).to be_utf8
expect(wiki_page.path).to be_utf8
expect(wiki_page.name).to be_utf8
end end
end end
......
...@@ -2,6 +2,7 @@ require 'spec_helper' ...@@ -2,6 +2,7 @@ require 'spec_helper'
describe Namespace do describe Namespace do
include ProjectForksHelper include ProjectForksHelper
include GitHelpers
let!(:namespace) { create(:namespace) } let!(:namespace) { create(:namespace) }
let(:gitlab_shell) { Gitlab::Shell.new } let(:gitlab_shell) { Gitlab::Shell.new }
...@@ -361,9 +362,7 @@ describe Namespace do ...@@ -361,9 +362,7 @@ describe Namespace do
end end
def project_rugged(project) def project_rugged(project)
Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged_repo(project.repository)
project.repository.rugged
end
end end
end end
......
...@@ -2,6 +2,7 @@ require 'spec_helper' ...@@ -2,6 +2,7 @@ require 'spec_helper'
describe Project do describe Project do
include ProjectForksHelper include ProjectForksHelper
include GitHelpers
describe 'associations' do describe 'associations' do
it { is_expected.to belong_to(:group) } it { is_expected.to belong_to(:group) }
...@@ -4039,8 +4040,6 @@ describe Project do ...@@ -4039,8 +4040,6 @@ describe Project do
end end
def rugged_config def rugged_config
Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged_repo(project.repository).config
project.repository.rugged.config
end
end end
end end
require 'rails_helper' require 'rails_helper'
describe RemoteMirror do describe RemoteMirror do
include GitHelpers
describe 'URL validation' do describe 'URL validation' do
context 'with a valid URL' do context 'with a valid URL' do
it 'should be valid' do it 'should be valid' do
...@@ -74,9 +76,7 @@ describe RemoteMirror do ...@@ -74,9 +76,7 @@ describe RemoteMirror do
mirror.update_attribute(:url, 'http://foo:baz@test.com') mirror.update_attribute(:url, 'http://foo:baz@test.com')
config = Gitlab::GitalyClient::StorageSettings.allow_disk_access do config = rugged_repo(repo).config
repo.raw_repository.rugged.config
end
expect(config["remote.#{mirror.remote_name}.url"]).to eq('http://foo:baz@test.com') expect(config["remote.#{mirror.remote_name}.url"]).to eq('http://foo:baz@test.com')
end end
......
...@@ -2,6 +2,8 @@ require 'spec_helper' ...@@ -2,6 +2,8 @@ require 'spec_helper'
describe Repository do describe Repository do
include RepoHelpers include RepoHelpers
include GitHelpers
TestBlob = Struct.new(:path) TestBlob = Struct.new(:path)
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
...@@ -137,9 +139,7 @@ describe Repository do ...@@ -137,9 +139,7 @@ describe Repository do
options = { message: 'test tag message\n', options = { message: 'test tag message\n',
tagger: { name: 'John Smith', email: 'john@gmail.com' } } tagger: { name: 'John Smith', email: 'john@gmail.com' } }
Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged_repo(repository).tags.create(annotated_tag_name, 'a48e4fc218069f68ef2e769dd8dfea3991362175', options)
repository.rugged.tags.create(annotated_tag_name, 'a48e4fc218069f68ef2e769dd8dfea3991362175', options)
end
double_first = double(committed_date: Time.now - 1.second) double_first = double(committed_date: Time.now - 1.second)
double_last = double(committed_date: Time.now) double_last = double(committed_date: Time.now)
...@@ -151,9 +151,7 @@ describe Repository do ...@@ -151,9 +151,7 @@ describe Repository do
it { is_expected.to eq(['v1.1.0', 'v1.0.0', annotated_tag_name]) } it { is_expected.to eq(['v1.1.0', 'v1.0.0', annotated_tag_name]) }
after do after do
Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged_repo(repository).tags.delete(annotated_tag_name)
repository.rugged.tags.delete(annotated_tag_name)
end
end end
end end
end end
...@@ -1678,10 +1676,7 @@ describe Repository do ...@@ -1678,10 +1676,7 @@ describe Repository do
it 'returns the number of branches' do it 'returns the number of branches' do
expect(repository.branch_count).to be_an(Integer) expect(repository.branch_count).to be_an(Integer)
# NOTE: Until rugged goes away, make sure rugged and gitaly are in sync rugged_count = rugged_repo(repository).branches.count
rugged_count = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
repository.raw_repository.rugged.branches.count
end
expect(repository.branch_count).to eq(rugged_count) expect(repository.branch_count).to eq(rugged_count)
end end
...@@ -1691,10 +1686,7 @@ describe Repository do ...@@ -1691,10 +1686,7 @@ describe Repository do
it 'returns the number of tags' do it 'returns the number of tags' do
expect(repository.tag_count).to be_an(Integer) expect(repository.tag_count).to be_an(Integer)
# NOTE: Until rugged goes away, make sure rugged and gitaly are in sync rugged_count = rugged_repo(repository).tags.count
rugged_count = Gitlab::GitalyClient::StorageSettings.allow_disk_access do
repository.raw_repository.rugged.tags.count
end
expect(repository.tag_count).to eq(rugged_count) expect(repository.tag_count).to eq(rugged_count)
end end
...@@ -2184,9 +2176,7 @@ describe Repository do ...@@ -2184,9 +2176,7 @@ describe Repository do
end end
def create_remote_branch(remote_name, branch_name, target) def create_remote_branch(remote_name, branch_name, target)
rugged = Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged = rugged_repo(repository)
repository.rugged
end
rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target.id) rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target.id)
end end
......
...@@ -77,7 +77,7 @@ describe WikiPage do ...@@ -77,7 +77,7 @@ describe WikiPage do
end end
describe "#initialize" do describe "#initialize" do
context "when initialized with an existing gollum page" do context "when initialized with an existing page" do
before do before do
create_page("test page", "test content") create_page("test page", "test content")
@page = wiki.wiki.page(title: "test page") @page = wiki.wiki.page(title: "test page")
......
...@@ -2,6 +2,7 @@ require 'spec_helper' ...@@ -2,6 +2,7 @@ require 'spec_helper'
describe GitTagPushService do describe GitTagPushService do
include RepoHelpers include RepoHelpers
include GitHelpers
let(:user) { create(:user) } let(:user) { create(:user) }
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
...@@ -118,9 +119,7 @@ describe GitTagPushService do ...@@ -118,9 +119,7 @@ describe GitTagPushService do
before do before do
# Create the lightweight tag # Create the lightweight tag
Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged_repo(project.repository).tags.create(tag_name, newrev)
project.repository.raw_repository.rugged.tags.create(tag_name, newrev)
end
# Clear tag list cache # Clear tag list cache
project.repository.expire_tags_cache project.repository.expire_tags_cache
......
require 'spec_helper' require 'spec_helper'
describe MergeRequests::SquashService do describe MergeRequests::SquashService do
include GitHelpers
let(:service) { described_class.new(project, user, {}) } let(:service) { described_class.new(project, user, {}) }
let(:user) { project.owner } let(:user) { project.owner }
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
...@@ -63,9 +65,7 @@ describe MergeRequests::SquashService do ...@@ -63,9 +65,7 @@ describe MergeRequests::SquashService do
end end
it 'has the same diff as the merge request, but a different SHA' do it 'has the same diff as the merge request, but a different SHA' do
rugged = Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged = rugged_repo(project.repository)
project.repository.rugged
end
mr_diff = rugged.diff(merge_request.diff_base_sha, merge_request.diff_head_sha) mr_diff = rugged.diff(merge_request.diff_base_sha, merge_request.diff_head_sha)
squash_diff = rugged.diff(merge_request.diff_start_sha, squash_sha) squash_diff = rugged.diff(merge_request.diff_start_sha, squash_sha)
......
require 'spec_helper' require 'spec_helper'
describe Projects::AfterImportService do describe Projects::AfterImportService do
include GitHelpers
subject { described_class.new(project) } subject { described_class.new(project) }
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
...@@ -53,7 +55,7 @@ describe Projects::AfterImportService do ...@@ -53,7 +55,7 @@ describe Projects::AfterImportService do
end end
def rugged def rugged
Gitlab::GitalyClient::StorageSettings.allow_disk_access { repository.rugged } rugged_repo(repository)
end end
end end
end end
require 'spec_helper' require 'spec_helper'
describe Projects::CreateService, '#execute' do describe Projects::CreateService, '#execute' do
include GitHelpers
let(:gitlab_shell) { Gitlab::Shell.new } let(:gitlab_shell) { Gitlab::Shell.new }
let(:user) { create :user } let(:user) { create :user }
let(:opts) do let(:opts) do
...@@ -295,9 +297,7 @@ describe Projects::CreateService, '#execute' do ...@@ -295,9 +297,7 @@ describe Projects::CreateService, '#execute' do
it 'writes project full path to .git/config' do it 'writes project full path to .git/config' do
project = create_project(user, opts) project = create_project(user, opts)
rugged = Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged = rugged_repo(project.repository)
project.repository.rugged
end
expect(rugged.config['gitlab.fullpath']).to eq project.full_path expect(rugged.config['gitlab.fullpath']).to eq project.full_path
end end
......
require 'spec_helper' require 'spec_helper'
describe Projects::HashedStorage::MigrateRepositoryService do describe Projects::HashedStorage::MigrateRepositoryService do
include GitHelpers
let(:gitlab_shell) { Gitlab::Shell.new } let(:gitlab_shell) { Gitlab::Shell.new }
let(:project) { create(:project, :legacy_storage, :repository, :wiki_repo) } let(:project) { create(:project, :legacy_storage, :repository, :wiki_repo) }
let(:legacy_storage) { Storage::LegacyProject.new(project) } let(:legacy_storage) { Storage::LegacyProject.new(project) }
...@@ -38,9 +40,7 @@ describe Projects::HashedStorage::MigrateRepositoryService do ...@@ -38,9 +40,7 @@ describe Projects::HashedStorage::MigrateRepositoryService do
it 'writes project full path to .git/config' do it 'writes project full path to .git/config' do
service.execute service.execute
rugged_config = Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged_config = rugged_repo(project.repository).config['gitlab.fullpath']
project.repository.rugged.config['gitlab.fullpath']
end
expect(rugged_config).to eq project.full_path expect(rugged_config).to eq project.full_path
end end
......
require 'spec_helper' require 'spec_helper'
describe Projects::TransferService do describe Projects::TransferService do
include GitHelpers
let(:gitlab_shell) { Gitlab::Shell.new } let(:gitlab_shell) { Gitlab::Shell.new }
let(:user) { create(:user) } let(:user) { create(:user) }
let(:group) { create(:group) } let(:group) { create(:group) }
...@@ -291,8 +293,6 @@ describe Projects::TransferService do ...@@ -291,8 +293,6 @@ describe Projects::TransferService do
end end
def rugged_config def rugged_config
Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged_repo(project.repository).config
project.repository.rugged.config
end
end end
end end
module CycleAnalyticsHelpers module CycleAnalyticsHelpers
include GitHelpers
def create_commit_referencing_issue(issue, branch_name: generate(:branch)) def create_commit_referencing_issue(issue, branch_name: generate(:branch))
project.repository.add_branch(user, branch_name, 'master') project.repository.add_branch(user, branch_name, 'master')
create_commit("Commit for ##{issue.iid}", issue.project, user, branch_name) create_commit("Commit for ##{issue.iid}", issue.project, user, branch_name)
...@@ -9,7 +11,7 @@ module CycleAnalyticsHelpers ...@@ -9,7 +11,7 @@ module CycleAnalyticsHelpers
oldrev = repository.commit(branch_name)&.sha || Gitlab::Git::BLANK_SHA oldrev = repository.commit(branch_name)&.sha || Gitlab::Git::BLANK_SHA
if Timecop.frozen? && Gitlab::GitalyClient.feature_enabled?(:operation_user_commit_files) if Timecop.frozen? && Gitlab::GitalyClient.feature_enabled?(:operation_user_commit_files)
mock_gitaly_multi_action_dates(repository.raw, commit_time) mock_gitaly_multi_action_dates(repository, commit_time)
end end
commit_shas = Array.new(count) do |index| commit_shas = Array.new(count) do |index|
...@@ -118,18 +120,15 @@ module CycleAnalyticsHelpers ...@@ -118,18 +120,15 @@ module CycleAnalyticsHelpers
protected: false) protected: false)
end end
def mock_gitaly_multi_action_dates(raw_repository, commit_time) def mock_gitaly_multi_action_dates(repository, commit_time)
allow(raw_repository).to receive(:multi_action).and_wrap_original do |m, *args| allow(repository.raw).to receive(:multi_action).and_wrap_original do |m, *args|
new_date = commit_time || Time.now new_date = commit_time || Time.now
branch_update = m.call(*args) branch_update = m.call(*args)
if branch_update.newrev if branch_update.newrev
_, opts = args _, opts = args
commit = Gitlab::GitalyClient::StorageSettings.allow_disk_access do commit = rugged_repo(repository).rev_parse(branch_update.newrev)
rugged = raw_repository.rugged
rugged.rev_parse(branch_update.newrev)
end
branch_update.newrev = commit.amend( branch_update.newrev = commit.amend(
update_ref: "#{Gitlab::Git::BRANCH_REF_PREFIX}#{opts[:branch_name]}", update_ref: "#{Gitlab::Git::BRANCH_REF_PREFIX}#{opts[:branch_name]}",
......
# frozen_string_literal: true # frozen_string_literal: true
module GitHelpers module GitHelpers
def rugged_repo(repository)
path = File.join(TestEnv.repos_path, repository.disk_path + '.git')
Rugged::Repository.new(path)
end
def project_hook_exists?(project) def project_hook_exists?(project)
Gitlab::GitalyClient::StorageSettings.allow_disk_access do Gitlab::GitalyClient::StorageSettings.allow_disk_access do
project_path = project.repository.raw_repository.path project_path = project.repository.raw_repository.path
......
...@@ -3,6 +3,8 @@ require 'fileutils' ...@@ -3,6 +3,8 @@ require 'fileutils'
require 'spec_helper' require 'spec_helper'
describe GitGarbageCollectWorker do describe GitGarbageCollectWorker do
include GitHelpers
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
let(:shell) { Gitlab::Shell.new } let(:shell) { Gitlab::Shell.new }
let!(:lease_uuid) { SecureRandom.uuid } let!(:lease_uuid) { SecureRandom.uuid }
...@@ -197,9 +199,7 @@ describe GitGarbageCollectWorker do ...@@ -197,9 +199,7 @@ describe GitGarbageCollectWorker do
# Create a new commit on a random new branch # Create a new commit on a random new branch
def create_objects(project) def create_objects(project)
rugged = Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged = rugged_repo(project.repository)
project.repository.rugged
end
old_commit = rugged.branches.first.target old_commit = rugged.branches.first.target
new_commit_sha = Rugged::Commit.create( new_commit_sha = Rugged::Commit.create(
rugged, rugged,
......
...@@ -2,6 +2,7 @@ require 'rails_helper' ...@@ -2,6 +2,7 @@ require 'rails_helper'
describe RepositoryRemoveRemoteWorker do describe RepositoryRemoveRemoteWorker do
include ExclusiveLeaseHelpers include ExclusiveLeaseHelpers
include GitHelpers
describe '#perform' do describe '#perform' do
let!(:project) { create(:project, :repository) } let!(:project) { create(:project, :repository) }
...@@ -50,9 +51,7 @@ describe RepositoryRemoveRemoteWorker do ...@@ -50,9 +51,7 @@ describe RepositoryRemoveRemoteWorker do
end end
def create_remote_branch(remote_name, branch_name, target) def create_remote_branch(remote_name, branch_name, target)
rugged = Gitlab::GitalyClient::StorageSettings.allow_disk_access do rugged = rugged_repo(project.repository)
project.repository.rugged
end
rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target.id) rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target.id)
end end
......
...@@ -438,7 +438,6 @@ github-linguist,5.3.3,MIT ...@@ -438,7 +438,6 @@ github-linguist,5.3.3,MIT
github-markup,1.7.0,MIT github-markup,1.7.0,MIT
gitlab-flowdock-git-hook,1.0.1,MIT gitlab-flowdock-git-hook,1.0.1,MIT
gitlab-gollum-lib,4.2.7.5,MIT gitlab-gollum-lib,4.2.7.5,MIT
gitlab-gollum-rugged_adapter,0.4.4.1,MIT
gitlab-grit,2.8.2,MIT gitlab-grit,2.8.2,MIT
gitlab-markup,1.6.4,MIT gitlab-markup,1.6.4,MIT
gitlab_omniauth-ldap,2.0.4,MIT gitlab_omniauth-ldap,2.0.4,MIT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment