Skip to content

Commit 4e56534

Browse files
committed
fix: Updated error if hostname is not set 🐛
1 parent d4ae143 commit 4e56534

File tree

1 file changed

+20
-26
lines changed

1 file changed

+20
-26
lines changed

pkg/provider/gitea.go

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package provider
22

33
import (
44
"context"
5-
"errors"
65
"fmt"
76
"os"
87
"regexp"
@@ -22,21 +21,30 @@ type GiteaRepository struct {
2221
repo string
2322
owner string
2423
stripVTagPrefix bool
25-
compareCommits bool
2624
baseURL string
2725
}
2826

29-
//gocyclo:ignore
27+
// gocyclo:ignore
3028
func (repo *GiteaRepository) Init(config map[string]string) error {
3129
giteaHost := config["gitea_host"]
3230
if giteaHost == "" {
3331
giteaHost = os.Getenv("GITEA_HOST")
3432
}
33+
// If host is still not set error
34+
if giteaHost == "" {
35+
return fmt.Errorf("gitea host is not set")
36+
}
37+
3538
repo.baseURL = giteaHost
3639
slug := config["slug"]
40+
3741
if slug == "" {
3842
slug = os.Getenv("GITHUB_REPOSITORY")
3943
}
44+
// Maybe we are running in Gitea Actions
45+
if slug == "" {
46+
slug = os.Getenv("GITEA_REPOSITORY")
47+
}
4048
// Maybe we are running in WoodpeckerCI
4149
if slug == "" {
4250
slug = os.Getenv("CI_REPO_NAME")
@@ -47,11 +55,11 @@ func (repo *GiteaRepository) Init(config map[string]string) error {
4755
token = os.Getenv("GITEA_TOKEN")
4856
}
4957
if token == "" {
50-
return errors.New("gitea token missing")
58+
return fmt.Errorf("gitea token missing")
5159
}
5260

5361
if !strings.Contains(slug, "/") {
54-
return errors.New("invalid slug")
62+
return fmt.Errorf("invalid slug")
5563
}
5664
split := strings.Split(slug, "/")
5765
// This could be due to act locally
@@ -63,21 +71,16 @@ func (repo *GiteaRepository) Init(config map[string]string) error {
6371
repo.repo = strings.TrimSuffix(repo.repo, ".git")
6472

6573
ctx := context.Background()
66-
if giteaHost != "" {
67-
client, err := gitea.NewClient(giteaHost,
68-
gitea.SetToken(token),
69-
gitea.SetContext(ctx))
70-
if err != nil {
71-
return err
72-
}
73-
repo.client = client
74-
}
7574

76-
if config["github_use_compare_commits"] == "true" {
77-
repo.compareCommits = true
75+
client, err := gitea.NewClient(giteaHost,
76+
gitea.SetToken(token),
77+
gitea.SetContext(ctx))
78+
if err != nil {
79+
return err
7880
}
7981

80-
var err error
82+
repo.client = client
83+
8184
stripVTagPrefix := config["strip_v_tag_prefix"]
8285
repo.stripVTagPrefix, err = strconv.ParseBool(stripVTagPrefix)
8386

@@ -101,15 +104,6 @@ func (repo *GiteaRepository) GetInfo() (*provider.RepositoryInfo, error) {
101104
}, nil
102105
}
103106

104-
//lint:ignore U1000 Ignore unused function temporarily for debugging
105-
//revive:disable-next-line
106-
func (repo *GiteaRepository) getCommitsFromGitea(fromSha string, opts *gitea.ListOptions) ([]*gitea.Commit, *gitea.Response, error) {
107-
return repo.client.ListRepoCommits(repo.owner, repo.repo, gitea.ListCommitOptions{
108-
SHA: fromSha,
109-
ListOptions: *opts,
110-
})
111-
}
112-
113107
func (repo *GiteaRepository) GetCommits(_, toSha string) ([]*semrel.RawCommit, error) {
114108
allCommits := make([]*semrel.RawCommit, 0)
115109
opts := &gitea.ListOptions{PageSize: 100}

0 commit comments

Comments
 (0)