Mitsuhiro Tanda 10 лет назад
Родитель
Сommit
6fa5e681aa
1 измененных файлов с 4 добавлено и 2 удалено
  1. 4 2
      pkg/api/cloudwatch/cloudwatch.go

+ 4 - 2
pkg/api/cloudwatch/cloudwatch.go

@@ -140,11 +140,12 @@ func handleListMetrics(req *cwRequest, c *middleware.Context) {
 }
 }
 
 
 func handleDescribeAlarmsForMetric(req *cwRequest, c *middleware.Context) {
 func handleDescribeAlarmsForMetric(req *cwRequest, c *middleware.Context) {
+	sess := session.New()
 	creds := credentials.NewChainCredentials(
 	creds := credentials.NewChainCredentials(
 		[]credentials.Provider{
 		[]credentials.Provider{
 			&credentials.EnvProvider{},
 			&credentials.EnvProvider{},
 			&credentials.SharedCredentialsProvider{Filename: "", Profile: req.DataSource.Database},
 			&credentials.SharedCredentialsProvider{Filename: "", Profile: req.DataSource.Database},
-			&ec2rolecreds.EC2RoleProvider{ExpiryWindow: 5 * time.Minute},
+			&ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(sess), ExpiryWindow: 5 * time.Minute},
 		})
 		})
 
 
 	cfg := &aws.Config{
 	cfg := &aws.Config{
@@ -187,11 +188,12 @@ func handleDescribeAlarmsForMetric(req *cwRequest, c *middleware.Context) {
 }
 }
 
 
 func handleDescribeAlarmHistory(req *cwRequest, c *middleware.Context) {
 func handleDescribeAlarmHistory(req *cwRequest, c *middleware.Context) {
+	sess := session.New()
 	creds := credentials.NewChainCredentials(
 	creds := credentials.NewChainCredentials(
 		[]credentials.Provider{
 		[]credentials.Provider{
 			&credentials.EnvProvider{},
 			&credentials.EnvProvider{},
 			&credentials.SharedCredentialsProvider{Filename: "", Profile: req.DataSource.Database},
 			&credentials.SharedCredentialsProvider{Filename: "", Profile: req.DataSource.Database},
-			&ec2rolecreds.EC2RoleProvider{ExpiryWindow: 5 * time.Minute},
+			&ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(sess), ExpiryWindow: 5 * time.Minute},
 		})
 		})
 
 
 	cfg := &aws.Config{
 	cfg := &aws.Config{