cybercinch/go-semantic-release
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

Merge branch 'master' of github.com:Nightapes/go-semantic-release into remove/draft

Browse Source
This commit is contained in:
fwiedmann
2019-08-22 00:12:24 +02:00
parent 2eb64f153a
commit a2fc03c64d
10 changed files with 128 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/releaser/github/github.go
View File

@@ -32,7 +32,7 @@ type Client struct {
func New(c *config.GitHubProvider) (*Client, error) {
var err error
if c.AccessToken, err = util.GetAccessToken(GITHUB); err != nil {
if c.AccessToken, err = util.GetAccessToken("GITHUB_TOKEN"); err != nil {
return &Client{}, err
}
ctx := context.Background()

20
internal/releaser/github/github_test.go
View File

@@ -143,19 +143,19 @@ func initHTTPServer(respCode int, body string) *httptest.Server {
func TestNew(t *testing.T) {
for _, testOject := range testNewClient {
if testOject.valid {
os.Setenv("GITHUB_ACCESS_TOKEN", "XXX")
os.Setenv("GITHUB_TOKEN", "XXX")
}
_, err := github.New(&testOject.config)
assert.Equal(t, testOject.valid, err == nil)
os.Unsetenv("GITHUB_ACCESS_TOKEN")
os.Unsetenv("GITHUB_TOKEN")
}
}
func TestGetCommitURL(t *testing.T) {
os.Setenv("GITHUB_ACCESS_TOKEN", "XX")
os.Setenv("GITHUB_TOKEN", "XX")
for _, testOject := range testNewClient {
client, _ := github.New(&testOject.config)
actualURL := client.GetCommitURL()
@@ -168,12 +168,12 @@ func TestGetCommitURL(t *testing.T) {
assert.EqualValues(t, expectedURL, actualURL)
}
}
os.Unsetenv("GITHUB_ACCESS_TOKEN")
os.Unsetenv("GITHUB_TOKEN")
}
func TestGetCompareURL(t *testing.T) {
os.Setenv("GITHUB_ACCESS_TOKEN", "XX")
os.Setenv("GITHUB_TOKEN", "XX")
for _, testOject := range testNewClient {
client, _ := github.New(&testOject.config)
actualURL := client.GetCompareURL("1", "2")
@@ -186,12 +186,12 @@ func TestGetCompareURL(t *testing.T) {
assert.EqualValues(t, expectedURL, actualURL)
}
}
os.Unsetenv("GITHUB_ACCESS_TOKEN")
os.Unsetenv("GITHUB_TOKEN")
}
func TestValidateConfig(t *testing.T) {
os.Setenv("GITHUB_ACCESS_TOKEN", "XX")
os.Setenv("GITHUB_TOKEN", "XX")
for _, testOject := range testHelperMethod {
client, _ := github.New(&testOject.config)
err := client.ValidateConfig()
@@ -199,11 +199,11 @@ func TestValidateConfig(t *testing.T) {
assert.Equal(t, testOject.valid, err == nil)
}
os.Unsetenv("GITHUB_ACCESS_TOKEN")
os.Unsetenv("GITHUB_TOKEN")
}
func TestCreateRelease(t *testing.T) {
os.Setenv("GITHUB_ACCESS_TOKEN", "XX")
os.Setenv("GITHUB_TOKEN", "XX")
for _, testObejct := range testReleases {
if testObejct.valid {
@@ -230,6 +230,6 @@ func TestCreateRelease(t *testing.T) {
assert.Error(t, err)
}
}
os.Unsetenv("GITHUB_ACCESS_TOKEN")
os.Unsetenv("GITHUB_TOKEN")
}

3
internal/releaser/releaser.go
View File

@@ -2,6 +2,7 @@ package releaser
import (
"fmt"
"strings"
"github.com/Nightapes/go-semantic-release/internal/releaser/github"
"github.com/Nightapes/go-semantic-release/internal/releaser/gitlab"
@@ -41,7 +42,7 @@ func (r *Releasers) GetReleaser() (Releaser, error) {
return github.New(&r.config.GitHubProvider)
case gitlab.GITLAB:
log.Debugf("initialize new %s-provider", gitlab.GITLAB)
accessToken, err := util.GetAccessToken(gitlab.GITLAB)
accessToken, err := util.GetAccessToken(fmt.Sprintf("%s_ACCESS_TOKEN", strings.ToUpper(gitlab.GITLAB)))
if err != nil {
return nil, err
}

4
internal/releaser/util/util.go
View File

@@ -49,11 +49,9 @@ func NewAddHeaderTransport(T http.RoundTripper, key, value string) *AddHeaderTra
}
// GetAccessToken lookup for the providers accesstoken
func GetAccessToken(providerName string) (string, error) {
func GetAccessToken(envName string) (string, error) {
var token string
var exists bool
envName := fmt.Sprintf("%s_ACCESS_TOKEN", strings.ToUpper(providerName))
log.Debugf("check if %s environment variable is set", envName)
if token, exists = os.LookupEnv(envName); !exists {

4
internal/releaser/util/util_test.go
View File

@@ -43,7 +43,7 @@ func TestGetAccessToken(t *testing.T) {
fmt.Println(err.Error())
}
_, err := util.GetAccessToken(testObject.providerName)
_, err := util.GetAccessToken(envName)
assert.Equal(t, testObject.valid, err == nil)
os.Unsetenv(envName)
@@ -193,7 +193,7 @@ func TestDoAndRoundTrip(t *testing.T) {
hasError: true,
responseBody: &example{},
responseBodyType: &example{},
path: "broken",
path: "4/broken",
},
}