mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "Feature: Allow getting credentials via EC2 role (#3343)" (#3985)

Browse source 
This reverts commit 808f79f00a.
This commit is contained in:
Jeeyoung Kim 2018-03-20 05:34:54 -07:00 committed by Brian Brazil
parent 58e2a31db8
commit 5b962c5748
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
discovery/ec2/ec2.go
View file

@ -22,7 +22,6 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
"github.com/aws/aws-sdk-go/aws/credentials/stscreds" "github.com/aws/aws-sdk-go/aws/credentials/stscreds"
"github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
@ -186,16 +185,6 @@ func (d *Discovery) Run(ctx context.Context, ch chan<- []*targetgroup.Group) {
} }
} }
func (d *Discovery) ec2MetadataAvailable(sess *session.Session) (isAvailable bool) {
svc := ec2metadata.New(sess, &aws.Config{
MaxRetries: aws.Int(0),
})
isAvailable = svc.Available()
return isAvailable
}
func (d *Discovery) refresh() (tg *targetgroup.Group, err error) { func (d *Discovery) refresh() (tg *targetgroup.Group, err error) {
t0 := time.Now() t0 := time.Now()
defer func() { defer func() {
@ -218,12 +207,7 @@ func (d *Discovery) refresh() (tg *targetgroup.Group, err error) {
creds := stscreds.NewCredentials(sess, d.roleARN) creds := stscreds.NewCredentials(sess, d.roleARN)
ec2s = ec2.New(sess, &aws.Config{Credentials: creds}) ec2s = ec2.New(sess, &aws.Config{Credentials: creds})
} else { } else {
if d.aws.Credentials == nil && d.ec2MetadataAvailable(sess) { ec2s = ec2.New(sess)
creds := ec2rolecreds.NewCredentials(sess)
ec2s = ec2.New(sess, &aws.Config{Credentials: creds})
} else {
ec2s = ec2.New(sess)
}
} }
tg = &targetgroup.Group{ tg = &targetgroup.Group{
Source: *d.aws.Region, Source: *d.aws.Region,