arnaucube/mirror-to-gitea
1
0
Fork 0
mirror of https://github.com/arnaucube/mirror-to-gitea.git synced 2026-02-07 11:36:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Dennis Jekubczyk
2021-05-24 16:52:05 +02:00
parent c188ec7ebf
commit aabd00dbba
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
internal/config/read.go
View File

@@ -11,16 +11,16 @@ const MirrorModePrivateAndPublic = "PRIVATE_AND_PUBLIC"
type Config struct { type Config struct {
MirrorMode string MirrorMode string
Gitea GiteaConfig Gitea Gitea
Github GithubConfig Github Github
} }
type GiteaConfig struct { type Gitea struct {
GiteaUrl string Url string
GiteaToken string Token string
} }
type GithubConfig struct { type Github struct {
Username string Username string
Token *string Token *string
} }
@@ -48,29 +48,29 @@ func Read() (*Config, error) {
}, nil }, nil
} }
func readGiteaConfig() (GiteaConfig, error) { func readGiteaConfig() (Gitea, error) {
url, a := os.LookupEnv("GITEA_URL") url, a := os.LookupEnv("GITEA_URL")
if !a { if !a {
return GiteaConfig{}, errors.New("missing mandatory parameter GITEA_URL, please specify your target gitea instance") return Gitea{}, errors.New("missing mandatory parameter GITEA_URL, please specify your target gitea instance")
} }
token, a := os.LookupEnv("GITEA_TOKEN") token, a := os.LookupEnv("GITEA_TOKEN")
if !a { if !a {
return GiteaConfig{}, errors.New("missing mandatory parameter GITEA_TOKEN, please specify your gitea application token") return Gitea{}, errors.New("missing mandatory parameter GITEA_TOKEN, please specify your gitea application token")
} }
return GiteaConfig{ return Gitea{
GiteaUrl: url, Url: url,
GiteaToken: token, Token: token,
}, nil }, nil
} }
func readGithubConfig() (GithubConfig, error) { func readGithubConfig() (Github, error) {
username, present := os.LookupEnv("GITHUB_USERNAME") username, present := os.LookupEnv("GITHUB_USERNAME")
if !present { if !present {
return GithubConfig{}, errors.New("") return Github{}, errors.New("")
} }
var token *string = nil var token *string = nil
@@ -78,7 +78,7 @@ func readGithubConfig() (GithubConfig, error) {
token = &val token = &val
} }
return GithubConfig{ return Github{
Username: username, Username: username,
Token: token, Token: token,
}, nil }, nil

4
internal/config/read_test.go
View File

@@ -81,8 +81,8 @@ var _ = Describe("Read", func() {
c, err := config.Read() c, err := config.Read()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(c.Gitea.GiteaUrl).To(Equal("https://gitea.url/api")) Expect(c.Gitea.Url).To(Equal("https://gitea.url/api"))
Expect(c.Gitea.GiteaToken).To(Equal("a-gitea-token")) Expect(c.Gitea.Token).To(Equal("a-gitea-token"))
}) })
It("fails on missing gitea url", func() { It("fails on missing gitea url", func() {