Mitsuhiro Tanda 8 лет назад
Родитель
Сommit
59cdd4d8d2
1 измененных файлов с 0 добавлено и 33 удалено
  1. 0 33
      pkg/tsdb/cloudwatch/credentials.go

+ 0 - 33
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