uncomment load default config, add config replace statement

aws · Oct 25, 2023 · 54bcc53 · 54bcc53
1 parent 4d7492b
commit 54bcc53
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/config/config.go b/config/config.go
@@ -174,30 +174,30 @@ func (cs configs) ResolveConfig(f func(configs []interface{}) error) error {
 // The default configuration sources are:
 // * Environment Variables
 // * Shared Configuration and Shared Credentials files.
-// func LoadDefaultConfig(ctx context.Context, optFns ...func(*LoadOptions) error) (cfg aws.Config, err error) {
-// 	fmt.Println("calling config.LoadDefaultConfig")
-// 	var options LoadOptions
-// 	for _, optFn := range optFns {
-// 		if err := optFn(&options); err != nil {
-// 			return aws.Config{}, err
-// 		}
-// 	}
-
-// 	// assign Load Options to configs
-// 	var cfgCpy = configs{options}
-
-// 	cfgCpy, err = cfgCpy.AppendFromLoaders(ctx, resolveConfigLoaders(&options))
-// 	if err != nil {
-// 		return aws.Config{}, err
-// 	}
-
-// 	cfg, err = cfgCpy.ResolveAWSConfig(ctx, defaultAWSConfigResolvers)
-// 	if err != nil {
-// 		return aws.Config{}, err
-// 	}
-
-// 	return cfg, nil
-// }
+func LoadDefaultConfig(ctx context.Context, optFns ...func(*LoadOptions) error) (cfg aws.Config, err error) {
+	fmt.Println("calling config.LoadDefaultConfig")
+	var options LoadOptions
+	for _, optFn := range optFns {
+		if err := optFn(&options); err != nil {
+			return aws.Config{}, err
+		}
+	}
+
+	// assign Load Options to configs
+	var cfgCpy = configs{options}
+
+	cfgCpy, err = cfgCpy.AppendFromLoaders(ctx, resolveConfigLoaders(&options))
+	if err != nil {
+		return aws.Config{}, err
+	}
+
+	cfg, err = cfgCpy.ResolveAWSConfig(ctx, defaultAWSConfigResolvers)
+	if err != nil {
+		return aws.Config{}, err
+	}
+
+	return cfg, nil
+}
 
 func resolveConfigLoaders(options *LoadOptions) []loader {
 	fmt.Println("calling config.resolveConfigLoaders")

diff --git a/service/elasticbeanstalk/go.mod b/service/elasticbeanstalk/go.mod
@@ -15,6 +15,8 @@ require (
 
 replace github.com/aws/aws-sdk-go-v2 => ../../
 
+replace github.com/aws/aws-sdk-go-v2/config => ../../config
+
 replace github.com/aws/aws-sdk-go-v2/internal/configsources => ../../internal/configsources/
 
 replace github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 => ../../internal/endpoints/v2/