Skip to content

Commit

Permalink
pull out debug logging and fix jobs and builds
Browse files Browse the repository at this point in the history
  • Loading branch information
robbybbb committed Oct 27, 2022
1 parent 6ea221c commit 6c95b2b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 26 deletions.
15 changes: 4 additions & 11 deletions builds.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ package travis
import (
"context"
"fmt"
"log"
"net/http"
"net/url"
)
Expand Down Expand Up @@ -164,17 +163,11 @@ func (bs *BuildsService) Find(ctx context.Context, id uint, opt *BuildOption) (*
//
// Travis CI API docs: https://developer.travis-ci.com/resource/builds#for_current_user
func (bs *BuildsService) List(ctx context.Context, opt *BuildsOption) ([]*Build, *http.Response, error) {
log.Printf("Made it here Build List: %v", 3)
u, err := urlWithOptions("builds", opt)
if err != nil {
return nil, nil, err
}

var h = bs.client.Headers
for k, v := range h {
log.Printf("Build List Headers k, v: %s %s", k, v)
}

req, err := bs.client.NewRequest(http.MethodGet, u, bs.client.Headers, nil)
if err != nil {
return nil, nil, err
Expand All @@ -198,7 +191,7 @@ func (bs *BuildsService) ListByRepoId(ctx context.Context, repoId uint, opt *Bui
return nil, nil, err
}

req, err := bs.client.NewRequest(http.MethodGet, u, nil, nil)
req, err := bs.client.NewRequest(http.MethodGet, u, bs.client.Headers, nil)
if err != nil {
return nil, nil, err
}
Expand All @@ -221,7 +214,7 @@ func (bs *BuildsService) ListByRepoSlug(ctx context.Context, repoSlug string, op
return nil, nil, err
}

req, err := bs.client.NewRequest(http.MethodGet, u, nil, nil)
req, err := bs.client.NewRequest(http.MethodGet, u, bs.client.Headers, nil)
if err != nil {
return nil, nil, err
}
Expand All @@ -244,7 +237,7 @@ func (bs *BuildsService) Cancel(ctx context.Context, id uint) (*Build, *http.Res
return nil, nil, err
}

req, err := bs.client.NewRequest(http.MethodPost, u, nil, nil)
req, err := bs.client.NewRequest(http.MethodPost, u, bs.client.Headers, nil)
if err != nil {
return nil, nil, err
}
Expand All @@ -267,7 +260,7 @@ func (bs *BuildsService) Restart(ctx context.Context, id uint) (*Build, *http.Re
return nil, nil, err
}

req, err := bs.client.NewRequest(http.MethodPost, u, nil, nil)
req, err := bs.client.NewRequest(http.MethodPost, u, bs.client.Headers, nil)
if err != nil {
return nil, nil, err
}
Expand Down
12 changes: 6 additions & 6 deletions jobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (js *JobsService) Find(ctx context.Context, id uint, opt *JobOption) (*Job,
return nil, nil, err
}

req, err := js.client.NewRequest(http.MethodGet, u, nil, nil)
req, err := js.client.NewRequest(http.MethodGet, u, js.client.Headers, nil)
if err != nil {
return nil, nil, err
}
Expand All @@ -132,7 +132,7 @@ func (js *JobsService) ListByBuild(ctx context.Context, buildId uint) ([]*Job, *
return nil, nil, err
}

req, err := js.client.NewRequest(http.MethodGet, u, nil, nil)
req, err := js.client.NewRequest(http.MethodGet, u, js.client.Headers, nil)
if err != nil {
return nil, nil, err
}
Expand All @@ -157,7 +157,7 @@ func (js *JobsService) List(ctx context.Context, opt *JobsOption) ([]*Job, *http
return nil, nil, err
}

req, err := js.client.NewRequest(http.MethodGet, u, nil, nil)
req, err := js.client.NewRequest(http.MethodGet, u, js.client.Headers, nil)
if err != nil {
return nil, nil, err
}
Expand All @@ -180,7 +180,7 @@ func (js *JobsService) Cancel(ctx context.Context, id uint) (*Job, *http.Respons
return nil, nil, err
}

req, err := js.client.NewRequest(http.MethodPost, u, nil, nil)
req, err := js.client.NewRequest(http.MethodPost, u, js.client.Headers, nil)
if err != nil {
return nil, nil, err
}
Expand All @@ -203,7 +203,7 @@ func (js *JobsService) Restart(ctx context.Context, id uint) (*Job, *http.Respon
return nil, nil, err
}

req, err := js.client.NewRequest(http.MethodPost, u, nil, nil)
req, err := js.client.NewRequest(http.MethodPost, u, js.client.Headers, nil)
if err != nil {
return nil, nil, err
}
Expand All @@ -228,7 +228,7 @@ func (js *JobsService) Debug(ctx context.Context, id uint) (*Job, *http.Response
return nil, nil, err
}

req, err := js.client.NewRequest(http.MethodPost, u, nil, nil)
req, err := js.client.NewRequest(http.MethodPost, u, js.client.Headers, nil)
if err != nil {
return nil, nil, err
}
Expand Down
9 changes: 0 additions & 9 deletions travis.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"fmt"
"io"
"io/ioutil"
"log"
"net/http"
"net/url"
"reflect"
Expand Down Expand Up @@ -124,14 +123,9 @@ func NewClient(baseUrl string, travisToken string) *Client {
c.Stages = &StagesService{client: c}
c.User = &UserService{client: c}

log.Printf("Token: %s", travisToken)
if travisToken != "" {
c.SetToken(travisToken)
}
var h = c.Headers
for k, v := range h {
log.Printf("Initial Creation Headers k, v: %s %s", k, v)
}
return c
}

Expand Down Expand Up @@ -180,13 +174,10 @@ func (c *Client) NewRequest(method, urlStr string, body interface{}, headers map
}

for k, v := range h {
log.Printf("Headers k, v: %s %s", k, v)
req.Header.Set(k, v)
}

req.Header.Set("User-Agent", c.UserAgent)
log.Printf("req.Method: %s", req.Method)
log.Printf("req.Url: %s", req.URL)
return req, nil
}

Expand Down

0 comments on commit 6c95b2b

Please sign in to comment.