Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change proxy_url from url.URL to string #28725

Merged
merged 4 commits into from
Nov 3, 2021
Merged

Change proxy_url from url.URL to string #28725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2564a96
Change proxy_url from url.URL to string
kaiyan-sheng Oct 29, 2021
5297010
add changelog
kaiyan-sheng Nov 2, 2021
d054427
Merge remote-tracking branch 'upstream/master' into proxy_url
kaiyan-sheng Nov 2, 2021
8faded9
fix fmt
kaiyan-sheng Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
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
26 changes: 16 additions & 10 deletions x-pack/libbeat/common/aws/credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,34 @@ import (
"github.com/aws/aws-sdk-go-v2/service/sts"
"github.com/pkg/errors"

"github.com/elastic/beats/v7/libbeat/common/transport/httpcommon"
"github.com/elastic/beats/v7/libbeat/logp"
)

// ConfigAWS is a structure defined for AWS credentials
type ConfigAWS struct {
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 *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"`
}

// 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)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: if you declare config.ProxyUrl as ProxyURI type you won't need to build it, since the type implements Unpack

beats/libbeat/common/transport/httpcommon/proxy_uri.go

Lines 63 to 71 in d504254

func (p *ProxyURI) Unpack(s string) error {
uri, err := NewProxyURIFromString(s)
if err != nil {
return err
}
*p = *uri
return nil
}

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