Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
52491575
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
52491575
编写于
5月 02, 2017
作者:
A
Alejandro Rodríguez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow gl-repository strings as project identifiers in PostReceive worker
上级
c45341c8
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
53 addition
and
50 deletion
+53
-50
app/workers/post_receive.rb
app/workers/post_receive.rb
+18
-13
lib/gitlab/git_post_receive.rb
lib/gitlab/git_post_receive.rb
+3
-26
spec/workers/post_receive_spec.rb
spec/workers/post_receive_spec.rb
+32
-11
未找到文件。
app/workers/post_receive.rb
浏览文件 @
52491575
...
...
@@ -2,27 +2,24 @@ class PostReceive
include
Sidekiq
::
Worker
include
DedicatedSidekiqQueue
def
perform
(
repo_path
,
identifier
,
changes
)
repo_relative_path
=
Gitlab
::
RepoPath
.
strip_storage_path
(
repo_path
)
def
perform
(
project_identifier
,
identifier
,
changes
)
project
,
is_wiki
=
parse_project_identifier
(
project_identifier
)
if
project
.
nil?
log
(
"Triggered hook for non-existing project with identifier
\"
#{
project_identifier
}
\"
"
)
return
false
end
changes
=
Base64
.
decode64
(
changes
)
unless
changes
.
include?
(
' '
)
# Use Sidekiq.logger so arguments can be correlated with execution
# time and thread ID's.
Sidekiq
.
logger
.
info
"changes:
#{
changes
.
inspect
}
"
if
ENV
[
'SIDEKIQ_LOG_ARGUMENTS'
]
post_received
=
Gitlab
::
GitPostReceive
.
new
(
repo_relative_path
,
identifier
,
changes
)
if
post_received
.
project
.
nil?
log
(
"Triggered hook for non-existing project with full path
\"
#{
repo_relative_path
}
\"
"
)
return
false
end
post_received
=
Gitlab
::
GitPostReceive
.
new
(
project
,
identifier
,
changes
)
if
post_received
.
wiki?
if
is_wiki
# Nothing defined here yet.
elsif
post_received
.
regular_project?
process_project_changes
(
post_received
)
else
log
(
"Triggered hook for unidentifiable repository type with full path
\"
#{
repo_relative_path
}
\"
"
)
false
process_project_changes
(
post_received
)
end
end
...
...
@@ -47,6 +44,14 @@ class PostReceive
private
def
parse_project_identifier
(
project_identifier
)
if
project_identifier
.
start_with?
(
'/'
)
Gitlab
::
RepoPath
.
parse
(
project_identifier
)
else
Gitlab
::
GlRepository
.
parse
(
project_identifier
)
end
end
def
log
(
message
)
Gitlab
::
GitLogger
.
error
(
"POST-RECEIVE:
#{
message
}
"
)
end
...
...
lib/gitlab/git_post_receive.rb
浏览文件 @
52491575
module
Gitlab
class
GitPostReceive
include
Gitlab
::
Identifier
attr_reader
:
repo_path
,
:identifier
,
:changes
,
:project
attr_reader
:
project
,
:identifier
,
:changes
def
initialize
(
repo_path
,
identifier
,
changes
)
repo_path
.
gsub!
(
/\.git\z/
,
''
)
repo_path
.
gsub!
(
/\A\//
,
''
)
@repo_path
=
repo_path
def
initialize
(
project
,
identifier
,
changes
)
@project
=
project
@identifier
=
identifier
@changes
=
deserialize_changes
(
changes
)
retrieve_project_and_type
end
def
wiki?
@type
==
:wiki
end
def
regular_project?
@type
==
:project
end
def
identify
(
revision
)
...
...
@@ -28,16 +15,6 @@ module Gitlab
private
def
retrieve_project_and_type
@type
=
:project
@project
=
Project
.
find_by_full_path
(
@repo_path
)
if
@repo_path
.
end_with?
(
'.wiki'
)
&&
!
@project
@type
=
:wiki
@project
=
Project
.
find_by_full_path
(
@repo_path
.
gsub
(
/\.wiki\z/
,
''
))
end
end
def
deserialize_changes
(
changes
)
changes
=
utf8_encode_changes
(
changes
)
changes
.
lines
...
...
spec/workers/post_receive_spec.rb
浏览文件 @
52491575
...
...
@@ -5,6 +5,7 @@ describe PostReceive do
let
(
:wrongly_encoded_changes
)
{
changes
.
encode
(
"ISO-8859-1"
).
force_encoding
(
"UTF-8"
)
}
let
(
:base64_changes
)
{
Base64
.
encode64
(
wrongly_encoded_changes
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:project_identifier
)
{
"project-
#{
project
.
id
}
"
}
let
(
:key
)
{
create
(
:key
,
user:
project
.
owner
)
}
let
(
:key_id
)
{
key
.
shell_id
}
...
...
@@ -14,6 +15,26 @@ describe PostReceive do
end
end
context
'with a non-existing project'
do
let
(
:project_identifier
)
{
"project-123456789"
}
let
(
:error_message
)
do
"Triggered hook for non-existing project with identifier
\"
#{
project_identifier
}
\"
"
end
it
"returns false and logs an error"
do
expect
(
Gitlab
::
GitLogger
).
to
receive
(
:error
).
with
(
"POST-RECEIVE:
#{
error_message
}
"
)
expect
(
described_class
.
new
.
perform
(
project_identifier
,
key_id
,
base64_changes
)).
to
be
(
false
)
end
end
context
"with an absolute path as the project identifier"
do
it
"searches the project by full path"
do
expect
(
Project
).
to
receive
(
:find_by_full_path
).
with
(
project
.
full_path
).
and_call_original
described_class
.
new
.
perform
(
pwd
(
project
),
key_id
,
base64_changes
)
end
end
describe
"#process_project_changes"
do
before
do
allow_any_instance_of
(
Gitlab
::
GitPostReceive
).
to
receive
(
:identify
).
and_return
(
project
.
owner
)
...
...
@@ -25,7 +46,7 @@ describe PostReceive do
it
"calls GitTagPushService"
do
expect_any_instance_of
(
GitPushService
).
to
receive
(
:execute
).
and_return
(
true
)
expect_any_instance_of
(
GitTagPushService
).
not_to
receive
(
:execute
)
described_class
.
new
.
perform
(
p
wd
(
project
)
,
key_id
,
base64_changes
)
described_class
.
new
.
perform
(
p
roject_identifier
,
key_id
,
base64_changes
)
end
end
...
...
@@ -35,7 +56,7 @@ describe PostReceive do
it
"calls GitTagPushService"
do
expect_any_instance_of
(
GitPushService
).
not_to
receive
(
:execute
)
expect_any_instance_of
(
GitTagPushService
).
to
receive
(
:execute
).
and_return
(
true
)
described_class
.
new
.
perform
(
p
wd
(
project
)
,
key_id
,
base64_changes
)
described_class
.
new
.
perform
(
p
roject_identifier
,
key_id
,
base64_changes
)
end
end
...
...
@@ -45,12 +66,12 @@ describe PostReceive do
it
"does not call any of the services"
do
expect_any_instance_of
(
GitPushService
).
not_to
receive
(
:execute
)
expect_any_instance_of
(
GitTagPushService
).
not_to
receive
(
:execute
)
described_class
.
new
.
perform
(
p
wd
(
project
)
,
key_id
,
base64_changes
)
described_class
.
new
.
perform
(
p
roject_identifier
,
key_id
,
base64_changes
)
end
end
context
"gitlab-ci.yml"
do
subject
{
described_class
.
new
.
perform
(
p
wd
(
project
)
,
key_id
,
base64_changes
)
}
subject
{
described_class
.
new
.
perform
(
p
roject_identifier
,
key_id
,
base64_changes
)
}
context
"creates a Ci::Pipeline for every change"
do
before
do
...
...
@@ -74,8 +95,8 @@ describe PostReceive do
context
"webhook"
do
it
"fetches the correct project"
do
expect
(
Project
).
to
receive
(
:find_by
_full_path
).
with
(
project
.
path_with_namespace
).
and_return
(
project
)
described_class
.
new
.
perform
(
p
wd
(
project
)
,
key_id
,
base64_changes
)
expect
(
Project
).
to
receive
(
:find_by
).
with
(
id:
project
.
id
.
to_s
)
described_class
.
new
.
perform
(
p
roject_identifier
,
key_id
,
base64_changes
)
end
it
"does not run if the author is not in the project"
do
...
...
@@ -85,22 +106,22 @@ describe PostReceive do
expect
(
project
).
not_to
receive
(
:execute_hooks
)
expect
(
described_class
.
new
.
perform
(
p
wd
(
project
)
,
key_id
,
base64_changes
)).
to
be_falsey
expect
(
described_class
.
new
.
perform
(
p
roject_identifier
,
key_id
,
base64_changes
)).
to
be_falsey
end
it
"asks the project to trigger all hooks"
do
allow
(
Project
).
to
receive
(
:find_by
_full_path
).
and_return
(
project
)
allow
(
Project
).
to
receive
(
:find_by
).
and_return
(
project
)
expect
(
project
).
to
receive
(
:execute_hooks
).
twice
expect
(
project
).
to
receive
(
:execute_services
).
twice
described_class
.
new
.
perform
(
p
wd
(
project
)
,
key_id
,
base64_changes
)
described_class
.
new
.
perform
(
p
roject_identifier
,
key_id
,
base64_changes
)
end
it
"enqueues a UpdateMergeRequestsWorker job"
do
allow
(
Project
).
to
receive
(
:find_by
_full_path
).
and_return
(
project
)
allow
(
Project
).
to
receive
(
:find_by
).
and_return
(
project
)
expect
(
UpdateMergeRequestsWorker
).
to
receive
(
:perform_async
).
with
(
project
.
id
,
project
.
owner
.
id
,
any_args
)
described_class
.
new
.
perform
(
p
wd
(
project
)
,
key_id
,
base64_changes
)
described_class
.
new
.
perform
(
p
roject_identifier
,
key_id
,
base64_changes
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录