This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Introduce backoff to retry requests - #10

Merged
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff
Aug 7, 2017
Merged

Introduce backoff to retry requests#10
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff

Conversation

@MorganEPatch

Copy link
Copy Markdown
Contributor

Depends on #9.

In the event that a request to JIRA or GitHub fails, retry the requests with an exponential backoff, until the request succeeds or sufficient time has passed.

@MorganEPatchMorganEPatch self-assigned this Jul 17, 2017
@MorganEPatchMorganEPatch mentioned this pull request Jul 18, 2017

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, all commit message summaries at CoreOS are <dirs-affected>: summary of commit, so commits that vendor code are normally vendor: .... the commit message for adding the dep should be:

vendor: add backoff lib

@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Okay, good to know. The CONTRIBUTING.md file in our projects just refers to it as "subsystem", I didn't realize it was intended to specifically match the directory names.

Comment threadcmd/root.go
}
}

// makeGHRequest takes an API function from the GitHub library

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

take these functions out of root.go

Comment threadcmd/root.go Outdated
// nil HTTP response and a timeout error are returned.
//
// It is nearly identical to makeGHRequest, but returns a JIRA API response.
func makeJIRARequest(f func() (interface{}, *jira.Response, error)) (ret interface{}, res *jira.Response, err error) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, we do not normally use named returns. I would prefer to see:

var ret interface{}
var res *jira.Response
op := ...
...
return ret, res, nil

Comment threadcmd/root.go Outdated
return nil, jira.CheckResponse(resp.Response)
}
project = *proj
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now a pointer to a pointer. is that what you want? also, make sure to check if the type assertion succeeds.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't a pointer to a pointer be project = &(proj.(*jira.Project))? That should dereference the pointer, so that project is just a jira.Project, no pointer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you're totally right 👍

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
ghIssues := i.([]*github.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check the type assertion to avoid panics later

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
jiraIssues := ji.([]jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issue %s to get comments.", jIssue.Key)
}
issue := i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Debugf("Error body: %s", body)
return err
}
jIssue = i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Errorf("Error retrieving GitHub comments for issue #%d. Error: %s.", *ghIssue.Number, err)
return err
}
comments := c.([]*github.IssueComment)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall look ok, @LyonesGamer. There are a few comments that will be quick to fix. We really need to get the structural changes in before any more features are added because this is completely unmaintanable. Also, in the future, please squash the non-vendor commits. Reviewing this code is almost impossible because each individual commit does not show the full picture, but if you look at all the changes together then all the meaningful changes are lost in thousands of lines of vendor changes.

Comment threadcmd/root.go Outdated
log.Errorf("Get JIRA project did not return project! Value: %v", proj)
return nil, errors.New(fmt.Sprintf("Get project failed: expected *jira.Project; got %T", proj))
}
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be done in a single type assertion above. you do

project, ok:=proj.(...)
if!ok {
return...
}
...continue using project.

Comment threadcmd/root.go Outdated
return jiraClient.Issue.Search(jql, nil)
})
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)
defer res.Body.Close()
body, _ := ioutil.ReadAll(res.Body)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not suppress this error. In this particular case, if there was an error making the request, then there is a chance that res.Body is nil.

