Skip to content

feat: Obey Octopus Server rate limits #757

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
YuKitsune merged 3 commits into from
Oct 16, 2026
Merged

feat: Obey Octopus Server rate limits #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8eaef56
wip: Support rate limiting
YuKitsune Oct 15, 2026
ceaeb29
chore: Update go-octopusdeploy rate limiting branch and fix tests
YuKitsune Oct 16, 2026
f819559
Use the released version
YuKitsune Oct 16, 2026
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/AlecAivazis/survey/v2 v2.3.7
github.com/MakeNowJust/heredoc/v2 v2.0.1
github.com/OctopusDeploy/go-octodiff v1.0.0
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.120.1
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.122.0
github.com/OctopusDeploy/go-octopusversioning v1.0.0
github.com/bmatcuk/doublestar/v4 v4.10.2
github.com/briandowns/spinner v1.23.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
github.com/OctopusDeploy/go-octodiff v1.0.0 h1:U+ORg6azniwwYo+O44giOw6TiD5USk8S4VDhOQ0Ven0=
github.com/OctopusDeploy/go-octodiff v1.0.0/go.mod h1:Mze0+EkOWTgTmi8++fyUc6r0aLZT7qD9gX+31t8MmIU=
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.120.1 h1:tEzyCSmtPFKNnlVpkEbV/Cf988LYMkpJkQCPGqJLHJY=
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.120.1/go.mod h1:y/waaa0IIa4fYeALqKd3NDoNlwhEbMLkrDPS8D+nRxg=
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.122.0 h1:AIxfHgUjbKMSD/VhHmZIeDZlCAhye7c3fDBrjz3M27I=
github.com/OctopusDeploy/go-octopusdeploy/v2 v2.122.0/go.mod h1:y/waaa0IIa4fYeALqKd3NDoNlwhEbMLkrDPS8D+nRxg=
github.com/OctopusDeploy/go-octopusversioning v1.0.0 h1:doAb5zfPTJ8neaOuJLtP/ZyBjTqlEQejjX+FRW5ggkw=
github.com/OctopusDeploy/go-octopusversioning v1.0.0/go.mod h1:i2j1FPBKueJkWh/mk36sstqCuUPkOde8ayZeDIDIcZs=
github.com/bmatcuk/doublestar/v4 v4.10.2 h1:eF7W7HWKg3z9NrWV9pTLnNeoXaqq3Tq9DNKXVMfoCnw=
Expand Down
5 changes: 3 additions & 2 deletions pkg/apiclient/client_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"strings"

"github.com/MakeNowJust/heredoc/v2"
"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/client/ratelimit"
"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/spaces"
"github.com/spf13/viper"

Expand Down Expand Up @@ -126,9 +127,9 @@ func NewClientFactoryFromConfig(ask question.AskProvider) (ClientFactory, error)
// The spinner is only wanted in interactive mode, but that is not settled
// yet: this runs before cobra parses --no-prompt. The round-tripper decides
// per request instead.
httpClient := &http.Client{
httpClient := ratelimit.NewHttpClient(&http.Client{
Transport: NewSpinnerRoundTripper(ask),
}
}, ratelimit.DefaultOptions())

var credentials octopusApiClient.ICredential

Expand Down
3 changes: 3 additions & 0 deletions pkg/cmd/login/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/AlecAivazis/survey/v2"
"github.com/MakeNowJust/heredoc/v2"
"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/client/ratelimit"
"github.com/pkg/browser"
"github.com/spf13/cobra"

Expand Down Expand Up @@ -414,6 +415,8 @@ func skipTlsVerification(roundTripper http.RoundTripper) error {
return nil
case *apiclient.SpinnerRoundTripper:
return skipTlsVerification(transport.Next)
case *ratelimit.Transport:
return skipTlsVerification(transport.Base())
default:
// Better to say so than to quietly leave verification on after the
// caller asked for the opposite.
Expand Down
Loading