Skip to content

Commit

Permalink
Change proxy_url from url.URL to string (#28725)
Browse files Browse the repository at this point in the history
(cherry picked from commit f025c96)

# Conflicts:
#	x-pack/libbeat/common/aws/credentials.go
  • Loading branch information
kaiyan-sheng authored and mergify-bot committed Nov 3, 2021
1 parent c5460fe commit 940ebc4
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix handling of float data types within processors. {issue}28279[28279] {pull}28280[28280]
- Allow `clone3` syscall in seccomp filters. {pull}28117[28117]
- Remove unnecessary escaping step in dashboard loading, so they can be displayed in Kibana. {pull}28395[28395]
- Fix AWS proxy_url config from url to string type. {pull}28725[28725]
- Fix `fingerprint` processor to give it access to the `@timestamp` field. {issue}28683[28683]

*Auditbeat*
Expand Down
24 changes: 22 additions & 2 deletions x-pack/libbeat/common/aws/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,17 @@ import (
"github.com/aws/aws-sdk-go-v2/service/sts"
"github.com/pkg/errors"

<<<<<<< HEAD
"github.com/elastic/beats/v7/libbeat/common/cfgwarn"
=======
"github.com/elastic/beats/v7/libbeat/common/transport/httpcommon"
>>>>>>> f025c96219 (Change proxy_url from url.URL to string (#28725))
"github.com/elastic/beats/v7/libbeat/logp"
)

// ConfigAWS is a structure defined for AWS credentials
type ConfigAWS struct {
<<<<<<< HEAD
AccessKeyID string `config:"access_key_id"`
SecretAccessKey string `config:"secret_access_key"`
SessionToken string `config:"session_token"`
Expand All @@ -30,15 +35,30 @@ type ConfigAWS struct {
RoleArn string `config:"role_arn"`
AWSPartition string `config:"aws_partition"` // Deprecated.
ProxyUrl *url.URL `config:"proxy_url"`
=======
AccessKeyID string `config:"access_key_id"`
SecretAccessKey string `config:"secret_access_key"`
SessionToken string `config:"session_token"`
ProfileName string `config:"credential_profile_name"`
SharedCredentialFile string `config:"shared_credential_file"`
Endpoint string `config:"endpoint"`
RoleArn string `config:"role_arn"`
ProxyUrl string `config:"proxy_url"`
>>>>>>> f025c96219 (Change proxy_url from url.URL to string (#28725))
}

// InitializeAWSConfig function creates the awssdk.Config object from the provided config
func InitializeAWSConfig(config ConfigAWS) (awssdk.Config, error) {
AWSConfig, _ := GetAWSCredentials(config)
if config.ProxyUrl != nil {
if config.ProxyUrl != "" {
proxyUrl, err := httpcommon.NewProxyURIFromString(config.ProxyUrl)
if err != nil {
return AWSConfig, err
}

httpClient := &http.Client{
Transport: &http.Transport{
Proxy: http.ProxyURL(config.ProxyUrl),
Proxy: http.ProxyURL(proxyUrl.URI()),
},
}
AWSConfig.HTTPClient = httpClient
Expand Down

0 comments on commit 940ebc4

Please sign in to comment.