Comment threadcmd/root.go
u, _, err := makeGHRequest(func() (interface{}, *github.Response, error) {
return ghClient.Users.Get(context.Background(), *ghComment.User.Login)
})
if err != nil {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really weird, there should not be a period between these two clauses but rather a colon. Conventionally we do:

log.Errorf("error retrieving GitHub user %s: %v", user.Login, err)

Comment threadcmd/root.go Outdated
user, ok := u.(*github.User)
if !ok {
log.Errorf("Get GitHub user did not return user! Got: %v", u)
return errors.New(fmt.Sprintf("Get GitHub user failed: expected *github.User; got %T", u))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errors should not start with a capital because it is convention to wrap errors in more errors and this results in capitalized words in the middle of sentences. if you use golint, these mistakes will be caught.

Comment threadcmd/root.go Outdated
if !dryRun {
req, err := jClient.NewRequest("PUT", fmt.Sprintf("rest/api/2/issue/%s/comment/%s", jIssue.Key, jComment.ID), request)
if err != nil {
log.Errorf("Error creating comment update request: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Morgan Patch added 2 commits August 7, 2017 09:49
Add the dependency on the github.com/cenkalti/backoff library.
Apparently this also triggered the entire vendor directory to be
refilled or something.
@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Fixed all of your comments.

@MorganEPatch
MorganEPatch merged commit 7473308 into coreos:masterAug 7, 2017
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MorganEPatch@squat
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Introduce backoff to retry requests - #10

Merged
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff
Aug 7, 2017
Merged

Introduce backoff to retry requests#10
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff

Conversation

@MorganEPatch

Copy link
Copy Markdown
Contributor

Depends on #9.

In the event that a request to JIRA or GitHub fails, retry the requests with an exponential backoff, until the request succeeds or sufficient time has passed.

@MorganEPatchMorganEPatch self-assigned this Jul 17, 2017
@MorganEPatchMorganEPatch mentioned this pull request Jul 18, 2017

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, all commit message summaries at CoreOS are <dirs-affected>: summary of commit, so commits that vendor code are normally vendor: .... the commit message for adding the dep should be:

vendor: add backoff lib

@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Okay, good to know. The CONTRIBUTING.md file in our projects just refers to it as "subsystem", I didn't realize it was intended to specifically match the directory names.

Comment threadcmd/root.go
}
}

// makeGHRequest takes an API function from the GitHub library

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

take these functions out of root.go

Comment threadcmd/root.go Outdated
// nil HTTP response and a timeout error are returned.
//
// It is nearly identical to makeGHRequest, but returns a JIRA API response.
func makeJIRARequest(f func() (interface{}, *jira.Response, error)) (ret interface{}, res *jira.Response, err error) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, we do not normally use named returns. I would prefer to see:

var ret interface{}
var res *jira.Response
op := ...
...
return ret, res, nil

Comment threadcmd/root.go Outdated
return nil, jira.CheckResponse(resp.Response)
}
project = *proj
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now a pointer to a pointer. is that what you want? also, make sure to check if the type assertion succeeds.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't a pointer to a pointer be project = &(proj.(*jira.Project))? That should dereference the pointer, so that project is just a jira.Project, no pointer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you're totally right 👍

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
ghIssues := i.([]*github.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check the type assertion to avoid panics later

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
jiraIssues := ji.([]jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issue %s to get comments.", jIssue.Key)
}
issue := i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Debugf("Error body: %s", body)
return err
}
jIssue = i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Errorf("Error retrieving GitHub comments for issue #%d. Error: %s.", *ghIssue.Number, err)
return err
}
comments := c.([]*github.IssueComment)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall look ok, @LyonesGamer. There are a few comments that will be quick to fix. We really need to get the structural changes in before any more features are added because this is completely unmaintanable. Also, in the future, please squash the non-vendor commits. Reviewing this code is almost impossible because each individual commit does not show the full picture, but if you look at all the changes together then all the meaningful changes are lost in thousands of lines of vendor changes.

Comment threadcmd/root.go Outdated
log.Errorf("Get JIRA project did not return project! Value: %v", proj)
return nil, errors.New(fmt.Sprintf("Get project failed: expected *jira.Project; got %T", proj))
}
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be done in a single type assertion above. you do

project, ok:=proj.(...)
if!ok {
return...
}
...continue using project.

Comment threadcmd/root.go Outdated
return jiraClient.Issue.Search(jql, nil)
})
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)
defer res.Body.Close()
body, _ := ioutil.ReadAll(res.Body)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not suppress this error. In this particular case, if there was an error making the request, then there is a chance that res.Body is nil.

