AWS SDK V2 Upgrade and update scalers (#4953)

Signed-off-by: Jeevan Reddy Ragula <jeevanragula@gmail.com>

CHANGELOG.md

@@ -58,6 +58,7 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
 - **General**: Add standalone CRD generation to release workflow ([#2726](https://github.com/kedacore/keda/issues/2726))
 - **General**: Adding a changelog validating script to check for formatting and order ([#3190](https://github.com/kedacore/keda/issues/3190))
 - **General**: Update golangci-lint version documented in CONTRIBUTING.md since old version doesn't support go 1.20 (N/A)
+- **General**: Updated AWS SDK and updated all the aws scalers ([#4905](https://github.com/kedacore/keda/issues/4905))
 - **Azure Pod Identity**: Introduce validation to prevent usage of empty identity ID for Azure identity providers ([#4528](https://github.com/kedacore/keda/issues/4528))
 
 ### Fixes

go.mod

@@ -23,7 +23,15 @@ require (
  github.com/Huawei/gophercloud v1.0.21
  github.com/IBM/sarama v1.41.1
  github.com/arangodb/go-driver v1.6.0
- github.com/aws/aws-sdk-go v1.45.2
+ github.com/aws/aws-sdk-go-v2 v1.21.0
+ github.com/aws/aws-sdk-go-v2/config v1.18.38
+ github.com/aws/aws-sdk-go-v2/credentials v1.13.36
+ github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.27.6
+ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.21.5
+ github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.15.5
+ github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5
+ github.com/aws/aws-sdk-go-v2/service/sqs v1.24.5
+ github.com/aws/aws-sdk-go-v2/service/sts v1.21.5
  github.com/bradleyfalzon/ghinstallation/v2 v2.6.0
  github.com/denisenkom/go-mssqldb v0.12.3
  github.com/dysnix/predictkube-libs v0.0.4-0.20230109175007-5a82fccd31c7
@@ -132,6 +140,17 @@ require (
  github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
  github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
  github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
+ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 // indirect
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.13.6 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 // indirect
+ github.com/aws/smithy-go v1.14.2 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/blang/semver/v4 v4.0.0 // indirect
  github.com/cenkalti/backoff/v3 v3.2.2 // indirect

go.sum

@@ -145,8 +145,46 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
-github.com/aws/aws-sdk-go v1.45.2 h1:hTong9YUklQKqzrGk3WnKABReb5R8GjbG4Y6dEQfjnk=
-github.com/aws/aws-sdk-go v1.45.2/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc=
+github.com/aws/aws-sdk-go-v2 v1.21.0/go.mod h1:/RfNgGmRxI+iFOB1OeJUyxiU+9s88k3pfHvDagGEp0M=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 h1:OPLEkmhXf6xFPiz0bLeDArZIDx1NNS4oJyG4nv3Gct0=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13/go.mod h1:gpAbvyDGQFozTEmlTFO8XcQKHzubdq0LzRyJpG6MiXM=
+github.com/aws/aws-sdk-go-v2/config v1.18.38 h1:CByQCELMgm2tM1lAehx3XNg0R/pfeXsYzqn0Aq2chJQ=
+github.com/aws/aws-sdk-go-v2/config v1.18.38/go.mod h1:vNm9Hf5VgG2fSUWhT3zFrqN/RosGcabFMYgiSoxKFU8=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.36 h1:ps0cPswZjpsOk6sLwG6fdXTzrYjCplgPEyG3OUbbdqE=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.36/go.mod h1:sY2phUzxbygoyDtTXhqi7GjGjCQ1S5a5Rj8u3ksBxCg=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 h1:uDZJF1hu0EVT/4bogChk8DyjSF6fof6uL/0Y26Ma7Fg=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11/go.mod h1:TEPP4tENqBGO99KwVpV9MlOX4NSrSLP8u3KRy2CDwA8=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41/go.mod h1:CrObHAuPneJBlfEJ5T3szXOUkLEThaGfvnhTf33buas=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35/go.mod h1:SJC1nEVVva1g3pHAIdCp7QsRIkMmLAgoDquQ9Rr8kYw=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 h1:GPUcE/Yq7Ur8YSUk6lVkoIMWnJNO0HT18GUzCWCgCI0=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42/go.mod h1:rzfdUlfA+jdgLDmPKjd3Chq9V7LVLYo1Nz++Wb91aRo=
+github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.27.6 h1:YUQGnci0QY+X+tu7XI7zy2vnUjmuUw0VT4OC1SikKIw=
+github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.27.6/go.mod h1:1HKxVrj5wsKy/wb2v07vzTSd+YPV1sDsWxferwPK7PA=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.21.5 h1:EeNQ3bDA6hlx3vifHf7LT/l9dh9w7D2XgCdaD11TRU4=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.21.5/go.mod h1:X3ThW5RPV19hi7bnQ0RMAiBjZbzxj4rZlj+qdctbMWY=
+github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.15.5 h1:xoalM/e1YsT6jkLKl6KA9HUiJANwn2ypJsM9lhW2WP0=
+github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.15.5/go.mod h1:7QtKdGj66zM4g5hPgxHRQgFGLGal4EgwggTw5OZH56c=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14 h1:m0QTSI6pZYJTk5WSKx3fm5cNW/DCicVzULBgU/6IyD0=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.14/go.mod h1:dDilntgHy9WnHXsh7dDtUPgHKEfTJIBUTHM8OWm0f/0=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35 h1:UKjpIDLVF90RfV88XurdduMoTxPqtGHZMIDYZQM7RO4=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.35/go.mod h1:B3dUg0V6eJesUTi+m27NUkj7n8hdDKYUpxj8f4+TqaQ=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 h1:CdzPW9kKitgIiLV1+MHobfR5Xg25iYnyzWZhyQuSlDI=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35/go.mod h1:QGF2Rs33W5MaN9gYdEQOBBFPLwTZkEhRwI33f7KIG0o=
+github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5 h1:naSZmQiFjoTLxNjfDy/KgEnWdG3odkR6gIEgTx21YOM=
+github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5/go.mod h1:0h3hOcyFXyjvI3wGt8C8vk2+II9XxHwFM7zH2KvLHmA=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.24.5 h1:RyDpTOMEJO6ycxw1vU/6s0KLFaH3M0z/z9gXHSndPTk=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.24.5/go.mod h1:RZBu4jmYz3Nikzpu/VuVvRnTEJ5a+kf36WT2fcl5Q+Q=
+github.com/aws/aws-sdk-go-v2/service/sso v1.13.6 h1:2PylFCfKCEDv6PeSN09pC/VUiRd10wi1VfHG5FrW0/g=
+github.com/aws/aws-sdk-go-v2/service/sso v1.13.6/go.mod h1:fIAwKQKBFu90pBxx07BFOMJLpRUGu8VOzLJakeY+0K4=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 h1:dnInJb4S0oy8aQuri1mV6ipLlnZPfnsDNB9BGO9PDNY=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5/go.mod h1:yygr8ACQRY2PrEcy3xsUI357stq2AxnFM6DIsR9lij4=
+github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 h1:CQBFElb0LS8RojMJlxRSo/HXipvTZW2S44Lt9Mk2aYQ=
+github.com/aws/aws-sdk-go-v2/service/sts v1.21.5/go.mod h1:VC7JDqsqiwXukYEDjoHh9U0fOJtNWh04FPQz4ct4GGU=
+github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ=
+github.com/aws/smithy-go v1.14.2/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -974,7 +1012,6 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
@@ -1060,15 +1097,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=

pkg/scalers/aws_cloudwatch_scaler.go

@@ -7,9 +7,9 @@ import (
  "strings"
  "time"
 
- "github.com/aws/aws-sdk-go/aws"
- "github.com/aws/aws-sdk-go/service/cloudwatch"
- "github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface"
+ "github.com/aws/aws-sdk-go-v2/aws"
+ "github.com/aws/aws-sdk-go-v2/service/cloudwatch"
+ "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
  "github.com/go-logr/logr"
  v2 "k8s.io/api/autoscaling/v2"
  "k8s.io/metrics/pkg/apis/external_metrics"
@@ -25,7 +25,7 @@ const (
 type awsCloudwatchScaler struct {
  metricType v2.MetricTargetType
  metadata *awsCloudwatchMetadata
- cwClient cloudwatchiface.CloudWatchAPI
+ cwClient cloudwatch.GetMetricDataAPIClient
  logger logr.Logger
 }
 
@@ -55,7 +55,7 @@ type awsCloudwatchMetadata struct {
 }
 
 // NewAwsCloudwatchScaler creates a new awsCloudwatchScaler
-func NewAwsCloudwatchScaler(config *ScalerConfig) (Scaler, error) {
+func NewAwsCloudwatchScaler(ctx context.Context, config *ScalerConfig) (Scaler, error) {
  metricType, err := GetMetricTargetType(config)
  if err != nil {
  return nil, fmt.Errorf("error getting scaler metric type: %w", err)
@@ -66,10 +66,14 @@ func NewAwsCloudwatchScaler(config *ScalerConfig) (Scaler, error) {
  return nil, fmt.Errorf("error parsing cloudwatch metadata: %w", err)
  }
 
+ cloudwatchClient, err := createCloudwatchClient(ctx, meta)
+ if err != nil {
+ return nil, fmt.Errorf("error creating cloudwatch client: %w", err)
+ }
  return &awsCloudwatchScaler{
  metricType: metricType,
  metadata: meta,
- cwClient: createCloudwatchClient(meta),
+ cwClient: cloudwatchClient,
  logger: InitializeLogger(config, "aws_cloudwatch_scaler"),
  }, nil
 }
@@ -106,12 +110,17 @@ func getFloatMetadataValue(metadata map[string]string, key string, required bool
  return defaultValue, nil
 }
 
-func createCloudwatchClient(metadata *awsCloudwatchMetadata) *cloudwatch.CloudWatch {
- sess, config := getAwsConfig(metadata.awsRegion,
- metadata.awsEndpoint,
- metadata.awsAuthorization)
+func createCloudwatchClient(ctx context.Context, metadata *awsCloudwatchMetadata) (*cloudwatch.Client, error) {
+ cfg, err := getAwsConfig(ctx, metadata.awsRegion, metadata.awsAuthorization)
 
- return cloudwatch.New(sess, config)
+ if err != nil {
+ return nil, err
+ }
+ return cloudwatch.NewFromConfig(*cfg, func(options *cloudwatch.Options) {
+ if metadata.awsEndpoint != "" {
+ options.BaseEndpoint = aws.String(metadata.awsEndpoint)
+ }
+ }), nil
 }
 
 func parseAwsCloudwatchMetadata(config *ScalerConfig) (*awsCloudwatchMetadata, error) {
@@ -233,24 +242,24 @@ func parseAwsCloudwatchMetadata(config *ScalerConfig) (*awsCloudwatchMetadata, e
 }
 
 func checkMetricStat(stat string) error {
- for _, s := range cloudwatch.Statistic_Values() {
- if stat == s {
+ for _, s := range types.Statistic("").Values() {
+ if s == types.Statistic(stat) {
  return nil
  }
  }
- return fmt.Errorf("metricStat '%s' is not one of %v", stat, cloudwatch.Statistic_Values())
+ return fmt.Errorf("metricStat '%s' is not one of %v", stat, types.Statistic("").Values())
 }
 
 func checkMetricUnit(unit string) error {
  if unit == "" {
  return nil
  }
- for _, u := range cloudwatch.StandardUnit_Values() {
- if unit == u {
+ for _, s := range types.StandardUnit("").Values() {
+ if s == types.StandardUnit(unit) {
  return nil
  }
  }
- return fmt.Errorf("metricUnit '%s' is not one of %v", unit, cloudwatch.StandardUnit_Values())
+ return fmt.Errorf("metricUnit '%s' is not one of %v", unit, types.StandardUnit("").Values())
 }
 
 func checkMetricStatPeriod(period int64) error {
@@ -278,8 +287,8 @@ func computeQueryWindow(current time.Time, metricPeriodSec, metricEndTimeOffsetS
  return
 }
 
-func (s *awsCloudwatchScaler) GetMetricsAndActivity(_ context.Context, metricName string) ([]external_metrics.ExternalMetricValue, bool, error) {
- metricValue, err := s.GetCloudwatchMetrics()
+func (s *awsCloudwatchScaler) GetMetricsAndActivity(ctx context.Context, metricName string) ([]external_metrics.ExternalMetricValue, bool, error) {
+ metricValue, err := s.GetCloudwatchMetrics(ctx)
 
  if err != nil {
  s.logger.Error(err, "Error getting metric value")
@@ -306,7 +315,7 @@ func (s *awsCloudwatchScaler) Close(context.Context) error {
  return nil
 }
 
-func (s *awsCloudwatchScaler) GetCloudwatchMetrics() (float64, error) {
+func (s *awsCloudwatchScaler) GetCloudwatchMetrics(ctx context.Context) (float64, error) {
  var input cloudwatch.GetMetricDataInput
 
  startTime, endTime := computeQueryWindow(time.Now(), s.metadata.metricStatPeriod, s.metadata.metricEndTimeOffset, s.metadata.metricCollectionTime)
@@ -315,53 +324,53 @@ func (s *awsCloudwatchScaler) GetCloudwatchMetrics() (float64, error) {
  input = cloudwatch.GetMetricDataInput{
  StartTime: aws.Time(startTime),
  EndTime: aws.Time(endTime),
- ScanBy: aws.String(cloudwatch.ScanByTimestampDescending),
- MetricDataQueries: []*cloudwatch.MetricDataQuery{
+ ScanBy: types.ScanByTimestampDescending,
+ MetricDataQueries: []types.MetricDataQuery{
  {
  Expression: aws.String(s.metadata.expression),
  Id: aws.String("q1"),
- Period: aws.Int64(s.metadata.metricStatPeriod),
+ Period: aws.Int32(int32(s.metadata.metricStatPeriod)),
  },
  },
  }
  } else {
- dimensions := []*cloudwatch.Dimension{}
+ var dimensions []types.Dimension
  for i := range s.metadata.dimensionName {
- dimensions = append(dimensions, &cloudwatch.Dimension{
+ dimensions = append(dimensions, types.Dimension{
  Name: &s.metadata.dimensionName[i],
  Value: &s.metadata.dimensionValue[i],
  })
  }
 
- var metricUnit *string
+ var metricUnit string
  if s.metadata.metricUnit != "" {
- metricUnit = aws.String(s.metadata.metricUnit)
+ metricUnit = s.metadata.metricUnit
  }
 
  input = cloudwatch.GetMetricDataInput{
  StartTime: aws.Time(startTime),
  EndTime: aws.Time(endTime),
- ScanBy: aws.String(cloudwatch.ScanByTimestampDescending),
- MetricDataQueries: []*cloudwatch.MetricDataQuery{
+ ScanBy: types.ScanByTimestampDescending,
+ MetricDataQueries: []types.MetricDataQuery{
  {
  Id: aws.String("c1"),
- MetricStat: &cloudwatch.MetricStat{
- Metric: &cloudwatch.Metric{
+ MetricStat: &types.MetricStat{
+ Metric: &types.Metric{
  Namespace: aws.String(s.metadata.namespace),
  Dimensions: dimensions,
  MetricName: aws.String(s.metadata.metricsName),
  },
- Period: aws.Int64(s.metadata.metricStatPeriod),
+ Period: aws.Int32(int32(s.metadata.metricStatPeriod)),
  Stat: aws.String(s.metadata.metricStat),
- Unit: metricUnit,
+ Unit: types.StandardUnit(metricUnit),
  },
  ReturnData: aws.Bool(true),
  },
  },
  }
  }
 
- output, err := s.cwClient.GetMetricData(&input)
+ output, err := s.cwClient.GetMetricData(ctx, &input)
 
  if err != nil {
  s.logger.Error(err, "Failed to get output")
@@ -371,7 +380,7 @@ func (s *awsCloudwatchScaler) GetCloudwatchMetrics() (float64, error) {
  s.logger.V(1).Info("Received Metric Data", "data", output)
  var metricValue float64
  if len(output.MetricDataResults) > 0 && len(output.MetricDataResults[0].Values) > 0 {
- metricValue = *output.MetricDataResults[0].Values[0]
+ metricValue = output.MetricDataResults[0].Values[0]
  } else {
  s.logger.Info("empty metric data received, returning minMetricValue")
  metricValue = s.metadata.minMetricValue

pkg/scalers/aws_cloudwatch_scaler_test.go

@@ -6,9 +6,8 @@ import (
  "testing"
  "time"
 
- "github.com/aws/aws-sdk-go/aws"
- "github.com/aws/aws-sdk-go/service/cloudwatch"
- "github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface"
+ "github.com/aws/aws-sdk-go-v2/service/cloudwatch"
+ "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
  "github.com/go-logr/logr"
  "github.com/stretchr/testify/assert"
 )
@@ -445,25 +444,24 @@ var awsCloudwatchGetMetricTestData = []awsCloudwatchMetadata{
 }
 
 type mockCloudwatch struct {
- cloudwatchiface.CloudWatchAPI
 }
 
-func (m *mockCloudwatch) GetMetricData(input *cloudwatch.GetMetricDataInput) (*cloudwatch.GetMetricDataOutput, error) {
+func (m *mockCloudwatch) GetMetricData(_ context.Context, input *cloudwatch.GetMetricDataInput, _ ...func(*cloudwatch.Options)) (*cloudwatch.GetMetricDataOutput, error) {
  if input.MetricDataQueries[0].MetricStat != nil {
  switch *input.MetricDataQueries[0].MetricStat.Metric.MetricName {
  case testAWSCloudwatchErrorMetric:
  return nil, errors.New("error")
  case testAWSCloudwatchNoValueMetric:
  return &cloudwatch.GetMetricDataOutput{
- MetricDataResults: []*cloudwatch.MetricDataResult{},
+ MetricDataResults: []types.MetricDataResult{},
  }, nil
  }
  }
 
  return &cloudwatch.GetMetricDataOutput{
- MetricDataResults: []*cloudwatch.MetricDataResult{
+ MetricDataResults: []types.MetricDataResult{
  {
- Values: []*float64{aws.Float64(10)},
+ Values: []float64{10},
  },
  },
  }, nil