Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-18 12:51:27 +01:00
Code Issues Projects Releases Wiki Activity

fix robot cannot update expirsat (#13944)

Browse Source 
Signed-off-by: Wang Yan <wangyan@vmware.com>
This commit is contained in:
Wang Yan 2021-01-11 11:26:05 +08:00 committed by GitHub
parent 5bff3e94a0
commit 64e61c0d11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/controller/robot/controller.go
View File

@ -136,7 +136,7 @@ func (d *controller) Update(ctx context.Context, r *Robot, option *Option) error
if r == nil { if r == nil {
return errors.New("cannot update a nil robot").WithCode(errors.BadRequestCode) return errors.New("cannot update a nil robot").WithCode(errors.BadRequestCode)
} }
if err := d.robotMgr.Update(ctx, &r.Robot, "secret", "description", "disabled", "duration"); err != nil { if err := d.robotMgr.Update(ctx, &r.Robot, "secret", "description", "disabled", "duration", "expiresat"); err != nil {
return err return err
} }
// update the permission // update the permission

2
src/controller/robot/controller_test.go
View File

@ -162,7 +162,7 @@ func (suite *ControllerTestSuite) TestUpdate() {
} }
config.InitWithSettings(conf) config.InitWithSettings(conf)
robotMgr.On("Update", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil) robotMgr.On("Update", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
projectMgr.On("Get", mock.Anything, mock.Anything).Return(&models.Project{ProjectID: 1, Name: "library"}, nil) projectMgr.On("Get", mock.Anything, mock.Anything).Return(&models.Project{ProjectID: 1, Name: "library"}, nil)
rbacMgr.On("DeletePermissionsByRole", mock.Anything, mock.Anything, mock.Anything).Return(nil) rbacMgr.On("DeletePermissionsByRole", mock.Anything, mock.Anything, mock.Anything).Return(nil)