Normalize forge statuses (#121)

* Normalize forge statuses

* Address review feedback on status normalization

* test: add bitbucket issue and access level cases

Author: abhinavgautam01

bitbucket/helpers_test.go

@@ -2,9 +2,9 @@ package bitbucket
 
 import "testing"
 
-func assertEqual(t *testing.T, field, want, got string) {
+func assertEqual[T ~string](t *testing.T, field, want string, got T) {
 	t.Helper()
-	if want != got {
+	if want != string(got) {
 		t.Errorf("%s: want %q, got %q", field, want, got)
 	}
 }

bitbucket/issues.go

@@ -107,13 +107,7 @@ func convertBitbucketIssue(bb bbIssue) forge.Issue {
 		HTMLURL: bb.Links.HTML.Href,
 	}
 
-	// Normalize Bitbucket states to open/closed
-	switch bb.State {
-	case "new", stateOpen:
-		result.State = stateOpen
-	default:
-		result.State = stateClosed
-	}
+	result.State = forge.NormalizeIssueState(bb.State)
 
 	if bb.Reporter != nil {
 		result.Author = forge.User{

bitbucket/prs.go

@@ -123,14 +123,9 @@ func convertBitbucketPR(bb bbPullRequest) forge.PullRequest {
 		}
 	}
 
-	switch bb.State {
-	case "OPEN":
-		result.State = "open"
-	case "MERGED":
-		result.State = "merged"
+	result.State = forge.NormalizePRStatus(bb.State)
+	if result.State == forge.PRStatusMerged {
 		result.Merged = true
-	default:
-		result.State = "closed"
 	}
 
 	if bb.Author != nil {

gitea/ci.go

@@ -23,7 +23,7 @@ func convertGiteaWorkflowRun(r *gitea.ActionWorkflowRun) forge.CIRun {
 	result := forge.CIRun{
 		ID:        r.ID,
 		Title:     r.DisplayTitle,
-		Status:    r.Status,
+		Status:    forge.NormalizeCIStatus(r.Status),
 		Branch:    r.HeadBranch,
 		SHA:       r.HeadSha,
 		Event:     r.Event,
@@ -32,7 +32,7 @@ func convertGiteaWorkflowRun(r *gitea.ActionWorkflowRun) forge.CIRun {
 	}
 
 	if r.Conclusion != "" {
-		result.Conclusion = r.Conclusion
+		result.Conclusion = forge.NormalizeCIConclusion(r.Conclusion)
 	}
 
 	if r.Actor != nil {
@@ -54,8 +54,8 @@ func convertGiteaWorkflowJob(j *gitea.ActionWorkflowJob) forge.CIJob {
 	job := forge.CIJob{
 		ID:         j.ID,
 		Name:       j.Name,
-		Status:     j.Status,
-		Conclusion: j.Conclusion,
+		Status:     forge.NormalizeCIStatus(j.Status),
+		Conclusion: forge.NormalizeCIConclusion(j.Conclusion),
 		HTMLURL:    j.HTMLURL,
 	}
 	if !j.StartedAt.IsZero() {

gitea/collaborators.go

@@ -41,7 +41,7 @@ func (s *giteaCollaboratorService) List(ctx context.Context, owner, repo string,
 			}
 			all = append(all, forge.Collaborator{
 				Login:      u.UserName,
-				Permission: perm,
+				Permission: forge.NormalizeAccessLevel(perm),
 			})
 		}
 		if lastPage(resp, len(users), perPage) || (opts.Limit > 0 && len(all) >= opts.Limit) {
@@ -78,7 +78,7 @@ func (s *giteaCollaboratorService) getPermission(owner, repo, username string) (
 func (s *giteaCollaboratorService) Add(ctx context.Context, owner, repo, username string, opts forge.AddCollaboratorOpts) error {
 	var perm *gitea.AccessMode
 	if opts.Permission != "" {
-		mode := gitea.AccessMode(opts.Permission)
+		mode := gitea.AccessMode(giteaPermission(opts.Permission))
 		perm = &mode
 	}
 
@@ -94,6 +94,19 @@ func (s *giteaCollaboratorService) Add(ctx context.Context, owner, repo, usernam
 	return nil
 }
 
+func giteaPermission(permission forge.AccessLevel) string {
+	switch forge.NormalizeAccessLevel(string(permission)) {
+	case forge.AccessLevelRead:
+		return "read"
+	case forge.AccessLevelWrite:
+		return "write"
+	case forge.AccessLevelAdmin:
+		return "admin"
+	default:
+		return string(permission)
+	}
+}
+
 func (s *giteaCollaboratorService) Remove(ctx context.Context, owner, repo, username string) error {
 	resp, err := s.client.DeleteCollaborator(owner, repo, username)
 	if err != nil {

gitea/commit_statuses.go

@@ -57,7 +57,7 @@ func (s *giteaCommitStatusService) List(ctx context.Context, owner, repo, sha st
 		}
 		for _, st := range statuses {
 			cs := forge.CommitStatus{
-				State:       string(st.State),
+				State:       forge.NormalizeCommitStatusState(string(st.State)),
 				Context:     st.Context,
 				Description: st.Description,
 				TargetURL:   st.TargetURL,
@@ -78,7 +78,7 @@ func (s *giteaCommitStatusService) List(ctx context.Context, owner, repo, sha st
 
 func (s *giteaCommitStatusService) Set(ctx context.Context, owner, repo, sha string, opts forge.SetCommitStatusOpts) (*forge.CommitStatus, error) {
 	result, resp, err := s.client.CreateStatus(owner, repo, sha, gitea.CreateStatusOption{
-		State:       gitea.StatusState(opts.State),
+		State:       gitea.StatusState(string(opts.State)),
 		TargetURL:   opts.TargetURL,
 		Description: opts.Description,
 		Context:     opts.Context,
@@ -91,7 +91,7 @@ func (s *giteaCommitStatusService) Set(ctx context.Context, owner, repo, sha str
 	}
 
 	cs := &forge.CommitStatus{
-		State:       string(result.State),
+		State:       forge.NormalizeCommitStatusState(string(result.State)),
 		Context:     result.Context,
 		Description: result.Description,
 		TargetURL:   result.TargetURL,

gitea/helpers_test.go

@@ -2,9 +2,9 @@ package gitea
 
 import "testing"
 
-func assertEqual(t *testing.T, field, want, got string) {
+func assertEqual[T ~string](t *testing.T, field, want string, got T) {
 	t.Helper()
-	if want != got {
+	if want != string(got) {
 		t.Errorf("%s: want %q, got %q", field, want, got)
 	}
 }

gitea/issues.go

@@ -26,14 +26,7 @@ func convertGiteaIssue(i *gitea.Issue) forge.Issue {
 		HTMLURL: i.HTMLURL,
 	}
 
-	switch i.State {
-	case gitea.StateOpen:
-		result.State = stateOpen
-	case gitea.StateClosed:
-		result.State = stateClosed
-	default:
-		result.State = string(i.State)
-	}
+	result.State = forge.NormalizeIssueState(string(i.State))
 
 	if i.Poster != nil {
 		result.Author = forge.User{

gitea/prs.go

@@ -41,11 +41,11 @@ func convertGiteaPR(pr *gitea.PullRequest) forge.PullRequest {
 
 	switch {
 	case pr.HasMerged:
-		result.State = "merged"
+		result.State = forge.PRStatusMerged
 	case pr.State == gitea.StateClosed:
-		result.State = stateClosed
+		result.State = forge.PRStatusClosed
 	default:
-		result.State = stateOpen
+		result.State = forge.PRStatusOpen
 	}
 
 	var baseRepoID int64

github/ci.go

@@ -23,15 +23,15 @@ func convertGitHubWorkflowRun(r *github.WorkflowRun) forge.CIRun {
 	result := forge.CIRun{
 		ID:      r.GetID(),
 		Title:   r.GetName(),
-		Status:  r.GetStatus(),
+		Status:  forge.NormalizeCIStatus(r.GetStatus()),
 		Branch:  r.GetHeadBranch(),
 		SHA:     r.GetHeadSHA(),
 		Event:   r.GetEvent(),
 		HTMLURL: r.GetHTMLURL(),
 	}
 
 	if c := r.GetConclusion(); c != "" {
-		result.Conclusion = c
+		result.Conclusion = forge.NormalizeCIConclusion(c)
 	}
 
 	if a := r.GetActor(); a != nil {
@@ -124,8 +124,8 @@ func (s *gitHubCIService) GetRun(ctx context.Context, owner, repo string, runID
 			job := forge.CIJob{
 				ID:         j.GetID(),
 				Name:       j.GetName(),
-				Status:     j.GetStatus(),
-				Conclusion: j.GetConclusion(),
+				Status:     forge.NormalizeCIStatus(j.GetStatus()),
+				Conclusion: forge.NormalizeCIConclusion(j.GetConclusion()),
 				HTMLURL:    j.GetHTMLURL(),
 			}
 			if t := j.GetStartedAt(); !t.IsZero() {