From 24eed1903480ba10b13d5b117451151672d2d464 Mon Sep 17 00:00:00 2001
From: skotambkar <kotambka@amazon.com>
Date: Mon, 21 Dec 2020 09:09:51 -0800
Subject: [PATCH] generate s3 control and s3 client constructor

---
 service/s3/api_client.go        | 17 +++++++++++++++++
 service/s3control/api_client.go | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/service/s3/api_client.go b/service/s3/api_client.go
index 9d38e73a511..52ec5d4b85c 100644
--- a/service/s3/api_client.go
+++ b/service/s3/api_client.go
@@ -12,6 +12,7 @@ import (
 	awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http"
 	acceptencodingcust "github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding"
 	"github.com/aws/aws-sdk-go-v2/service/internal/s3shared"
+	s3sharedconfig "github.com/aws/aws-sdk-go-v2/service/internal/s3shared/config"
 	s3cust "github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations"
 	smithy "github.com/awslabs/smithy-go"
 	"github.com/awslabs/smithy-go/logging"
@@ -177,6 +178,7 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client {
 		ClientLogMode: cfg.ClientLogMode,
 	}
 	resolveAWSEndpointResolver(cfg, &opts)
+	resolveClientConfig(cfg, &opts)
 	return New(opts, optFns...)
 }
 
@@ -241,6 +243,21 @@ func addRetryMiddlewares(stack *middleware.Stack, o Options) error {
 	return retry.AddRetryMiddlewares(stack, mo)
 }
 
+// resolves client config
+func resolveClientConfig(cfg aws.Config, o *Options) error {
+	if cfg.ConfigSources == nil || len(cfg.ConfigSources) == 0 {
+		return nil
+	}
+	value, found, err := s3sharedconfig.ResolveUseARNRegion(context.Background(), cfg.ConfigSources)
+	if err != nil {
+		return err
+	}
+	if found {
+		o.UseARNRegion = value
+	}
+	return nil
+}
+
 func addMetadataRetrieverMiddleware(stack *middleware.Stack) error {
 	return s3shared.AddMetadataRetrieverMiddleware(stack)
 }
diff --git a/service/s3control/api_client.go b/service/s3control/api_client.go
index 6915fb23b85..c501bab19da 100644
--- a/service/s3control/api_client.go
+++ b/service/s3control/api_client.go
@@ -11,6 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws/signer/v4"
 	awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http"
 	"github.com/aws/aws-sdk-go-v2/service/internal/s3shared"
+	s3sharedconfig "github.com/aws/aws-sdk-go-v2/service/internal/s3shared/config"
 	smithy "github.com/awslabs/smithy-go"
 	"github.com/awslabs/smithy-go/logging"
 	"github.com/awslabs/smithy-go/middleware"
@@ -168,6 +169,7 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client {
 		ClientLogMode: cfg.ClientLogMode,
 	}
 	resolveAWSEndpointResolver(cfg, &opts)
+	resolveClientConfig(cfg, &opts)
 	return New(opts, optFns...)
 }
 
@@ -238,6 +240,21 @@ func addRetryMiddlewares(stack *middleware.Stack, o Options) error {
 	return retry.AddRetryMiddlewares(stack, mo)
 }
 
+// resolves client config
+func resolveClientConfig(cfg aws.Config, o *Options) error {
+	if cfg.ConfigSources == nil || len(cfg.ConfigSources) == 0 {
+		return nil
+	}
+	value, found, err := s3sharedconfig.ResolveUseARNRegion(context.Background(), cfg.ConfigSources)
+	if err != nil {
+		return err
+	}
+	if found {
+		o.UseARNRegion = value
+	}
+	return nil
+}
+
 // IdempotencyTokenProvider interface for providing idempotency token
 type IdempotencyTokenProvider interface {
 	GetIdempotencyToken() (string, error)