diff --git a/go.mod b/go.mod index 0b5b9682..8948612c 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 24d7e943..20b63901 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/pkg/apiclient/client_factory.go b/pkg/apiclient/client_factory.go index fb622e65..a2ec8fc0 100644 --- a/pkg/apiclient/client_factory.go +++ b/pkg/apiclient/client_factory.go @@ -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" @@ -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 diff --git a/pkg/cmd/login/login.go b/pkg/cmd/login/login.go index 94123999..5ce2c5e1 100644 --- a/pkg/cmd/login/login.go +++ b/pkg/cmd/login/login.go @@ -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" @@ -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.