From 4fc8718266ba64088156fedaffdca286cce04605 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Wed, 1 Oct 2025 02:46:20 +0800 Subject: [PATCH] test: replace AWS SDK v1 imports with v2 We migrated to AWS SDK v2 in https://github.com/kubernetes-sigs/aws-load-balancer-controller/pull/3844. But some new commits accidentally introduced v1 package back again: - 643f33d6b30849e4aaf2a6e7d50003e56435a1ad - 4f950a1d3e07952f17f22176d0acfe868c60a06e - b0e9edd341bcf81c4c519795381ff5e573128376 - 0169f632dd42f767f304143efd18a54dc1a22b31 - 73b1f0e01a6913512c0d1aff4000a3fc93e89f73 - d85426e9371efbc8a82f918ebf98b52ab2b1e08d - 04e8e9b5b4961ab57bcc4f22706219f8e448bf48 Signed-off-by: Eng Zer Jun --- go.mod | 5 +- go.sum | 46 +++++-------------- .../elbv2/load_balancer_manager_test.go | 41 ++++++++--------- .../model/model_build_listener_test.go | 31 ++++++------- pkg/ingress/model_build_listener_test.go | 9 ++-- pkg/networking/subnet_resolver_test.go | 3 +- pkg/service/model_build_load_balancer_test.go | 19 ++++---- .../resource_manager_test.go | 9 ++-- test/e2e/gateway/alb_instance_target_test.go | 7 ++- test/e2e/gateway/alb_ip_target_test.go | 7 ++- 10 files changed, 73 insertions(+), 104 deletions(-) diff --git a/go.mod b/go.mod index 2129fefc86..65c2dc53b8 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module sigs.k8s.io/aws-load-balancer-controller go 1.24.6 require ( - github.com/aws/aws-sdk-go v1.55.5 github.com/aws/aws-sdk-go-v2 v1.36.3 github.com/aws/aws-sdk-go-v2/config v1.27.27 github.com/aws/aws-sdk-go-v2/credentials v1.17.27 @@ -35,6 +34,8 @@ require ( golang.org/x/net v0.42.0 golang.org/x/time v0.12.0 gomodules.xyz/jsonpatch/v2 v2.4.0 + google.golang.org/grpc v1.71.1 + google.golang.org/protobuf v1.36.6 helm.sh/helm/v3 v3.18.5 k8s.io/api v0.33.3 k8s.io/apimachinery v0.33.3 @@ -166,8 +167,6 @@ require ( golang.org/x/text v0.27.0 // indirect golang.org/x/tools v0.34.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.71.1 // indirect - google.golang.org/protobuf v1.36.6 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index b12e6bf2d7..2f590f8e43 100644 --- a/go.sum +++ b/go.sum @@ -29,8 +29,6 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= 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.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= -github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM= github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg= github.com/aws/aws-sdk-go-v2/config v1.27.27 h1:HdqgGt1OAP0HkEDDShEl0oSYa9ZZBSOmKpdpsDMdO90= @@ -87,8 +85,6 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= -github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFquP7hsFII= -github.com/containerd/containerd v1.7.27/go.mod h1:xZmPnl75Vc+BLGt4MIfu6bp+fy03gdHAn9bz+FreFR0= github.com/containerd/containerd v1.7.28 h1:Nsgm1AtcmEh4AHAJ4gGlNSaKgXiNccU270Dnf81FQ3c= github.com/containerd/containerd v1.7.28/go.mod h1:azUkWcOvHrWvaiUjSQH0fjzuHIwSPg1WL5PshGP4Szs= github.com/containerd/errdefs v0.3.0 h1:FSZgGOeK4yuT/+DnF07/Olde/q4KBoMsaamhXxIMDp4= @@ -287,8 +283,8 @@ github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/Qd github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ= -github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ= +github.com/miekg/dns v1.1.65 h1:0+tIPHzUW0GCge7IiK3guGP57VAw7hoPDfApjkMD1Fc= +github.com/miekg/dns v1.1.65/go.mod h1:Dzw9769uoKVaLuODMDZz9M6ynFU6Em65csPuoi8G0ck= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= @@ -432,8 +428,8 @@ go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 h1:jmTVJ86dP60C01K3slFQ go.opentelemetry.io/contrib/exporters/autoexport v0.57.0/go.mod h1:EJBheUMttD/lABFyLXhce47Wr6DPWYReCzaZiXadH7g= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q= -go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw= -go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I= +go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= +go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 h1:WzNab7hOOLzdDF/EoWCt4glhrbMPVMOO5JYTmpz36Ls= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0/go.mod h1:hKvJwTzJdp90Vh7p6q/9PAOd55dI6WA6sWj62a/JvSs= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 h1:S+LdBGiQXtJdowoJoQPEtI52syEP/JYBUpjO49EQhV8= @@ -458,18 +454,16 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 h1:cC2yDI3IQd0Udsu go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0/go.mod h1:2PD5Ex6z8CFzDbTdOlwyNIUywRr1DN0ospafJM1wJ+s= go.opentelemetry.io/otel/log v0.8.0 h1:egZ8vV5atrUWUbnSsHn6vB8R21G2wrKqNiDt3iWertk= go.opentelemetry.io/otel/log v0.8.0/go.mod h1:M9qvDdUTRCopJcGRKg57+JSQ9LgLBrwwfC32epk5NX8= -go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ= -go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M= -go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM= -go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM= +go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= +go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= +go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= go.opentelemetry.io/otel/sdk/log v0.8.0 h1:zg7GUYXqxk1jnGF/dTdLPrK06xJdrXgqgFLnI4Crxvs= go.opentelemetry.io/otel/sdk/log v0.8.0/go.mod h1:50iXr0UVwQrYS45KbruFrEt4LvAdCaWWgIrsN3ZQggo= -go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= -go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= -go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s= -go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck= +go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= +go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= +go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg= go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -493,9 +487,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w= -golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg= +golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -507,12 +500,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= -golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= -golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc= -golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -555,8 +544,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= -golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= -golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -575,15 +562,10 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= -google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q= -google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08= google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= +google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= -google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0= -google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw= google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI= google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -592,8 +574,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= -google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -647,8 +627,6 @@ oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc= oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o= sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8= sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM= -sigs.k8s.io/gateway-api v1.2.0 h1:LrToiFwtqKTKZcZtoQPTuo3FxhrrhTgzQG0Te+YGSo8= -sigs.k8s.io/gateway-api v1.2.0/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0= sigs.k8s.io/gateway-api v1.3.0 h1:q6okN+/UKDATola4JY7zXzx40WO4VISk7i9DIfOvr9M= sigs.k8s.io/gateway-api v1.3.0/go.mod h1:d8NV8nJbaRbEKem+5IuxkL8gJGOZ+FJ+NvOIltV8gDk= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= diff --git a/pkg/deploy/elbv2/load_balancer_manager_test.go b/pkg/deploy/elbv2/load_balancer_manager_test.go index 0064b5b879..edbff6a487 100644 --- a/pkg/deploy/elbv2/load_balancer_manager_test.go +++ b/pkg/deploy/elbv2/load_balancer_manager_test.go @@ -5,7 +5,6 @@ import ( "testing" elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" - "github.com/aws/aws-sdk-go/aws" "github.com/go-logr/logr" "sigs.k8s.io/aws-load-balancer-controller/pkg/aws/services" @@ -672,11 +671,11 @@ func Test_defaultLoadBalancerManager_updateSDKLoadBalancerWithSubnetMappings(t * SubnetMappings: []elbv2types.SubnetMapping{ { SubnetId: awssdk.String("subnet-A"), - IPv6Address: aws.String("2600:1f18::1"), + IPv6Address: awssdk.String("2600:1f18::1"), }, { SubnetId: awssdk.String("subnet-B"), - IPv6Address: aws.String("2600:1f18::2"), + IPv6Address: awssdk.String("2600:1f18::2"), }, }, }, @@ -690,11 +689,11 @@ func Test_defaultLoadBalancerManager_updateSDKLoadBalancerWithSubnetMappings(t * SubnetMappings: []elbv2model.SubnetMapping{ { SubnetID: "subnet-A", - IPv6Address: aws.String("2600:1f18::1"), + IPv6Address: awssdk.String("2600:1f18::1"), }, { SubnetID: "subnet-B", - IPv6Address: aws.String("2600:1f18::2"), + IPv6Address: awssdk.String("2600:1f18::2"), }, }, Type: elbv2model.LoadBalancerTypeNetwork, @@ -762,11 +761,11 @@ func Test_defaultLoadBalancerManager_removeIPAMPools(t *testing.T) { SubnetMappings: []elbv2model.SubnetMapping{ { SubnetID: "subnet-A", - IPv6Address: aws.String("2600:1f18::1"), + IPv6Address: awssdk.String("2600:1f18::1"), }, { SubnetID: "subnet-B", - IPv6Address: aws.String("2600:1f18::2"), + IPv6Address: awssdk.String("2600:1f18::2"), }, }, Type: elbv2model.LoadBalancerTypeNetwork, @@ -791,11 +790,11 @@ func Test_defaultLoadBalancerManager_removeIPAMPools(t *testing.T) { SubnetMappings: []elbv2model.SubnetMapping{ { SubnetID: "subnet-A", - IPv6Address: aws.String("2600:1f18::1"), + IPv6Address: awssdk.String("2600:1f18::1"), }, { SubnetID: "subnet-B", - IPv6Address: aws.String("2600:1f18::2"), + IPv6Address: awssdk.String("2600:1f18::2"), }, }, Type: elbv2model.LoadBalancerTypeNetwork, @@ -821,11 +820,11 @@ func Test_defaultLoadBalancerManager_removeIPAMPools(t *testing.T) { SubnetMappings: []elbv2model.SubnetMapping{ { SubnetID: "subnet-A", - IPv6Address: aws.String("2600:1f18::1"), + IPv6Address: awssdk.String("2600:1f18::1"), }, { SubnetID: "subnet-B", - IPv6Address: aws.String("2600:1f18::2"), + IPv6Address: awssdk.String("2600:1f18::2"), }, }, Type: elbv2model.LoadBalancerTypeNetwork, @@ -850,11 +849,11 @@ func Test_defaultLoadBalancerManager_removeIPAMPools(t *testing.T) { SubnetMappings: []elbv2model.SubnetMapping{ { SubnetID: "subnet-A", - IPv6Address: aws.String("2600:1f18::1"), + IPv6Address: awssdk.String("2600:1f18::1"), }, { SubnetID: "subnet-B", - IPv6Address: aws.String("2600:1f18::2"), + IPv6Address: awssdk.String("2600:1f18::2"), }, }, Type: elbv2model.LoadBalancerTypeNetwork, @@ -913,11 +912,11 @@ func Test_defaultLoadBalancerManager_addIPAMPools(t *testing.T) { SubnetMappings: []elbv2model.SubnetMapping{ { SubnetID: "subnet-A", - IPv6Address: aws.String("2600:1f18::1"), + IPv6Address: awssdk.String("2600:1f18::1"), }, { SubnetID: "subnet-B", - IPv6Address: aws.String("2600:1f18::2"), + IPv6Address: awssdk.String("2600:1f18::2"), }, }, Type: elbv2model.LoadBalancerTypeNetwork, @@ -944,11 +943,11 @@ func Test_defaultLoadBalancerManager_addIPAMPools(t *testing.T) { SubnetMappings: []elbv2model.SubnetMapping{ { SubnetID: "subnet-A", - IPv6Address: aws.String("2600:1f18::1"), + IPv6Address: awssdk.String("2600:1f18::1"), }, { SubnetID: "subnet-B", - IPv6Address: aws.String("2600:1f18::2"), + IPv6Address: awssdk.String("2600:1f18::2"), }, }, Type: elbv2model.LoadBalancerTypeNetwork, @@ -975,11 +974,11 @@ func Test_defaultLoadBalancerManager_addIPAMPools(t *testing.T) { SubnetMappings: []elbv2model.SubnetMapping{ { SubnetID: "subnet-A", - IPv6Address: aws.String("2600:1f18::1"), + IPv6Address: awssdk.String("2600:1f18::1"), }, { SubnetID: "subnet-B", - IPv6Address: aws.String("2600:1f18::2"), + IPv6Address: awssdk.String("2600:1f18::2"), }, }, Type: elbv2model.LoadBalancerTypeNetwork, @@ -1005,11 +1004,11 @@ func Test_defaultLoadBalancerManager_addIPAMPools(t *testing.T) { SubnetMappings: []elbv2model.SubnetMapping{ { SubnetID: "subnet-A", - IPv6Address: aws.String("2600:1f18::1"), + IPv6Address: awssdk.String("2600:1f18::1"), }, { SubnetID: "subnet-B", - IPv6Address: aws.String("2600:1f18::2"), + IPv6Address: awssdk.String("2600:1f18::2"), }, }, Type: elbv2model.LoadBalancerTypeNetwork, diff --git a/pkg/gateway/model/model_build_listener_test.go b/pkg/gateway/model/model_build_listener_test.go index e78ee33a77..a859588694 100644 --- a/pkg/gateway/model/model_build_listener_test.go +++ b/pkg/gateway/model/model_build_listener_test.go @@ -15,7 +15,6 @@ import ( "strings" "testing" - "github.com/aws/aws-sdk-go/aws" "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" @@ -394,11 +393,11 @@ func TestBuildCertificates(t *testing.T) { hostnames: []string{"my-host-1", "my-host-2"}, }, lbLsCfg: &elbv2gw.ListenerConfiguration{ - DefaultCertificate: aws.String("arn:aws:acm:region:123456789012:certificate/default-cert"), + DefaultCertificate: awssdk.String("arn:aws:acm:region:123456789012:certificate/default-cert"), }, want: []elbv2model.Certificate{ { - CertificateARN: aws.String("arn:aws:acm:region:123456789012:certificate/default-cert"), + CertificateARN: awssdk.String("arn:aws:acm:region:123456789012:certificate/default-cert"), }, }, }, @@ -422,16 +421,16 @@ func TestBuildCertificates(t *testing.T) { }, lbLsCfg: &elbv2gw.ListenerConfiguration{ Certificates: []*string{ - aws.String("arn:aws:acm:region:123456789012:certificate/extra-cert-1"), - aws.String("arn:aws:acm:region:123456789012:certificate/extra-cert-2"), + awssdk.String("arn:aws:acm:region:123456789012:certificate/extra-cert-1"), + awssdk.String("arn:aws:acm:region:123456789012:certificate/extra-cert-2"), }, }, want: []elbv2model.Certificate{ { - CertificateARN: aws.String("arn:aws:acm:region:123456789012:certificate/extra-cert-1"), + CertificateARN: awssdk.String("arn:aws:acm:region:123456789012:certificate/extra-cert-1"), }, { - CertificateARN: aws.String("arn:aws:acm:region:123456789012:certificate/extra-cert-2"), + CertificateARN: awssdk.String("arn:aws:acm:region:123456789012:certificate/extra-cert-2"), }, }, }, @@ -454,21 +453,21 @@ func TestBuildCertificates(t *testing.T) { hostnames: []string{"my-host-1", "my-host-2"}, }, lbLsCfg: &elbv2gw.ListenerConfiguration{ - DefaultCertificate: aws.String("arn:aws:acm:region:123456789012:certificate/default-cert"), + DefaultCertificate: awssdk.String("arn:aws:acm:region:123456789012:certificate/default-cert"), Certificates: []*string{ - aws.String("arn:aws:acm:region:123456789012:certificate/extra-cert-1"), - aws.String("arn:aws:acm:region:123456789012:certificate/extra-cert-2"), + awssdk.String("arn:aws:acm:region:123456789012:certificate/extra-cert-1"), + awssdk.String("arn:aws:acm:region:123456789012:certificate/extra-cert-2"), }, }, want: []elbv2model.Certificate{ { - CertificateARN: aws.String("arn:aws:acm:region:123456789012:certificate/default-cert"), + CertificateARN: awssdk.String("arn:aws:acm:region:123456789012:certificate/default-cert"), }, { - CertificateARN: aws.String("arn:aws:acm:region:123456789012:certificate/extra-cert-1"), + CertificateARN: awssdk.String("arn:aws:acm:region:123456789012:certificate/extra-cert-1"), }, { - CertificateARN: aws.String("arn:aws:acm:region:123456789012:certificate/extra-cert-2"), + CertificateARN: awssdk.String("arn:aws:acm:region:123456789012:certificate/extra-cert-2"), }, }, }, @@ -502,7 +501,7 @@ func TestBuildCertificates(t *testing.T) { }, want: []elbv2model.Certificate{ { - CertificateARN: aws.String("arn:aws:acm:region:123456789012:certificate/cert-1"), + CertificateARN: awssdk.String("arn:aws:acm:region:123456789012:certificate/cert-1"), }, }, }, @@ -536,10 +535,10 @@ func TestBuildCertificates(t *testing.T) { }, want: []elbv2model.Certificate{ { - CertificateARN: aws.String("arn:aws:acm:region:123456789012:certificate/cert-1"), + CertificateARN: awssdk.String("arn:aws:acm:region:123456789012:certificate/cert-1"), }, { - CertificateARN: aws.String("arn:aws:acm:region:123456789012:certificate/cert-2"), + CertificateARN: awssdk.String("arn:aws:acm:region:123456789012:certificate/cert-2"), }, }, }, diff --git a/pkg/ingress/model_build_listener_test.go b/pkg/ingress/model_build_listener_test.go index 52ce53709b..dd488307a8 100644 --- a/pkg/ingress/model_build_listener_test.go +++ b/pkg/ingress/model_build_listener_test.go @@ -3,7 +3,6 @@ package ingress import ( "context" awssdk "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go/aws" "testing" "github.com/stretchr/testify/assert" @@ -462,28 +461,28 @@ func Test_validateMutualAuthenticationConfig(t *testing.T) { port: 800, mode: string(elbv2model.MutualAuthenticationVerifyMode), trustStoreARN: "truststore", - ignoreClientCert: aws.Bool(true), + ignoreClientCert: awssdk.Bool(true), }, { name: "happy path no validation error verify mode, with ignore client cert expiry false", port: 800, mode: string(elbv2model.MutualAuthenticationVerifyMode), trustStoreARN: "truststore", - ignoreClientCert: aws.Bool(false), + ignoreClientCert: awssdk.Bool(false), }, { name: "happy path no validation error verify mode, with advertise ca on", port: 800, mode: string(elbv2model.MutualAuthenticationVerifyMode), trustStoreARN: "truststore", - advertiseCANames: aws.String("on"), + advertiseCANames: awssdk.String("on"), }, { name: "happy path no validation error verify mode, with advertise ca off", port: 800, mode: string(elbv2model.MutualAuthenticationVerifyMode), trustStoreARN: "truststore", - advertiseCANames: aws.String("off"), + advertiseCANames: awssdk.String("off"), }, { name: "no mode", diff --git a/pkg/networking/subnet_resolver_test.go b/pkg/networking/subnet_resolver_test.go index 92722de61c..ebcdbbef0e 100644 --- a/pkg/networking/subnet_resolver_test.go +++ b/pkg/networking/subnet_resolver_test.go @@ -3,7 +3,6 @@ package networking import ( "context" "errors" - "github.com/aws/aws-sdk-go/aws/awserr" "testing" ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" @@ -3164,7 +3163,7 @@ func Test_IsSubnetInLocalZoneOrOutpost(t *testing.T) { input: &ec2sdk.DescribeSubnetsInput{ SubnetIds: []string{"subnet-notfound"}, }, - err: awserr.New("InvalidSubnetID.NotFound", "Subnet ID 'subnet-notfound' does not exist", nil), + err: errors.New("InvalidSubnetID.NotFound: Subnet ID 'subnet-notfound' does not exist"), }, }, }, diff --git a/pkg/service/model_build_load_balancer_test.go b/pkg/service/model_build_load_balancer_test.go index 040a5099c7..a08e5c6aa7 100644 --- a/pkg/service/model_build_load_balancer_test.go +++ b/pkg/service/model_build_load_balancer_test.go @@ -5,7 +5,6 @@ import ( "errors" ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" - "github.com/aws/aws-sdk-go/service/ec2" "sigs.k8s.io/aws-load-balancer-controller/pkg/shared_constants" "testing" @@ -924,7 +923,7 @@ func Test_defaultModelBuilderTask_buildSubnetMappings(t *testing.T) { { Ipv6CidrBlock: aws.String("2600:1f13:837:8500::/64"), Ipv6CidrBlockState: &ec2types.SubnetCidrBlockState{ - State: ec2.SubnetCidrBlockStateCodeAssociated, + State: ec2types.SubnetCidrBlockStateCodeAssociated, }, }, }, @@ -955,7 +954,7 @@ func Test_defaultModelBuilderTask_buildSubnetMappings(t *testing.T) { { Ipv6CidrBlock: aws.String("2600:1f13:837:8500::/64"), Ipv6CidrBlockState: &ec2types.SubnetCidrBlockState{ - State: ec2.SubnetCidrBlockStateCodeAssociated, + State: ec2types.SubnetCidrBlockStateCodeAssociated, }, }, }, @@ -986,7 +985,7 @@ func Test_defaultModelBuilderTask_buildSubnetMappings(t *testing.T) { { Ipv6CidrBlock: aws.String("2600:1f13:837:8500::/64"), Ipv6CidrBlockState: &ec2types.SubnetCidrBlockState{ - State: ec2.SubnetCidrBlockStateCodeAssociated, + State: ec2types.SubnetCidrBlockStateCodeAssociated, }, }, }, @@ -1017,7 +1016,7 @@ func Test_defaultModelBuilderTask_buildSubnetMappings(t *testing.T) { { Ipv6CidrBlock: aws.String("2600:1f13:837:8500::/64"), Ipv6CidrBlockState: &ec2types.SubnetCidrBlockState{ - State: ec2.SubnetCidrBlockStateCodeAssociated, + State: ec2types.SubnetCidrBlockStateCodeAssociated, }, }, }, @@ -1048,7 +1047,7 @@ func Test_defaultModelBuilderTask_buildSubnetMappings(t *testing.T) { { Ipv6CidrBlock: aws.String("2600:1f13:837:8500::/64"), Ipv6CidrBlockState: &ec2types.SubnetCidrBlockState{ - State: ec2.SubnetCidrBlockStateCodeAssociated, + State: ec2types.SubnetCidrBlockStateCodeAssociated, }, }, }, @@ -1079,7 +1078,7 @@ func Test_defaultModelBuilderTask_buildSubnetMappings(t *testing.T) { { Ipv6CidrBlock: aws.String("2600:1f13:837:8500::/64"), Ipv6CidrBlockState: &ec2types.SubnetCidrBlockState{ - State: ec2.SubnetCidrBlockStateCodeAssociated, + State: ec2types.SubnetCidrBlockStateCodeAssociated, }, }, }, @@ -1110,7 +1109,7 @@ func Test_defaultModelBuilderTask_buildSubnetMappings(t *testing.T) { { Ipv6CidrBlock: aws.String("2600:1f13:837:8500::/64"), Ipv6CidrBlockState: &ec2types.SubnetCidrBlockState{ - State: ec2.SubnetCidrBlockStateCodeAssociated, + State: ec2types.SubnetCidrBlockStateCodeAssociated, }, }, }, @@ -1541,7 +1540,7 @@ func Test_defaultModelBuildTask_buildLoadBalancerEnablePrefixForIpv6SourceNat(t { Ipv6CidrBlock: aws.String("2600:1f13:837:8500::/64"), Ipv6CidrBlockState: &ec2types.SubnetCidrBlockState{ - State: ec2.SubnetCidrBlockStateCodeAssociated, + State: ec2types.SubnetCidrBlockStateCodeAssociated, }, }, }, @@ -1568,7 +1567,7 @@ func Test_defaultModelBuildTask_buildLoadBalancerEnablePrefixForIpv6SourceNat(t { Ipv6CidrBlock: aws.String("2600:1f13:837:8500::/64"), Ipv6CidrBlockState: &ec2types.SubnetCidrBlockState{ - State: ec2.SubnetCidrBlockStateCodeAssociated, + State: ec2types.SubnetCidrBlockStateCodeAssociated, }, }, }, diff --git a/pkg/targetgroupbinding/resource_manager_test.go b/pkg/targetgroupbinding/resource_manager_test.go index 3ccee5a710..0f8adc0b82 100644 --- a/pkg/targetgroupbinding/resource_manager_test.go +++ b/pkg/targetgroupbinding/resource_manager_test.go @@ -4,7 +4,6 @@ import ( "context" ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types" elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" - "github.com/aws/aws-sdk-go/aws" "github.com/aws/smithy-go" "github.com/golang/mock/gomock" "k8s.io/apimachinery/pkg/util/cache" @@ -513,7 +512,7 @@ func Test_defaultResourceManager_GenerateOverrideAzFn(t *testing.T) { vpcInfo: networking.VPCInfo{ CidrBlockAssociationSet: []ec2types.VpcCidrBlockAssociation{ { - CidrBlock: aws.String("127.0.0.0/24"), + CidrBlock: awssdk.String("127.0.0.0/24"), CidrBlockState: &ec2types.VpcCidrBlockState{ State: ec2types.VpcCidrBlockStateCodeAssociated, }, @@ -541,7 +540,7 @@ func Test_defaultResourceManager_GenerateOverrideAzFn(t *testing.T) { vpcInfo: networking.VPCInfo{ Ipv6CidrBlockAssociationSet: []ec2types.VpcIpv6CidrBlockAssociation{ { - Ipv6CidrBlock: aws.String("2001:db8::/32"), + Ipv6CidrBlock: awssdk.String("2001:db8::/32"), Ipv6CidrBlockState: &ec2types.VpcCidrBlockState{ State: ec2types.VpcCidrBlockStateCodeAssociated, }, @@ -570,7 +569,7 @@ func Test_defaultResourceManager_GenerateOverrideAzFn(t *testing.T) { vpcInfo: networking.VPCInfo{ CidrBlockAssociationSet: []ec2types.VpcCidrBlockAssociation{ { - CidrBlock: aws.String("127.0.0.0/24"), + CidrBlock: awssdk.String("127.0.0.0/24"), CidrBlockState: &ec2types.VpcCidrBlockState{ State: ec2types.VpcCidrBlockStateCodeAssociated, }, @@ -599,7 +598,7 @@ func Test_defaultResourceManager_GenerateOverrideAzFn(t *testing.T) { vpcInfo: networking.VPCInfo{ Ipv6CidrBlockAssociationSet: []ec2types.VpcIpv6CidrBlockAssociation{ { - Ipv6CidrBlock: aws.String("2001:db8::/32"), + Ipv6CidrBlock: awssdk.String("2001:db8::/32"), Ipv6CidrBlockState: &ec2types.VpcCidrBlockState{ State: ec2types.VpcCidrBlockStateCodeAssociated, }, diff --git a/test/e2e/gateway/alb_instance_target_test.go b/test/e2e/gateway/alb_instance_target_test.go index 96afefb144..fbe71e7995 100644 --- a/test/e2e/gateway/alb_instance_target_test.go +++ b/test/e2e/gateway/alb_instance_target_test.go @@ -9,7 +9,6 @@ import ( awssdk "github.com/aws/aws-sdk-go-v2/aws" elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" - "github.com/aws/aws-sdk-go/aws" "github.com/gavv/httpexpect/v2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -561,7 +560,7 @@ var _ = Describe("test k8s alb gateway using instance targets reconciled by the TargetGroups: []elbv2types.TargetGroupTuple{ { TargetGroupArn: awssdk.String(testTargetGroupArn), - Weight: aws.Int32(1), + Weight: awssdk.Int32(1), }, }, }, @@ -593,7 +592,7 @@ var _ = Describe("test k8s alb gateway using instance targets reconciled by the TargetGroups: []elbv2types.TargetGroupTuple{ { TargetGroupArn: awssdk.String(testTargetGroupArn), - Weight: aws.Int32(1), + Weight: awssdk.Int32(1), }, }, }, @@ -632,7 +631,7 @@ var _ = Describe("test k8s alb gateway using instance targets reconciled by the TargetGroups: []elbv2types.TargetGroupTuple{ { TargetGroupArn: awssdk.String(testTargetGroupArn), - Weight: aws.Int32(1), + Weight: awssdk.Int32(1), }, }, }, diff --git a/test/e2e/gateway/alb_ip_target_test.go b/test/e2e/gateway/alb_ip_target_test.go index 2bd3230038..88ce1ca7a1 100644 --- a/test/e2e/gateway/alb_ip_target_test.go +++ b/test/e2e/gateway/alb_ip_target_test.go @@ -9,7 +9,6 @@ import ( awssdk "github.com/aws/aws-sdk-go-v2/aws" elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" - "github.com/aws/aws-sdk-go/aws" "github.com/gavv/httpexpect/v2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -565,7 +564,7 @@ var _ = Describe("test k8s alb gateway using ip targets reconciled by the aws lo TargetGroups: []elbv2types.TargetGroupTuple{ { TargetGroupArn: awssdk.String(testTargetGroupArn), - Weight: aws.Int32(1), + Weight: awssdk.Int32(1), }, }, }, @@ -597,7 +596,7 @@ var _ = Describe("test k8s alb gateway using ip targets reconciled by the aws lo TargetGroups: []elbv2types.TargetGroupTuple{ { TargetGroupArn: awssdk.String(testTargetGroupArn), - Weight: aws.Int32(1), + Weight: awssdk.Int32(1), }, }, }, @@ -636,7 +635,7 @@ var _ = Describe("test k8s alb gateway using ip targets reconciled by the aws lo TargetGroups: []elbv2types.TargetGroupTuple{ { TargetGroupArn: awssdk.String(testTargetGroupArn), - Weight: aws.Int32(1), + Weight: awssdk.Int32(1), }, }, },