Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-24 19:25:19 +01:00
Code Issues Projects Releases Wiki Activity

Avoid to create duplicated immutable tag rules in the same project

Browse Source 
Fix #9681, add constraint on immutable_tag_rule and catch the error

Signed-off-by: stonezdj <stonezdj@gmail.com>
This commit is contained in:
stonezdj 2019-11-14 15:23:21 +08:00
parent 2a4ade4aca
commit 15898f2069
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
make/migrations/postgresql/0015_1.10.0_schema.up.sql
View File

@ -44,7 +44,8 @@ CREATE TABLE immutable_tag_rule
project_id int NOT NULL,
tag_filter text,
disabled BOOLEAN NOT NULL DEFAULT FALSE,
creation_time timestamp default CURRENT_TIMESTAMP
creation_time timestamp default CURRENT_TIMESTAMP,
UNIQUE(project_id, tag_filter)
);
ALTER TABLE robot ADD COLUMN visible boolean DEFAULT true NOT NULL;

4
src/core/api/immutabletagrule.go
View File

@ -92,6 +92,10 @@ func (itr *ImmutableTagRuleAPI) Post() {
}
ir.ProjectID = itr.projectID
id, err := itr.ctr.CreateImmutableRule(ir)
if err != nil && strings.Contains(err.Error(), "duplicate key") {
itr.RenderError(http.StatusConflict, "immutable tag rule duplicated")
return
}
if err != nil {
itr.SendInternalServerError(err)
return

4
src/core/api/immutabletagrule_test.go
View File

@ -152,7 +152,7 @@ func TestImmutableTagRuleAPI_Post(t *testing.T) {
},
code: http.StatusCreated,
},
// 201
// 409
{
request: &testingRequest{
method: http.MethodPost,
@ -160,7 +160,7 @@ func TestImmutableTagRuleAPI_Post(t *testing.T) {
credential: projAdmin,
bodyJSON: metadata,
},
code: http.StatusCreated,
code: http.StatusConflict,
},
// 403
{

2
src/pkg/immutabletag/controller_test.go
View File

@ -150,7 +150,7 @@ func (s *ControllerTestSuite) TestImmutableRule() {
s.ruleID, err = s.ctr.CreateImmutableRule(rule2)
s.require.Nil(err)
rules, err := s.ctr.ListImmutableRules(1)
rules, err := s.ctr.ListImmutableRules(projectID)
s.require.Nil(err)
s.require.Equal(2, len(rules))

11
src/pkg/immutabletag/dao/immutable_test.go
View File

@ -1,12 +1,14 @@
package dao
import (
"strings"
"testing"
"github.com/goharbor/harbor/src/common/dao"
"github.com/goharbor/harbor/src/pkg/immutabletag/dao/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"testing"
)
type immutableRuleDaoTestSuite struct {
@ -29,6 +31,13 @@ func (t *immutableRuleDaoTestSuite) TestCreateImmutableRule() {
id, err := t.dao.CreateImmutableRule(ir)
t.require.Nil(err)
t.require.True(id > 0, "Can not create immutable tag rule")
// insert duplicate rows
ir2 := &model.ImmutableRule{TagFilter: "**", ProjectID: 1}
id2, err := t.dao.CreateImmutableRule(ir2)
t.require.True(strings.Contains(err.Error(), "duplicate key"))
t.require.Equal(int64(0), id2)
_, err = t.dao.DeleteImmutableRule(id)
t.require.Nil(err)
}