Comment threadcmd/root.go
u, _, err := makeGHRequest(func() (interface{}, *github.Response, error) {
return ghClient.Users.Get(context.Background(), *ghComment.User.Login)
})
if err != nil {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really weird, there should not be a period between these two clauses but rather a colon. Conventionally we do:

log.Errorf("error retrieving GitHub user %s: %v", user.Login, err)

Comment threadcmd/root.go Outdated
user, ok := u.(*github.User)
if !ok {
log.Errorf("Get GitHub user did not return user! Got: %v", u)
return errors.New(fmt.Sprintf("Get GitHub user failed: expected *github.User; got %T", u))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errors should not start with a capital because it is convention to wrap errors in more errors and this results in capitalized words in the middle of sentences. if you use golint, these mistakes will be caught.

Comment threadcmd/root.go Outdated
if !dryRun {
req, err := jClient.NewRequest("PUT", fmt.Sprintf("rest/api/2/issue/%s/comment/%s", jIssue.Key, jComment.ID), request)
if err != nil {
log.Errorf("Error creating comment update request: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Morgan Patch added 2 commits August 7, 2017 09:49
Add the dependency on the github.com/cenkalti/backoff library.
Apparently this also triggered the entire vendor directory to be
refilled or something.
@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Fixed all of your comments.

@MorganEPatch
MorganEPatch merged commit 7473308 into coreos:masterAug 7, 2017
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MorganEPatch@squat
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Introduce backoff to retry requests - #10

Merged
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff
Aug 7, 2017
Merged

Introduce backoff to retry requests#10
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff

Conversation

@MorganEPatch

Copy link
Copy Markdown
Contributor

Depends on #9.

In the event that a request to JIRA or GitHub fails, retry the requests with an exponential backoff, until the request succeeds or sufficient time has passed.

@MorganEPatchMorganEPatch self-assigned this Jul 17, 2017
@MorganEPatchMorganEPatch mentioned this pull request Jul 18, 2017

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, all commit message summaries at CoreOS are <dirs-affected>: summary of commit, so commits that vendor code are normally vendor: .... the commit message for adding the dep should be:

vendor: add backoff lib

@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Okay, good to know. The CONTRIBUTING.md file in our projects just refers to it as "subsystem", I didn't realize it was intended to specifically match the directory names.

Comment threadcmd/root.go
}
}

// makeGHRequest takes an API function from the GitHub library

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

take these functions out of root.go

Comment threadcmd/root.go Outdated
// nil HTTP response and a timeout error are returned.
//
// It is nearly identical to makeGHRequest, but returns a JIRA API response.
func makeJIRARequest(f func() (interface{}, *jira.Response, error)) (ret interface{}, res *jira.Response, err error) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, we do not normally use named returns. I would prefer to see:

var ret interface{}
var res *jira.Response
op := ...
...
return ret, res, nil

Comment threadcmd/root.go Outdated
return nil, jira.CheckResponse(resp.Response)
}
project = *proj
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now a pointer to a pointer. is that what you want? also, make sure to check if the type assertion succeeds.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't a pointer to a pointer be project = &(proj.(*jira.Project))? That should dereference the pointer, so that project is just a jira.Project, no pointer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you're totally right 👍

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
ghIssues := i.([]*github.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check the type assertion to avoid panics later

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
jiraIssues := ji.([]jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issue %s to get comments.", jIssue.Key)
}
issue := i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Debugf("Error body: %s", body)
return err
}
jIssue = i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Errorf("Error retrieving GitHub comments for issue #%d. Error: %s.", *ghIssue.Number, err)
return err
}
comments := c.([]*github.IssueComment)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall look ok, @LyonesGamer. There are a few comments that will be quick to fix. We really need to get the structural changes in before any more features are added because this is completely unmaintanable. Also, in the future, please squash the non-vendor commits. Reviewing this code is almost impossible because each individual commit does not show the full picture, but if you look at all the changes together then all the meaningful changes are lost in thousands of lines of vendor changes.

Comment threadcmd/root.go Outdated
log.Errorf("Get JIRA project did not return project! Value: %v", proj)
return nil, errors.New(fmt.Sprintf("Get project failed: expected *jira.Project; got %T", proj))
}
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be done in a single type assertion above. you do

project, ok:=proj.(...)
if!ok {
return...
}
...continue using project.

Comment threadcmd/root.go Outdated
return jiraClient.Issue.Search(jql, nil)
})
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)
defer res.Body.Close()
body, _ := ioutil.ReadAll(res.Body)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not suppress this error. In this particular case, if there was an error making the request, then there is a chance that res.Body is nil.

