Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
2fe95046
D
dashboard
项目概览
凌波微步_大先生
/
dashboard
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dashboard
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2fe95046
编写于
2月 24, 2016
作者:
H
higashi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move logic to separete file
上级
91fbf42c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
222 addition
and
19 deletion
+222
-19
src/app/frontend/common/docker/dockerimagereference.js
src/app/frontend/common/docker/dockerimagereference.js
+60
-0
src/app/frontend/deploy/deployfromsettings_controller.js
src/app/frontend/deploy/deployfromsettings_controller.js
+2
-19
src/test/frontend/common/docker/dockerimagereference_test.js
src/test/frontend/common/docker/dockerimagereference_test.js
+160
-0
未找到文件。
src/app/frontend/common/docker/dockerimagereference.js
0 → 100644
浏览文件 @
2fe95046
// Copyright 2015 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/**
* Parser to get TAG from reference of Docker container image
*
* Docker Container image can be set with the following value:
* [REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG]
* REGISTRY can be omitted and NAME can contain '/' as delimiters for NAMESPACE.
*
* So only TAG is specified.
*
*/
export
default
class
DockerImageIdentifier
{
/**
* Constructs DockerUri object.
*
* @param {string} identifier
*/
constructor
(
identifier
=
''
)
{
this
.
identifier
=
identifier
;
}
/**
* Returns tag
*
* TAG cannot contain ':' and '/'.
* Not if TAG is omitted, last block text(separated by '/') contains TAG.
* @return {string}
*/
tag
()
{
/** @type {number} **/
let
index
=
this
.
identifier
.
lastIndexOf
(
'
/
'
);
/** @type {string} **/
let
last_block
;
if
(
index
>
-
1
)
{
last_block
=
this
.
identifier
.
substring
(
index
+
1
);
}
else
{
last_block
=
this
.
identifier
}
index
=
last_block
.
lastIndexOf
(
'
:
'
);
if
(
index
>
-
1
)
{
return
last_block
.
substring
(
index
+
1
);
}
return
''
}
}
src/app/frontend/deploy/deployfromsettings_controller.js
浏览文件 @
2fe95046
...
...
@@ -19,6 +19,7 @@ import {
stateName
as
replicationcontrollerliststate
,
}
from
'
replicationcontrollerlist/replicationcontrollerlist_state
'
;
import
{
uniqueNameValidationKey
}
from
'
./uniquename_directive
'
;
import
DockerImageReference
from
'
../common/docker/dockerimagereference
'
;
// Label keys for predefined labels
const
APP_LABEL_KEY
=
'
app
'
;
...
...
@@ -345,25 +346,7 @@ export default class DeployFromSettingsController {
* @return {string}
* @private
*/
getContainerImageVersion_
()
{
/** @type {number} */
let
index
=
(
this
.
containerImage
||
''
).
lastIndexOf
(
'
/
'
);
let
imagename
;
if
(
index
>
-
1
)
{
imagename
=
this
.
containerImage
.
substring
(
index
+
1
);
}
else
{
imagename
=
this
.
containerImage
;
}
index
=
(
imagename
||
''
).
lastIndexOf
(
'
:
'
);
if
(
index
>
-
1
)
{
return
imagename
.
substring
(
index
+
1
);
}
return
''
;
}
getContainerImageVersion_
()
{
return
new
DockerImageReference
(
this
.
containerImage
).
tag
();
}
/**
* Returns application name.
...
...
src/test/frontend/common/docker/dockerimagereference_test.js
0 → 100644
浏览文件 @
2fe95046
// Copyright 2015 Google Inc. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import
DockerImageReference
from
'
common/docker/dockerimagereference
'
;
describe
(
'
DokcerImageReference
'
,
()
=>
{
it
(
'
should return empty string when containerImage is undefined
'
,
()
=>
{
// given
let
reference
=
undefined
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
''
);
});
it
(
'
should return empty string when containerImage is empty
'
,
()
=>
{
// given
let
reference
=
""
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
''
);
});
it
(
'
should return empty string when containerImage is not empty and does not contain `:`
'
+
'
delimiter
'
,
()
=>
{
// given
let
reference
=
'
test
'
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
''
);
});
it
(
'
should return part of the string after `:` delimiter
'
,
()
=>
{
// given
let
reference
=
'
test:1
'
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
'
1
'
);
});
it
(
'
should return part of the string after `:` delimiter
'
,
()
=>
{
// given
let
reference
=
'
test:1
'
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
'
1
'
);
});
it
(
'
should return part of the string after `:` delimiter
'
,
()
=>
{
// given
let
reference
=
'
private.registry:5000/test:1
'
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
'
1
'
);
});
it
(
'
should return empty string when containerImage is not empty and does not containe `:`
'
+
'
delimiter after `/` delimiter
'
,
()
=>
{
// given
let
reference
=
'
private.registry:5000/test
'
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
''
);
});
it
(
'
should return part of the string after `:` delimiter when containerImage is not empty
'
+
'
and containe two `/` delimiters
'
,
()
=>
{
// given
let
reference
=
'
private.registry:5000/namespace/test:1
'
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
'
1
'
);
});
it
(
'
should return part of the string after last `:` delimiter when containerImage is not empty
'
+
'
and containe two `:` delimiters
'
,
()
=>
{
// given
let
reference
=
'
private.registry:5000/test:image:1
'
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
'
1
'
);
});
it
(
'
should return empty string when containerImage is only `:` delimiter
'
,
()
=>
{
// given
let
reference
=
'
:
'
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
''
);
});
it
(
'
should return empty string when containerImage is only `/` delimiter
'
,
()
=>
{
// given
let
reference
=
'
/
'
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
''
);
});
it
(
'
should return empty string when containerImage is only `/` delimiter
'
+
'
and `:` delimiter
'
,
()
=>
{
// given
let
reference
=
'
/:
'
;
// when
let
result
=
new
DockerImageReference
(
reference
).
tag
();
// then
expect
(
result
).
toEqual
(
''
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录