Commit Graph

377 Commits

Author SHA1 Message Date
Wenkai Yin
ff348be048 1. support policy deletion 2. bug fix: missing semicolon in js 2016-08-12 17:59:25 +08:00
Daniel Jiang
361f6bd393 Merge pull request #679 from ywk253100/master_d
bug fix: check whether project is nil befere reading its properties
2016-08-12 14:39:27 +08:00
Daniel Jiang
13b859f58b Merge pull request #673 from ywk253100/dev_ut
add UT for package utils
2016-08-12 14:38:42 +08:00
Daniel Jiang
71716ef06d fixes #658 2016-08-11 21:38:15 +08:00
Wenkai Yin
3d909bd0bd add UT for package utils 2016-08-11 17:58:17 +08:00
Wenkai Yin
98e399c8fe bug fix: check whether project is nil befere reading its properties 2016-08-11 14:11:45 +08:00
Tan Jiang
c683be1c64 merge with master 2016-08-10 15:34:23 +08:00
yhua
74702a0be7 add api testing framework 2016-08-10 14:34:56 +08:00
Wenkai Yin
5079a8d20c sys admin can not delete himself 2016-08-08 12:42:30 +08:00
Daniel Jiang
4fc9373fec Merge pull request #618 from ywk253100/security_check_on_jobservice
add security check on job service
2016-08-05 14:53:38 +08:00
Wenkai Yin
c4081f9aa3 add security check on job service
update
2016-08-05 13:00:24 +08:00
Tan Jiang
318d10186e Use AES to encrypt password for target 2016-08-04 11:35:52 +08:00
Tan Jiang
fa18ab3a75 merge with master 2016-08-03 17:15:00 +08:00
Wenkai Yin
cf953f74fe return more information when calling get mannifest API
Conflicts:
	api/repository.go
2016-08-02 10:53:53 +08:00
Wenkai Yin
3b827e36f5 support pagination for listing repositories, jobs and access logs
update
2016-08-01 17:54:12 +08:00
Wenkai Yin
82af69d9f6 fix #591 2016-07-31 20:21:19 +08:00
yhua
d746bfc9f2 add *_empty_test.go for actual go test coverage 2016-07-29 18:39:29 +08:00
Daniel Jiang
cf23b067a6 Merge pull request #565 from reasonerjt/master
handle DB error to return 409 when creating project
2016-07-19 15:14:08 +08:00
Tan Jiang
236a54f9bd handle DB error to return 409 when creating project 2016-07-19 13:35:39 +08:00
Wenkai Yin
befc22f3f7 fix #561 2016-07-18 20:37:52 +08:00
Wenkai Yin
3d558b54b4 close connection immediately when it is not used anymore 2016-07-14 18:15:24 +08:00
Wenkai Yin
5011e2de20 Merge pull request #534 from ywk253100/bug_fix
fix #520 #521 #522
2016-07-13 18:11:31 +08:00
Wenkai Yin
f685702475 do not trigger replication if the policy is disabled 2016-07-13 17:19:23 +08:00
Wenkai Yin
67a8c8631a fix #520 #521 #522 2016-07-13 15:51:57 +08:00
Wenkai Yin
37fc63aacc add parameter 'num' to list jobs 2016-07-06 14:12:16 +08:00
Wenkai Yin
2dab2137db add auth check as registry does not distinguish 401 and 403 2016-07-05 12:05:01 +08:00
Daniel Jiang
34a93348a7 Merge pull request #446 from ywk253100/insecure_env
pass insecure env to ui
2016-06-29 19:39:08 +08:00
Wenkai Yin
92193f3456 update 2016-06-29 18:52:24 +08:00
Daniel Jiang
fa7e3b4666 Merge pull request #445 from ywk253100/filter_job_by_time
filter jobs by time
2016-06-29 18:46:50 +08:00
Wenkai Yin
5f75156e1d pass golint 2016-06-29 18:20:53 +08:00
Wenkai Yin
d7f78502d7 pass govet 2016-06-29 18:14:50 +08:00
Wenkai Yin
f31d469758 pass insecure env to ui 2016-06-29 18:09:47 +08:00
Wenkai Yin
2f9ace7eeb update 2016-06-29 17:52:35 +08:00
Wenkai Yin
23b026655c handle repository deletion event in API 2016-06-29 17:10:17 +08:00
Wenkai Yin
60e15cc1fa filter jobs by time 2016-06-29 16:58:16 +08:00
Wenkai Yin
a2b6355fb5 audit deleting repository 2016-06-28 17:33:39 +08:00
Wenkai Yin
1c8cdb8a6b 1.order jobs by create time desc 2.open job log in browser 3.update start time of policy when the policy is enabled 4.do not push manifest if it already exists 2016-06-28 11:06:56 +08:00
Wenkai Yin
10adb7567f filter jobs by status 2016-06-27 16:24:04 +08:00
Wenkai Yin
1c2babda0a move ProjectSorter to package model to avoid package import cycle 2016-06-27 14:46:06 +08:00
wemeya
8af26bb951 add regular expression to check project name 2016-06-24 16:52:08 +08:00
wemeya
f037b23fb8 modify code for test 2016-06-23 18:15:58 +08:00
Wenkai Yin
61a888926e Merge remote-tracking branch 'upstream/new-ui-with-sync-image' into bug_fix_for_access_log
Conflicts:
	api/target.go