Comment threadcmd/root.go
u, _, err := makeGHRequest(func() (interface{}, *github.Response, error) {
return ghClient.Users.Get(context.Background(), *ghComment.User.Login)
})
if err != nil {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really weird, there should not be a period between these two clauses but rather a colon. Conventionally we do:

log.Errorf("error retrieving GitHub user %s: %v", user.Login, err)

Comment threadcmd/root.go Outdated
user, ok := u.(*github.User)
if !ok {
log.Errorf("Get GitHub user did not return user! Got: %v", u)
return errors.New(fmt.Sprintf("Get GitHub user failed: expected *github.User; got %T", u))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errors should not start with a capital because it is convention to wrap errors in more errors and this results in capitalized words in the middle of sentences. if you use golint, these mistakes will be caught.

Comment threadcmd/root.go Outdated
if !dryRun {
req, err := jClient.NewRequest("PUT", fmt.Sprintf("rest/api/2/issue/%s/comment/%s", jIssue.Key, jComment.ID), request)
if err != nil {
log.Errorf("Error creating comment update request: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Morgan Patch added 2 commits August 7, 2017 09:49
Add the dependency on the github.com/cenkalti/backoff library.
Apparently this also triggered the entire vendor directory to be
refilled or something.
@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Fixed all of your comments.

@MorganEPatch
MorganEPatch merged commit 7473308 into coreos:masterAug 7, 2017
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MorganEPatch@squat
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Introduce backoff to retry requests - #10

Merged
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff
Aug 7, 2017
Merged

Introduce backoff to retry requests#10
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff

Conversation

@MorganEPatch

Copy link
Copy Markdown
Contributor

Depends on #9.

In the event that a request to JIRA or GitHub fails, retry the requests with an exponential backoff, until the request succeeds or sufficient time has passed.

@MorganEPatchMorganEPatch self-assigned this Jul 17, 2017
@MorganEPatchMorganEPatch mentioned this pull request Jul 18, 2017

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, all commit message summaries at CoreOS are <dirs-affected>: summary of commit, so commits that vendor code are normally vendor: .... the commit message for adding the dep should be:

vendor: add backoff lib

@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Okay, good to know. The CONTRIBUTING.md file in our projects just refers to it as "subsystem", I didn't realize it was intended to specifically match the directory names.

Comment threadcmd/root.go
}
}

// makeGHRequest takes an API function from the GitHub library

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

take these functions out of root.go

Comment threadcmd/root.go Outdated
// nil HTTP response and a timeout error are returned.
//
// It is nearly identical to makeGHRequest, but returns a JIRA API response.
func makeJIRARequest(f func() (interface{}, *jira.Response, error)) (ret interface{}, res *jira.Response, err error) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, we do not normally use named returns. I would prefer to see:

var ret interface{}
var res *jira.Response
op := ...
...
return ret, res, nil

Comment threadcmd/root.go Outdated
return nil, jira.CheckResponse(resp.Response)
}
project = *proj
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now a pointer to a pointer. is that what you want? also, make sure to check if the type assertion succeeds.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't a pointer to a pointer be project = &(proj.(*jira.Project))? That should dereference the pointer, so that project is just a jira.Project, no pointer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you're totally right 👍

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
ghIssues := i.([]*github.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check the type assertion to avoid panics later

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
jiraIssues := ji.([]jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issue %s to get comments.", jIssue.Key)
}
issue := i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Debugf("Error body: %s", body)
return err
}
jIssue = i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Errorf("Error retrieving GitHub comments for issue #%d. Error: %s.", *ghIssue.Number, err)
return err
}
comments := c.([]*github.IssueComment)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall look ok, @LyonesGamer. There are a few comments that will be quick to fix. We really need to get the structural changes in before any more features are added because this is completely unmaintanable. Also, in the future, please squash the non-vendor commits. Reviewing this code is almost impossible because each individual commit does not show the full picture, but if you look at all the changes together then all the meaningful changes are lost in thousands of lines of vendor changes.

Comment threadcmd/root.go Outdated
log.Errorf("Get JIRA project did not return project! Value: %v", proj)
return nil, errors.New(fmt.Sprintf("Get project failed: expected *jira.Project; got %T", proj))
}
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be done in a single type assertion above. you do

project, ok:=proj.(...)
if!ok {
return...
}
...continue using project.

Comment threadcmd/root.go Outdated
return jiraClient.Issue.Search(jql, nil)
})
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)
defer res.Body.Close()
body, _ := ioutil.ReadAll(res.Body)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not suppress this error. In this particular case, if there was an error making the request, then there is a chance that res.Body is nil.

