Skip to content

Deal with github bridge import rate limit #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichaelMure merged 16 commits into from
Apr 10, 2021
Merged

Deal with github bridge import rate limit #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
689b640
Deal with github bridge import rate limit
rng-dynamics Feb 26, 2021
9a8e487
Fix errors: deadlock and empty titles
rng-dynamics Mar 5, 2021
93b14c5
Remove maps containing channels.
rng-dynamics Mar 8, 2021
d7f555b
Github bridge: try again in case of web API error
rng-dynamics Mar 9, 2021
52fba35
Github bridge: send message to user when waiting
rng-dynamics Mar 17, 2021
2646c63
Github bridge: Refactor
rng-dynamics Mar 22, 2021
21b330d
Github bridge: fix message about timeout
rng-dynamics Mar 27, 2021
db57227
Github bridge: stop sleep-timer on SIGINT
rng-dynamics Mar 27, 2021
b2e98ef
Github bridge: refactor message handling
rng-dynamics Mar 28, 2021
3d14e2e
Bridges: move credential loading and client creation
rng-dynamics Apr 8, 2021
ede5e21
Add comment to clarify look ahead in import channel
rng-dynamics Apr 8, 2021
0fd5701
Improve feedback for user when Github rate limiting
rng-dynamics Apr 8, 2021
1520f67
Merge remote-tracking branch 'origin/master' into dev-gh-bridge
MichaelMure Apr 9, 2021
10a80f1
github: minor cleanups
MichaelMure Apr 9, 2021
be24cdf
Revert "Bridges: move credential loading and client creation"
rng-dynamics Apr 9, 2021
8fb6ea0
Github brdige: move credential loading and client creation back
rng-dynamics Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions bridge/core/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ const (
// but not severe enough to consider the import a failure.
ImportEventWarning

// The import system (web API) has reached the rate limit
ImportEventRateLimiting

// Error happened during import
ImportEventError
)
Expand Down Expand Up @@ -87,6 +90,8 @@ func (er ImportResult) String() string {
parts = append(parts, fmt.Sprintf("err: %s", er.Err))
}
return strings.Join(parts, " ")
case ImportEventRateLimiting:
return fmt.Sprintf("rate limiting: %s", er.Reason)

default:
panic("unknown import result")
Expand Down Expand Up @@ -165,3 +170,10 @@ func NewImportIdentity(id entity.Id) ImportResult {
Event: ImportEventIdentity,
}
}

func NewImportRateLimiting(msg string) ImportResult {
return ImportResult{
Reason: msg,
Event: ImportEventRateLimiting,
}
}
2 changes: 1 addition & 1 deletion bridge/github/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func promptUserToGoToBrowser(url, userCode string) {
fmt.Println("Please visit the following Github URL in a browser and enter your user authentication code.")
fmt.Println()
fmt.Println(" URL:", url)
fmt.Println(" user authentiation code:", userCode)
fmt.Println(" user authentication code:", userCode)
fmt.Println()
}

Expand Down
4 changes: 2 additions & 2 deletions bridge/github/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ func (ge *githubExporter) cacheGithubLabels(ctx context.Context, gc *githubv4.Cl
return nil
}

func (ge *githubExporter) getLabelID(gc *githubv4.Client, label string) (string, error) {
func (ge *githubExporter) getLabelID(label string) (string, error) {
label = strings.ToLower(label)
for cachedLabel, ID := range ge.cachedLabels {
if label == strings.ToLower(cachedLabel) {
Expand Down Expand Up @@ -598,7 +598,7 @@ func (ge *githubExporter) createGithubLabelV4(gc *githubv4.Client, label, labelC

func (ge *githubExporter) getOrCreateGithubLabelID(ctx context.Context, gc *githubv4.Client, repositoryID string, label bug.Label) (string, error) {
// try to get label id from cache
labelID, err := ge.getLabelID(gc, string(label))
labelID, err := ge.getLabelID(string(label))
if err == nil {
return labelID, nil
}
Expand Down
2 changes: 1 addition & 1 deletion bridge/github/export_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ func TestGithubPushPull(t *testing.T) {
require.True(t, ok)
require.Equal(t, issueOrigin, target)

//TODO: maybe more tests to ensure bug final state
// TODO: maybe more tests to ensure bug final state
})
}
}
Expand Down
Loading