taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

support enterprise Travis endpoints

Browse Source
This commit is contained in:
Steven Whitehead 2019-09-23 21:50:06 -04:00
parent 00f56a5f3a
commit 9de738362a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/travisci/client.go
View File

@ -17,6 +17,9 @@ func BuildsFor(settings *Settings) (*Builds, error) {
builds := &Builds{} builds := &Builds{}
travisAPIURL.Host = "api." + TRAVIS_HOSTS[settings.pro] travisAPIURL.Host = "api." + TRAVIS_HOSTS[settings.pro]
if settings.baseURL != "" {
travisAPIURL.Host = settings.baseURL
}
resp, err := travisBuildRequest(settings) resp, err := travisBuildRequest(settings)
if err != nil { if err != nil {
@ -39,6 +42,9 @@ var (
func travisBuildRequest(settings *Settings) (*http.Response, error) { func travisBuildRequest(settings *Settings) (*http.Response, error) {
var path string = "builds" var path string = "builds"
if settings.baseURL != "" {
travisAPIURL.Path = "/api/"
}
params := url.Values{} params := url.Values{}
params.Add("limit", settings.limit) params.Add("limit", settings.limit)
params.Add("sort_by", settings.sort_by) params.Add("sort_by", settings.sort_by)
@ -46,15 +52,15 @@ func travisBuildRequest(settings *Settings) (*http.Response, error) {
requestUrl := travisAPIURL.ResolveReference(&url.URL{Path: path, RawQuery: params.Encode()}) requestUrl := travisAPIURL.ResolveReference(&url.URL{Path: path, RawQuery: params.Encode()})
req, err := http.NewRequest("GET", requestUrl.String(), nil) req, err := http.NewRequest("GET", requestUrl.String(), nil)
if err != nil {
return nil, err
}
req.Header.Add("Accept", "application/json") req.Header.Add("Accept", "application/json")
req.Header.Add("Content-Type", "application/json") req.Header.Add("Content-Type", "application/json")
req.Header.Add("Travis-API-Version", "3") req.Header.Add("Travis-API-Version", "3")
bearer := fmt.Sprintf("token %s", settings.apiKey) bearer := fmt.Sprintf("token %s", settings.apiKey)
req.Header.Add("Authorization", bearer) req.Header.Add("Authorization", bearer)
if err != nil {
return nil, err
}
httpClient := &http.Client{} httpClient := &http.Client{}
resp, err := httpClient.Do(req) resp, err := httpClient.Do(req)

2
modules/travisci/settings.go
View File

@ -16,6 +16,7 @@ type Settings struct {
common *cfg.Common common *cfg.Common
apiKey string apiKey string
baseURL string `help:"Your TravisCI Enterprise API URL." optional:"true"`
compact bool compact bool
limit string limit string
pro bool pro bool
@ -27,6 +28,7 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co
common: cfg.NewCommonSettingsFromModule(name, defaultTitle, defaultFocusable, ymlConfig, globalConfig), common: cfg.NewCommonSettingsFromModule(name, defaultTitle, defaultFocusable, ymlConfig, globalConfig),
apiKey: ymlConfig.UString("apiKey", ymlConfig.UString("apikey", os.Getenv("WTF_TRAVIS_API_TOKEN"))), apiKey: ymlConfig.UString("apiKey", ymlConfig.UString("apikey", os.Getenv("WTF_TRAVIS_API_TOKEN"))),
baseURL: ymlConfig.UString("baseURL", ymlConfig.UString("baseURL", os.Getenv("WTF_TRAVIS_BASE_URL"))),
pro: ymlConfig.UBool("pro", false), pro: ymlConfig.UBool("pro", false),
compact: ymlConfig.UBool("compact", false), compact: ymlConfig.UBool("compact", false),
limit: ymlConfig.UString("limit", "10"), limit: ymlConfig.UString("limit", "10"),