Comment threadcmd/root.go
u, _, err := makeGHRequest(func() (interface{}, *github.Response, error) {
return ghClient.Users.Get(context.Background(), *ghComment.User.Login)
})
if err != nil {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really weird, there should not be a period between these two clauses but rather a colon. Conventionally we do:

log.Errorf("error retrieving GitHub user %s: %v", user.Login, err)

Comment threadcmd/root.go Outdated
user, ok := u.(*github.User)
if !ok {
log.Errorf("Get GitHub user did not return user! Got: %v", u)
return errors.New(fmt.Sprintf("Get GitHub user failed: expected *github.User; got %T", u))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errors should not start with a capital because it is convention to wrap errors in more errors and this results in capitalized words in the middle of sentences. if you use golint, these mistakes will be caught.

Comment threadcmd/root.go Outdated
if !dryRun {
req, err := jClient.NewRequest("PUT", fmt.Sprintf("rest/api/2/issue/%s/comment/%s", jIssue.Key, jComment.ID), request)
if err != nil {
log.Errorf("Error creating comment update request: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Morgan Patch added 2 commits August 7, 2017 09:49
Add the dependency on the github.com/cenkalti/backoff library.
Apparently this also triggered the entire vendor directory to be
refilled or something.
@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Fixed all of your comments.

@MorganEPatch
MorganEPatch merged commit 7473308 into coreos:masterAug 7, 2017
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MorganEPatch@squat
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Introduce backoff to retry requests - #10

Merged
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff
Aug 7, 2017
Merged

Introduce backoff to retry requests#10
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff

Conversation

@MorganEPatch

Copy link
Copy Markdown
Contributor

Depends on #9.

In the event that a request to JIRA or GitHub fails, retry the requests with an exponential backoff, until the request succeeds or sufficient time has passed.

@MorganEPatchMorganEPatch self-assigned this Jul 17, 2017
@MorganEPatchMorganEPatch mentioned this pull request Jul 18, 2017

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, all commit message summaries at CoreOS are <dirs-affected>: summary of commit, so commits that vendor code are normally vendor: .... the commit message for adding the dep should be:

vendor: add backoff lib

@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Okay, good to know. The CONTRIBUTING.md file in our projects just refers to it as "subsystem", I didn't realize it was intended to specifically match the directory names.

Comment threadcmd/root.go
}
}

// makeGHRequest takes an API function from the GitHub library

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

take these functions out of root.go

Comment threadcmd/root.go Outdated
// nil HTTP response and a timeout error are returned.
//
// It is nearly identical to makeGHRequest, but returns a JIRA API response.
func makeJIRARequest(f func() (interface{}, *jira.Response, error)) (ret interface{}, res *jira.Response, err error) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, we do not normally use named returns. I would prefer to see:

var ret interface{}
var res *jira.Response
op := ...
...
return ret, res, nil

Comment threadcmd/root.go Outdated
return nil, jira.CheckResponse(resp.Response)
}
project = *proj
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now a pointer to a pointer. is that what you want? also, make sure to check if the type assertion succeeds.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't a pointer to a pointer be project = &(proj.(*jira.Project))? That should dereference the pointer, so that project is just a jira.Project, no pointer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you're totally right 👍

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
ghIssues := i.([]*github.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check the type assertion to avoid panics later

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
jiraIssues := ji.([]jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issue %s to get comments.", jIssue.Key)
}
issue := i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Debugf("Error body: %s", body)
return err
}
jIssue = i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Errorf("Error retrieving GitHub comments for issue #%d. Error: %s.", *ghIssue.Number, err)
return err
}
comments := c.([]*github.IssueComment)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall look ok, @LyonesGamer. There are a few comments that will be quick to fix. We really need to get the structural changes in before any more features are added because this is completely unmaintanable. Also, in the future, please squash the non-vendor commits. Reviewing this code is almost impossible because each individual commit does not show the full picture, but if you look at all the changes together then all the meaningful changes are lost in thousands of lines of vendor changes.

Comment threadcmd/root.go Outdated
log.Errorf("Get JIRA project did not return project! Value: %v", proj)
return nil, errors.New(fmt.Sprintf("Get project failed: expected *jira.Project; got %T", proj))
}
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be done in a single type assertion above. you do

project, ok:=proj.(...)
if!ok {
return...
}
...continue using project.

Comment threadcmd/root.go Outdated
return jiraClient.Issue.Search(jql, nil)
})
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)
defer res.Body.Close()
body, _ := ioutil.ReadAll(res.Body)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not suppress this error. In this particular case, if there was an error making the request, then there is a chance that res.Body is nil.

