git-workflow/autogits
SHA256
19
0
Fork 8
Code Issues 44 Pull Requests 6 Projects 2 Activity

rename interfaces

Browse Source
This commit is contained in:
Adam Majer
2025-02-06 19:18:09 +01:00
parent 2cd7307291
commit a84d55c858
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bots-common/gitea_utils.go
View File

@@ -60,7 +60,7 @@ const (
ReviewStateUnknown models.ReviewStateType = "" ReviewStateUnknown models.ReviewStateType = ""
) )
type GiteaMaintainershipInterface interface { type GiteaMaintainershipReader interface {
FetchMaintainershipFile(org, prjGit, branch string) ([]byte, error) FetchMaintainershipFile(org, prjGit, branch string) ([]byte, error)
FetchMaintainershipDirFile(org, prjGit, branch, pkg string) ([]byte, error) FetchMaintainershipDirFile(org, prjGit, branch, pkg string) ([]byte, error)
} }
@@ -73,6 +73,11 @@ type GiteaReviewFetcher interface {
GetPullRequestReviews(org, project string, PRnum int64) ([]*models.PullReview, error) GetPullRequestReviews(org, project string, PRnum int64) ([]*models.PullReview, error)
} }
type GiteaPRChecker interface {
GiteaReviewFetcher
GiteaMaintainershipReader
}
type GiteaReviewRequester interface { type GiteaReviewRequester interface {
RequestReviews(pr *models.PullRequest, reviewer string) ([]*models.PullReview, error) RequestReviews(pr *models.PullRequest, reviewer string) ([]*models.PullReview, error)
} }
@@ -98,7 +103,7 @@ type Gitea interface {
GetRecentPullRequests(org, repo string) ([]*models.PullRequest, error) GetRecentPullRequests(org, repo string) ([]*models.PullRequest, error)
GetRecentCommits(org, repo, branch string, commitNo int64) ([]*models.Commit, error) GetRecentCommits(org, repo, branch string, commitNo int64) ([]*models.Commit, error)
GiteaMaintainershipInterface GiteaMaintainershipReader
} }
type GiteaTransport struct { type GiteaTransport struct {

2
workflow-pr/maintainership.go
View File

@@ -33,7 +33,7 @@ func parseMaintainershipData(data []byte) (*MaintainershipMap, error) {
return maintainers, nil return maintainers, nil
} }
func FetchProjectMaintainershipData(gitea common.GiteaMaintainershipInterface, org, prjGit, branch string) (*MaintainershipMap, error) { func FetchProjectMaintainershipData(gitea common.GiteaMaintainershipReader, org, prjGit, branch string) (*MaintainershipMap, error) {
data, err := gitea.FetchMaintainershipDirFile(org, prjGit, branch, ProjectFileKey) data, err := gitea.FetchMaintainershipDirFile(org, prjGit, branch, ProjectFileKey)
dir := true dir := true
if err != nil || data == nil { if err != nil || data == nil {

6
workflow-pr/maintainership_test.go
View File

@@ -120,7 +120,7 @@ func TestMaintainership(t *testing.T) {
notFoundError := errors.New("not found") notFoundError := errors.New("not found")
for _, test := range packageTests { for _, test := range packageTests {
runTests := func(t *testing.T, mi common.GiteaMaintainershipInterface) { runTests := func(t *testing.T, mi common.GiteaMaintainershipReader) {
maintainers, err := FetchProjectMaintainershipData(mi, config.Organization, config.GitProjectName, config.Branch) maintainers, err := FetchProjectMaintainershipData(mi, config.Organization, config.GitProjectName, config.Branch)
if err != nil && !test.otherError { if err != nil && !test.otherError {
if test.maintainersFileErr == nil { if test.maintainersFileErr == nil {
@@ -153,7 +153,7 @@ func TestMaintainership(t *testing.T) {
t.Run(test.name+"_File", func(t *testing.T) { t.Run(test.name+"_File", func(t *testing.T) {
ctl := gomock.NewController(t) ctl := gomock.NewController(t)
mi := mock_common.NewMockGiteaMaintainershipInterface(ctl) mi := mock_common.NewMockGiteaMaintainershipReader(ctl)
// tests with maintainership file // tests with maintainership file
mi.EXPECT().FetchMaintainershipFile("foo", common.DefaultGitPrj, "bar"). mi.EXPECT().FetchMaintainershipFile("foo", common.DefaultGitPrj, "bar").
@@ -166,7 +166,7 @@ func TestMaintainership(t *testing.T) {
t.Run(test.name+"_Dir", func(t *testing.T) { t.Run(test.name+"_Dir", func(t *testing.T) {
ctl := gomock.NewController(t) ctl := gomock.NewController(t)
mi := mock_common.NewMockGiteaMaintainershipInterface(ctl) mi := mock_common.NewMockGiteaMaintainershipReader(ctl)
// run same tests with directory maintainership data // run same tests with directory maintainership data
for filename, data := range test.maintainersDir { for filename, data := range test.maintainersDir {

2
workflow-pr/pr.go
View File

@@ -103,7 +103,7 @@ func (rs *PRSet) IsConsistent() bool {
return true return true
} }
func (rs *PRSet) IsReviewed(gitea common.GiteaReviewFetcher) bool { func (rs *PRSet) IsReviewed(gitea common.GiteaPRChecker) bool {
configReviewers := ParseReviewers(rs.config.Reviewers) configReviewers := ParseReviewers(rs.config.Reviewers)
is_reviewed := false is_reviewed := false

2
workflow-pr/pr_test.go
View File

@@ -143,7 +143,7 @@ func TestPR(t *testing.T) {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
ctl := gomock.NewController(t) ctl := gomock.NewController(t)
pr_mock := mock_common.NewMockGiteaPRFetcher(ctl) pr_mock := mock_common.NewMockGiteaPRFetcher(ctl)
review_mock := mock_common.NewMockGiteaReviewFetcher(ctl) review_mock := mock_common.NewMockGiteaPRChecker(ctl)
var test_err error var test_err error
for _, data := range test.data { for _, data := range test.data {