Skip to content

Commit b74a2d2

Browse files
muthukrishnan24muthukrishnan24
committed
refactor(config): Default returns new config
1 parent f0fffde commit b74a2d2

File tree

3 files changed

+143
-144
lines changed

3 files changed

+143
-144
lines changed

‎config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func LookupAndParse() (*lint.Config, error) {
9494
}
9595

9696
if confType == internal.DefaultConfig {
97-
return defConf, nil
97+
return Default(), nil
9898
}
9999

100100
conf, err := Parse(confFilePath)

‎config/default.go

Lines changed: 140 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -7,149 +7,146 @@ import (
77
"github.com/conventionalcommit/commitlint/rule"
88
)
99

10-
var defConf = &lint.Config{
11-
MinVersion: internal.Version(),
12-
13-
Formatter: (&formatter.DefaultFormatter{}).Name(),
14-
15-
Rules: defRuleConf,
16-
}
17-
18-
var defRuleConf = map[string]lint.RuleConfig{
19-
// Header Min Len Rule
20-
(&rule.HeadMinLenRule{}).Name(): {
21-
Enabled: true,
22-
Severity: lint.SeverityError,
23-
Argument: 10,
24-
},
25-
26-
// Header Max Len Rule
27-
(&rule.HeadMaxLenRule{}).Name(): {
28-
Enabled: true,
29-
Severity: lint.SeverityError,
30-
Argument: 50,
31-
},
32-
33-
// Body Max Line Rule
34-
(&rule.BodyMaxLineLenRule{}).Name(): {
35-
Enabled: true,
36-
Severity: lint.SeverityError,
37-
Argument: 72,
38-
},
39-
40-
// Footer Max Line Rule
41-
(&rule.FooterMaxLineLenRule{}).Name(): {
42-
Enabled: true,
43-
Severity: lint.SeverityError,
44-
Argument: 72,
45-
},
46-
47-
// Types Enum Rule
48-
(&rule.TypeEnumRule{}).Name(): {
49-
Enabled: true,
50-
Severity: lint.SeverityError,
51-
Argument: []interface{}{
52-
"feat", "fix", "docs", "style", "refactor", "perf",
53-
"test", "build", "ci", "chore", "revert", "merge",
54-
},
55-
},
56-
57-
// Scope Enum Rule
58-
(&rule.ScopeEnumRule{}).Name(): {
59-
Enabled: false,
60-
Severity: lint.SeverityError,
61-
Argument: []interface{}{},
62-
Flags: map[string]interface{}{
63-
"allow-empty": true,
64-
},
65-
},
66-
67-
// Body Min Len Rule
68-
(&rule.BodyMinLenRule{}).Name(): {
69-
Enabled: false,
70-
Severity: lint.SeverityError,
71-
Argument: 0,
72-
},
73-
74-
// Body Max Len Rule
75-
(&rule.BodyMaxLenRule{}).Name(): {
76-
Enabled: false,
77-
Severity: lint.SeverityError,
78-
Argument: -1,
79-
},
80-
81-
// Footer Min Len Rule
82-
(&rule.FooterMinLenRule{}).Name(): {
83-
Enabled: false,
84-
Severity: lint.SeverityError,
85-
Argument: 0,
86-
},
87-
88-
// Footer Max Len Rule
89-
(&rule.FooterMaxLenRule{}).Name(): {
90-
Enabled: false,
91-
Severity: lint.SeverityError,
92-
Argument: -1,
93-
},
94-
95-
// Type Min Len Rule
96-
(&rule.TypeMinLenRule{}).Name(): {
97-
Enabled: false,
98-
Severity: lint.SeverityError,
99-
Argument: 0,
100-
},
101-
102-
// Type Max Len Rule
103-
(&rule.TypeMaxLenRule{}).Name(): {
104-
Enabled: false,
105-
Severity: lint.SeverityError,
106-
Argument: -1,
107-
},
108-
109-
// Scope Min Len Rule
110-
(&rule.ScopeMinLenRule{}).Name(): {
111-
Enabled: false,
112-
Severity: lint.SeverityError,
113-
Argument: 0,
114-
},
115-
116-
// Scope Max Len Rule
117-
(&rule.ScopeMaxLenRule{}).Name(): {
118-
Enabled: false,
119-
Severity: lint.SeverityError,
120-
Argument: -1,
121-
},
122-
123-
// Description Min Len Rule
124-
(&rule.DescriptionMinLenRule{}).Name(): {
125-
Enabled: false,
126-
Severity: lint.SeverityError,
127-
Argument: 0,
128-
},
129-
130-
// Description Max Len Rule
131-
(&rule.DescriptionMaxLenRule{}).Name(): {
132-
Enabled: false,
133-
Severity: lint.SeverityError,
134-
Argument: -1,
135-
},
136-
137-
// Type Charset Rule
138-
(&rule.TypeCharsetRule{}).Name(): {
139-
Enabled: false,
140-
Severity: lint.SeverityError,
141-
Argument: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
142-
},
143-
144-
// Scope Charset Rule
145-
(&rule.ScopeCharsetRule{}).Name(): {
146-
Enabled: false,
147-
Severity: lint.SeverityError,
148-
Argument: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/,",
149-
},
150-
}
151-
15210
// Default returns default config
15311
func Default() *lint.Config {
154-
return defConf
12+
def := &lint.Config{
13+
MinVersion: internal.Version(),
14+
15+
Formatter: (&formatter.DefaultFormatter{}).Name(),
16+
17+
Rules: map[string]lint.RuleConfig{
18+
// Header Min Len Rule
19+
(&rule.HeadMinLenRule{}).Name(): {
20+
Enabled: true,
21+
Severity: lint.SeverityError,
22+
Argument: 10,
23+
},
24+
25+
// Header Max Len Rule
26+
(&rule.HeadMaxLenRule{}).Name(): {
27+
Enabled: true,
28+
Severity: lint.SeverityError,
29+
Argument: 50,
30+
},
31+
32+
// Body Max Line Rule
33+
(&rule.BodyMaxLineLenRule{}).Name(): {
34+
Enabled: true,
35+
Severity: lint.SeverityError,
36+
Argument: 72,
37+
},
38+
39+
// Footer Max Line Rule
40+
(&rule.FooterMaxLineLenRule{}).Name(): {
41+
Enabled: true,
42+
Severity: lint.SeverityError,
43+
Argument: 72,
44+
},
45+
46+
// Types Enum Rule
47+
(&rule.TypeEnumRule{}).Name(): {
48+
Enabled: true,
49+
Severity: lint.SeverityError,
50+
Argument: []interface{}{
51+
"feat", "fix", "docs", "style", "refactor", "perf",
52+
"test", "build", "ci", "chore", "revert", "merge",
53+
},
54+
},
55+
56+
// Scope Enum Rule
57+
(&rule.ScopeEnumRule{}).Name(): {
58+
Enabled: false,
59+
Severity: lint.SeverityError,
60+
Argument: []interface{}{},
61+
Flags: map[string]interface{}{
62+
"allow-empty": true,
63+
},
64+
},
65+
66+
// Body Min Len Rule
67+
(&rule.BodyMinLenRule{}).Name(): {
68+
Enabled: false,
69+
Severity: lint.SeverityError,
70+
Argument: 0,
71+
},
72+
73+
// Body Max Len Rule
74+
(&rule.BodyMaxLenRule{}).Name(): {
75+
Enabled: false,
76+
Severity: lint.SeverityError,
77+
Argument: -1,
78+
},
79+
80+
// Footer Min Len Rule
81+
(&rule.FooterMinLenRule{}).Name(): {
82+
Enabled: false,
83+
Severity: lint.SeverityError,
84+
Argument: 0,
85+
},
86+
87+
// Footer Max Len Rule
88+
(&rule.FooterMaxLenRule{}).Name(): {
89+
Enabled: false,
90+
Severity: lint.SeverityError,
91+
Argument: -1,
92+
},
93+
94+
// Type Min Len Rule
95+
(&rule.TypeMinLenRule{}).Name(): {
96+
Enabled: false,
97+
Severity: lint.SeverityError,
98+
Argument: 0,
99+
},
100+
101+
// Type Max Len Rule
102+
(&rule.TypeMaxLenRule{}).Name(): {
103+
Enabled: false,
104+
Severity: lint.SeverityError,
105+
Argument: -1,
106+
},
107+
108+
// Scope Min Len Rule
109+
(&rule.ScopeMinLenRule{}).Name(): {
110+
Enabled: false,
111+
Severity: lint.SeverityError,
112+
Argument: 0,
113+
},
114+
115+
// Scope Max Len Rule
116+
(&rule.ScopeMaxLenRule{}).Name(): {
117+
Enabled: false,
118+
Severity: lint.SeverityError,
119+
Argument: -1,
120+
},
121+
122+
// Description Min Len Rule
123+
(&rule.DescriptionMinLenRule{}).Name(): {
124+
Enabled: false,
125+
Severity: lint.SeverityError,
126+
Argument: 0,
127+
},
128+
129+
// Description Max Len Rule
130+
(&rule.DescriptionMaxLenRule{}).Name(): {
131+
Enabled: false,
132+
Severity: lint.SeverityError,
133+
Argument: -1,
134+
},
135+
136+
// Type Charset Rule
137+
(&rule.TypeCharsetRule{}).Name(): {
138+
Enabled: false,
139+
Severity: lint.SeverityError,
140+
Argument: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
141+
},
142+
143+
// Scope Charset Rule
144+
(&rule.ScopeCharsetRule{}).Name(): {
145+
Enabled: false,
146+
Severity: lint.SeverityError,
147+
Argument: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/,",
148+
},
149+
},
150+
}
151+
return def
155152
}

‎config/default_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
)
88

99
func TestDefaultLint(t *testing.T) {
10+
defConf := Default()
1011
_, err := NewLinter(defConf)
1112
if err != nil {
1213
t.Error("default lint creation failed", err)
@@ -15,6 +16,7 @@ func TestDefaultLint(t *testing.T) {
1516
}
1617

1718
func TestDefaultConf(t *testing.T) {
19+
defConf := Default()
1820
rules := registry.Rules()
1921
if len(rules) != len(defConf.Rules) {
2022
t.Error("default conf does not have all rules", len(rules), len(defConf.Rules))

0 commit comments

Comments
 (0)