Comment threadcmd/root.go
u, _, err := makeGHRequest(func() (interface{}, *github.Response, error) {
return ghClient.Users.Get(context.Background(), *ghComment.User.Login)
})
if err != nil {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really weird, there should not be a period between these two clauses but rather a colon. Conventionally we do:

log.Errorf("error retrieving GitHub user %s: %v", user.Login, err)

Comment threadcmd/root.go Outdated
user, ok := u.(*github.User)
if !ok {
log.Errorf("Get GitHub user did not return user! Got: %v", u)
return errors.New(fmt.Sprintf("Get GitHub user failed: expected *github.User; got %T", u))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errors should not start with a capital because it is convention to wrap errors in more errors and this results in capitalized words in the middle of sentences. if you use golint, these mistakes will be caught.

Comment threadcmd/root.go Outdated
if !dryRun {
req, err := jClient.NewRequest("PUT", fmt.Sprintf("rest/api/2/issue/%s/comment/%s", jIssue.Key, jComment.ID), request)
if err != nil {
log.Errorf("Error creating comment update request: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Morgan Patch added 2 commits August 7, 2017 09:49
Add the dependency on the github.com/cenkalti/backoff library.
Apparently this also triggered the entire vendor directory to be
refilled or something.
@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Fixed all of your comments.

@MorganEPatch
MorganEPatch merged commit 7473308 into coreos:masterAug 7, 2017
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MorganEPatch@squat
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Introduce backoff to retry requests - #10

Merged
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff
Aug 7, 2017
Merged

Introduce backoff to retry requests#10
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff

Conversation

@MorganEPatch

Copy link
Copy Markdown
Contributor

Depends on #9.

In the event that a request to JIRA or GitHub fails, retry the requests with an exponential backoff, until the request succeeds or sufficient time has passed.

@MorganEPatchMorganEPatch self-assigned this Jul 17, 2017
@MorganEPatchMorganEPatch mentioned this pull request Jul 18, 2017

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, all commit message summaries at CoreOS are <dirs-affected>: summary of commit, so commits that vendor code are normally vendor: .... the commit message for adding the dep should be:

vendor: add backoff lib

@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Okay, good to know. The CONTRIBUTING.md file in our projects just refers to it as "subsystem", I didn't realize it was intended to specifically match the directory names.

Comment threadcmd/root.go
}
}

// makeGHRequest takes an API function from the GitHub library

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

take these functions out of root.go

Comment threadcmd/root.go Outdated
// nil HTTP response and a timeout error are returned.
//
// It is nearly identical to makeGHRequest, but returns a JIRA API response.
func makeJIRARequest(f func() (interface{}, *jira.Response, error)) (ret interface{}, res *jira.Response, err error) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, we do not normally use named returns. I would prefer to see:

var ret interface{}
var res *jira.Response
op := ...
...
return ret, res, nil

Comment threadcmd/root.go Outdated
return nil, jira.CheckResponse(resp.Response)
}
project = *proj
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now a pointer to a pointer. is that what you want? also, make sure to check if the type assertion succeeds.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't a pointer to a pointer be project = &(proj.(*jira.Project))? That should dereference the pointer, so that project is just a jira.Project, no pointer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you're totally right 👍

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
ghIssues := i.([]*github.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check the type assertion to avoid panics later

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
jiraIssues := ji.([]jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issue %s to get comments.", jIssue.Key)
}
issue := i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Debugf("Error body: %s", body)
return err
}
jIssue = i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Errorf("Error retrieving GitHub comments for issue #%d. Error: %s.", *ghIssue.Number, err)
return err
}
comments := c.([]*github.IssueComment)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall look ok, @LyonesGamer. There are a few comments that will be quick to fix. We really need to get the structural changes in before any more features are added because this is completely unmaintanable. Also, in the future, please squash the non-vendor commits. Reviewing this code is almost impossible because each individual commit does not show the full picture, but if you look at all the changes together then all the meaningful changes are lost in thousands of lines of vendor changes.

Comment threadcmd/root.go Outdated
log.Errorf("Get JIRA project did not return project! Value: %v", proj)
return nil, errors.New(fmt.Sprintf("Get project failed: expected *jira.Project; got %T", proj))
}
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be done in a single type assertion above. you do

project, ok:=proj.(...)
if!ok {
return...
}
...continue using project.

Comment threadcmd/root.go Outdated
return jiraClient.Issue.Search(jql, nil)
})
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)
defer res.Body.Close()
body, _ := ioutil.ReadAll(res.Body)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not suppress this error. In this particular case, if there was an error making the request, then there is a chance that res.Body is nil.