2016-06-23 11:17:09 +08:00
Daniel Jiang
9e8256c2d8 Merge pull request #393 from reasonerjt/job-service
propagate more env vars
2016-06-23 11:07:46 +08:00
Tan Jiang
26124d366f propagate more env vars 2016-06-22 18:41:56 +08:00
Wenkai Yin
2da237f8bb bug fix: fixed policy can not be updated 2016-06-22 18:11:47 +08:00
Wenkai Yin
b985c5bed4 1.only target of disabled policy can be modified 2.duplicated policy can not be created 2016-06-22 14:19:19 +08:00
Wenkai Yin
7862bd8033 insecure config 2016-06-22 12:03:50 +08:00
Wenkai Yin
c1a8846a68 1. modify registry client 2. add https support 2016-06-21 16:39:03 +08:00
Wenkai Yin
ba08c24369 bug fix: there's access log generated each time when view the manifest of a repository. 2016-06-20 22:55:36 +08:00
kunw
d9825763cf update for user settings and listing project role. 2016-06-17 15:22:58 +08:00
Wenkai Yin
dbc84dc99b pass golint 2016-06-17 11:44:40 +08:00
Wenkai Yin
7747e72c28 filter jobs by policy ID and repository 2016-06-17 11:34:52 +08:00
Daniel Jiang
dfa8fdb15e Merge pull request #348 from reasonerjt/job-service
add comment to source files
2016-06-16 15:03:53 +08:00
Tan Jiang
d909405c11 add header comment 2016-06-16 14:57:45 +08:00
Wenkai Yin
8939b54448 1. support updating the target of policy 2. can not delete a target if it is being used 2016-06-16 14:18:23 +08:00
Wenkai Yin
836598f5c9 remove useless import 2016-06-15 13:42:19 +08:00
Wenkai Yin
fc8fbbcb98 bug fix: modify the implements of checking whether project name is in lower case 2016-06-15 13:31:00 +08:00
Wenkai Yin
f050c963d5 Merge branch 'bug_fix_for_delete_repo' into sync_image
Conflicts:
	api/repository.go
2016-06-14 18:25:08 +08:00
Wenkai Yin
12a72c0f6c bug fix: deletion of repository which has been deleted should return 404 2016-06-14 18:17:32 +08:00
Wenkai Yin
db9347135c bug fix 2016-06-14 17:33:37 +08:00
Wenkai Yin
81600e8db4 bug fix 2016-06-14 11:14:48 +08:00
Wenkai Yin
14e71f0052 Merge branch 'master' into sync_image
Conflicts:
	.travis.yml
	models/accesslog.go
	models/project.go
	models/user.go
