diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-03-01 15:30:41 +0100 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-03-01 16:41:08 +0100 |
commit | 34fbade4ae67b56061da89fc881781352880b4ed (patch) | |
tree | 9544b4ed3ed7abc025837c4bd064a06e2a24a08d /lib | |
parent | e66e776772c70b07d403b2124e9ef458e85db726 (diff) | |
download | gitlab-ce-34fbade4ae67b56061da89fc881781352880b4ed.tar.gz |
Client implementation for Licensee#key
Part of the migration as tracked in: gitlab-org/gitaly#1026
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/git/repository.rb | 15 | ||||
-rw-r--r-- | lib/gitlab/gitaly_client/repository_service.rb | 8 |
2 files changed, 23 insertions, 0 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index ddb9cf433eb..2b8c7cd7fd3 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1032,6 +1032,21 @@ module Gitlab end end + def license_short_name + gitaly_migrate(:license_short_name) do |is_enabled| + if is_enabled + gitaly_repository_client.license_short_name + else + begin + # The licensee gem creates a Rugged object from the path: + # https://github.com/benbalter/licensee/blob/v8.7.0/lib/licensee/projects/git_project.rb + Licensee.license(path).try(:key) + rescue Rugged::Error + end + end + end + end + def with_repo_branch_commit(start_repository, start_branch_name) Gitlab::Git.check_namespace!(start_repository) start_repository = RemoteRepository.new(start_repository) unless start_repository.is_a?(RemoteRepository) diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb index 603457d0664..188cb6e904e 100644 --- a/lib/gitlab/gitaly_client/repository_service.rb +++ b/lib/gitlab/gitaly_client/repository_service.rb @@ -249,6 +249,14 @@ module Gitlab raise Gitlab::Git::OSError.new(response.error) unless response.error.empty? end + + def license_short_name + request = Gitaly::FindLicenseRequest.new(repository: @gitaly_repo) + + response = GitalyClient.call(@storage, :repository_service, :find_license, request, timeout: GitalyClient.fast_timeout) + + response.license_short_name.presence + end end end end |