Migrate AWS SDK for Go to v2 (#943)

* chore(deps): Migrate go.mod from AWS SDK v1 to v2

Replace aws-sdk-go v1.55.6 with aws-sdk-go-v2 and individual service
modules. Update both root and test/ module dependencies.

Key dependency changes:
- Remove github.com/aws/aws-sdk-go v1.55.6
- Add github.com/aws/aws-sdk-go-v2 v1.41.5
- Add github.com/aws/aws-sdk-go-v2/config v1.32.14
- Add github.com/aws/aws-sdk-go-v2/service/vpclattice v1.20.11
- Add github.com/aws/aws-sdk-go-v2/service/acm v1.38.1
- Add github.com/aws/smithy-go v1.24.3
- Add additional v2 service modules for integration tests

* refactor: Migrate production code from AWS SDK v1 to v2

Migrate all production code in pkg/ from aws-sdk-go v1 to
aws-sdk-go-v2. This is the core of the SDK migration.

Import convention follows idiomatic v2 patterns:
- vpclattice: service package (Input/Output types)
- types: types subpackage (model types, enums)
- apitypes: k8s apimachinery types (where conflict exists)

Key changes across all files:
- Replace v1 session-based clients with v2 config-based clients
- Replace *string fields with string for SDK model types
- Replace []*Type slices with []Type value slices
- Replace *int64 with *int32 for port/count fields
- Replace map[string]*string tags with map[string]string
- Replace WithContext method calls with context-first signatures
- Replace awserr error handling with smithy-go error types
- Replace string constants with typed enums
- Replace v1 Matcher/RuleAction structs with v2 union interfaces
- Remove unused gwlogAdapter and getMapValue dead code
- Fix printf format for struct pointer (%s -> %v)

* chore: Regenerate mocks for v2 SDK interfaces

Regenerate all gomock files via go generate to match updated
interface signatures using AWS SDK v2 types.

* test: Migrate unit tests from AWS SDK v1 to v2

Update all pkg/ unit tests to use v2 SDK types, matching the
production code migration. Changes mirror the production code
patterns: value types in slices, typed enums, *int32 ports,
map[string]string tags, and v2 union interfaces for Matcher
and RuleAction.

* test: Migrate integration tests from AWS SDK v1 to v2

Update all test/ integration tests and framework to use v2 SDK.

Key changes:
- Replace session.NewSession() with config.LoadDefaultConfig()
- Replace service.New(sess) with service.NewFromConfig(cfg)
- Migrate all AWS service clients (VPC Lattice, EC2, ACM, S3, IAM,
  STS, Route53, CloudWatch Logs, Firehose, RAM)
- Update HealthCheckConfig assertions for v2 types (*int32, typed
  enums, MatcherMemberHttpCode union interface)
- Update EC2 DescribeVpcs VpcIds from []*string to []string

* fixes

* fixes

* address comments, fix flaky tests

* fix: Restore shortened comments, remove test retry override

- Restore multi-line comments in drift_detection_test.go that were
  accidentally shortened during rebase
- Remove RetryMaxAttempts=10 override in ram_share_test.go to match
  v1 behavior (SDK default of 3 attempts)
- Add Serial to VpcAssociationPolicy drift test to prevent interference
- Fix flaky drift test: wait for associations to be ACTIVE before delete
- Increase association deletion timeout from 2min to 4min

* address review comments

* add more retries for ram share test

* Disable aws sdk built-in rate limiter

* fix flaky service drift detection test

Author: liucalvin

go.mod

@@ -3,7 +3,14 @@ module github.com/aws/aws-application-networking-k8s
 go 1.26.0
 
 require (
-	github.com/aws/aws-sdk-go v1.55.6
+	github.com/aws/aws-sdk-go-v2 v1.41.6
+	github.com/aws/aws-sdk-go-v2/config v1.28.6
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21
+	github.com/aws/aws-sdk-go-v2/service/acm v1.38.2
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.298.0
+	github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.31.11
+	github.com/aws/aws-sdk-go-v2/service/vpclattice v1.20.12
+	github.com/aws/smithy-go v1.25.0
 	github.com/go-logr/zapr v1.3.0
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/golang-lru/v2 v2.0.7
@@ -25,6 +32,15 @@ require (
 )
 
 require (
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.22 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.22 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.22 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -51,7 +67,6 @@ require (
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.9.1 // indirect

go.sum

@@ -1,8 +1,40 @@
 github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
 github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
-github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk=
-github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
+github.com/aws/aws-sdk-go-v2 v1.41.6 h1:1AX0AthnBQzMx1vbmir3Y4WsnJgiydmnJjiLu+LvXOg=
+github.com/aws/aws-sdk-go-v2 v1.41.6/go.mod h1:dy0UzBIfwSeot4grGvY1AqFWN5zgziMmWGzysDnHFcQ=
+github.com/aws/aws-sdk-go-v2/config v1.28.6 h1:D89IKtGrs/I3QXOLNTH93NJYtDhm8SYa9Q5CsPShmyo=
+github.com/aws/aws-sdk-go-v2/config v1.28.6/go.mod h1:GDzxJ5wyyFSCoLkS+UhGB0dArhb9mI+Co4dHtoTxbko=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.47 h1:48bA+3/fCdi2yAwVt+3COvmatZ6jUDNkDTIsqDiMUdw=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.47/go.mod h1:+KdckOejLW3Ks3b0E3b5rHsr2f9yuORBum0WPnE5o5w=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 h1:AmoU1pziydclFT/xRV+xXE/Vb8fttJCLRPv8oAkprc0=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21/go.mod h1:AjUdLYe4Tgs6kpH4Bv7uMZo7pottoyHMn4eTcIcneaY=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.22 h1:GmLa5Kw1ESqtFpXsx5MmC84QWa/ZrLZvlJGa2y+4kcQ=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.22/go.mod h1:6sW9iWm9DK9YRpRGga/qzrzNLgKpT2cIxb7Vo2eNOp0=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.22 h1:dY4kWZiSaXIzxnKlj17nHnBcXXBfac6UlsAx2qL6XrU=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.22/go.mod h1:KIpEUx0JuRZLO7U6cbV204cWAEco2iC3l061IxlwLtI=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
+github.com/aws/aws-sdk-go-v2/service/acm v1.38.2 h1:ozcwethaFOi2ST9h6MKGq1GAIHP68tjiDqgkWVPwfR8=
+github.com/aws/aws-sdk-go-v2/service/acm v1.38.2/go.mod h1:HNtDOv4XmqExPxNIBp171KKc5ZoUJwHH9ZhlCcZmdt0=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.298.0 h1:PP4/BDTcOWR9Sr64K3atzu2738pmNLiFzJ70lxS3Yno=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.298.0/go.mod h1:E1pnYwWFZ8N3REmeN9Fe/Zipbpps4HJj8DQGNnLUMYc=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.8 h1:HtOTYcbVcGABLOVuPYaIihj6IlkqubBwFj10K5fxRek=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.8/go.mod h1:VsK9abqQeGlzPgUr+isNWzPlK2vKe9INMLWnY65f5Xs=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.22 h1:PUmZeJU6Y1Lbvt9WFuJ0ugUK2xn6hIWUBBbKuOWF30s=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.22/go.mod h1:nO6egFBoAaoXze24a2C0NjQCvdpk8OueRoYimvEB9jo=
+github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.31.11 h1:H+rP6r3xvF72rcATLBm+XAdjjxL+v5g+ka/gjJBvPao=
+github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.31.11/go.mod h1:1orx2HYtb6hJEmD1o/OID8vWD5sBKxB8RH+0XS25rYo=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 h1:rLnYAfXQ3YAccocshIH5mzNNwZBkBo+bP6EhIxak6Hw=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.7/go.mod h1:ZHtuQJ6t9A/+YDuxOLnbryAmITtr8UysSny3qcyvJTc=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 h1:JnhTZR3PiYDNKlXy50/pNeix9aGMo6lLpXwJ1mw8MD4=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6/go.mod h1:URronUEGfXZN1VpdktPSD1EkAL9mfrV+2F4sjH38qOY=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 h1:s4074ZO1Hk8qv65GqNXqDjmkf4HSQqJukaLuuW0TpDA=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.2/go.mod h1:mVggCnIWoM09jP71Wh+ea7+5gAp53q+49wDFs1SW5z8=
+github.com/aws/aws-sdk-go-v2/service/vpclattice v1.20.12 h1:Lu9L/Jy3AxHqMO3GtJp61gYPj8gT03oPk4kfHurGAKY=
+github.com/aws/aws-sdk-go-v2/service/vpclattice v1.20.12/go.mod h1:besmPK9H+eqFdoUqfIS6rlJ184HkKL/Cu6wrU5Np2Ow=
+github.com/aws/smithy-go v1.25.0 h1:Sz/XJ64rwuiKtB6j98nDIPyYrV1nVNJ4YU74gttcl5U=
+github.com/aws/smithy-go v1.25.0/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -87,10 +119,6 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -247,10 +275,7 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/aws/cloud.go

@@ -3,14 +3,16 @@ package aws
 import (
 	"context"
 	"fmt"
-
-	"github.com/prometheus/client_golang/prometheus"
-
 	"maps"
 
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/vpclattice"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware"
+	"github.com/aws/aws-sdk-go-v2/aws/ratelimit"
+	"github.com/aws/aws-sdk-go-v2/aws/retry"
+	awsconfig "github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/service/vpclattice"
+	"github.com/aws/smithy-go/middleware"
+	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/aws/aws-application-networking-k8s/pkg/aws/metrics"
 	"github.com/aws/aws-application-networking-k8s/pkg/aws/services"
@@ -20,6 +22,8 @@ import (
 const (
 	TagBase      = "application-networking.k8s.aws/"
 	TagManagedBy = TagBase + "ManagedBy"
+
+	userAgent = "amazon-vpc-lattice-gateway-api-controller"
 )
 
 //go:generate mockgen -destination cloud_mocks.go -package aws github.com/aws/aws-application-networking-k8s/pkg/aws Cloud
@@ -61,48 +65,45 @@ type Cloud interface {
 
 // NewCloud constructs new Cloud implementation.
 func NewCloud(log gwlog.Logger, cfg CloudConfig, metricsRegisterer prometheus.Registerer) (Cloud, error) {
-	sess, err := session.NewSession()
+	awsCfg, err := awsconfig.LoadDefaultConfig(context.TODO(),
+		awsconfig.WithRegion(cfg.Region),
+		awsconfig.WithRetryer(func() aws.Retryer {
+			return retry.NewStandard(func(o *retry.StandardOptions) {
+				o.RateLimiter = ratelimit.None
+			})
+		}),
+	)
 	if err != nil {
 		return nil, err
 	}
 
-	addUserAgentHandler(sess)
-
-	sess.Handlers.Complete.PushFront(func(r *request.Request) {
-		if r.Error != nil {
-			log.Debugw(context.TODO(), "error",
-				"error", r.Error.Error(),
-				"serviceName", r.ClientInfo.ServiceName,
-				"operation", r.Operation.Name,
-				"params", r.Params,
-			)
-		} else {
-			log.Debugw(context.TODO(), "response",
-				"serviceName", r.ClientInfo.ServiceName,
-				"operation", r.Operation.Name,
-				"params", r.Params,
-			)
-		}
+	// Add user agent to all API calls
+	awsCfg.APIOptions = append(awsCfg.APIOptions, awsmiddleware.AddUserAgentKeyValue(userAgent, ""))
+
+	// Add logging middleware
+	awsCfg.APIOptions = append(awsCfg.APIOptions, func(stack *middleware.Stack) error {
+		return stack.Initialize.Add(&loggingMiddleware{log: log}, middleware.After)
 	})
 
+	// Add metrics middleware
 	if metricsRegisterer != nil {
 		metricsCollector, err := metrics.NewCollector(metricsRegisterer)
 		if err != nil {
 			return nil, err
 		}
-		metricsCollector.InjectHandlers(&sess.Handlers)
+		awsCfg.APIOptions = append(awsCfg.APIOptions, metricsCollector.APIOptions()...)
 	}
 
-	lattice := services.NewDefaultLattice(sess, cfg.AccountId, cfg.Region)
+	lattice := services.NewDefaultLattice(awsCfg, cfg.AccountId, cfg.Region)
 	var tagging services.Tagging
 
 	if cfg.TaggingServiceAPIDisabled {
-		tagging = services.NewLatticeTagging(sess, cfg.AccountId, cfg.Region, cfg.VpcId)
+		tagging = services.NewLatticeTagging(awsCfg, cfg.AccountId, cfg.Region, cfg.VpcId)
 	} else {
-		tagging = services.NewDefaultTagging(sess, cfg.Region)
+		tagging = services.NewDefaultTagging(awsCfg)
 	}
 
-	acmClient := services.NewDefaultACM(sess, cfg.Region)
+	acmClient := services.NewDefaultACM(awsCfg)
 
 	return &defaultCloud{
 		cfg:          cfg,
@@ -156,9 +157,9 @@ func (c *defaultCloud) Config() CloudConfig {
 }
 
 func (c *defaultCloud) DefaultTags() services.Tags {
-	tags := services.Tags{}
-	tags[TagManagedBy] = &c.managedByTag
-	return tags
+	return services.Tags{
+		TagManagedBy: c.managedByTag,
+	}
 }
 
 func (c *defaultCloud) DefaultTagsMergedWith(tags services.Tags) services.Tags {
@@ -179,8 +180,7 @@ func (c *defaultCloud) MergeTags(baseTags services.Tags, additionalTags services
 }
 
 func (c *defaultCloud) getTags(ctx context.Context, arn string) (services.Tags, error) {
-	tagsReq := &vpclattice.ListTagsForResourceInput{ResourceArn: &arn}
-	resp, err := c.lattice.ListTagsForResourceWithContext(ctx, tagsReq)
+	resp, err := c.lattice.ListTagsForResource(ctx, &vpclattice.ListTagsForResourceInput{ResourceArn: &arn})
 	if err != nil {
 		return nil, err
 	}
@@ -189,10 +189,10 @@ func (c *defaultCloud) getTags(ctx context.Context, arn string) (services.Tags,
 
 func (c *defaultCloud) GetManagedByFromTags(tags services.Tags) string {
 	tag, ok := tags[TagManagedBy]
-	if !ok || tag == nil {
+	if !ok {
 		return ""
 	}
-	return *tag
+	return tag
 }
 
 func (c *defaultCloud) IsArnManaged(ctx context.Context, arn string) (bool, error) {
@@ -226,7 +226,7 @@ func (c *defaultCloud) TryOwnFromTags(ctx context.Context, arn string, tags serv
 }
 
 func (c *defaultCloud) ownResource(ctx context.Context, arn string) error {
-	_, err := c.Lattice().TagResourceWithContext(ctx, &vpclattice.TagResourceInput{
+	_, err := c.Lattice().TagResource(ctx, &vpclattice.TagResourceInput{
 		ResourceArn: &arn,
 		Tags:        c.DefaultTags(),
 	})
@@ -241,7 +241,34 @@ func getManagedByTag(cfg CloudConfig) string {
 	return fmt.Sprintf("%s/%s/%s", cfg.AccountId, cfg.ClusterName, cfg.VpcId)
 }
 
-// addUserAgentHandler appends the controller identifier to the User-Agent header on all AWS API calls.
-func addUserAgentHandler(sess *session.Session) {
-	sess.Handlers.Build.PushBack(request.MakeAddToUserAgentFreeFormHandler("amazon-vpc-lattice-gateway-api-controller"))
+// loggingMiddleware logs API call results
+type loggingMiddleware struct {
+	log gwlog.Logger
+}
+
+func (m *loggingMiddleware) ID() string { return "ControllerLogging" }
+
+func (m *loggingMiddleware) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
+	out middleware.InitializeOutput, metadata middleware.Metadata, err error,
+) {
+	out, metadata, err = next.HandleInitialize(ctx, in)
+
+	service := middleware.GetServiceID(ctx)
+	operation := middleware.GetOperationName(ctx)
+
+	if err != nil {
+		m.log.Debugw(ctx, "error",
+			"error", err.Error(),
+			"serviceName", service,
+			"operation", operation,
+			"params", in.Parameters,
+		)
+	} else {
+		m.log.Debugw(ctx, "response",
+			"serviceName", service,
+			"operation", operation,
+			"params", in.Parameters,
+		)
+	}
+	return out, metadata, err
 }