2016-06-13 18:14:41 +08:00
Wenkai Yin
8f56e9fc4a Merge pull request #330 from ywk253100/sync_image
add modify policy
2016-06-13 17:54:05 +08:00
Wenkai Yin
bc0aa21441 add modify policy 2016-06-13 17:32:22 +08:00
Wenkai Yin
32857a9154 Merge pull request #329 from ywk253100/sync_image
filter policies by name and project ID
2016-06-13 16:57:43 +08:00
Wenkai Yin
39edccf549 filter policies by name and project ID 2016-06-13 16:49:46 +08:00
Wenkai Yin
784947a787 Merge pull request #328 from ywk253100/sync_image
Sync image
2016-06-13 14:40:25 +08:00
Wenkai Yin
cf7ee9a327 update implements of FilterTargets() 2016-06-13 14:24:13 +08:00
Wenkai Yin
e5fe595f62 add test for FilterTargets() 2016-06-13 08:42:11 +08:00
Wenkai Yin
3bc41cc6d3 filter targets by name 2016-06-13 08:31:32 +08:00
wemeya
0147ec8d3b Merge remote-tracking branch 'upstream/job-service' into develop 2016-06-07 20:35:24 +08:00
wemeya
fbb26634a7 change code for travis ci 2016-06-06 23:47:27 +08:00
shixi_weimeng
8459fcf7dc change code for review 2016-06-06 23:07:17 +08:00
wemeya
411ead21fc change code for review 2016-06-06 17:53:36 +08:00
Wenkai Yin
4fbe18cb03 pass golint 2016-06-06 17:46:19 +08:00
Wenkai Yin
e8cad0f9f3 pass golint 2016-06-06 17:42:16 +08:00
Wenkai Yin
f4e6d048b2 add validation to create, update policies and targets 2016-06-06 17:31:47 +08:00
wemeya
15ee62485f Merge remote-tracking branch 'upstream/job-service' into develop 2016-06-06 16:35:59 +08:00
wemeya
e985a587c2 modify as travis CI required 2016-06-02 19:15:23 +08:00
wemeya
26d7f77532 modify as travis CI required 2016-06-02 19:10:53 +08:00
Wenkai Yin
10cf76a682 try to stop replication when a policy is disabled 2016-06-02 18:17:00 +08:00
wemeya
eb62beba31 modify merge conflicts 2016-06-02 17:57:39 +08:00
wemeya
389a6037d5 change code as the review reqired 2016-06-02 17:33:10 +08:00
root
d66a8f913e merge master 2016-06-02 13:41:52 +08:00
wemeya
267152f8e6 change code according to review 2016-06-01 19:29:08 +08:00
wemeya
ccbe297bba change code according to travis CI 2016-06-01 18:12:06 +08:00
wemeya
c972406d0f change code 2016-06-01 18:02:32 +08:00
wemeya
9b5cb57d2a change code according to travis CI 2016-06-01 17:57:33 +08:00
wemeya
af55312664 change code for review 2016-06-01 17:51:06 +08:00
wemeya
4d4ab9e408 Merge remote-tracking branch 'upstream/master' 2016-06-01 17:02:02 +08:00
wemeya
ffd58c0f2d add api to list top 10 repos 2016-06-01 17:01:43 +08:00
Daniel Jiang
03389abb96 Merge pull request #298 from reasonerjt/api-attributes
update attributes of api
2016-06-01 15:43:52 +08:00
Tan Jiang
bf86f1ff58 update attributes of api 2016-06-01 15:17:05 +08:00
Wenkai Yin
610566fe73 Merge branch 'master' into sync_image 2016-06-01 15:10:52 +08:00
Wenkai Yin
8c6ea744c2 modify test codes of registry client to pass test 2016-06-01 15:09:10 +08:00
Wenkai Yin
297e5c4a44 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-06-01 13:50:19 +08:00
Wenkai Yin
07c7ce403c bug fix: the length should be 0 when initialize a slice 2016-06-01 13:47:23 +08:00
Tan Jiang
bd223796b4 fix issue in travis 2016-06-01 13:28:02 +08:00
wemeya
498d2e629a change code according to review 2016-06-01 12:27:26 +08:00
wemeya
0aade05222 change code according to comment 2016-05-31 17:38:51 +08:00
wemeya
53edb50eef modify code to search logs only relevant to the user 2016-05-30 17:11:39 +08:00
Wenkai Yin
f0de98d9ad add comment 2016-05-30 15:39:51 +08:00
Wenkai Yin
2df9f97467 Merge pull request #282 from ywk253100/sync_image
support job deletion
2016-05-27 18:48:26 +08:00
Wenkai Yin
4f0e64c404 support job deletion 2016-05-27 18:46:07 +08:00
wemeya
e4bffb59da Merge remote-tracking branch 'upstream/master' 2016-05-27 17:32:54 +08:00
Tan Jiang
8817c24a27 Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-27 16:21:55 +08:00
Tan Jiang
9493b8c238 integrate jobservice into docker-compose template 2016-05-27 16:21:32 +08:00
Wenkai Yin
f76b45426c conflict fix 2016-05-27 15:15:57 +08:00
Wenkai Yin
1e09cf899b fix 2016-05-27 15:04:20 +08:00
Wenkai Yin
119dd50418 buf fix: create repository client with credential when basic auth is used 2016-05-27 12:18:12 +08:00
Wenkai Yin
cdac114955 support tag transfer and deletion 2016-05-27 10:45:21 +08:00
wemeya
4314c244e5 add instructions for new added api 2016-05-26 16:48:49 +08:00
Wenkai Yin
039d94c13d Merge branch 'master' into sync_image
Conflicts:
	api/repository.go
