diff --git a/pkg/scalers/aws_sigv4.go b/pkg/scalers/aws_sigv4.go index df84a8011d0..8a449b9ef1d 100644 --- a/pkg/scalers/aws_sigv4.go +++ b/pkg/scalers/aws_sigv4.go @@ -11,15 +11,11 @@ import ( v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4" "github.com/aws/aws-sdk-go-v2/service/amp" + awsutils "github.com/kedacore/keda/v2/pkg/scalers/aws" + httputils "github.com/kedacore/keda/v2/pkg/util" ) -// SigV4Config configures signing requests with SigV4. -type SigV4Config struct { - Enabled bool `yaml:"enabled,omitempty"` - Region string `yaml:"region,omitempty"` -} - type awsConfigMetadata struct { awsRegion string awsAuthorization awsutils.AuthorizationMetadata @@ -51,7 +47,7 @@ func (rt *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) { return nil, err } // Create default transport - transport := &http.Transport{} + transport := httputils.CreateHTTPTransport(false) // Send signed request return transport.RoundTrip(req) @@ -60,12 +56,6 @@ func (rt *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) { func parseAwsAMPMetadata(config *ScalerConfig) (*awsConfigMetadata, error) { meta := awsConfigMetadata{} - if val, ok := config.TriggerMetadata["awsRegion"]; ok && val != "" { - meta.awsRegion = val - } else { - return nil, ErrAwsAMPNoAwsRegion - } - auth, err := awsutils.GetAwsAuthorization(config.TriggerUniqueKey, config.PodIdentity, config.TriggerMetadata, config.AuthParams, config.ResolvedEnv) if err != nil { return nil, err @@ -97,14 +87,10 @@ func NewSigV4RoundTripper(config *ScalerConfig) (http.RoundTripper, error) { return nil, fmt.Errorf("trigger metadata cannot be nil") } - awsRegion := triggerMetadata["awsRegion"] - if awsRegion == "" { - return nil, fmt.Errorf("awsRegion not configured in trigger metadata") - } client := amp.NewFromConfig(*awsCfg, func(o *amp.Options) {}) rt := &roundTripper{ client: client, - region: awsRegion, + region: metadata.awsRegion, } return rt, nil diff --git a/pkg/scalers/aws_sigv4_test.go b/pkg/scalers/aws_sigv4_test.go index d0e0bd8c8c6..5eaa9c2fcc6 100644 --- a/pkg/scalers/aws_sigv4_test.go +++ b/pkg/scalers/aws_sigv4_test.go @@ -5,15 +5,12 @@ import ( "strings" "testing" - "github.com/kedacore/keda/v2/pkg/util" "github.com/stretchr/testify/require" + + "github.com/kedacore/keda/v2/pkg/util" ) func TestSigV4RoundTripper(t *testing.T) { - // rt := &roundTripper{ - // client: amp.New(nil), - // region: "us-west-2", - // } transport := util.CreateHTTPTransport(false)