From 59cdd4d8d21cb0aff220f6be348fbdebabab0e84 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Tanda Date: Tue, 26 Sep 2017 18:08:46 +0900 Subject: [PATCH] remove obsolete code --- pkg/tsdb/cloudwatch/credentials.go | 33 ------------------------------ 1 file changed, 33 deletions(-) diff --git a/pkg/tsdb/cloudwatch/credentials.go b/pkg/tsdb/cloudwatch/credentials.go index 8921eaa9315..882d2e3320a 100644 --- a/pkg/tsdb/cloudwatch/credentials.go +++ b/pkg/tsdb/cloudwatch/credentials.go @@ -14,16 +14,8 @@ import ( "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sts" - m "github.com/grafana/grafana/pkg/models" ) -type cwRequest struct { - Region string `json:"region"` - Action string `json:"action"` - Body []byte `json:"-"` - DataSource *m.DataSource -} - type DatasourceInfo struct { Profile string Region string @@ -35,31 +27,6 @@ type DatasourceInfo struct { SecretKey string } -func (req *cwRequest) GetDatasourceInfo() *DatasourceInfo { - authType := req.DataSource.JsonData.Get("authType").MustString() - assumeRoleArn := req.DataSource.JsonData.Get("assumeRoleArn").MustString() - accessKey := "" - secretKey := "" - - for key, value := range req.DataSource.SecureJsonData.Decrypt() { - if key == "accessKey" { - accessKey = value - } - if key == "secretKey" { - secretKey = value - } - } - - return &DatasourceInfo{ - AuthType: authType, - AssumeRoleArn: assumeRoleArn, - Region: req.Region, - Profile: req.DataSource.Database, - AccessKey: accessKey, - SecretKey: secretKey, - } -} - type cache struct { credential *credentials.Credentials expiration *time.Time