AWS: Update deprecated aws-sdk functions from env variable versions (#89643)
This commit is contained in:
@@ -4,7 +4,9 @@ import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/grafana/grafana-aws-sdk/pkg/awsds"
|
||||
awssdk "github.com/grafana/grafana-aws-sdk/pkg/sigv4"
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
|
||||
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
|
||||
"github.com/mwitkow/go-conntrack"
|
||||
|
||||
@@ -42,7 +44,21 @@ func New(cfg *setting.Cfg, validator validations.PluginRequestValidator, tracer
|
||||
|
||||
// SigV4 signing should be performed after all headers are added
|
||||
if cfg.SigV4AuthEnabled {
|
||||
middlewares = append(middlewares, awssdk.SigV4Middleware(cfg.SigV4VerboseLogging))
|
||||
authSettings := awsds.AuthSettings{
|
||||
AllowedAuthProviders: cfg.AWSAllowedAuthProviders,
|
||||
AssumeRoleEnabled: cfg.AWSAssumeRoleEnabled,
|
||||
ExternalID: cfg.AWSExternalId,
|
||||
ListMetricsPageLimit: cfg.AWSListMetricsPageLimit,
|
||||
SecureSocksDSProxyEnabled: cfg.SecureSocksDSProxy.Enabled,
|
||||
}
|
||||
if cfg.AWSSessionDuration != "" {
|
||||
sessionDuration, err := gtime.ParseDuration(cfg.AWSSessionDuration)
|
||||
if err == nil {
|
||||
authSettings.SessionDuration = &sessionDuration
|
||||
}
|
||||
}
|
||||
|
||||
middlewares = append(middlewares, awssdk.SigV4MiddlewareWithAuthSettings(cfg.SigV4VerboseLogging, authSettings))
|
||||
}
|
||||
|
||||
setDefaultTimeoutOptions(cfg)
|
||||
|
||||
Reference in New Issue
Block a user