BUG/MEDIUM: disallow unprocessed tags, apply only one definition per set

Author: aiharos

check-commit/check.go

@@ -163,6 +163,7 @@ func (c CommitPolicyConfig) CheckSubject(rawSubject []byte) error {
 			if c.CheckPatchTypes(tag, severity, pType) { // we found what we were looking for, so consume input
 				rawSubject = rawSubject[submatch[1]:]
 				tagOK = tagOK || true
+				break
 			}
 		}
 
@@ -171,6 +172,11 @@ func (c CommitPolicyConfig) CheckSubject(rawSubject []byte) error {
 		}
 	}
 
+	submatch := r.FindSubmatchIndex(rawSubject)
+	if len(submatch) != 0 { // no match
+		return fmt.Errorf("detected unprocessed tags, %w", ErrTagScope)
+	}
+
 	return checkSubjectText(string(rawSubject))
 }
 

check-commit/check_test.go

@@ -17,38 +17,43 @@ func TestCheckSubject(t *testing.T) {
 		wantErr bool
 	}{
 		{
-			name:    "valid type/severity",
+			name:    "valid type and severity",
 			args:    args{subject: "BUG/MEDIUM: config: add default location of path to the configuration file"},
 			wantErr: false,
 		},
 		{
-			name:    "bug-fail",
+			name:    "short subject",
 			args:    args{subject: "BUG/MEDIUM: config: default"},
 			wantErr: true,
 		},
 		{
 			name:    "missing severity",
-			args:    args{subject: "BUG/: config: default"},
+			args:    args{subject: "BUG/: config: default implementation"},
 			wantErr: true,
 		},
 		{
 			name:    "wrong tag",
-			args:    args{subject: "WRONG: config: default"},
+			args:    args{subject: "WRONG: config: default implementation"},
 			wantErr: true,
 		},
 		{
 			name:    "wrong severity",
-			args:    args{subject: "BUG/WRONG: config: default"},
+			args:    args{subject: "BUG/WRONG: config: default implementation"},
 			wantErr: true,
 		},
 		{
 			name:    "double spaces",
-			args:    args{subject: "BUG/MEDIUM: config:  default"},
+			args:    args{subject: "BUG/MEDIUM: config:  default implementation"},
 			wantErr: true,
 		},
 		{
 			name:    "trailing spaces",
-			args:    args{subject: "BUG/MEDIUM: config: default "},
+			args:    args{subject: "BUG/MEDIUM: config: default implementation "},
+			wantErr: true,
+		},
+		{
+			name:    "unprocessed tags remain",
+			args:    args{subject: "BUG/MINOR: MAJOR: config: default implementation"},
 			wantErr: true,
 		},
 	}