2016-05-26 14:12:26 +08:00
Wenkai Yin
6b2b6dedd8 support Get /api/projects/:id 2016-05-26 13:59:03 +08:00
Wenkai Yin
2a0571fc64 remove goto 2016-05-26 13:26:10 +08:00
Wenkai Yin
ce1bdb9212 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-25 16:52:11 +08:00
Tan Jiang
a2d2314708 add tags in db, and support tags in dao and job service api 2016-05-25 16:33:45 +08:00
Wenkai Yin
84cfafaeb0 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-25 15:41:11 +08:00
Tan Jiang
b80e727b7f Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-25 15:26:24 +08:00
Wenkai Yin
0b57345a4d 1.add API for getting logs of job 2.trigger replication by creating policy or enabling policy 3.trigger replication by webhook 2016-05-25 15:25:16 +08:00
Tan Jiang
86112c942b enable secret validation on UI and let job service use this secret to communicate with uI 2016-05-25 15:24:44 +08:00
wemeya
25a88f8e29 change code for user and logapi 2016-05-25 14:21:01 +08:00
Wenkai Yin
55bc9de505 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-24 15:03:44 +08:00
Wenkai Yin
de72efaba8 CRUD of target API 2016-05-24 14:59:36 +08:00
Tan Jiang
86e44363a7 Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-24 13:20:52 +08:00
Tan Jiang
6fcb532da3 Merge branch 'job-service' of https://github.com/vmware/harbor into job-service 2016-05-24 13:16:24 +08:00
Tan Jiang
b537225f16 /replicationJobs api will handle creating a job for a single repository 2016-05-24 13:15:27 +08:00
Tan Jiang
da6f7f8a8c store log in fs, provide api for getting log of a job 2016-05-23 19:39:13 +08:00
Tan Jiang
71b4dde8a9 Merge branch 'job-service' of https://github.com/vmware/harbor into job-service 2016-05-23 19:37:42 +08:00
Wenkai Yin
7449b3604c move target.go to api/ 2016-05-23 18:41:48 +08:00
Wenkai Yin
772280d4e3 add targets api 2016-05-23 16:48:55 +08:00
wemeya
27efcc133d modify code as travis ci required 2016-05-20 17:56:01 +08:00
wemeya
45136996eb modify code as travis ci required 2016-05-20 17:39:49 +08:00
wemeya
a6fd1a5050 modify code as travis ci required 2016-05-20 17:12:23 +08:00
wemeya
888604fb0d modify code as travis ci required 2016-05-20 17:03:50 +08:00
wemeya
7c74b16eef add api for listing recent logs and changing user profile 2016-05-20 16:56:12 +08:00
Wenkai Yin
0b30d04455 sort tags by name 2016-05-20 14:02:44 +08:00
Wenkai Yin
cc8a4cbdab Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-20 11:50:50 +08:00
Wenkai Yin
1919f19459 remove useless codes 2016-05-20 11:38:24 +08:00
Wenkai Yin
7920803735 handle project name is nil 2016-05-20 11:32:12 +08:00
Wenkai Yin
8c86e786c2 user can get public projects without login 2016-05-20 11:16:19 +08:00
Wenkai Yin
6cd1813b86 1. user can get repositories of public project without login 2. add basic auth support for repository API 3. system admin can CRUD members of all projects 2016-05-19 18:36:40 +08:00
Tan Jiang
fcd0de0ca0 Merge branch 'master' into job-service 2016-05-19 16:12:21 +08:00
Tan Jiang
4510bdb113 provide api to stop running jobs of a policy 2016-05-19 16:10:25 +08:00
Wenkai Yin
fa5dbeeaf5 add update method for replication target 2016-05-19 13:08:27 +08:00
wemeya
155f8dc1a8 modify error message 2016-05-18 15:07:54 +08:00
wemeya
3e1bf8c862 change code for statistics and project api 2016-05-18 14:36:20 +08:00
Tan Jiang
85ac6c762a api for getting jobs and policies 2016-05-17 18:49:02 +08:00
wemeya
313887967e change api for statistics and project 2016-05-17 17:03:40 +08:00
Tan Jiang
c45a3d205b Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-17 13:45:21 +08:00
Tan Jiang
f9b6b2f604 merge with master 2016-05-17 13:36:21 +08:00
Tan Jiang
bb3bebac13 dao methods for querying policy and jobs 2016-05-16 19:34:24 +08:00
wemeya
9017fe2b56 change code for statistics api and project detail api 2016-05-16 17:31:38 +08:00
wemeya
30f0081e3f Merge remote-tracking branch 'upstream/master' 2016-05-16 17:29:56 +08:00
Wenkai Yin
4641f2b89f add authtication to repository API 2016-05-16 14:39:57 +08:00
Tan Jiang
dd4c346826 refactor, associate statemachine to worker and reuse it 2016-05-13 21:43:17 +08:00
wemeya
d30fc97b3f modify code when project list length is 0 2016-05-13 16:39:22 +08:00
wemeya
c5b1b86d89 modify code where CI unpassed 2016-05-13 16:18:48 +08:00
wemeya
85ce86df1a change code of statistic api 2016-05-13 15:28:26 +08:00
wemeya
8c35e6ffa2 change code for statistic and project repo_count, role_id api 2016-05-13 22:45:30 +08:00
Daniel Jiang
d7c0bb66e2 Revert "introduce workerpool to handle jobs" 2016-05-13 14:49:12 +08:00
Tan Jiang
fd0d291931 Merge branch 'master' into job-service 2016-05-12 17:44:17 +08:00
wemeya
f43d6dab18 change api for statistics and project repo, roleid 2016-05-12 14:56:43 +08:00
wemeya
acb2d0252b change the comment of the function 2016-05-11 16:05:35 +08:00
wemeya
d4cc5090e4 Merge remote-tracking branch 'upstream/master' 2016-05-11 15:55:03 +08:00
wemeya
8502d3da1b change api for statistics 2016-05-11 15:54:26 +08:00
Daniel Jiang
5ae6d7d16c Merge pull request #195 from ywk253100/sysadmin_has_all_privileges_for_projects
Sysadmin has all privileges for projects
2016-05-11 12:28:11 +08:00
Daniel Jiang
5e12fd694d Merge pull request #201 from ywk253100/search_api_modification_for_admin
Search api modification for admin
2016-05-11 12:04:27 +08:00
Tan Jiang
2752213ed1 Merge branch 'master' into job-service 2016-05-10 19:45:24 +08:00
Tan Jiang
4541ed27f0 job service rework 2016-05-10 19:38:50 +08:00
wemeya
be6bf2ab22 add statistic api for projects and repos 2016-05-10 15:10:19 +08:00
xiahaoshawn
cb9b8a7f55 change password for admin user when in LDAP mode 2016-05-09 20:57:41 +08:00
Wenkai Yin
56ccfc024a search api modification for admin 2016-05-09 16:48:59 +08:00
Wenkai Yin
8c8bad8602 sysadmin has all privileges for projects 2016-05-09 12:45:45 +08:00
Tan Jiang
8fba0b314f Merge branch 'master' into job-service 2016-05-03 13:52:50 +08:00
Wenkai Yin
0a873bc046 Merge remote-tracking branch 'upstream/master' into registry_api_util_update
Conflicts:
	api/repository.go
