[extension/awsproxy] Reuse awsutil session logic. (amazon-contributin…

…g#174)

extension/awsproxy/go.mod

@@ -29,6 +29,7 @@ require (
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.89.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/collector/config/configopaque v0.89.0 // indirect
 	go.opentelemetry.io/collector/config/configtelemetry v0.89.0 // indirect
@@ -49,12 +50,14 @@ require (
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common
 
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ./../../internal/aws/awsutil
+
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => ./../../internal/aws/proxy
 
+replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
+
 retract (
 	v0.76.2
 	v0.76.1
 	v0.65.0
 )
-
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws

internal/aws/awsutil/conn.go

@@ -192,7 +192,7 @@ func GetAWSConfigSession(logger *zap.Logger, cn ConnAttr, cfg *AWSSessionSetting
 	case cfg.Region != "":
 		awsRegion = cfg.Region
 		logger.Debug("Fetch region from commandline/config file", zap.String("region", awsRegion))
-	case !cfg.NoVerifySSL:
+	case !cfg.LocalMode:
 		var es *session.Session
 		es, err = GetDefaultSession(logger, cfg)
 		if err != nil {

internal/aws/proxy/cfg.go

@@ -6,6 +6,13 @@ package proxy // import "github.com/open-telemetry/opentelemetry-collector-contr
 import (
 	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configtls"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
+)
+
+const (
+	idleConnTimeout                = 30
+	remoteProxyMaxIdleConnsPerHost = 2
 )
 
 // Config is the configuration for the local TCP proxy server.
@@ -38,6 +45,16 @@ type Config struct {
 	// will be called or not. Set to `true` to skip EC2 instance
 	// metadata check.
 	LocalMode bool `mapstructure:"local_mode"`
+
+	// Change the default profile for shared creds file
+	Profile string `mapstructure:"profile"`
+
+	// Change the default shared creds file location
+	SharedCredentialsFile []string `mapstructure:"shared_credentials_file"`
+
+	// Add a custom certificates file
+	CertificateFilePath string `mapstructure:"certificate_file_path"`
+
 	// How many times should we retry imds v2
 	IMDSRetries int `mapstructure:"imds_retries"`
 }
@@ -57,3 +74,19 @@ func DefaultConfig() *Config {
 		AWSEndpoint: "",
 	}
 }
+
+func (cfg *Config) toSessionConfig() *awsutil.AWSSessionSettings {
+	sessionSettings := awsutil.CreateDefaultSessionConfig()
+	sessionSettings.CertificateFilePath = cfg.CertificateFilePath
+	sessionSettings.Endpoint = cfg.AWSEndpoint
+	sessionSettings.IMDSRetries = cfg.IMDSRetries
+	sessionSettings.LocalMode = cfg.LocalMode
+	sessionSettings.MaxRetries = remoteProxyMaxIdleConnsPerHost
+	sessionSettings.Profile = cfg.Profile
+	sessionSettings.ProxyAddress = cfg.ProxyAddress
+	sessionSettings.Region = cfg.Region
+	sessionSettings.RequestTimeoutSeconds = idleConnTimeout
+	sessionSettings.RoleARN = cfg.RoleARN
+	sessionSettings.SharedCredentialsFile = cfg.SharedCredentialsFile
+	return &sessionSettings
+}