Comment threadcmd/root.go
u, _, err := makeGHRequest(func() (interface{}, *github.Response, error) {
return ghClient.Users.Get(context.Background(), *ghComment.User.Login)
})
if err != nil {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really weird, there should not be a period between these two clauses but rather a colon. Conventionally we do:

log.Errorf("error retrieving GitHub user %s: %v", user.Login, err)

Comment threadcmd/root.go Outdated
user, ok := u.(*github.User)
if !ok {
log.Errorf("Get GitHub user did not return user! Got: %v", u)
return errors.New(fmt.Sprintf("Get GitHub user failed: expected *github.User; got %T", u))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errors should not start with a capital because it is convention to wrap errors in more errors and this results in capitalized words in the middle of sentences. if you use golint, these mistakes will be caught.

Comment threadcmd/root.go Outdated
if !dryRun {
req, err := jClient.NewRequest("PUT", fmt.Sprintf("rest/api/2/issue/%s/comment/%s", jIssue.Key, jComment.ID), request)
if err != nil {
log.Errorf("Error creating comment update request: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Morgan Patch added 2 commits August 7, 2017 09:49
Add the dependency on the github.com/cenkalti/backoff library.
Apparently this also triggered the entire vendor directory to be
refilled or something.
@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Fixed all of your comments.

@MorganEPatch
MorganEPatch merged commit 7473308 into coreos:masterAug 7, 2017
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MorganEPatch@squat
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Introduce backoff to retry requests - #10

Merged
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff
Aug 7, 2017
Merged

Introduce backoff to retry requests#10
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff

Conversation

@MorganEPatch

Copy link
Copy Markdown
Contributor

Depends on #9.

In the event that a request to JIRA or GitHub fails, retry the requests with an exponential backoff, until the request succeeds or sufficient time has passed.

@MorganEPatchMorganEPatch self-assigned this Jul 17, 2017
@MorganEPatchMorganEPatch mentioned this pull request Jul 18, 2017

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, all commit message summaries at CoreOS are <dirs-affected>: summary of commit, so commits that vendor code are normally vendor: .... the commit message for adding the dep should be:

vendor: add backoff lib

@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Okay, good to know. The CONTRIBUTING.md file in our projects just refers to it as "subsystem", I didn't realize it was intended to specifically match the directory names.

Comment threadcmd/root.go
}
}

// makeGHRequest takes an API function from the GitHub library

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

take these functions out of root.go

Comment threadcmd/root.go Outdated
// nil HTTP response and a timeout error are returned.
//
// It is nearly identical to makeGHRequest, but returns a JIRA API response.
func makeJIRARequest(f func() (interface{}, *jira.Response, error)) (ret interface{}, res *jira.Response, err error) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, we do not normally use named returns. I would prefer to see:

var ret interface{}
var res *jira.Response
op := ...
...
return ret, res, nil

Comment threadcmd/root.go Outdated
return nil, jira.CheckResponse(resp.Response)
}
project = *proj
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now a pointer to a pointer. is that what you want? also, make sure to check if the type assertion succeeds.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't a pointer to a pointer be project = &(proj.(*jira.Project))? That should dereference the pointer, so that project is just a jira.Project, no pointer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you're totally right 👍

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
ghIssues := i.([]*github.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check the type assertion to avoid panics later

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
jiraIssues := ji.([]jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issue %s to get comments.", jIssue.Key)
}
issue := i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Debugf("Error body: %s", body)
return err
}
jIssue = i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Errorf("Error retrieving GitHub comments for issue #%d. Error: %s.", *ghIssue.Number, err)
return err
}
comments := c.([]*github.IssueComment)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall look ok, @LyonesGamer. There are a few comments that will be quick to fix. We really need to get the structural changes in before any more features are added because this is completely unmaintanable. Also, in the future, please squash the non-vendor commits. Reviewing this code is almost impossible because each individual commit does not show the full picture, but if you look at all the changes together then all the meaningful changes are lost in thousands of lines of vendor changes.

Comment threadcmd/root.go Outdated
log.Errorf("Get JIRA project did not return project! Value: %v", proj)
return nil, errors.New(fmt.Sprintf("Get project failed: expected *jira.Project; got %T", proj))
}
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be done in a single type assertion above. you do

project, ok:=proj.(...)
if!ok {
return...
}
...continue using project.

Comment threadcmd/root.go Outdated
return jiraClient.Issue.Search(jql, nil)
})
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)
defer res.Body.Close()
body, _ := ioutil.ReadAll(res.Body)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not suppress this error. In this particular case, if there was an error making the request, then there is a chance that res.Body is nil.

