object: add httpClient param to object.NewS3Agent()
To allow the caller to pass in their own transport when testing. Signed-off-by: Joshua Hoblitt <josh@hoblitt.com>
This commit is contained in:
1 parent
e5f79dba7f
commit
57b7eeec80
7 files changed
+50
-59
No files matched your search
@@ -735,15 +735,6 @@ func (p *Provisioner) setAdminOpsAPIClient() error {
|
||||
|
||||
func (p *Provisioner) setS3Agent() error {
|
||||
var err error
|
||||
|
||||
if p.insecureTLS {
|
||||
p.s3Agent, err = object.NewInsecureS3Agent(p.accessKeyID, p.secretAccessKey, p.getObjectStoreEndpoint(), logger.LevelAt(capnslog.DEBUG))
|
||||
} else {
|
||||
p.s3Agent, err = object.NewS3Agent(p.accessKeyID, p.secretAccessKey, p.getObjectStoreEndpoint(), logger.LevelAt(capnslog.DEBUG), p.tlsCert)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
p.s3Agent, err = object.NewS3Agent(p.accessKeyID, p.secretAccessKey, p.getObjectStoreEndpoint(), logger.LevelAt(capnslog.DEBUG), p.tlsCert, p.insecureTLS, nil)
|
||||
return err
|
||||
}
|
||||
@@ -91,10 +91,7 @@ func newS3Agent(p provisioner) (*object.S3Agent, error) {
|
||||
}
|
||||
}
|
||||
|
||||
if insecureTLS {
|
||||
return object.NewInsecureS3Agent(accessKey, secretKey, objContext.Endpoint, logger.LevelAt(capnslog.DEBUG))
|
||||
}
|
||||
return object.NewS3Agent(accessKey, secretKey, objContext.Endpoint, logger.LevelAt(capnslog.DEBUG), tlsCert)
|
||||
return object.NewS3Agent(accessKey, secretKey, objContext.Endpoint, logger.LevelAt(capnslog.DEBUG), tlsCert, insecureTLS, nil)
|
||||
}
|
||||
|
||||
// TODO: convert all rules without restrictions once the AWS SDK supports that
|
||||
|
||||
@@ -39,27 +39,24 @@ type S3Agent struct {
|
||||
Client *s3.S3
|
||||
}
|
||||
|
||||
func NewS3Agent(accessKey, secretKey, endpoint string, debug bool, tlsCert []byte) (*S3Agent, error) {
|
||||
return newS3Agent(accessKey, secretKey, endpoint, debug, tlsCert, false)
|
||||
}
|
||||
|
||||
func NewInsecureS3Agent(accessKey, secretKey, endpoint string, debug bool) (*S3Agent, error) {
|
||||
return newS3Agent(accessKey, secretKey, endpoint, debug, nil, true)
|
||||
}
|
||||
|
||||
func newS3Agent(accessKey, secretKey, endpoint string, debug bool, tlsCert []byte, insecure bool) (*S3Agent, error) {
|
||||
func NewS3Agent(accessKey, secretKey, endpoint string, debug bool, tlsCert []byte, insecure bool, httpClient *http.Client) (*S3Agent, error) {
|
||||
logLevel := aws.LogOff
|
||||
if debug {
|
||||
logLevel = aws.LogDebug
|
||||
}
|
||||
client := http.Client{
|
||||
Timeout: HttpTimeOut,
|
||||
}
|
||||
tlsEnabled := false
|
||||
if len(tlsCert) > 0 || insecure {
|
||||
tlsEnabled = true
|
||||
client.Transport = BuildTransportTLS(tlsCert, insecure)
|
||||
}
|
||||
if httpClient == nil {
|
||||
httpClient = &http.Client{
|
||||
Timeout: HttpTimeOut,
|
||||
}
|
||||
if tlsEnabled {
|
||||
httpClient.Transport = BuildTransportTLS(tlsCert, insecure)
|
||||
}
|
||||
}
|
||||
|
||||
session, err := awssession.NewSession(
|
||||
aws.NewConfig().
|
||||
WithRegion(CephRegion).
|
||||
@@ -68,7 +65,7 @@ func newS3Agent(accessKey, secretKey, endpoint string, debug bool, tlsCert []byt
|
||||
WithS3ForcePathStyle(true).
|
||||
WithMaxRetries(5).
|
||||
WithDisableSSL(!tlsEnabled).
|
||||
WithHTTPClient(&client).
|
||||
WithHTTPClient(httpClient).
|
||||
WithLogLevel(logLevel),
|
||||
)
|
||||
if err != nil {
|
||||
|
||||
@@ -32,7 +32,7 @@ func TestNewS3Agent(t *testing.T) {
|
||||
t.Run("test without tls/debug", func(t *testing.T) {
|
||||
debug := false
|
||||
insecure := false
|
||||
s3Agent, err := newS3Agent(accessKey, secretKey, endpoint, debug, nil, insecure)
|
||||
s3Agent, err := NewS3Agent(accessKey, secretKey, endpoint, debug, nil, insecure, nil)
|
||||
assert.NoError(t, err)
|
||||
assert.NotEqual(t, aws.LogDebug, s3Agent.Client.Config.LogLevel)
|
||||
assert.Equal(t, nil, s3Agent.Client.Config.HTTPClient.Transport)
|
||||
@@ -42,7 +42,7 @@ func TestNewS3Agent(t *testing.T) {
|
||||
debug := true
|
||||
logLevel := aws.LogDebug
|
||||
insecure := false
|
||||
s3Agent, err := newS3Agent(accessKey, secretKey, endpoint, debug, nil, insecure)
|
||||
s3Agent, err := NewS3Agent(accessKey, secretKey, endpoint, debug, nil, insecure, nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, &logLevel, s3Agent.Client.Config.LogLevel)
|
||||
assert.Nil(t, s3Agent.Client.Config.HTTPClient.Transport)
|
||||
@@ -51,7 +51,7 @@ func TestNewS3Agent(t *testing.T) {
|
||||
t.Run("test without tls client cert but insecure tls", func(t *testing.T) {
|
||||
debug := true
|
||||
insecure := true
|
||||
s3Agent, err := newS3Agent(accessKey, secretKey, endpoint, debug, nil, insecure)
|
||||
s3Agent, err := NewS3Agent(accessKey, secretKey, endpoint, debug, nil, insecure, nil)
|
||||
assert.NoError(t, err)
|
||||
assert.NotNil(t, s3Agent.Client.Config.HTTPClient.Transport.(*http.Transport).TLSClientConfig.RootCAs) // still includes sys certs
|
||||
assert.True(t, s3Agent.Client.Config.HTTPClient.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify)
|
||||
@@ -61,7 +61,7 @@ func TestNewS3Agent(t *testing.T) {
|
||||
debug := true
|
||||
insecure := false
|
||||
tlsCert := []byte("tlsCert")
|
||||
s3Agent, err := newS3Agent(accessKey, secretKey, endpoint, debug, tlsCert, insecure)
|
||||
s3Agent, err := NewS3Agent(accessKey, secretKey, endpoint, debug, tlsCert, insecure, nil)
|
||||
assert.NoError(t, err)
|
||||
assert.NotNil(t, s3Agent.Client.Config.HTTPClient.Transport.(*http.Transport).TLSClientConfig.RootCAs)
|
||||
assert.False(t, *s3Agent.Client.Config.DisableSSL)
|
||||
@@ -70,10 +70,32 @@ func TestNewS3Agent(t *testing.T) {
|
||||
debug := true
|
||||
insecure := true
|
||||
tlsCert := []byte("tlsCert")
|
||||
s3Agent, err := newS3Agent(accessKey, secretKey, endpoint, debug, tlsCert, insecure)
|
||||
s3Agent, err := NewS3Agent(accessKey, secretKey, endpoint, debug, tlsCert, insecure, nil)
|
||||
assert.NoError(t, err)
|
||||
assert.NotNil(t, s3Agent.Client.Config.HTTPClient.Transport)
|
||||
assert.True(t, s3Agent.Client.Config.HTTPClient.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify)
|
||||
assert.False(t, *s3Agent.Client.Config.DisableSSL)
|
||||
})
|
||||
t.Run("test with custom http.Client", func(t *testing.T) {
|
||||
debug := true
|
||||
logLevel := aws.LogDebug
|
||||
insecure := false
|
||||
httpClient := &http.Client{
|
||||
Transport: &http.Transport{
|
||||
// set some values to check if they are passed through
|
||||
MaxIdleConns: 7,
|
||||
MaxIdleConnsPerHost: 13,
|
||||
MaxConnsPerHost: 17,
|
||||
},
|
||||
}
|
||||
s3Agent, err := NewS3Agent(accessKey, secretKey, endpoint, debug, nil, insecure, httpClient)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, &logLevel, s3Agent.Client.Config.LogLevel)
|
||||
assert.NotNil(t, s3Agent.Client.Config.HTTPClient.Transport)
|
||||
assert.True(t, *s3Agent.Client.Config.DisableSSL)
|
||||
transport := s3Agent.Client.Config.HTTPClient.Transport
|
||||
assert.Equal(t, 7, transport.(*http.Transport).MaxIdleConns)
|
||||
assert.Equal(t, 13, transport.(*http.Transport).MaxIdleConnsPerHost)
|
||||
assert.Equal(t, 17, transport.(*http.Transport).MaxConnsPerHost)
|
||||
})
|
||||
}
|
||||
Reference in new issue
Block a user