2016-04-29 15:18:22 +08:00
hmwenchen
5e8a6a6d55 Merge remote-tracking branch 'origin/master' into feature/accesslog
Enlarge registry timeout
2016-04-27 20:38:04 +08:00
Wenkai Yin
994b4e290b registry v2 API util 2016-04-27 17:59:43 +08:00
hmwenchen
f5b15e9f22 Merge remote-tracking branch 'origin/master' into feature/accesslog 2016-04-26 20:06:47 +08:00
Tan Jiang
8d9d639cbf Merge branch 'master' into job-service 2016-04-25 17:53:41 +08:00
Wenkai Yin
5b32c4cfbb using medie type of distribution 2016-04-25 13:31:58 +08:00
wy65701436
9c655e710b Change to get uri from http request, and response with relative path of resource. 2016-04-24 21:10:15 -07:00
wy65701436
94422e9a71 add post return, add the URI to header location. 2016-04-22 02:57:39 -07:00
hmwenchen
dc96ded36a Merge with origin master 2016-04-22 09:18:51 +08:00
hmwenchen
ab6bb58c36 Add tag to accesslog 2016-04-22 00:28:59 +08:00
wy65701436
0bcb65f69a update changepassword to /api/users/:id/password 2016-04-20 22:27:47 -07:00
Tan Jiang
c7a7eb29a0 Merge remote-tracking branch 'upstream/job-service' into job-service 2016-04-20 14:33:12 +08:00
Tan Jiang
90d58c8774 prototype api for job management 2016-04-20 14:24:17 +08:00
Daniel Jiang
6779274b54 Merge pull request #113 from ywk253100/delete_image
API for deleting repository and tag
2016-04-19 13:58:24 +08:00
kunw
aef3d6cbef updates for create time localization of image detail and i18n of index title 2016-04-18 18:42:12 +08:00
Wenkai Yin
0b6e620f86 add credential interface 2016-04-18 18:24:08 +08:00
Wenkai Yin
4dc81927d3 remove useless code 2016-04-17 22:39:10 +08:00
Wenkai Yin
0cd7175a6b handler non-200 status code for standardAuthHandler 2016-04-15 17:01:59 +08:00
wy65701436
fc24341c17 update per comments, add support for basic auth 2016-04-15 01:55:33 -07:00
Wenkai Yin
85869f1b81 repo tag delete 2016-04-15 13:17:32 +08:00
wy65701436
7165156f2d update per comments, add support for basic auth 2016-04-14 21:33:48 -07:00
wy65701436
943d6ebd4c merge code with api/user; refactor api/users 2016-04-08 00:25:52 -07:00
wy65701436
b76acb6381 remove validate step as the duplication, and user model.User instead of new struct. 2016-04-05 20:26:24 -07:00
wy65701436
f54b942fd7 fix log issue 2016-04-05 02:45:47 -07:00
wy65701436
fb91857899 remove disabled import 2016-04-05 02:35:00 -07:00