Merge pull request 'Enable switch check in linter' (#4555) from thefox/reenable-switch-check into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4555
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>

.golangci.yml

@@ -43,7 +43,6 @@ linters-settings:
   gocritic:
     disabled-checks:
       - ifElseChain
-      - singleCaseSwitch # Every time this occurred in the code, there  was no other way.
   revive:
     severity: error
     rules:

models/db/convert.go

@@ -58,6 +58,7 @@ func Cell2Int64(val xorm.Cell) int64 {
 
 		v, _ := strconv.ParseInt(string((*val).([]uint8)), 10, 64)
 		return v
-	}
+	default:
 		return (*val).(int64)
 	}
+}

models/repo/repo_unit.go

@@ -235,8 +235,7 @@ func (cfg *ActionsConfig) ToDB() ([]byte, error) {
 
 // BeforeSet is invoked from XORM before setting the value of a field of this object.
 func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) {
-	switch colName {
-	case "type":
+	if colName == "type" {
 		switch unit.Type(db.Cell2Int64(val)) {
 		case unit.TypeExternalWiki:
 			r.Config = new(ExternalWikiConfig)

modules/actions/workflows.go

@@ -649,8 +649,7 @@ func matchReleaseEvent(payload *api.ReleasePayload, evt *jobparser.Event) bool {
 			// unpublished, created, deleted, prereleased, released
 
 			action := payload.Action
-			switch action {
-			case api.HookReleaseUpdated:
+			if action == api.HookReleaseUpdated {
 				action = "edited"
 			}
 			for _, val := range vals {
@@ -686,8 +685,7 @@ func matchPackageEvent(payload *api.PackagePayload, evt *jobparser.Event) bool {
 			// updated
 
 			action := payload.Action
-			switch action {
-			case api.HookPackageCreated:
+			if action == api.HookPackageCreated {
 				action = "published"
 			}
 			for _, val := range vals {

modules/actions/workflows_test.go

@@ -18,56 +18,65 @@ func TestDetectMatched(t *testing.T) {
 	testCases := []struct {
 		desc           string
 		commit         *git.Commit
-		triggedEvent webhook_module.HookEventType
+		triggeredEvent webhook_module.HookEventType
 		payload        api.Payloader
 		yamlOn         string
 		expected       bool
 	}{
 		{
 			desc:           "HookEventCreate(create) matches GithubEventCreate(create)",
-			triggedEvent: webhook_module.HookEventCreate,
+			triggeredEvent: webhook_module.HookEventCreate,
 			payload:        nil,
 			yamlOn:         "on: create",
 			expected:       true,
 		},
 		{
 			desc:           "HookEventIssues(issues) `opened` action matches GithubEventIssues(issues)",
-			triggedEvent: webhook_module.HookEventIssues,
+			triggeredEvent: webhook_module.HookEventIssues,
 			payload:        &api.IssuePayload{Action: api.HookIssueOpened},
 			yamlOn:         "on: issues",
 			expected:       true,
 		},
+		{
+			desc:           "HookEventIssueComment(issue_comment) `created` action matches GithubEventIssueComment(issue_comment)",
+			triggeredEvent: webhook_module.HookEventIssueComment,
+			payload:        &api.IssueCommentPayload{Action: api.HookIssueCommentCreated},
+			yamlOn:         "on:\n  issue_comment:\n    types: [created]",
+			expected:       true,
+		},
+
 		{
 			desc:           "HookEventIssues(issues) `milestoned` action matches GithubEventIssues(issues)",
-			triggedEvent: webhook_module.HookEventIssues,
+			triggeredEvent: webhook_module.HookEventIssues,
 			payload:        &api.IssuePayload{Action: api.HookIssueMilestoned},
 			yamlOn:         "on: issues",
 			expected:       true,
 		},
+
 		{
 			desc:           "HookEventPullRequestSync(pull_request_sync) matches GithubEventPullRequest(pull_request)",
-			triggedEvent: webhook_module.HookEventPullRequestSync,
+			triggeredEvent: webhook_module.HookEventPullRequestSync,
 			payload:        &api.PullRequestPayload{Action: api.HookIssueSynchronized},
 			yamlOn:         "on: pull_request",
 			expected:       true,
 		},
 		{
 			desc:           "HookEventPullRequest(pull_request) `label_updated` action doesn't match GithubEventPullRequest(pull_request) with no activity type",
-			triggedEvent: webhook_module.HookEventPullRequest,
+			triggeredEvent: webhook_module.HookEventPullRequest,
 			payload:        &api.PullRequestPayload{Action: api.HookIssueLabelUpdated},
 			yamlOn:         "on: pull_request",
 			expected:       false,
 		},
 		{
 			desc:           "HookEventPullRequest(pull_request) `closed` action doesn't match GithubEventPullRequest(pull_request) with no activity type",
-			triggedEvent: webhook_module.HookEventPullRequest,
+			triggeredEvent: webhook_module.HookEventPullRequest,
 			payload:        &api.PullRequestPayload{Action: api.HookIssueClosed},
 			yamlOn:         "on: pull_request",
 			expected:       false,
 		},
 		{
 			desc:           "HookEventPullRequest(pull_request) `closed` action doesn't match GithubEventPullRequest(pull_request) with branches",
-			triggedEvent: webhook_module.HookEventPullRequest,
+			triggeredEvent: webhook_module.HookEventPullRequest,
 			payload: &api.PullRequestPayload{
 				Action: api.HookIssueClosed,
 				PullRequest: &api.PullRequest{
@@ -79,56 +88,64 @@ func TestDetectMatched(t *testing.T) {
 		},
 		{
 			desc:           "HookEventPullRequest(pull_request) `label_updated` action matches GithubEventPullRequest(pull_request) with `label` activity type",
-			triggedEvent: webhook_module.HookEventPullRequest,
+			triggeredEvent: webhook_module.HookEventPullRequest,
 			payload:        &api.PullRequestPayload{Action: api.HookIssueLabelUpdated},
 			yamlOn:         "on:\n  pull_request:\n    types: [labeled]",
 			expected:       true,
 		},
 		{
 			desc:           "HookEventPullRequestReviewComment(pull_request_review_comment) matches GithubEventPullRequestReviewComment(pull_request_review_comment)",
-			triggedEvent: webhook_module.HookEventPullRequestReviewComment,
+			triggeredEvent: webhook_module.HookEventPullRequestReviewComment,
 			payload:        &api.PullRequestPayload{Action: api.HookIssueReviewed},
 			yamlOn:         "on:\n  pull_request_review_comment:\n    types: [created]",
 			expected:       true,
 		},
 		{
 			desc:           "HookEventPullRequestReviewRejected(pull_request_review_rejected) doesn't match GithubEventPullRequestReview(pull_request_review) with `dismissed` activity type (we don't support `dismissed` at present)",
-			triggedEvent: webhook_module.HookEventPullRequestReviewRejected,
+			triggeredEvent: webhook_module.HookEventPullRequestReviewRejected,
 			payload:        &api.PullRequestPayload{Action: api.HookIssueReviewed},
 			yamlOn:         "on:\n  pull_request_review:\n    types: [dismissed]",
 			expected:       false,
 		},
 		{
 			desc:           "HookEventRelease(release) `published` action matches GithubEventRelease(release) with `published` activity type",
-			triggedEvent: webhook_module.HookEventRelease,
+			triggeredEvent: webhook_module.HookEventRelease,
 			payload:        &api.ReleasePayload{Action: api.HookReleasePublished},
 			yamlOn:         "on:\n  release:\n    types: [published]",
 			expected:       true,
 		},
+		{
+			desc:           "HookEventRelease(updated) `updated` action matches GithubEventRelease(edited) with `edited` activity type",
+			triggeredEvent: webhook_module.HookEventRelease,
+			payload:        &api.ReleasePayload{Action: api.HookReleaseUpdated},
+			yamlOn:         "on:\n  release:\n    types: [edited]",
+			expected:       true,
+		},
+
 		{
 			desc:           "HookEventPackage(package) `created` action doesn't match GithubEventRegistryPackage(registry_package) with `updated` activity type",
-			triggedEvent: webhook_module.HookEventPackage,
+			triggeredEvent: webhook_module.HookEventPackage,
 			payload:        &api.PackagePayload{Action: api.HookPackageCreated},
 			yamlOn:         "on:\n  registry_package:\n    types: [updated]",
 			expected:       false,
 		},
 		{
 			desc:           "HookEventWiki(wiki) matches GithubEventGollum(gollum)",
-			triggedEvent: webhook_module.HookEventWiki,
+			triggeredEvent: webhook_module.HookEventWiki,
 			payload:        nil,
 			yamlOn:         "on: gollum",
 			expected:       true,
 		},
 		{
-			desc:         "HookEventSchedue(schedule) matches GithubEventSchedule(schedule)",
-			triggedEvent: webhook_module.HookEventSchedule,
+			desc:           "HookEventSchedule(schedule) matches GithubEventSchedule(schedule)",
+			triggeredEvent: webhook_module.HookEventSchedule,
 			payload:        nil,
 			yamlOn:         "on: schedule",
 			expected:       true,
 		},
 		{
 			desc:           "HookEventWorkflowDispatch(workflow_dispatch) matches GithubEventWorkflowDispatch(workflow_dispatch)",
-			triggedEvent: webhook_module.HookEventWorkflowDispatch,
+			triggeredEvent: webhook_module.HookEventWorkflowDispatch,
 			payload:        nil,
 			yamlOn:         "on: workflow_dispatch",
 			expected:       true,
@@ -140,7 +157,7 @@ func TestDetectMatched(t *testing.T) {
 			evts, err := GetEventsFromContent([]byte(tc.yamlOn))
 			require.NoError(t, err)
 			assert.Len(t, evts, 1)
-			assert.Equal(t, tc.expected, detectMatched(nil, tc.commit, tc.triggedEvent, tc.payload, evts[0]))
+			assert.Equal(t, tc.expected, detectMatched(nil, tc.commit, tc.triggeredEvent, tc.payload, evts[0]))
 		})
 	}
 }

modules/forgefed/forgefed.go

@@ -16,9 +16,10 @@ func GetItemByType(typ ap.ActivityVocabularyType) (ap.Item, error) {
 	switch typ {
 	case RepositoryType:
 		return RepositoryNew(""), nil
-	}
+	default:
 		return ap.GetItemByType(typ)
 	}
+}
 
 // JSONUnmarshalerFn is the function that will load the data from a fastjson.Value into an Item
 // that the go-ap/activitypub package doesn't know about.
@@ -28,9 +29,10 @@ func JSONUnmarshalerFn(typ ap.ActivityVocabularyType, val *fastjson.Value, i ap.
 		return OnRepository(i, func(r *Repository) error {
 			return JSONLoadRepository(val, r)
 		})
-	}
+	default:
 		return nil
 	}
+}
 
 // NotEmpty is the function that checks if an object is empty
 func NotEmpty(i ap.Item) bool {
@@ -44,6 +46,7 @@ func NotEmpty(i ap.Item) bool {
 			return false
 		}
 		return ap.NotEmpty(r.Actor)
-	}
+	default:
 		return ap.NotEmpty(i)
 	}
+}

modules/markup/markdown/callout/github.go

@@ -34,8 +34,7 @@ func (g *GitHubCalloutTransformer) Transform(node *ast.Document, reader text.Rea
 			return ast.WalkContinue, nil
 		}
 
-		switch v := n.(type) {
-		case *ast.Blockquote:
+		if v, ok := n.(*ast.Blockquote); ok {
 			if v.ChildCount() == 0 {
 				return ast.WalkContinue, nil
 			}

modules/markup/markdown/callout/github_legacy.go

@@ -23,8 +23,7 @@ func (g *GitHubLegacyCalloutTransformer) Transform(node *ast.Document, reader te
 			return ast.WalkContinue, nil
 		}
 
-		switch v := n.(type) {
-		case *ast.Blockquote:
+		if v, ok := n.(*ast.Blockquote); ok {
 			if v.ChildCount() == 0 {
 				return ast.WalkContinue, nil
 			}

modules/repository/license.go

@@ -98,8 +98,7 @@ func getLicensePlaceholder(name string) *licensePlaceholder {
 
 	// Some special placeholders for specific licenses.
 	// It's unsafe to apply them to all licenses.
-	switch name {
-	case "0BSD":
+	if name == "0BSD" {
 		return &licensePlaceholder{
 			Owner:     []string{"AUTHOR"},
 			Email:     []string{"EMAIL"},

modules/session/redis.go

@@ -122,8 +122,7 @@ func (p *RedisProvider) Init(maxlifetime int64, configs string) (err error) {
 	uri := nosql.ToRedisURI(configs)
 
 	for k, v := range uri.Query() {
-		switch k {
-		case "prefix":
+		if k == "prefix" {
 			p.prefix = v[0]
 		}
 	}

modules/structs/task.go

@@ -13,9 +13,10 @@ func (taskType TaskType) Name() string {
 	switch taskType {
 	case TaskTypeMigrateRepo:
 		return "Migrate Repository"
-	}
+	default:
 		return ""
 	}
+}
 
 // TaskStatus defines task status
 type TaskStatus int

routers/web/user/package.go

@@ -208,8 +208,7 @@ func ViewPackageVersion(ctx *context.Context) {
 		groups := make(container.Set[string])
 		for _, f := range pd.Files {
 			for _, pp := range f.Properties {
-				switch pp.Name {
-				case arch_model.PropertyDistribution:
+				if pp.Name == arch_model.PropertyDistribution {
 					groups.Add(pp.Value)
 				}
 			}

services/actions/workflows.go

@@ -83,13 +83,10 @@ func (entry *Workflow) Dispatch(ctx context.Context, inputGetter InputValueGette
 					}
 					continue
 				}
-			} else {
-				switch input.Type {
-				case "boolean":
+			} else if input.Type == "boolean" {
 				// Since "boolean" inputs are rendered as a checkbox in html, the value inside the form is "on"
 				val = strconv.FormatBool(val == "on")
 			}
-			}
 			inputs[key] = val
 		}
 	}

services/mailer/incoming/incoming_handler.go

@@ -181,7 +181,7 @@ func (h *UnsubscribeHandler) Handle(ctx context.Context, _ *MailContent, doer *u
 		}
 
 		return issues_model.CreateOrUpdateIssueWatch(ctx, doer.ID, issue.ID, false)
-	}
-
+	default:
 		return fmt.Errorf("unsupported unsubscribe reference: %v", ref)
 	}
+}

services/webhook/dingtalk.go

@@ -160,8 +160,7 @@ func (dc dingtalkConvertor) PullRequest(p *api.PullRequestPayload) (DingtalkPayl
 // Review implements PayloadConvertor Review method
 func (dc dingtalkConvertor) Review(p *api.PullRequestPayload, event webhook_module.HookEventType) (DingtalkPayload, error) {
 	var text, title string
-	switch p.Action {
-	case api.HookIssueReviewed:
+	if p.Action == api.HookIssueReviewed {
 		action, err := parseHookPullRequestEventType(event)
 		if err != nil {
 			return DingtalkPayload{}, err

services/webhook/discord.go

@@ -215,8 +215,7 @@ func (d discordConvertor) PullRequest(p *api.PullRequestPayload) (DiscordPayload
 func (d discordConvertor) Review(p *api.PullRequestPayload, event webhook_module.HookEventType) (DiscordPayload, error) {
 	var text, title string
 	var color int
-	switch p.Action {
-	case api.HookIssueReviewed:
+	if p.Action == api.HookIssueReviewed {
 		action, err := parseHookPullRequestEventType(event)
 		if err != nil {
 			return DiscordPayload{}, err

services/webhook/matrix.go

@@ -237,8 +237,7 @@ func (m matrixConvertor) Review(p *api.PullRequestPayload, event webhook_module.
 	repoLink := htmlLinkFormatter(p.Repository.HTMLURL, p.Repository.FullName)
 	var text string
 
-	switch p.Action {
-	case api.HookIssueReviewed:
+	if p.Action == api.HookIssueReviewed {
 		action, err := parseHookPullRequestEventType(event)
 		if err != nil {
 			return MatrixPayload{}, err

services/webhook/msteams.go

@@ -225,8 +225,7 @@ func (m msteamsConvertor) PullRequest(p *api.PullRequestPayload) (MSTeamsPayload
 func (m msteamsConvertor) Review(p *api.PullRequestPayload, event webhook_module.HookEventType) (MSTeamsPayload, error) {
 	var text, title string
 	var color int
-	switch p.Action {
-	case api.HookIssueReviewed:
+	if p.Action == api.HookIssueReviewed {
 		action, err := parseHookPullRequestEventType(event)
 		if err != nil {
 			return MSTeamsPayload{}, err

services/webhook/slack.go

@@ -289,8 +289,7 @@ func (s slackConvertor) Review(p *api.PullRequestPayload, event webhook_module.H
 	repoLink := SlackLinkFormatter(p.Repository.HTMLURL, p.Repository.FullName)
 	var text string
 
-	switch p.Action {
-	case api.HookIssueReviewed:
+	if p.Action == api.HookIssueReviewed {
 		action, err := parseHookPullRequestEventType(event)
 		if err != nil {
 			return SlackPayload{}, err

services/webhook/telegram.go

@@ -164,8 +164,7 @@ func (t telegramConvertor) PullRequest(p *api.PullRequestPayload) (TelegramPaylo
 // Review implements PayloadConvertor Review method
 func (t telegramConvertor) Review(p *api.PullRequestPayload, event webhook_module.HookEventType) (TelegramPayload, error) {
 	var text, attachmentText string
-	switch p.Action {
-	case api.HookIssueReviewed:
+	if p.Action == api.HookIssueReviewed {
 		action, err := parseHookPullRequestEventType(event)
 		if err != nil {
 			return TelegramPayload{}, err

services/webhook/wechatwork.go

@@ -154,8 +154,7 @@ func (wc wechatworkConvertor) PullRequest(p *api.PullRequestPayload) (Wechatwork
 // Review implements PayloadConvertor Review method
 func (wc wechatworkConvertor) Review(p *api.PullRequestPayload, event webhook_module.HookEventType) (WechatworkPayload, error) {
 	var text, title string
-	switch p.Action {
-	case api.HookIssueReviewed:
+	if p.Action == api.HookIssueReviewed {
 		action, err := parseHookPullRequestEventType(event)
 		if err != nil {
 			return WechatworkPayload{}, err