Comment threadcmd/root.go
u, _, err := makeGHRequest(func() (interface{}, *github.Response, error) {
return ghClient.Users.Get(context.Background(), *ghComment.User.Login)
})
if err != nil {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really weird, there should not be a period between these two clauses but rather a colon. Conventionally we do:

log.Errorf("error retrieving GitHub user %s: %v", user.Login, err)

Comment threadcmd/root.go Outdated
user, ok := u.(*github.User)
if !ok {
log.Errorf("Get GitHub user did not return user! Got: %v", u)
return errors.New(fmt.Sprintf("Get GitHub user failed: expected *github.User; got %T", u))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errors should not start with a capital because it is convention to wrap errors in more errors and this results in capitalized words in the middle of sentences. if you use golint, these mistakes will be caught.

Comment threadcmd/root.go Outdated
if !dryRun {
req, err := jClient.NewRequest("PUT", fmt.Sprintf("rest/api/2/issue/%s/comment/%s", jIssue.Key, jComment.ID), request)
if err != nil {
log.Errorf("Error creating comment update request: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Morgan Patch added 2 commits August 7, 2017 09:49
Add the dependency on the github.com/cenkalti/backoff library.
Apparently this also triggered the entire vendor directory to be
refilled or something.
@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Fixed all of your comments.

@MorganEPatch
MorganEPatch merged commit 7473308 into coreos:masterAug 7, 2017
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MorganEPatch@squat
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Introduce backoff to retry requests - #10

Merged
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff
Aug 7, 2017
Merged

Introduce backoff to retry requests#10
MorganEPatch merged 2 commits into
coreos:masterfrom
MorganEPatch:backoff

Conversation

@MorganEPatch

Copy link
Copy Markdown
Contributor

Depends on #9.

In the event that a request to JIRA or GitHub fails, retry the requests with an exponential backoff, until the request succeeds or sufficient time has passed.

@MorganEPatchMorganEPatch self-assigned this Jul 17, 2017
@MorganEPatchMorganEPatch mentioned this pull request Jul 18, 2017

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, all commit message summaries at CoreOS are <dirs-affected>: summary of commit, so commits that vendor code are normally vendor: .... the commit message for adding the dep should be:

vendor: add backoff lib

@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Okay, good to know. The CONTRIBUTING.md file in our projects just refers to it as "subsystem", I didn't realize it was intended to specifically match the directory names.

Comment threadcmd/root.go
}
}

// makeGHRequest takes an API function from the GitHub library

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

take these functions out of root.go

Comment threadcmd/root.go Outdated
// nil HTTP response and a timeout error are returned.
//
// It is nearly identical to makeGHRequest, but returns a JIRA API response.
func makeJIRARequest(f func() (interface{}, *jira.Response, error)) (ret interface{}, res *jira.Response, err error) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by convention, we do not normally use named returns. I would prefer to see:

var ret interface{}
var res *jira.Response
op := ...
...
return ret, res, nil

Comment threadcmd/root.go Outdated
return nil, jira.CheckResponse(resp.Response)
}
project = *proj
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now a pointer to a pointer. is that what you want? also, make sure to check if the type assertion succeeds.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't a pointer to a pointer be project = &(proj.(*jira.Project))? That should dereference the pointer, so that project is just a jira.Project, no pointer.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes you're totally right 👍

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
ghIssues := i.([]*github.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check the type assertion to avoid panics later

Comment threadcmd/root.go Outdated
if err != nil {
return err
}
jiraIssues := ji.([]jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issue %s to get comments.", jIssue.Key)
}
issue := i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Debugf("Error body: %s", body)
return err
}
jIssue = i.(*jira.Issue)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
log.Errorf("Error retrieving GitHub comments for issue #%d. Error: %s.", *ghIssue.Number, err)
return err
}
comments := c.([]*github.IssueComment)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving GitHub user %s. Error: %s", *ghComment.User.Login, err)
}
user := u.(*github.User)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@squatsquat left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall look ok, @LyonesGamer. There are a few comments that will be quick to fix. We really need to get the structural changes in before any more features are added because this is completely unmaintanable. Also, in the future, please squash the non-vendor commits. Reviewing this code is almost impossible because each individual commit does not show the full picture, but if you look at all the changes together then all the meaningful changes are lost in thousands of lines of vendor changes.

Comment threadcmd/root.go Outdated
log.Errorf("Get JIRA project did not return project! Value: %v", proj)
return nil, errors.New(fmt.Sprintf("Get project failed: expected *jira.Project; got %T", proj))
}
project = *(proj.(*jira.Project))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be done in a single type assertion above. you do

project, ok:=proj.(...)
if!ok {
return...
}
...continue using project.

Comment threadcmd/root.go Outdated
return jiraClient.Issue.Search(jql, nil)
})
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Comment threadcmd/root.go Outdated
if err != nil {
log.Errorf("Error retrieving JIRA issues: %s", err)
defer res.Body.Close()
body, _ := ioutil.ReadAll(res.Body)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do not suppress this error. In this particular case, if there was an error making the request, then there is a chance that res.Body is nil.

Comment threadcmd/root.go
u, _, err := makeGHRequest(func() (interface{}, *github.Response, error) {
return ghClient.Users.Get(context.Background(), *ghComment.User.Login)
})
if err != nil {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really weird, there should not be a period between these two clauses but rather a colon. Conventionally we do:

log.Errorf("error retrieving GitHub user %s: %v", user.Login, err)

Comment threadcmd/root.go Outdated
user, ok := u.(*github.User)
if !ok {
log.Errorf("Get GitHub user did not return user! Got: %v", u)
return errors.New(fmt.Sprintf("Get GitHub user failed: expected *github.User; got %T", u))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Errors should not start with a capital because it is convention to wrap errors in more errors and this results in capitalized words in the middle of sentences. if you use golint, these mistakes will be caught.

Comment threadcmd/root.go Outdated
if !dryRun {
req, err := jClient.NewRequest("PUT", fmt.Sprintf("rest/api/2/issue/%s/comment/%s", jIssue.Key, jComment.ID), request)
if err != nil {
log.Errorf("Error creating comment update request: %s", err)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%v

Morgan Patch added 2 commits August 7, 2017 09:49
Add the dependency on the github.com/cenkalti/backoff library.
Apparently this also triggered the entire vendor directory to be
refilled or something.
@MorganEPatch

Copy link
Copy Markdown
ContributorAuthor

@squat Fixed all of your comments.

@MorganEPatch
MorganEPatch merged commit 7473308 into coreos:masterAug 7, 2017
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@MorganEPatch@squat