Commit Graph

2546 Commits

Author SHA1 Message Date
Yogi_Wang
1e17036b04 fix get user list about permission issue
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-03-04 14:59:06 +08:00
stonezdj
3fdc0fd9ba Search local DB first when adding a project member with username
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-03-04 11:22:37 +08:00
stonezdj
cf134bc80e Add new parameter ldap_group_membership_attribute
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-03-03 10:03:22 +08:00
zhoulin xie
33b7c41f8b Fix some misspells in file
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-03-01 15:13:30 +08:00
Daniel Jiang
321874c815 Move Settings of HTTP auth proxy (#7047)
Previously the settings of HTTP authproxy were set in environment
variable.
This commit move them to the configuration API

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-03-01 14:11:14 +08:00
Fangyuan Cheng
f79895b6d8
Merge pull request #7034 from pureshine/robot-expiration
Implement Robot account expiration
2019-03-01 10:04:26 +08:00
jwangyangls
b3c4d1688d
Merge pull request #7011 from jwangyangls/fix_6950
fix 6950 about the default option is not displayed When we click the add-member button, the default option is not displayed.
2019-02-28 14:07:07 +08:00
He Weiwei
053a18a490 Skip transfer blob for foreign layers
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-02-27 16:14:17 +08:00
FangyuanCheng
a2cd2e50fc Implement Robot account expiration
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-02-27 14:16:07 +08:00
cd1989
8732a20709 Rewrite registry manager with new interface
Signed-off-by: cd1989 <chende@caicloud.io>
2019-02-27 11:54:04 +08:00
cd1989
6bdf3053a7 Implement registries manager
Signed-off-by: cd1989 <chende@caicloud.io>
2019-02-27 11:54:04 +08:00
Wenkai Yin
95888b3dc2
Merge branch 'replication_ng' into 190130_transfer_repo 2019-02-27 11:00:42 +08:00
Yuan Lei
253600ad39 sync from upstream and merge the conflic
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-02-27 10:52:03 +08:00
Wenkai Yin
79d34c6f80 Create dao folder in replication
This commit creates a new folder called dao under replication to hold dao codes

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-26 14:54:16 +08:00
Daniel Jiang
f69e4f9a4a
Merge pull request #7004 from wy65701436/robot-expiration-time
add expiration of robot account
2019-02-25 13:48:11 +08:00
Yogi_Wang
11d7989ee3 fix_6950
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-25 12:36:03 +08:00
wang yan
91aa67a541 Update expiration variable name to expiresat/tokenduration
Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-25 11:55:42 +08:00
zhoulin xie
b2ed619e1e Fix some misspells in code
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-02-24 01:43:53 +08:00
wang yan
36a778b482 Update expiration schema to bigint and default unit to minute
Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-22 18:42:43 +08:00
wang yan
47a09b5891 add expiration of robot account
This commit is to make the expiration of robot account configurable

1, The expiration could be set by system admin in the configuation page or
by /api/config with robot_token_expiration=60, the default value is 30 days.
2, The expiration could be shown in the robot account infor both on UI and API.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-22 18:42:34 +08:00
stonezdj(Daojun Zhang)
4cb49e5388
Merge pull request #6963 from stonezdj/remove_container
Remove everything of adminserver container
2019-02-22 18:27:43 +08:00
stonezdj
0cba36d79f Remove everything of adminserver
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-22 16:34:39 +08:00
Nguyen Quang Huy
eda6c47b3e add signoff for DCO gate (#6981)
Some variable name, function name is colliding with builtin function.

Signed-off-by: Nguyen Quang Huy <huynq0911@gmail.com>
2019-02-22 15:00:18 +08:00
Wenkai Yin
8894a27d2d Implement the operation controller
This commit implements the operation controller. The operation controller wraps the flow controller and execution manager to provide capabilities for the upper level

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-22 10:12:14 +08:00
Wenkai Yin
a3e4772fe9
Merge pull request #6983 from reasonerjt/new-bump-up-notary-migrate
Bump up the migrate tool of notary
2019-02-21 18:03:17 +08:00
Daniel Jiang
1832699e93 Bump up the migrate tool of notary
fixes #5863
The migrate binary that we include in notary is quite out dated.
Additionally it introduced a breaking change, more details see #5863

In this commit a go program was added to workaround this issue to ensure the
migration process works, and refined bootstrap scripts and make process accordingly.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-02-21 00:36:24 -08:00
Daniel Jiang
321adc8362
Merge pull request #6941 from ywk253100/190213_replication_policy
Fix #6698: cannot create a same name replication policy after deleting it
2019-02-21 16:03:55 +08:00
Wenkai Yin
e3a9264162 Refactor the Scheduler interface
This commit refactors the Scheduler interface and does the corresponding changes to the flow controller

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-21 15:34:57 +08:00
Wenkai Yin
0c0c833dda Merge remote-tracking branch 'upstream/master' into 190220_sync 2019-02-20 17:21:38 +08:00
jwangyangls
c8c0ee623d
Merge pull request #6954 from jwangyangls/skipped_tests_fix
fix_skipped_tests
2019-02-20 10:13:18 +08:00
Yogi_Wang
60aecf2a1a fix_skipped_tests
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-19 09:43:23 +08:00
stonezdj
7a5fbf718f Revise code with review comments
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 15:20:54 +08:00
stonezdj
880051c08a Add load for user settings in core/config/config.go
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 14:06:19 +08:00
stonezdj
36e1c13a43 fix ut error in systeminfo_test.go
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 14:06:19 +08:00
stonezdj
1ae5126bb4 Refactor adminserver stage 3: replace config api and change ut settings
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-02-18 14:06:19 +08:00
Yuan Lei
7108b5c58c update scheduler interface to follow the new standard
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-02-18 11:40:58 +08:00
Wenkai Yin
f0f2e77fb4 Implement the repository transfer
This commit implements the Transfer interface for resource repository

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-15 17:49:35 +08:00
Yogi_Wang
4ee5ebe442 skipped_tests_fix
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-15 16:52:34 +08:00
jwangyangls
d28b8355ef
Merge pull request #6930 from jwangyangls/issue-6923
fix issue 2923
2019-02-15 15:53:51 +08:00
Wenkai Yin
530ba1d27b Fix #6698
This commit fixes the issue #6698: cannot create a same name replication policy after deleting it

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-15 15:17:48 +08:00
jwangyangls
0891300d21
Merge pull request #6927 from jwangyangls/harbor_style_change
change_style and datagrid refresh interface change
2019-02-15 15:04:52 +08:00
Wenkai Yin
4ceaf3e6c9 Merge remote-tracking branch 'upstream/master' into 190215_syncmaster 2019-02-15 14:15:00 +08:00
Yogi_Wang
a9db2ab943 fix issue 2923
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-15 10:23:53 +08:00
Yogi_Wang
651a142429 change_style_unitTest
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-14 16:38:05 +08:00
Meina Zhou
0d239cb1cb move gc to lib and add in registry config
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-02-14 13:45:15 +08:00
Wenkai Yin
e12da7264a Implement the replication flow controller
1. Implement the replication flow controller
2. Implement the registry adapter management
3. Define the interface for PolicyManager, RegistryManager, ExecutionManager, TaskManager and Scheduler

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-02-14 11:34:12 +08:00
Yogi_Wang
06eaa304da fixed_ciIssue
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-02-14 10:21:18 +08:00
Fangyuan Cheng
6d782e0fe4
Merge pull request #6902 from pureshine/cert-link
Download the certificate link by default on ui
2019-02-13 21:24:12 +08:00
Daniel Jiang
81639e2110
Merge pull request #6865 from wy65701436/remove-token
Remove the token attribute from robot table
2019-02-13 19:23:06 +08:00
Fangyuan Cheng
04c76d7f09 Modify the ui name and token that cannot be displayed due to backend api changes (#6914)
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-02-13 18:57:49 +08:00
Yuan Lei
bd84f5f490 sperate the logics to two part: 1,tasks generating. 2,tasks submit
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-02-13 17:47:07 +08:00
FangyuanCheng
54f74ff91d Download the certificate link by default on ui
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-02-13 15:16:45 +08:00
Yan
e9556a4cec
Add post response for robot account API (#6906)
This commit is to do:
1, Add post response on creating robot account
2, Lower-case the attribute of response

Signed-off-by: wang yan <wangyan@vmware.com>
2019-02-13 14:40:04 +08:00
SDBrett
90529832a2 Additional unit tests for base.go (#6888)
Increased coverage for http functions in base.go.

Signed-off-by: Brett Johnson <brett@sdbrett.com>
2019-02-12 16:06:20 +08:00
Yuan Lei
956a4c4f05 scheduler module to schedule the transfer job of resouce
Signed-off-by: Yuan Lei <371304458@qq.com>
2019-02-11 16:49:25 +08:00
jwangyangls
a95586034e
Merge pull request #6885 from jwangyangls/privilege_escalation
PermissionMasterRoleWithIsue
2019-02-01 21:17:48 +08:00
He Weiwei
f7218f80e0
Merge pull request #6852 from heww/protect-api-using-rbac
Protect API using rbac
2019-02-01 21:11:26 +08:00
Yogi_Wang
1b80e79ec4 fixPermissionIssue
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-02-01 20:48:38 +08:00
He Weiwei
1c4b9aa346 Protect API using rbac
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-02-01 18:55:06 +08:00
System Administrator
1a551690d3 promission reset
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-31 18:06:49 +08:00
wang yan
5d6a28d73e Remove the token attribute for robot table
This commit is to remove the token attribute as harbor doesn't store the token in DB.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-30 23:56:23 +08:00
FangyuanCheng
dacc0bd6bc Fixed display problems caused by formatting
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-30 10:29:49 +08:00
Fangyuan Cheng
829bfe031e
Merge pull request #6823 from pureshine/robot-account
Support Robot account in Harbor
2019-01-29 18:36:26 +08:00
wang yan
f4f4535304 Fix action and resouce of RBAC change
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-29 17:05:15 +08:00
Daniel Jiang
bf663df0e7
Merge pull request #6820 from wy65701436/robot-service
Add robot account authn & authz implementation
2019-01-29 16:08:25 +08:00
FangyuanCheng
404ee307f3 Support Robot account in Harbor
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-29 15:49:15 +08:00
Wenkai Yin
759cb5467b Refine the replication job
1. Refine the replication job
2. Define the Transfer interface
3. Define the common models

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-01-29 15:48:02 +08:00
Wenkai Yin
daf81e2413
Merge pull request #6841 from heww/standard-rbac-actions
Standard actions for rbac
2019-01-29 13:49:41 +08:00
He Weiwei
6e95b98108 Standard actions for rbac
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-29 11:59:11 +08:00
Mia ZHOU
f202e5f738
Merge pull request #6827 from pureshine/tag-col
The tag column sets the Maximum  width
2019-01-29 11:09:56 +08:00
He Weiwei
1da0a66fe5
Merge pull request #6781 from heww/user-permissions-api
Implement api for get current user permissions
2019-01-29 01:58:51 +08:00
He Weiwei
0ab7c93e16 Replace casbin builtin keyMatch2 with custom match func
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-29 01:26:38 +08:00
wang yan
2d7ea9c383 update codes per review comments
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-28 21:26:06 +08:00
He Weiwei
8b5e68073d Implement api for get current user permissions
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-28 18:06:52 +08:00
Yan
71f37fb820 * Add robot account authn & authz implementation.
This commit is to add the jwt token service, and do the authn & authz for robot account.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-28 17:39:57 +08:00
Daniel Jiang
20db0e737b Provide HTTP authenticator
An HTTP authenticator verifies the credentials by sending a POST request
to an HTTP endpoint.  After successful authentication he will be
onboarded to Harbor's local DB and assigned a role in a project.

This commit provides the initial implementation.
Currently one limitation is that we don't have clear definition about
how we would "search" a user via this HTTP authenticator, a flag for
"alway onboard" is provided to skip the search, otherwise, a user has
to login first before he can be assigned a role in Harbor.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-01-28 15:43:44 +08:00
FangyuanCheng
fe5820efee The tag column sets the minimum width
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-27 23:47:41 +08:00
Yogi_Wang
ebda1cda22 style_change
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-25 13:36:48 +08:00
He Weiwei
3f8e06a8bc Support master role for project member create and update apis (#6780)
* Support master role for project member create and update apis

Signed-off-by: He Weiwei <hweiwei@vmware.com>

* Fix description for role_id in swagger.yaml

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-23 14:56:23 +08:00
He Weiwei
ae061482ae Add Can method to securty.Context interface (#6779)
* Add Can method to securty.Context interface

Signed-off-by: He Weiwei <hweiwei@vmware.com>

* Improve mockSecurityContext Can method

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-23 14:32:37 +08:00
Mia ZHOU
1ca9fb59b5
Merge pull request #6770 from ninjadq/fix_issue_global_search_cannot_reload_data
Fix: data not reload when global serach navigate to same location
2019-01-18 14:30:36 +08:00
Qian Deng
276202cfa9 Fix issue data not reload when global serach going to a location that has the same url
Just add a reload option on router module. This feature is introduced in angular5, we can solve this issue easily.

Signed-off-by: Qian Deng <dengq@vmware.com>
2019-01-18 13:34:32 +08:00
wang yan
903e15235e Update validation and error message per comments 2019-01-17 15:33:05 +08:00
wang yan
4cde11892a update the conflict check with DB unique constrain error message
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-17 13:13:55 +08:00
Yan
1af0f3c3b9 Add API implementation of robot account
Add API implementation of robot account

1. POST /api/project/pid/robots
2, GET /api/project/pid/robots/id?
3, PUT /api/project/pid/robots/id
4, DELETE /api/project/pid/robots/id

Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-17 13:13:55 +08:00
He Weiwei
8dab10bbed
Merge pull request #6765 from heww/rename-ram
Rename ram to rbac
2019-01-17 11:50:14 +08:00
He Weiwei
bacfe64979 Rename ram to rbac
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-16 18:20:30 +08:00
Wenkai Yin
f8d9653419
Merge pull request #6737 from ywk253100/190109_health_check
Implement the unified health check API
2019-01-16 18:14:14 +08:00
He Weiwei
76bee7a9fc
Merge pull request #6710 from heww/security-by-ram
Implement current security interfaces using ram
2019-01-16 17:47:13 +08:00
Wenkai Yin
be4455ec1b Implement the unified health check API
The commit implements an unified health check API for all Harbor services

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-01-16 17:21:04 +08:00
He Weiwei
ebd26c0105 Implement current security interfaces using ram
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-16 16:08:17 +08:00
Steven Zou
464bdf71cd
Merge pull request #6727 from wy65701436/robot-dao
Add dao of robot account
2019-01-14 19:34:23 +08:00
wang yan
d349c256e8 add support for query nil
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-11 16:19:42 +08:00
Daniel Jiang
a1d4bfd332
Merge pull request #6344 from reasonerjt/bump-up-golang
Bump up golang to 1.11.2
2019-01-11 16:15:59 +08:00
Daniel Jiang
5d59d6fab8 Bump up golang to 1.11.2
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-01-11 14:44:32 +08:00
wang yan
6bd6fbd4ad Add fuzzy match and delete funt per review comments
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-11 14:26:49 +08:00
System Administrator
27c180bf20 fix_bug
Signed-off-by: Yogi_Wang <wang1084@126.com>
2019-01-11 11:00:46 +08:00
wang yan
c6ae1388ec Add dao of robot account
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-10 14:51:33 +08:00
Daniel Jiang
80af81154c
Merge pull request #6702 from wy65701436/robot-db-scheme
Add DB table for robot account
2019-01-10 14:25:58 +08:00
wang yan
db09f9f101 Update token length and upper case the sql key words
Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-09 10:00:54 +08:00
wang yan
362a0638d0 Add DB table for robot account
This commit is to add DB scheme for robot account and update the db orm releated.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-01-08 18:46:16 +08:00
Daniel Jiang
b5788f0695
Merge pull request #6671 from heww/ram
Add ram pkg
2019-01-08 15:39:36 +08:00
Mia ZHOU
45685b49d6
Merge pull request #6708 from zhoumeina/cherry_pick_disable_retag
disable retag function if with admiral
2019-01-08 15:04:10 +08:00
Meina Zhou
b7153798b5 disable retag function if with admiral
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-01-08 13:49:54 +08:00
Yogi_Wang
10d74eabd7 upgrade clarity components to 1.0 and fix issue
Signed-off-by: Yogi_Wang <Yogiwang@Yogi-WangdeMacBook-Pro.local>
2019-01-08 12:50:26 +08:00
Wenkai Yin
f9c1a528cb
Merge pull request #6689 from jkroepke/patch-1
Remove user agent check for docker notifications
2019-01-04 18:23:09 +08:00
He Weiwei
79f786ecbe Add ram pkg
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-01-04 13:17:13 +08:00
Fangyuan Cheng
5967537daa
Merge pull request #6609 from pureshine/devcenter-btn
Modify the location to open the Developer Center
2019-01-04 11:24:02 +08:00
Jan-Otto Kröpke
8b65e4f424
Remove user agent check for docker notifications
Fixes #5729

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
2019-01-03 21:17:29 +01:00
Wenkai Yin
75d45ebd9d
Merge pull request #6547 from cd1989/retag-input-validation
Validate repo and tag names in retag
2019-01-03 17:45:44 +08:00
FangyuanCheng
7a22f895ab Modify the location to open the Developer Center
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2019-01-03 14:57:26 +08:00
Yogi_Wang
aee07fff96 upgrade clarity components to 1.0
Signed-off-by: Yogi_Wang <Yogiwang@Yogi-WangdeMacBook-Pro.local>
2019-01-03 10:32:52 +08:00
Mia ZHOU
4f291e34eb
Merge pull request #6630 from pureshine/refactor-config
Config component nav tabs to use clarity component
2018-12-26 12:18:54 +08:00
Fangyuan Cheng
1456d1d326
Merge pull request #6628 from zhoumeina/add_swagger_title
add harbor swagger title for api explorer
2018-12-26 10:37:57 +08:00
Meina Zhou
92539a4bec add harbor swagger title for api explorer
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-26 09:41:54 +08:00
FangyuanCheng
4ad66b6d9b Config component nav tabs to use clarity component
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-25 18:36:18 +08:00
FangyuanCheng
a4e17ec183 When harbor is deployed in http mode, the registry certificate download button is not displayed in the project page.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-25 14:31:29 +08:00
cd1989
c117a23133 Validate repo and tag names in retag
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-24 16:49:39 +08:00
FangyuanCheng
256289810d Fix download certificate link bug
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-24 00:06:04 +08:00
Daniel Jiang
93c0a18b06
Merge pull request #6537 from stonezdj/ref_admin_driver
Refactor config settings stage2
2018-12-21 15:12:56 +08:00
stonezdj
2446878f6b Refactor config settings stage2
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-12-21 10:59:11 +08:00
He Weiwei
f403e50234
Merge pull request #6577 from heww/master
Include os version in image tag detail page
2018-12-20 18:18:44 +08:00
Qian Deng
c4ecd4e0f6 Fix i18n switch issue (#6579)
This issue is caused by error formated json file

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-12-20 15:52:59 +08:00
He Weiwei
e7f09643bd Include os version in image tag detail page
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2018-12-20 15:12:19 +08:00
Qian Deng
1430a24b55 Update i18n files of project_detail
Add `helmchart` item in `project_detail` entry

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-12-20 10:09:26 +08:00
Meina Zhou
66c1beb467 fix retag project list can not select
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-19 14:39:49 +08:00
Mia ZHOU
ac47500eb6
Merge pull request #6552 from pureshine/inline-css
Move inline css style to scss
2018-12-19 13:40:16 +08:00
Mia ZHOU
2062c436d3
Merge pull request #6553 from zhoumeina/fix_retag_ui
show retag tooltip use regex, reset the dialog form when retagged
2018-12-19 13:32:07 +08:00
Meina Zhou
a3e357bb7f show retag tooltip use regex, reset the dialog form when retagged
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-19 13:07:46 +08:00
Fangyuan Cheng
bb15f67316
Merge branch 'master' into inline-css 2018-12-19 10:07:21 +08:00
FangyuanCheng
c36e9daea1 Move inline css style to scss
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-18 21:19:08 +08:00
Wenkai Yin
b28bca7af4
Merge pull request #6541 from salkin/proxy-transport
Add support for http proxy in transport
2018-12-18 15:46:29 +08:00
Niklas Wik
138bc69f0f Add support for http proxy in transport
Signed-off-by: Niklas Wik <niklas.wik@nokia.com>
2018-12-17 10:35:27 +02:00
Mia ZHOU
da0f1d2831
Merge pull request #6525 from zhoumeina/dev-center1
add developer center in swagger ui way
2018-12-13 16:27:55 +08:00
Meina Zhou
d45ccbbb29 add developer center in swagger ui way
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-13 15:17:38 +08:00
SDBrett
0e260d180c Added tests for failure conditions (#6501)
Added unit tests for registryctl auth to cover failure conditions to increase test coverage.
New tests cover no secret specified and incorrect harbor secret prefix

Signed-off-by: Brett Johnson <brett@sdbrett.com>
2018-12-13 11:35:17 +08:00
stonezdj(Daojun Zhang)
13511d74ed Refactor config settings encrypt + metadata (#6387)
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-12-12 12:14:33 +08:00
Wenkai Yin
f7a28ee2a2 Remove the duplicate http error struct (#6516)
There are two different types to represent http error in the current code. This commit updates the codes to keep only one.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-12 11:51:19 +08:00
Wenkai Yin
5388eb4db6 Read ssl mode param from the adminserver to init the connection with database (#6504)
This commit adds the ssl mode as a param when establishing the connection with database

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-11 13:58:37 +08:00
Fangyuan Cheng
7f4dac2101
Merge pull request #6497 from pureshine/error-message
Modify the error message when deleting a signed images in harbor-helm
2018-12-11 11:29:47 +08:00
Mia ZHOU
e9a34224e4
Merge pull request #6499 from cd1989/retag-button-for-guest
Enable retag button to project guest
2018-12-11 10:55:50 +08:00
Mia ZHOU
53858fe2f1
Merge pull request #6482 from pureshine/default-version
Return unknow when about dialog cannot get harbor version
2018-12-11 10:30:40 +08:00
Mia ZHOU
4fc0716005
Merge pull request #6500 from pureshine/svg-format
Change the image in png format to the image in svg format
2018-12-11 10:24:04 +08:00
cd1989
fdddb37545 Enable retag button to project guest
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-10 15:46:48 +08:00
FangyuanCheng
892a76c27e Modify the error message when deleting a signed images in harbor-helm
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-10 14:39:04 +08:00
FangyuanCheng
cce22d569d Return unknow when about dialog cannot get harbor version
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-10 13:20:20 +08:00
FangyuanCheng
13686cbe83 Change the image in png format to the image in svg format
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-07 13:54:13 +08:00
Meina Zhou
073cacd9b3 fix helm chart did not get global label
The root cause is helm chart does not get glboal labels

Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-07 12:33:25 +08:00
Mia ZHOU
f2a9e8ae9b
Merge pull request #6472 from pureshine/filter-tag
Remove the default label when filtering images by label
2018-12-07 08:24:43 +08:00
Wenkai Yin
bcd6947fcc
Merge pull request #6470 from cd1989/retag-problem
Give meaningful error messages when retag is forbidden
2018-12-06 18:47:58 +08:00
De Chen
60d65a9d86 Block retag requests in read-only mode (#6457)
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-06 18:35:22 +08:00
cd1989
caf07a96fe Give meaningful messages when retag forbided
Signed-off-by: cd1989 <chende@caicloud.io>
2018-12-06 16:25:21 +08:00
FangyuanCheng
158fb92745 Remove the border of default label when filtering images by label
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-06 15:35:42 +08:00
Mia ZHOU
657ee8a150
Merge pull request #6469 from zhoumeina/fix_scan_log_viewer
fix #6432 modify scan log to use popup window
2018-12-06 15:11:03 +08:00
Meina Zhou
791646b8b0 fix #6432 modify scan log to use popup window
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-06 14:24:24 +08:00
Mia ZHOU
9100dfdb5f
Merge pull request #6468 from zhoumeina/fix_500_gc
#6440 fix gc will have 500 error when user try to put a new schedule
2018-12-06 14:22:43 +08:00
Wenkai Yin
746d58ceb4 Return the error message when changing password with wrong old password (#6466)
Return a meaningful error message when changing password but the a wrong old password is provided to render on UI

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-06 13:29:30 +08:00
Mia ZHOU
eeb6d4a9b9
Merge pull request #6456 from pureshine/add-user
Modify the error message when adding members
2018-12-06 12:53:44 +08:00
Mia ZHOU
2614306768
Merge pull request #6427 from pureshine/remove-am
Time display using 24-hour system
2018-12-06 12:52:52 +08:00
Mia ZHOU
a16c7b07a9
Merge pull request #6424 from pureshine/scan-now
Don't get the next available time while scan now
2018-12-06 12:44:56 +08:00
Meina Zhou
5db765ea10 #6440 fix gc will have 500 error when user try to put a new schedule
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-06 12:43:24 +08:00
Daniel Jiang
29d5b5da72 Return 409 when there is a scan all job running (#6460)
* Return 409 when user trigger another "scan all"

This commit fixes #6418, that when multiple "scan all" jobs are
triggered, the API should not return 500.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>

* Update swagger to add 409 to scanAll API

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-12-06 11:46:38 +08:00
FangyuanCheng
b866344310 Modify the error message when adding members
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-05 19:37:01 +08:00
FangyuanCheng
f09002a26c Time display using 24-hour system
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-05 18:26:23 +08:00
Meina Zhou
87cf6527c7 fix #6421 javascript error when user input nothing in the filter logs
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-12-05 18:16:24 +08:00
Wenkai Yin
538082ceb6 Remove the permission checking for getcert API (#6436)
The Harbor root cert can be downloaded by all users now, so the permission checking is not needed anymore

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-12-05 12:15:23 +08:00
FangyuanCheng
2e0fcab6ee Don't get the next available time while scan now
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-12-04 16:44:31 +08:00
peimingming
585d7b2b01 Add unit test for JobService Logger
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-12-03 16:20:03 +08:00
Daniel Jiang
ae240df031 Remove the Scan all in-memory marker (#6399)
Previously there was a in-memory marker to prevent user from frequently
calling the "scan all" API.  This has become problematic in HA
deployment, and is no longer needed after enhancement in jobservice.

This commit removes the marker for "scan all" api, however, we need to
review the mechanism and rework to make it stateless.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-12-02 15:40:50 +08:00
Steven Zou
9c76c375ac
Merge pull request #6396 from steven-zou/unique_job
Support unique job constraints (both unique queue and running jobs)
2018-11-30 17:03:43 +08:00
Qian Deng
1de52e28ae
Merge pull request #6398 from ninjadq/fix_i18n_of_delete_project_failure_msg
Fix: i18n issues of deleting project failure info
2018-11-30 16:44:11 +08:00
Mia ZHOU
a90fb5219c
Merge pull request #6394 from ninjadq/fix_robot_cases_for_global_search
Fix xpath in go to project robot case
2018-11-30 16:43:55 +08:00
Mia ZHOU
42fe0ec30a
Merge pull request #6397 from ninjadq/fix_helm_chart_api_in_ui
Fix: helmchart api change caused problems
2018-11-30 16:43:19 +08:00
Wenkai Yin
a81346a4ba
Merge pull request #6386 from heww/session
change session cookie name to sid
2018-11-30 16:13:45 +08:00
Steven Zou
84d864607c Add UT cases for new added code
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-30 16:08:15 +08:00
Qian Deng
9020cd6cd2 Fix: i18n issues of deleting project failure info
Fix i18n issues that may confuse people

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-30 15:40:26 +08:00
Qian Deng
9dd509e0eb Fix xpath in go to project robot case
Global search bug fix introduced test case failure, fix it by edit xpath

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-30 15:33:14 +08:00
Qian Deng
2a583fccfe Fix: helmchart api change caused problems
Adapter ui to new backend API

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-30 15:28:28 +08:00
Steven Zou
ec2ad4d0b8
Merge pull request #6093 from cd1989/replication-record-id
Add op uuid to image replication
2018-11-30 14:54:43 +08:00
Mia ZHOU
b3d0d64ebd
Merge pull request #6392 from pureshine/nav-logo
Add harbor logo to navigation bar
2018-11-30 14:42:55 +08:00
Steven Zou
ccd486a0ad Support unique job constraints (both unique queue and running jobs)
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-30 14:14:21 +08:00
Wenkai Yin
9d5cf57373 Check the existence of name when creating replication rule and fix bugs in testing library (#6381)
1. Fix #5102 by checking the existence of name when creating/editing replication rule
2. Add unique constraint to the name of replication policy and target
3. Fix bugs of testing library

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-11-30 13:32:20 +08:00
FangyuanCheng
566fc5de02 Add harbor logo to navigation bar
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-11-29 23:18:26 +08:00
stonezdj
3b165d41d4 Fix LDAP search error
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-11-29 18:37:23 +08:00
Steven Zou
68b1b98f0a
Merge pull request #6375 from steven-zou/fix_global_search_502_issue
Fix global search 502 issue happened when chart repo is not enabled
2018-11-29 16:29:08 +08:00
Daniel Jiang
a3f424f5f3
Merge pull request #6378 from cd1989/retag-status-code-fix
Fix status code for permission check in retag, use 403
2018-11-29 16:00:34 +08:00
Steven Zou
d82482499b
Merge pull request #6371 from mmpei/6144-JSLoggerInDB
6144 js logger in db
2018-11-29 15:58:20 +08:00
Steven Zou
e7ffaecca5 Fix global search 502 issue happened when chart repo is not enabled
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-29 15:53:09 +08:00
He Weiwei
00a3948fff change session cookie name to sid
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2018-11-29 15:18:15 +08:00
Wenkai Yin
3ff4402a35
Merge pull request #6379 from steven-zou/add_retry_to_connect_redis
Add retry with backoff when creating redis cache for chart server
2018-11-29 13:52:43 +08:00
Mia ZHOU
3c000f10a0
Merge pull request #6338 from ninjadq/fix_chart_ui_related_issues
Fix chart ui related issues
2018-11-29 10:11:44 +08:00
Steven Zou
5ccfa9f8ad Add retry with backoff when creating redis cache for chart server
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-28 22:23:03 +08:00
陈德
f72c7766ae Fix status code for permission check in retag, use 403
Signed-off-by: 陈德 <chende@caicloud.io>
2018-11-28 19:48:25 +08:00
peimingming
238dbc0347 Add UT and review comments and issue fix (#6144)
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-11-28 17:43:14 +08:00
Steven Zou
b895fda13a Fix the malformat json data of chart list API
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-28 17:07:17 +08:00
peimingming
c67fdc40f5 Support store job log in DB (#6144)
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-11-28 15:09:29 +08:00
Qian Deng
59b47ba29b Enhance: the header of add label component will passed by parant
Make the header word of label to be a input argument.

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-27 14:45:08 +08:00
Mia ZHOU
f78660ff84
Merge pull request #6356 from pureshine/fix-iconbug
Fix the bug that markdown icon does not display on the page
2018-11-27 11:27:29 +08:00
FangyuanCheng
f39cd17003 Fix the bug that markdown icon does not display on the page
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-11-27 10:16:14 +08:00
Daniel Jiang
ca79a98f17 Add dependencies to Gopkg.toml (#6343)
During the legal process for 1.7.0 I found some dependencies are not tracked in
Gopkg.toml.
This commit explicitly add depedencies on these packages.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-11-27 09:27:12 +08:00
Qian Deng
d484025fa1 Fix: helm chart results style
1. Do not show chart results if chart is not enabled
2. Fix style in scroll of results page

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-23 17:38:51 +08:00
Qian Deng
259b984755 Fix: change label style in helm chart summary page
1. Add label style
2. Fix style

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-23 16:36:03 +08:00
Qian Deng
213dd39b5b Fix: strange string in cmd input in the chart summary
Should using backquotes instead of doublequotes to string that need interpreted.

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-23 16:28:51 +08:00
Qian Deng
31f45ae908 Fix: i18n issue in add label filter header in chart version
In chart version view, wrong description appeared in add label button's header

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-23 16:07:04 +08:00
Qian Deng
405565b744 Enhance: Add helm chart count number in the project list
Project API return the helm chart count now, so put it to UI.

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-12 15:47:51 +08:00
Qian Deng
6a3fe60d55
Merge pull request #6246 from zhoumeina/refactor_registry_for_admiral
Refactor registry for admiral
2018-11-09 13:48:43 +08:00
Meina Zhou
6bcc803588 modify registry component using tabs
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-09 12:58:26 +08:00
Wenkai Yin
32c42be677
Merge pull request #6241 from steven-zou/logger_framework_job_service
Uncomment the harbor configuration injection code block
2018-11-09 10:41:52 +08:00
Steven Zou
01bb7f4abb Uncomment the harbor configuration injection code block
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-09 10:19:14 +08:00
Steven Zou
8f0e8d083a Fix typo in the README doc of jobservice
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-08 18:24:41 +08:00
Steven Zou
b3c87673a6
Merge pull request #6215 from steven-zou/logger_framework_job_service
Build logger framework to support configurable loggers/sweepers/getters
2018-11-08 18:15:36 +08:00
Steven Zou
093bf9fc8a Update the job service config yaml in the installation template
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-08 10:40:39 +08:00
Steven Zou
e6d4c024ee Update README of job service to reflect latest updates
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-08 10:35:12 +08:00
Mia ZHOU
db3088ae4d
Merge pull request #6218 from zhoumeina/upgrade_package_version
upgrade package version to rc6
2018-11-07 12:46:40 +08:00
James Zabala
ae1196ec8a
Merge pull request #6229 from ninjadq/change_title_wording
Fix:Vmware is appeared in ihe title of loading page
2018-11-06 08:55:48 -05:00
Daniel Jiang
abe728325b Wait for manifest in notification handler
There's an issue in registry 2.6.x, that when the webhook is sent the
manifest of the image may not be written.
For details: https://github.com/docker/distribution/issues/2625

This will cause issue in "scan on push" or replication.
This commit mitigates the issue by adding retries in notification
handler.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-11-06 19:23:54 +08:00
Qian Deng
5210aecc76 Fix:Vmware is appeared in ihe title of loading page
Should change it to Harbor

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-06 19:00:46 +08:00
Steven Zou
e9194ca107 Add/update unit test cases for the new implemented job logger framework
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-06 14:43:06 +08:00
Qian Deng
35f3346948
Merge pull request #6155 from mmpei/6086-UserNameLength
Support longer UserName
2018-11-06 10:50:50 +08:00
Meina Zhou
5143943ced upgrade package version to rc6
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-06 10:23:08 +08:00
Steven Zou
7b106d06c5 Build logger framework to support configurable loggers/sweepers/getters
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-06 09:31:31 +08:00
Meina Zhou
f594c44045 refactor system settings and fixed bug of system settings
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-06 08:43:34 +08:00
Daniel Jiang
163fc11b7f
Merge pull request #6198 from ywk253100/181101_replication
Pass internal core URL as source in replication
2018-11-02 12:29:53 +08:00
Mia ZHOU
a20d49359b
Merge pull request #6195 from pureshine/labels-btn
Ordinary user login is forbidden to add labels in images.
2018-11-02 10:03:10 +08:00
FangyuanCheng
7430ae7426 Ordinary user login is forbidden to add labels in images.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-11-01 18:15:38 +08:00
Wenkai Yin
88aa413fe6 Pass internal core URL as source in replication
Currently, we pass the external URL as the source registry and set insecure as true in replication, this causes security issue. This commit replaces the URL with the internal one and set insecure to false. Fixes #6109.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-11-01 17:13:38 +08:00
Mia ZHOU
4894d1f46f
Merge pull request #6190 from zhoumeina/fix_nightly
fix nightly test
2018-11-01 15:16:26 +08:00
Meina Zhou
0ba9856c66 fix nightly test
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-01 14:07:55 +08:00
Qian Deng
e19616a99d
Merge pull request #6192 from ninjadq/fix_session_expire_issue
Fix: When session expire can not click anything
2018-11-01 13:59:49 +08:00
FangyuanCheng
74046cb5e1 Let the retag error prompt show complete
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-11-01 13:13:22 +08:00
Qian Deng
558638f912 Fix: When session expire can not click anything
This is casued that not handle 401 err on member routing guard

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-01 13:12:48 +08:00
Steven Zou
e37e275a77
Merge pull request #6183 from steven-zou/use_separate_conn
Use separate redis conn for the lock mechanism in the periodic enqueuer
2018-10-31 15:55:18 +08:00
Steven Zou
300977d539 Use separate redis conn for the lock mechanism in the periodic enqueuer
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-31 15:19:11 +08:00
Qian Deng
d517320c78
Merge pull request #6182 from zhoumeina/remove_switch_tab_confirm
remove switch tab confirmation
2018-10-31 15:15:41 +08:00
Meina Zhou
7991387eb8 remove switch tab confirmation
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-31 14:46:49 +08:00
Steven Zou
646cf282ba
Merge pull request #6181 from steven-zou/add_test_on_borrow_func
Add TestOnBorrow check func of redis pool to verify the getting conn
2018-10-31 14:10:33 +08:00
Mia ZHOU
1287b0d1b1
Merge pull request #6173 from zhoumeina/refactor_config
refactor configuration
2018-10-31 14:02:59 +08:00
Steven Zou
58eefb9c17 Add TestOnBorrow check func of redis pool to verify the getting conn
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-31 13:30:29 +08:00
Steven Zou
b48748492e Fix the issue of stopping periodic job (#6174)
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-31 11:43:46 +08:00
Wenkai Yin
5d585c7c65
Merge pull request #6176 from steven-zou/support_health_check_js
Support health check free call in job service
2018-10-31 09:42:42 +08:00
Mia ZHOU
c530f65ba9
Merge pull request #6170 from cd1989/portal-retag-permission
Allow retag in portal only for developer or above role
2018-10-31 09:40:47 +08:00
Steven Zou
8341aa14b0 Support health check free call in job service
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-30 17:35:07 +08:00
FangyuanCheng
f55666d593 Let the repository description support the markdown format.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-10-30 17:17:24 +08:00
Meina Zhou
e3e15dbc65 refactor configuration
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-30 15:45:04 +08:00
Fangyuan Cheng
e7e2312e16
Merge pull request #6160 from pureshine/datepicker
Change Datapicker on replication to clarity widget
2018-10-30 10:58:18 +08:00
FangyuanCheng
ae71673cf0 Change Datapicker on replication to clarity widget
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-10-30 10:14:13 +08:00
陈德
4bf5962e35 Allow retag in portal only for developer or above role
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-29 19:43:43 +08:00
Steven Zou
1b1ab60802
Merge pull request #6152 from mmpei/5178-jibSupporting
5178 jib supporting
2018-10-29 16:34:13 +08:00
Wenkai Yin
af17c2c3fd
Merge pull request #6154 from wy65701436/fix-gc-redis
Fix gc jobs issues
2018-10-29 16:29:57 +08:00
Steven Zou
dde6c39e80
Merge pull request #6169 from steven-zou/fix_issue_of_periodic_conflicts
Return 409 conflict error in liue of 200 with ID of existing one
2018-10-29 16:18:40 +08:00
peimingming
59f777d82c Adjust length of UserName to 255
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-10-29 16:03:43 +08:00
peimingming
d3a617efd6 Support longer UserName
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-10-29 15:59:17 +08:00
Daniel Jiang
4dc89f57f2
Merge pull request #6167 from steven-zou/fix_issue_of_duplicated_schedule
Fix the issue of duplicated periodic job scheduling
2018-10-29 15:56:03 +08:00
Steven Zou
408b751ae6 Return 409 conflict error in liue of 200 with ID of existing one when submmiting periodic job
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-29 15:40:31 +08:00
wang yan
903d3906ab Fix per comments by wk
Signed-off-by: wang yan <wangyan@vmware.com>
2018-10-29 15:29:14 +08:00
Steven Zou
d32e51052e Fix the issue of duplicated periodic job scheduling
Signed-off-by: Steven Zou <szou@vmware.com>

Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-29 14:52:45 +08:00
Qian Deng
4aa625e1a6 Fix: Centering Label in the dropdown item
Label in drop down should position in ther vertical center

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-29 10:54:09 +08:00
Qian Deng
0c756d8df9 Fix: Icon is not at the center of button
Icon in the action bar button need be a certer position

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-29 10:54:09 +08:00
Mia ZHOU
a745922b77
Merge pull request #6153 from zhoumeina/fix_robot_for_replication
modify test case since replication log change to popup a new page
2018-10-29 08:43:35 +08:00
wang yan
566169f59a Fix gc jobs issues.
This commit is to fix two problems in the gc job,
1, in order to support redis cluseter, gc job should delete the keys only
for docker reigstry instead of all keys. It because that in the redis cluster,
only db 0 is supported.
2, to restore the real status of read only not just to set it to false.

Signed-off-by: wang yan <wangyan@vmware.com>
2018-10-26 18:37:20 +08:00
Meina Zhou
b68dd47a20 modify test case since replication log change to popup a new page
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-26 16:20:00 +08:00
mmpei
a209519b0e add support jib
Signed-off-by: mmpei <peimingming1986@126.com>
Signed-off-by: peimingming <peimingming@corp.netease.com>
2018-10-26 15:32:10 +08:00
mmpei
99c70ceab9 issue 5851 support jib client
Signed-off-by: mmpei <peimingming1986@126.com>
2018-10-26 15:27:28 +08:00
Steven Zou
a2f0da0d7d Fix the web hook mising issue for the periodic job executions
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-26 14:28:04 +08:00
Mia ZHOU
079059ef0c
Merge pull request #6140 from ninjadq/extend_username_length
Extend username length
2018-10-26 13:03:01 +08:00
Steven Zou
9bbc9233f1
Merge pull request #6147 from clouderati/fix-misspelling
Fix mispelling
2018-10-26 12:47:31 +08:00
Wenkai Yin
591e3df9c5
Merge pull request #6126 from reasonerjt/no-scanall-bootstrap
Not submit scan all job when core container starts
2018-10-26 12:45:01 +08:00
Qian Deng
571384cdb2 Enhance: Extend username length to 255
Backend username is extend to 255, UI should update eithera #6086

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-26 12:28:18 +08:00
Daniel Jiang
13b40e6074
Merge pull request #6146 from clouderati/fix-header
Adding copyright header
2018-10-26 09:57:02 +08:00
clouderati
5c47e83bd6 Fix mispelling
* s/convertor/converter
* s/Convertor/Converter

Signed-off-by: clouderati <35942204+clouderati@users.noreply.github.com>
2018-10-25 21:29:46 +00:00
clouderati
b0d523841e Adding copyright header
Adding header to replication/models/policy.go file as it was previously
missing.

Signed-off-by: clouderati <35942204+clouderati@users.noreply.github.com>
2018-10-25 20:54:05 +00:00
Daniel Jiang
39b4d011c7 Not submit scan all job when core container starts
Fixes #6115

As for the change in migration sql file, in 1.7 we'll switch to
jobservice for scheduling "scan all" job.  To avoid inconsistency,
this item will be reset and user will need to configure the policy again.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-10-25 19:01:52 +08:00
Qian Deng
4b1e94d419 Fix: UAA can not edit after save
UAA should editable if no uaa users in db

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-25 15:33:44 +08:00
Qian Deng
a48ae01e4b
Merge pull request #6131 from ninjadq/ui_enhancement_of_chart_label
Enhancement: Harbor Helmchart UI Label
2018-10-25 14:14:07 +08:00
Qian Deng
7164856239 Enhancement: Harbor Helmchart UI Label
1. Add Filter to helmchart datagrid
2. Fix UI misc issues

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-24 19:03:18 +08:00
Mia ZHOU
bc85ef2cb3
Merge pull request #6125 from zhoumeina/add_login_image
add login page image
2018-10-24 11:07:19 +08:00
Steven Zou
3b76a960e1
Merge pull request #6039 from stonezdj/refact_5996
Refactor capacity
2018-10-24 10:50:11 +08:00
Meina Zhou
1aef241d77 add login page image
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-24 10:47:11 +08:00
陈德
5063f57a1f Fix validation in image name input form
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-24 09:49:57 +08:00
陈德
ea8fe8a2c5 Add image retag function in portal
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-24 09:49:57 +08:00
Steven Zou
04e9190870
Merge pull request #5371 from kofj/master
Build history
2018-10-24 09:39:03 +08:00
James Zabala
6556d782bf
Merge pull request #6034 from estaleiro/harbor-ptBR
Adds support for Brazilian Portuguese
2018-10-23 14:03:12 -04:00
Daniel Jiang
2920ec5f9b
Merge pull request #6077 from clouderati/update-copyright
Updating copyright notices
2018-10-23 18:38:15 +08:00
Frank Kung
735ae1b2f6 Add unit test of build history section.
Move style to scss file.

Signed-off-by: Frank Kung <kfanjian@gmail.com>
2018-10-23 16:10:41 +08:00
Frank Kung
fd9e3dc2b8 Add build history component to Harbor UI
Add build histroy section and navbar to tag-detail component
Add i18n items of build history
Format code.

Signed-off-by: Frank Kung <kfanjian@gmail.com>
2018-10-23 16:10:41 +08:00
Qian Deng
4b103d115a
Merge pull request #6110 from ninjadq/add_chart_2_global_result
Feature: Add helmchart version result in global search result
2018-10-23 15:46:55 +08:00
Mia ZHOU
951c53d9f9
Merge pull request #6112 from zhoumeina/disable_scan_users
Disable scan button in tag detail page if login with normal user role
2018-10-23 15:19:35 +08:00
Qian Deng
2eff6a794a Feature: Add helmchart version result in global search result
Include helmchart to global search resault related to ##5791

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-23 15:15:46 +08:00
Meina Zhou
7f6917a2c1 disable scan button in tag detail page if login with normal user role
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-23 14:34:00 +08:00
Qian Deng
9fc9664d30
Merge pull request #6107 from ninjadq/fix_i18n_on_repository_cardview
Fix: Show image description info based on locale setting
2018-10-23 13:06:01 +08:00
Mia ZHOU
07712d37fd
Merge pull request #6101 from pureshine/scan-btn
Revert "Disable scan button when vulnerability data is not ready."
2018-10-23 12:45:02 +08:00
FangyuanCheng
842d3a4723 Revert "Disable scan button when vulnerability data is not ready."
This reverts commit 2a3c113458.

Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-10-23 11:40:58 +08:00
Steven Zou
0c901a475f
Merge pull request #6074 from goharbor/enhance_job_service
Enhance job service to support multiple executions recording
2018-10-23 09:50:05 +08:00
Mia ZHOU
c13a0bfaae
Merge pull request #6088 from pureshine/fixed_bug
Vulnerability scan cancel editing to make UI into orginal status
2018-10-23 08:39:32 +08:00
Qian Deng
2e3e225147 Fix: Show image description info based on locale setting
Descrition info not present based on locale info before, translate it before showing on page.

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-22 20:43:06 +08:00
陈德
1ffd9d8fba Add op uuid to image replication
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-21 23:55:57 +08:00
Cheng Fangyuan
8b6e72e56e Vulnerability scan cancel editing to make UI into orginal status
Signed-off-by: Cheng Fangyuan <fangyuanc@fangyuanc-a01.vmware.com>
2018-10-19 13:14:43 +08:00
Qian Deng
2891ab2822
Merge pull request #6085 from ninjadq/add_label_2_helm_chart
Add label 2 helm chart
2018-10-19 13:08:35 +08:00
Qian Deng
6eb9fa53a7 Add labels on chart summary page
Add labels on chart summary

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-19 12:47:49 +08:00
Steven Zou
db24cbe25a
Merge pull request #5779 from cd1989/images-retag
Merge Images retag
2018-10-19 11:04:48 +08:00
Steven Zou
7ca2e9df81 Enhance job service to support multiple executions rectording
- print more logs
- add execution records for periodic job
- add launch job func in job context to launch sub job
- replace copyright header with new version

Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-19 11:02:09 +08:00
Qian Deng
7ffa135432 Add Label Marker to Helmchart version
1. Add Label marker component
2. Add Label apis
3. Add Label to Helmchart version

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-19 10:30:02 +08:00
Daniel Jiang
fe2e58e1a0 Ignore duplication error when inserting config
This commit mitigates the situation when more then one adminserver is
deployed and there may be duplication error when they try to initialize
the configuration to DB.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-10-19 10:23:00 +08:00
clouderati
9a93f225d7 Updating copyright notices
Replacing copyright notices with "Copyright 2018 The Harbor Authors".

Signed-off-by: clouderati <35942204+clouderati@users.noreply.github.com>
2018-10-18 16:04:36 +00:00
Mia ZHOU
5cf6c04ea6
Merge pull request #6071 from zhoumeina/gc_releated_ui
fix gc ui issues
2018-10-18 13:19:29 +08:00
Meina Zhou
c6aaea869f fix gc ui issues
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-18 11:37:55 +08:00
FangyuanCheng
c111a354f0 Add a header separator line to the action drop-down menu.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-10-18 10:33:50 +08:00
Fangyuan Cheng
7851404d0d
Merge pull request #6069 from pureshine/scan_btn
Disable scan button when vulnerability data is not ready.
2018-10-18 09:32:32 +08:00
陈德
a1b4729aa7 Add more unit tests
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-18 00:26:25 +08:00
FangyuanCheng
2a3c113458 Disable scan button when vulnerability data is not ready.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-10-17 23:48:10 +08:00
Qian Deng
7c43420cfd
Merge pull request #6061 from zhoumeina/hide_repo
hide the popular repositories by default
2018-10-17 18:51:29 +08:00
Meina Zhou
bb6ff76c40 hide the popular repositories by default
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-17 17:55:03 +08:00
FangyuanCheng
15172988cb Allow developers and project admins administrators to download the harbor certs from UI.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-10-17 15:14:46 +08:00
Mia ZHOU
00c6e2dc5f
Merge pull request #6044 from pureshine/refactor-vul
Refactoring the vulnerability UI to make it similar to GC.
2018-10-17 09:18:16 +08:00
stonezdj
0278981523 Change admin server to core in jobservice
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-10-16 19:23:12 +08:00
Fangyuan Cheng
141a81ac47
Merge pull request #6051 from pureshine/modify_text
Modify the dialog information when removing a member of project
2018-10-16 16:38:31 +08:00
FangyuanCheng
0b8569371d Refactoring the vulnerability UI to make it similar to GC.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-10-16 16:31:46 +08:00
FangyuanCheng
9cbcd07d10 Modify the dialog information when removing a member of project
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-10-16 15:11:02 +08:00
Meina Zhou
95188de77f modify delete to uppercase
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-16 09:46:44 +08:00
stonezdj(Daojun Zhang)
b764033fc9
Merge pull request #6007 from stonezdj/refact_5998
Change admin server to core in jobservice
2018-10-15 17:52:24 +08:00
stonezdj
79bac7a64e Change admin server to core in jobservice
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-10-15 14:56:18 +08:00
Daniel Jiang
00c8344c13 Remove the local scheduler
This is no longer needed after moving the "scan all" to job-service.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-10-15 14:14:11 +08:00
Wenkai Yin
0ebed68f5b
Merge pull request #5924 from cd1989/replication-status-check
Fix statuses condition when trigger replication
2018-10-15 11:26:22 +08:00
Ricardo Pchevuzinske Katz
3298fd752e
Adds support for Brazilian Portuguese
Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@serpro.gov.br>
2018-10-14 19:05:18 -03:00
陈德
e5e5ba79a5 Add operations filter
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-13 11:09:53 +08:00
Wenkai Yin
18aedacef8
Merge pull request #6020 from reasonerjt/fix-insecure-transport
Revoke the change in replicator
2018-10-12 10:34:52 +08:00
Daniel Jiang
b895a2d7cf Revoke the change in replicator
Revoke the change made to replicator to reset the insecure flag to true
when accessing source registry.  The reason is that the replicator will
use external URL to access source registry, setting it to false will
break replication when Harbor is hosting with self-signed certificate.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-10-11 18:29:38 +08:00
Steven Zou
326e0d455a Log error if failed to create logger for job
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-11 16:29:00 +08:00
Qian Deng
a69f86054f
Merge pull request #6013 from zhoumeina/release_rc5
modify harbor ui package structure
2018-10-11 14:00:10 +08:00
Meina Zhou
be3fd2e6f3 modify harbor ui package structure
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-11 10:47:04 +08:00
Wenkai Yin
83147b1982
Merge pull request #6003 from wy65701436/fix-gc-bug
Fix gc api issues
2018-10-11 10:26:38 +08:00
Wenkai Yin
b4a9eae8cc
Merge pull request #6009 from reasonerjt/fix-insecure-transport
Use secure transport to access HTTP endpoint
2018-10-11 10:23:12 +08:00
陈德
d6f5560145 Fix status check when trigger replication
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-11 09:03:49 +08:00
Steven Zou
95d48436b8 Add README doc for job service (#6010)
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-10 19:08:20 +08:00
Daniel Jiang
1188bd89b9 Use secure transport to access HTTP endpoint
In various parts of the code, we used insecure transport in http Client
when we assume the endpoint is http.  This causes complaints form
security scanner.  We should use secure transport in such cases.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-10-10 17:51:02 +08:00
Qian Deng
7116baabed
Merge pull request #6001 from zhoumeina/fix_console_error_gc
replace Observable.throw to observableThrowError to avoid undefined e…
2018-10-10 16:19:38 +08:00
wang yan
a4ad4c7282 Fix gc api issues
1, filter out the scan all jobs in the gc list.
2, make it able to delete unexecuted scheduler.

Signed-off-by: wang yan <wangyan@vmware.com>
2018-10-10 15:45:03 +08:00
Mia ZHOU
a8d39c0b05
Merge pull request #5989 from ninjadq/add_buttons_to_chart_list_view
Add buttons to chart list view
2018-10-10 15:08:37 +08:00
Meina Zhou
1487b649ff replace Observable.throw to observableThrowError to avoid undefined error
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-10 15:05:41 +08:00
Qian Deng
b9697df44a Add download latest version button
Add download button in chart list view to download latest chart

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-10 11:23:09 +08:00
Meina Zhou
081921cf89 refactor gauge component using angular way,remove jquery
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-10 10:49:20 +08:00
Qian Deng
2011e606fc Add delete chart button
Add delete chart button to remove all version of seleted charts

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-10-09 15:42:35 +08:00
陈德
b648084d95 Improve code styles and fix after Harbor refactoring
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-09 10:49:03 +08:00
陈德
03d5157eaf Updae retag api spec
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-08 19:07:23 +08:00
陈德
75f1cdb449 Update swagger file to add retag API
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-08 19:07:22 +08:00
陈德
48d2435146 Fix notification event filtered because of user agent
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-08 19:07:22 +08:00
陈德
03af3c5936 Add image retag API
Signed-off-by: 陈德 <chende@caicloud.io>
2018-10-08 19:07:21 +08:00
James Zabala
e09a157dce
Merge pull request #5896 from erks/normalize_ldap_group_dn
Normalize (make lowercase) ldap_group_dn during onboarding
2018-10-02 16:03:03 -04:00
James Zabala
ce0e195d18
Merge pull request #5957 from reasonerjt/scan-all-jobsvc
Schedule "scan all" via jobservice
2018-10-02 15:31:42 -04:00
James Zabala
a9dcd7c475
Merge pull request #5967 from gnomeontherun/remove-bootstrap
Remove unused Bootstrap from portal dependencies
2018-10-02 15:29:58 -04:00
Daniel Jiang
b12dc3b5d8 Schedule "scan all" via jobservice
This commit leverage the jobservice to trigger "scan all" and
gets rid of the local scheduler to make the harbor-core container
stateless.
It keeps using the notifer mechanism to handle the configuration change.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-09-28 15:42:37 +08:00
Fangyuan Cheng
832bbc3b9b
Merge pull request #5965 from pureshine/package
Refactor and improve the format of vulnerability scan report
2018-09-28 15:25:53 +08:00
Cheng
033523d223 Refactor and improve the format of vulnerability scan report
Signed-off-by: Cheng <fangyuanc@vmware.com>
2018-09-28 14:28:28 +08:00
Jeremy Wilken
329072bbb9 Remove unused Bootstrap from portal dependencies, add jQuery which was implicitly depended upon
Signed-off-by: Jeremy Wilken <gnomation@gnomeontherun.com>
2018-09-27 14:20:45 -05:00
Steven Zou
55c50f310d Fix #5956 issue: The APIs should not get chart information when Harbor is not installed with chart repo
Signed-off-by: Steven Zou <szou@vmware.com>
2018-09-27 13:22:25 +08:00
Mia ZHOU
1173955200
Merge pull request #5950 from pureshine/replication_dialog
Make the replication dialog a little bit wider
2018-09-26 16:47:47 +08:00
Cheng
79e5abe2df Make the replication dialog a little bit wider
Signed-off-by: Cheng <fangyuanc@vmware.com>
2018-09-26 14:14:12 +08:00
Meina Zhou
03d0ad0faf fresh page after job finished
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-26 13:07:41 +08:00
Cheng
98cba2a1a9 Make the replication dialog a little bit wider
Signed-off-by: Cheng <fangyuanc@vmware.com>
2018-09-26 12:50:24 +08:00
Cheng
f3cc7676ef Make the replication dialog a little bit wider
Signed-off-by: Cheng <fangyuanc@vmware.com>
2018-09-26 12:23:29 +08:00
Cheng
f1648602d5 Make the replication dialog a little bit wider
Signed-off-by: Cheng <fangyuanc@vmware.com>
2018-09-26 12:10:47 +08:00
Daniel Jiang
8e438d81d1
Merge pull request #5945 from steven-zou/provide_total_count_of_charts
Return the total count of charts under the project in project API
2018-09-25 18:32:29 +08:00
Steven Zou
8b538cbc0a Return the total count of charts under the project in project API
- add new interface method to get total count of charts under namespaces by calling get index
- add new field 'chart_count' in project model
- append chart count to the project model in project API

Signed-off-by: Steven Zou <szou@vmware.com>
2018-09-25 17:56:11 +08:00
Cheng
d9ac235fb2 Revert replication dialog
Signed-off-by: Cheng <fangyuanc@vmware.com>
2018-09-25 15:06:07 +08:00
Daniel Jiang
0699980924 Add Scan All job to job service (#5934)
This commit adds the job to scan all images on registry.
It also makes necessary change to Secret based security context, to
job service has higher permission to call the API of core service.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-09-22 13:07:32 +08:00
Wenkai Yin
978f8721e6
Merge pull request #5927 from steven-zou/return_labels_in_chart_api
Refactor the chart service implementation to provide more extending flexibilities
2018-09-21 15:59:53 +08:00
Qian Deng
0cb430d463
Merge pull request #5932 from ninjadq/refactor_auth_api
Refactor backend api for authrization
2018-09-21 15:59:07 +08:00
Qian Deng
88bb461314 Reactor backend api for authrization
1. Change backend api
2. Change frontend api
3. Change the proxy config file

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-21 14:03:17 +08:00
Steven Zou
78b9cbf35e Fix failures of UT cases of chart API related
Signed-off-by: Steven Zou <szou@vmware.com>
2018-09-21 14:02:45 +08:00
Meina Zhou
d8b917c097 Modify some small issues in gc ui
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-21 09:41:06 +08:00
Daniel Jiang
6c84a3dc4f
Merge pull request #5690 from goharbor/clouderati-copyright-update
Updating copyright notices
2018-09-20 19:38:26 +08:00
Steven Zou
d4c423ea8e Merge branch 'master' into return_labels_in_chart_api 2018-09-20 17:55:48 +08:00
Steven Zou
24c0be789d Add more UT cases for changed chart API
- add more cases in the ChartRepositoryAPI controller
- move chart utility testing functions to a separate go file under testing
- ignore testing coverage for testing folder
- update other UT cases to reflect the change of adding chart testing utility functions

Signed-off-by: Steven Zou <szou@vmware.com>
2018-09-20 17:51:27 +08:00
Cheng Fangyuan
8192bf2d62
Merge pull request #5930 from pureshine/modify_dropdown
After selecting color, the color button is closed
2018-09-20 14:55:15 +08:00
Cheng
3568673e85 After selecting color, the color button is closed
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-20 14:10:40 +08:00
Cheng
e47e17ed3f After selecting color, the color button is closed
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-20 14:09:05 +08:00
Mia ZHOU
f49ae02a1a
Merge pull request #5925 from zhoumeina/gc_ui
Implementation of  GC UI
2018-09-20 13:46:54 +08:00
Meina Zhou
aefb97dec8 Implement gc UI
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-20 13:21:22 +08:00
De Chen
970d84f1b9 Add comment format check to makefile and travis (#5832)
* Add comment format check to makefile and travis

Signed-off-by: 陈德 <chende@caicloud.io>
2018-09-20 11:48:38 +08:00
Cheng
7d9c6287b3 After selecting color, the color button is closed
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-20 11:15:30 +08:00
Steven Zou
e6de7f080d Rename the import path of new package 'label'
Signed-off-by: Steven Zou <szou@vmware.com>
2018-09-20 10:31:29 +08:00
clouderati
587459df15 Replacing copyright notices with "Copyright Project Harbor Authors".
Signed-off-by: clouderati <35942204+clouderati@users.noreply.github.com>
2018-09-19 16:59:36 +00:00
Steven Zou
3a204dbf7d Rebase to fix conflicts 2018-09-19 17:46:47 +08:00
Qian Deng
7873a0312a Rename harbor-ui to harbor-core
1. Update the nginx.conf
2. Update Makefile
3. Update docker-compose
4. Update image name
5. Rename folder ui to core
6. Change the harbor-ui's package name to core
7. Remove unused static file on harbor-core
8. Remove unused code for harbor-portal

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-19 16:35:13 +08:00
Steven Zou
df241c0666 Refactor the chart service implementation to provide more extemding flexibilities
- use unified proxy handler to handle all the proxy traffic
- define interfaces for the handlers
- implement the interface at chart controller level
- refactor UT cases
- update other related reference code

Signed-off-by: Steven Zou <szou@vmware.com>
2018-09-19 16:34:58 +08:00
Yan
29ca31cf6c
Update gc api to fix issues found by UI implemention (#5920)
This commit is to update gc api to fix issues found by UI implemention:
1, Return json format of gc schedule
2, Unify capital and small letter
3,Return gc records by desc

Signed-off-by: wang yan <wangyan@vmware.com>
2018-09-19 14:36:47 +08:00
Touch Ungboriboonpisal
e256547411 Normalize (make lowercase) the ldap group dn when onboarding
Fixes #5895

Signed-off-by: Touch Ungboriboonpisal <tungbori@zynga.com>
2018-09-18 13:37:35 -07:00
Cheng Fangyuan
262de58c55
Merge pull request #5898 from pureshine/modify_tooltips
Modify the tooltip to increase and display the full content
2018-09-18 18:28:23 +08:00
Cheng Fangyuan
6a0ccae913
Merge pull request #5903 from pureshine/modify_text
Tooltip prompts 'repository read only'
2018-09-18 17:46:32 +08:00
Cheng Fangyuan
407b46801b
Merge pull request #5899 from pureshine/modify_space
Make the space between the button and the tab section consistent
2018-09-18 17:44:47 +08:00
Cheng
27a5df5c90 Modify the tooltip to increase and display the full content
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-18 14:02:31 +08:00
Cheng
efc3937368 Make the space between the button and the tab section consistent
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-18 13:52:11 +08:00
Cheng
b9dae3f156 Make the space between the button and the tab section consistent
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-18 13:45:33 +08:00
Cheng
76c66a9dea Tooltip prompts 'repository read only'
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-18 11:58:23 +08:00
Cheng
014a81da68 Modify the tooltip to increase and display the full content
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-18 11:37:35 +08:00
Cheng Fangyuan
8250bce9c5
Merge pull request #5897 from pureshine/modify_sort
Remove the sort of project and endpoint name
2018-09-18 10:21:26 +08:00
Cheng
d2f1681943 Tooltip prompts 'repository read only'
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-17 15:52:57 +08:00
Cheng
61298e2673 Make the space between the button and the tab section consistent
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-17 15:27:08 +08:00
Cheng
34e66a709e Modify the tooltip to increase and display the full
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-17 10:54:30 +08:00
Cheng
9b8bc80012 fiexed by pr: #5472 Remove the sort of project and endpoint name
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-17 09:54:50 +08:00
Mia ZHOU
424f5f80a7
Merge pull request #5892 from pureshine/modify_button
Disable delete button when there is no group
2018-09-14 17:00:23 +08:00
Wenkai Yin
dfcd6f044d
Merge pull request #5888 from steven-zou/mark_labels_to_chart
Add API to support marking labels to charts
2018-09-14 15:09:46 +08:00
Cheng
b8f9b71d89 Disable delete button when there is no group
Signed-off-by: Cheng <1309173081@qq.com>
2018-09-14 13:36:22 +08:00
Steven Zou
7b8fe27c22 Add API to support marking labels to charts
- add related chart label API entries
- extract label related functionalities to a separate manager interface
- add a base controller for label related actions
- add related UT cases

Signed-off-by: Steven Zou <szou@vmware.com>
2018-09-14 13:27:50 +08:00
Wenkai Yin
89893779fb Support configuring sslmode for the connection of database (#5861)
The sslmode of the connection with postgresql is hardcoded as "disable" currently, this commit expose it as an environment variable so that users can configure it

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-09-14 13:05:05 +08:00
chengfangyuan
00c225f374 Make the replication dialog a little bit wider
Signed-off-by: chengfangyuan <1309173081@qq.com>
2018-09-14 10:07:39 +08:00
Qian Deng
8cdd2d29d9
Merge pull request #5862 from ninjadq/fix_rebot_case_for_angular6
Fix xpath in robot case
2018-09-11 10:20:08 +08:00
Qian Deng
dfeb1924c6 Fix xpath in robot case
1. Fix xpath of Upload button
2. Fix xpath of status span

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-10 17:24:28 +08:00
Qian Deng
7a8c1bfbac
Merge pull request #5854 from zhoumeina/fix_remove_static
remove static after angular 6 ugprade
2018-09-10 16:58:06 +08:00
Wenkai Yin
1f195c2b5f
Merge pull request #5840 from Colstuwjx/fix-tcp-probe
Fix `TestTCPConn` break issue.
2018-09-10 14:46:04 +08:00
Meina Zhou
232a8f390a remove static after angular 6 ugprade
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-10 14:39:09 +08:00
Qian Deng
ac6c9d79ba Remove nodeclarity
Remove the nodeclarity container related code and ui_builder parameter no longer needed when build clarity

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-08 20:33:21 +08:00
Qian Deng
8c26f78ae4 Fix tslint fail issues
Fix issues that cause tslint fail

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-08 14:58:50 +08:00
Qian Deng
0578d51437 Remove clarity logo
Replace favicon to harbor logo

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-07 17:37:05 +08:00
Qian Deng
aff8521c18 Add i18n to static assets
Add i18n files to static asset

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-07 16:13:37 +08:00
Qian Deng
9f90306600 Merge branch 'angular6' of https://github.com/vmware/harbor into angular6 2018-09-07 16:12:33 +08:00
Qian Deng
ba4762095f Update dockerfile of portal based on angular6 upgrade
1. Update entrypoint to reflect angular 6 upgrade

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-07 15:06:15 +08:00
Qian Deng
db8d7b9c1c Merge branch 'seprate_harbor_portal_from_harbor_core' into angular6 2018-09-07 14:56:16 +08:00
Qian Deng
d797c50438 Fix trivial issues about rename ui_ng to portal
Update ui_ng to portal

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-07 13:25:41 +08:00
Qian Deng
870653a5fb Update nginx config to redirect traffic to specific backend
1. Update nginx.conf file
2. Update photon makefile
3. Update global makefile

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-07 13:21:27 +08:00
Qian Deng
dc21f3f5e2 Add container for harbor-portal
1. Add dockerfile for building harbor-portal
2. change the name from ui_ng to harbor-portal

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-09-07 13:20:08 +08:00
Meina Zhou
94f967e054 remove ng-package and use angular command to build lib
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-07 11:30:01 +08:00
Meina Zhou
20b4386256 remove rxjs-compat in package
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-07 11:30:00 +08:00
Meina Zhou
5c174d5090 fix i18n does not show correctly
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-07 11:30:00 +08:00
Meina Zhou
806fbaa49c fix build fail for angular 6
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-07 11:30:00 +08:00
Meina Zhou
a330d4e116 upgrade to angular 6
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-07 11:30:00 +08:00
Daniel Jiang
cd31cbf892
Merge pull request #5828 from stonezdj/ldap_caseinsense
LDAP group DN should be case insensitively
2018-09-07 10:48:31 +08:00
Colstuwjx
e49a9de2f4 Fix TestTCPConn break issue.
Signed-off-by: Colstuwjx <Colstuwjx@gmail.com>
2018-09-06 14:58:04 +08:00
Meina Zhou
66d2d25d26 remove ng-package and use angular command to build lib
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-06 14:41:50 +08:00
stonezdj
9dca49ba6e LDAP group DN should be case insensitive
Fix issue #5776, LDAP servers are case insensitive. because only LDAP
group DN is used to compare/equal operation, lowercase all LDAP group DN
when retrieves it from LDAP server, and lowercase them before save in DB

Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-09-06 11:33:05 +08:00
Wenkai Yin
5427c0064c
Merge pull request #5731 from Colstuwjx/fix-log-test
Fix logger test case, add SetSkipLine func.
2018-09-06 08:17:17 +08:00
Colstuwjx
bab203c0f4 Fix logger test case.
Signed-off-by: Colstuwjx <Colstuwjx@gmail.com>
2018-09-05 19:25:17 +08:00
陈德
0582db9a82 Apply consistent format for comments
Signed-off-by: 陈德 <chende@caicloud.io>
2018-09-05 16:16:31 +08:00
Meina Zhou
0c1ba5a201 remove rxjs-compat in package
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-05 14:35:38 +08:00
Meina Zhou
6c8bd45f0b fix i18n does not show correctly
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-05 14:17:43 +08:00
Meina Zhou
4abf4e09ea fix build fail for angular 6
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-05 09:28:08 +08:00
Wenkai Yin
49bb5cfafb Test TCP connection before upgrading database schema
This commit moves the database schema upgrading after database initialization. The init will test TCP connection.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-09-05 02:07:47 +08:00
Wenkai Yin
b43024ccbf
Merge pull request #5829 from steven-zou/support_chart_search
Enhance the global search API to include chart searching result
2018-09-06 09:58:43 +08:00
Steven Zou
a9f2ff2c91 Enhance the global search API to include chart searching result
- add chart search interface method in utility handler
- update the search API handler
- update the search API UT case

Signed-off-by: Steven Zou <szou@vmware.com>
2018-09-05 20:13:27 +08:00
Meina Zhou
888fc21218 upgrade to angular 6
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-09-04 15:36:08 +08:00
陈德
6eb972c383 Add pull scope to post/put/patch method
Signed-off-by: 陈德 <chende@caicloud.io>
2018-09-03 11:12:11 +08:00
Daniel Jiang
22c53d9f34
Merge pull request #5761 from wy65701436/fix-4926
Extend configuration length to 1024 in DB
2018-08-31 14:50:12 +08:00
wang yan
f8b964d8cf Extend configuration length to 1024 in DB
Signed-off-by: wang yan <wangyan@vmware.com>
2018-08-31 13:42:24 +08:00
Steven Zou
7752595313
Merge pull request #5759 from steven-zou/support_delete_chart
Delete all the versions of the specified chart
2018-08-30 17:03:08 +08:00
Steven Zou
35603288e1
Merge pull request #5762 from steven-zou/enhance_js_webhook
Return more data of the job when reporting status info via webhook
2018-08-30 16:40:13 +08:00
Wenkai Yin
7564214946
Merge pull request #5767 from steven-zou/add_latest_version
Append latest version of the chart when returning the chart list
2018-08-30 16:37:44 +08:00
Steven Zou
34f19f437d Delete all the versions of the specified chart
- add API route
- add DELETE chart method in utility handler of chart controller
- add UT case for the newly added methods
- update swagger.yaml to refelct the new change

Signed-off-by: Steven Zou <szou@vmware.com>
2018-08-30 16:31:05 +08:00
Steven Zou
12c6f1ada3 Append latest version of the chart when returning the chart list
- append `LatestVersion` to the `ChartInfo` model
- update the UT case to check the `LatestVersion`

Signed-off-by: Steven Zou <szou@vmware.com>
2018-08-30 14:43:41 +08:00
Steven Zou
1636b138f2 Return more data of the job when reporting status info via webhook
- update the status report func `RedisJobStatsManager.reportStatus`
- update the UT case for the above change

Signed-off-by: Steven Zou <szou@vmware.com>
2018-08-30 14:28:12 +08:00
陈德
a59af8ce82 fix gofmt
Signed-off-by: 陈德 <chende@caicloud.io>
2018-08-30 14:11:18 +08:00