Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
水淹萌龙
kubesphere
提交
054d85e6
K
kubesphere
项目概览
水淹萌龙
/
kubesphere
与 Fork 源项目一致
Fork自
KubeSphere / kubesphere
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kubesphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
未验证
提交
054d85e6
编写于
2月 01, 2021
作者:
LinuxSuRen
提交者:
rick
2月 22, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix the wrong count of total Pipeline Run number
Signed-off-by:
rick
<
rick@jenkins-zh.cn
>
上级
2f5202f3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
67 addition
and
20 deletion
+67
-20
pkg/simple/client/devops/jenkins/pure_request.go
pkg/simple/client/devops/jenkins/pure_request.go
+3
-2
pkg/simple/client/devops/jenkins/utils.go
pkg/simple/client/devops/jenkins/utils.go
+7
-18
pkg/simple/client/devops/jenkins/utils_test.go
pkg/simple/client/devops/jenkins/utils_test.go
+57
-0
未找到文件。
pkg/simple/client/devops/jenkins/pure_request.go
浏览文件 @
054d85e6
...
@@ -34,12 +34,13 @@ func (j *Jenkins) SendPureRequest(path string, httpParameters *devops.HttpParame
...
@@ -34,12 +34,13 @@ func (j *Jenkins) SendPureRequest(path string, httpParameters *devops.HttpParame
// provider request header to call jenkins api.
// provider request header to call jenkins api.
// transfer bearer token to basic token for inner Oauth and Jeknins
// transfer bearer token to basic token for inner Oauth and Jeknins
func
(
j
*
Jenkins
)
SendPureRequestWithHeaderResp
(
path
string
,
httpParameters
*
devops
.
HttpParameters
)
([]
byte
,
http
.
Header
,
error
)
{
func
(
j
*
Jenkins
)
SendPureRequestWithHeaderResp
(
path
string
,
httpParameters
*
devops
.
HttpParameters
)
([]
byte
,
http
.
Header
,
error
)
{
Url
,
err
:=
url
.
Parse
(
j
.
Server
+
path
)
apiURL
,
err
:=
url
.
Parse
(
j
.
Server
+
path
)
if
err
!=
nil
{
if
err
!=
nil
{
klog
.
Error
(
err
)
klog
.
Error
(
err
)
return
nil
,
nil
,
err
return
nil
,
nil
,
err
}
}
apiURL
.
RawQuery
=
httpParameters
.
Url
.
RawQuery
client
:=
&
http
.
Client
{
Timeout
:
30
*
time
.
Second
}
client
:=
&
http
.
Client
{
Timeout
:
30
*
time
.
Second
}
header
:=
httpParameters
.
Header
header
:=
httpParameters
.
Header
...
@@ -47,7 +48,7 @@ func (j *Jenkins) SendPureRequestWithHeaderResp(path string, httpParameters *dev
...
@@ -47,7 +48,7 @@ func (j *Jenkins) SendPureRequestWithHeaderResp(path string, httpParameters *dev
newRequest
:=
&
http
.
Request
{
newRequest
:=
&
http
.
Request
{
Method
:
httpParameters
.
Method
,
Method
:
httpParameters
.
Method
,
URL
:
Url
,
URL
:
apiURL
,
Header
:
header
,
Header
:
header
,
Body
:
httpParameters
.
Body
,
Body
:
httpParameters
.
Body
,
Form
:
httpParameters
.
Form
,
Form
:
httpParameters
.
Form
,
...
...
pkg/simple/client/devops/jenkins/utils.go
浏览文件 @
054d85e6
...
@@ -74,10 +74,9 @@ func getRespBody(resp *http.Response) ([]byte, error) {
...
@@ -74,10 +74,9 @@ func getRespBody(resp *http.Response) ([]byte, error) {
// ParseJenkinsQuery Parse the special query of jenkins.
// ParseJenkinsQuery Parse the special query of jenkins.
// ParseQuery in the standard library makes the query not re-encode
// ParseQuery in the standard library makes the query not re-encode
func
ParseJenkinsQuery
(
query
string
)
(
url
.
Values
,
error
)
{
func
ParseJenkinsQuery
(
query
string
)
(
result
url
.
Values
,
err
error
)
{
m
:=
make
(
url
.
Values
)
result
=
make
(
url
.
Values
)
err
:=
error
(
nil
)
for
query
!=
""
&&
err
==
nil
{
for
query
!=
""
{
key
:=
query
key
:=
query
if
i
:=
strings
.
IndexAny
(
key
,
"&"
);
i
>=
0
{
if
i
:=
strings
.
IndexAny
(
key
,
"&"
);
i
>=
0
{
key
,
query
=
key
[
:
i
],
key
[
i
+
1
:
]
key
,
query
=
key
[
:
i
],
key
[
i
+
1
:
]
...
@@ -91,23 +90,13 @@ func ParseJenkinsQuery(query string) (url.Values, error) {
...
@@ -91,23 +90,13 @@ func ParseJenkinsQuery(query string) (url.Values, error) {
if
i
:=
strings
.
Index
(
key
,
"="
);
i
>=
0
{
if
i
:=
strings
.
Index
(
key
,
"="
);
i
>=
0
{
key
,
value
=
key
[
:
i
],
key
[
i
+
1
:
]
key
,
value
=
key
[
:
i
],
key
[
i
+
1
:
]
}
}
key
,
err1
:=
url
.
QueryUnescape
(
key
)
if
key
,
err
=
url
.
QueryUnescape
(
key
);
err
==
nil
{
if
err1
!=
nil
{
if
value
,
err
=
url
.
QueryUnescape
(
value
);
err
==
nil
{
if
err
==
nil
{
result
[
key
]
=
append
(
result
[
key
],
value
)
err
=
err1
}
}
continue
}
value
,
err1
=
url
.
QueryUnescape
(
value
)
if
err1
!=
nil
{
if
err
==
nil
{
err
=
err1
}
continue
}
}
m
[
key
]
=
append
(
m
[
key
],
value
)
}
}
return
m
,
err
return
}
}
type
JenkinsBlueTime
time
.
Time
type
JenkinsBlueTime
time
.
Time
...
...
pkg/simple/client/devops/jenkins/utils_test.go
0 → 100644
浏览文件 @
054d85e6
package
jenkins
import
(
"github.com/stretchr/testify/assert"
"net/url"
"testing"
)
func
TestParseJenkinsQuery
(
t
*
testing
.
T
)
{
table
:=
[]
testData
{
{
param
:
"start=0&limit=10&branch=master"
,
expected
:
url
.
Values
{
"start"
:
[]
string
{
"0"
},
"limit"
:
[]
string
{
"10"
},
"branch"
:
[]
string
{
"master"
},
},
err
:
false
,
},
{
param
:
"branch=master"
,
expected
:
url
.
Values
{
"branch"
:
[]
string
{
"master"
},
},
err
:
false
,
},
{
param
:
"&branch=master"
,
expected
:
url
.
Values
{
"branch"
:
[]
string
{
"master"
},
},
err
:
false
,
},
{
param
:
"branch=master&"
,
expected
:
url
.
Values
{
"branch"
:
[]
string
{
"master"
},
},
err
:
false
,
},
{
param
:
"branch=%gg"
,
expected
:
url
.
Values
{},
err
:
true
,
},
{
param
:
"%gg=fake"
,
expected
:
url
.
Values
{},
err
:
true
,
},
}
for
index
,
item
:=
range
table
{
result
,
err
:=
parseJenkinsQuery
(
item
.
param
)
if
item
.
err
{
assert
.
NotNil
(
t
,
err
,
"index: [%d], unexpected error happen %v"
,
index
,
err
)
}
else
{
assert
.
Nil
(
t
,
err
,
"index: [%d], unexpected error happen %v"
,
index
,
err
)
}
assert
.
Equal
(
t
,
item
.
expected
,
result
,
"index: [%d], result do not match with the expect value"
,
index
)
}
}
type
testData
struct
{
param
string
expected
interface
{}
err
bool
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录