Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b60c1462
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,体验更适合开发者的 AI 搜索 >>
提交
b60c1462
编写于
1月 07, 2016
作者:
T
Tomasz Maczukin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change :variable_id to :key as resource ID in API
上级
16bd4df0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
53 deletion
+36
-53
app/models/ci/variable.rb
app/models/ci/variable.rb
+5
-1
lib/api/variables.rb
lib/api/variables.rb
+16
-25
spec/requests/api/variables_spec.rb
spec/requests/api/variables_spec.rb
+15
-27
未找到文件。
app/models/ci/variable.rb
浏览文件 @
b60c1462
...
...
@@ -18,8 +18,12 @@ module Ci
belongs_to
:project
,
class_name:
'::Project'
,
foreign_key: :gl_project_id
validates_presence_of
:key
validates_uniqueness_of
:key
,
scope: :gl_project_id
validates
:key
,
presence:
true
,
length:
{
within:
0
..
255
},
format:
{
with:
/\A[a-zA-Z0-9_]+\z/
,
message:
"can contain only letters, digits and '_'."
}
attr_encrypted
:value
,
mode: :per_attribute_iv_and_salt
,
key:
Gitlab
::
Application
.
secrets
.
db_key_base
end
...
...
lib/api/variables.rb
浏览文件 @
b60c1462
...
...
@@ -22,19 +22,12 @@ module API
#
# Parameters:
# id (required) - The ID of a project
# variable_id (required) - The ID OR `key` of variable to show; if variable_id contains only digits it's treated
# as ID other ways it's treated as `key`
# key (required) - The `key` of variable
# Example Request:
# GET /projects/:id/variables/:variable_id
get
':id/variables/:variable_id'
do
variable_id
=
params
[
:variable_id
]
variables
=
user_project
.
variables
variables
=
if
variable_id
.
match
(
/^\d+$/
)
variables
.
where
(
id:
variable_id
.
to_i
)
else
variables
.
where
(
key:
variable_id
)
end
# GET /projects/:id/variables/:key
get
':id/variables/:key'
do
key
=
params
[
:key
]
variables
=
user_project
.
variables
.
where
(
key:
key
)
return
not_found!
(
'Variable'
)
if
variables
.
empty?
...
...
@@ -45,8 +38,8 @@ module API
#
# Parameters:
# id (required) - The ID of a project
# key (required) - The key of variable
being created
# value (required) - The value of variable
being created
# key (required) - The key of variable
# value (required) - The value of variable
# Example Request:
# POST /projects/:id/variables
post
':id/variables'
do
...
...
@@ -63,17 +56,15 @@ module API
#
# Parameters:
# id (required) - The ID of a project
# variable_id (required) - The ID of a variable
# key (optional) - new value for `key` field of variable
# value (optional) - new value for `value` field of variable
# key (optional) - The `key` of variable
# value (optional) - New value for `value` field of variable
# Example Request:
# PUT /projects/:id/variables/:
variable_id
put
':id/variables/:
variable_id
'
do
variable
=
user_project
.
variables
.
where
(
id:
params
[
:variable_id
].
to_i
).
first
# PUT /projects/:id/variables/:
key
put
':id/variables/:
key
'
do
variable
=
user_project
.
variables
.
where
(
key:
params
[
:key
]
).
first
return
not_found!
(
'Variable'
)
unless
variable
variable
.
key
=
params
[
:key
]
variable
.
value
=
params
[
:value
]
variable
.
save!
...
...
@@ -84,11 +75,11 @@ module API
#
# Parameters:
# id (required) - The ID of a project
#
variable_id
(required) - The ID of a variable
#
key
(required) - The ID of a variable
# Exanoke Reqyest:
# DELETE /projects/:id/variables/:
variable_id
delete
':id/variables/:
variable_id
'
do
variable
=
user_project
.
variables
.
where
(
id:
params
[
:variable_id
].
to_i
).
first
# DELETE /projects/:id/variables/:
key
delete
':id/variables/:
key
'
do
variable
=
user_project
.
variables
.
where
(
key:
params
[
:key
]
).
first
return
not_found!
(
'Variable'
)
unless
variable
...
...
spec/requests/api/variables_spec.rb
浏览文件 @
b60c1462
...
...
@@ -37,26 +37,17 @@ describe API::API, api: true do
end
end
describe
'GET /projects/:id/variables/:
variable_id
'
do
describe
'GET /projects/:id/variables/:
key
'
do
context
'authorized user with proper permissions'
do
it
'should return project variable details when ID is used as :variable_id'
do
get
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
id
}
"
,
user
)
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
json_response
[
'key'
]).
to
eq
(
variable
.
key
)
expect
(
json_response
[
'value'
]).
to
eq
(
variable
.
value
)
end
it
'should return project variable details when `key` is used as :variable_id'
do
it
'should return project variable details'
do
get
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
key
}
"
,
user
)
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
json_response
[
'id'
]).
to
eq
(
variable
.
id
)
expect
(
json_response
[
'value'
]).
to
eq
(
variable
.
value
)
end
it
'should responde with 404 Not Found if requesting non-existing variable'
do
get
api
(
"/projects/
#{
project
.
id
}
/variables/
9999
"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/variables/
non_existing_variable
"
,
user
)
expect
(
response
.
status
).
to
eq
(
404
)
end
...
...
@@ -64,7 +55,7 @@ describe API::API, api: true do
context
'authorized user with invalid permissions'
do
it
'should not return project variable details'
do
get
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
id
}
"
,
user2
)
get
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
key
}
"
,
user2
)
expect
(
response
.
status
).
to
eq
(
403
)
end
...
...
@@ -72,7 +63,7 @@ describe API::API, api: true do
context
'unauthorized user'
do
it
'should not return project variable details'
do
get
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
id
}
"
)
get
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
key
}
"
)
expect
(
response
.
status
).
to
eq
(
401
)
end
...
...
@@ -117,26 +108,23 @@ describe API::API, api: true do
end
end
describe
'PUT /projects/:id/variables/:
variable_id
'
do
describe
'PUT /projects/:id/variables/:
key
'
do
context
'authorized user with proper permissions'
do
it
'should update variable data'
do
initial_variable
=
project
.
variables
.
first
key_before
=
initial_variable
.
key
value_before
=
initial_variable
.
value
put
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
id
}
"
,
user
),
key:
'TEST_VARIABLE_1_UP'
,
value:
'VALUE_1_UP'
put
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
key
}
"
,
user
)
,
value:
'VALUE_1_UP'
updated_variable
=
project
.
variables
.
first
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
key_before
).
to
eq
(
variable
.
key
)
expect
(
value_before
).
to
eq
(
variable
.
value
)
expect
(
updated_variable
.
key
).
to
eq
(
'TEST_VARIABLE_1_UP'
)
expect
(
updated_variable
.
value
).
to
eq
(
'VALUE_1_UP'
)
end
it
'should responde with 404 Not Found if requesting non-existing variable'
do
put
api
(
"/projects/
#{
project
.
id
}
/variables/
9999
"
,
user
)
put
api
(
"/projects/
#{
project
.
id
}
/variables/
non_existing_variable
"
,
user
)
expect
(
response
.
status
).
to
eq
(
404
)
end
...
...
@@ -144,7 +132,7 @@ describe API::API, api: true do
context
'authorized user with invalid permissions'
do
it
'should not update variable'
do
put
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
id
}
"
,
user2
)
put
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
key
}
"
,
user2
)
expect
(
response
.
status
).
to
eq
(
403
)
end
...
...
@@ -152,24 +140,24 @@ describe API::API, api: true do
context
'unauthorized user'
do
it
'should not update variable'
do
put
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
id
}
"
)
put
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
key
}
"
)
expect
(
response
.
status
).
to
eq
(
401
)
end
end
end
describe
'DELETE /projects/:id/variables/:
variable_id
'
do
describe
'DELETE /projects/:id/variables/:
key
'
do
context
'authorized user with proper permissions'
do
it
'should delete variable'
do
expect
do
delete
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
id
}
"
,
user
)
delete
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
key
}
"
,
user
)
end
.
to
change
{
project
.
variables
.
count
}.
by
(
-
1
)
expect
(
response
.
status
).
to
eq
(
200
)
end
it
'should responde with 404 Not Found if requesting non-existing variable'
do
delete
api
(
"/projects/
#{
project
.
id
}
/variables/
9999
"
,
user
)
delete
api
(
"/projects/
#{
project
.
id
}
/variables/
non_existing_variable
"
,
user
)
expect
(
response
.
status
).
to
eq
(
404
)
end
...
...
@@ -177,7 +165,7 @@ describe API::API, api: true do
context
'authorized user with invalid permissions'
do
it
'should not delete variable'
do
delete
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
id
}
"
,
user2
)
delete
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
key
}
"
,
user2
)
expect
(
response
.
status
).
to
eq
(
403
)
end
...
...
@@ -185,7 +173,7 @@ describe API::API, api: true do
context
'unauthorized user'
do
it
'should not delete variable'
do
delete
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
id
}
"
)
delete
api
(
"/projects/
#{
project
.
id
}
/variables/
#{
variable
.
key
}
"
)
expect
(
response
.
status
).
to
eq
(
401
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录