opensourcemirror
/
git.sr.ht
mirror of https://git.sr.ht/~sircmpwn/git.sr.ht
1
0
Fork 0
Code Issues Releases Wiki Activity

gitsrht-update-hook: drop trivial getters 

Individual fields can be accessed directly.
This commit is contained in:
Simon Ser 2023-12-04 10:12:43 +00:00 committed by Drew DeVault
parent 4278f329f8
commit 5610eb6e5c
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gitsrht-update-hook/submitter.go
View File

@ -171,22 +171,10 @@ func (submitter GitBuildSubmitter) FindManifests() (map[string]string, error) {
return manifests, nil
}
func (submitter GitBuildSubmitter) GetBuildsOrigin() string {
return submitter.BuildOrigin
}
func (submitter GitBuildSubmitter) GetOauthToken() *string {
return submitter.OwnerToken
}
func (submitter GitBuildSubmitter) GetCommitId() string {
return submitter.Commit.Hash.String()
}
func (submitter GitBuildSubmitter) GetVisibility() string {
return submitter.Visibility
}
func firstLine(text string) string {
buf := bytes.NewBufferString(text)
scanner := bufio.NewScanner(buf)
@ -220,7 +208,7 @@ func (submitter GitBuildSubmitter) GetCommitNote() string {
}
func (submitter GitBuildSubmitter) GetJobTags() []string {
tags := []string{submitter.GetRepoName(), "commits"}
tags := []string{submitter.RepoName, "commits"}
if strings.HasPrefix(submitter.Ref, "refs/heads/") {
tags = append(tags, strings.TrimPrefix(submitter.Ref, "refs/heads/"))
}
@ -252,14 +240,6 @@ func (submitter GitBuildSubmitter) GetCloneUrl() string {
}
}
func (submitter GitBuildSubmitter) GetRepoName() string {
return submitter.RepoName
}
func (submitter GitBuildSubmitter) GetPusherName() string {
return submitter.PusherName
}
type BuildSubmission struct {
// TODO: Move errors into this struct and set up per-submission error
// tracking
@ -328,7 +308,7 @@ func SubmitBuild(ctx context.Context, submitter *GitBuildSubmitter) ([]BuildSubm
"manifest": yaml,
"tags": append(submitter.GetJobTags(), name),
"note": submitter.GetCommitNote(),
"visibility": submitter.GetVisibility(),
"visibility": submitter.Visibility,
},
}
@ -341,7 +321,7 @@ func SubmitBuild(ctx context.Context, submitter *GitBuildSubmitter) ([]BuildSubm
Errors gqlerror.List `json:"errors"`
}{}
err = client.Execute(ctx, submitter.GetPusherName(), "builds.sr.ht", query, &resp)
err = client.Execute(ctx, submitter.PusherName, "builds.sr.ht", query, &resp)
if err != nil {
return nil, err
} else if len(resp.Errors) > 0 {
@ -354,8 +334,8 @@ func SubmitBuild(ctx context.Context, submitter *GitBuildSubmitter) ([]BuildSubm
results = append(results, BuildSubmission{
Name: name,
Url: fmt.Sprintf("%s/~%s/job/%d",
submitter.GetBuildsOrigin(),
submitter.GetPusherName(),
submitter.BuildOrigin,
submitter.PusherName,
resp.Data.Submit.ID),
})
}
@ -367,7 +347,7 @@ func autoSetupManifest(submitter *GitBuildSubmitter, manifest *Manifest) {
var hasSelf bool
cloneUrl := submitter.GetCloneUrl() + "#" + submitter.GetCommitId()
for i, src := range manifest.Sources {
if path.Base(src) == submitter.GetRepoName() {
if path.Base(src) == submitter.RepoName {
manifest.Sources[i] = cloneUrl
hasSelf = true
}