public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move cloudwatch crendential related code

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2017-09-29 13:45:11 +09:00
parent 4f5f38f41b
commit fe9fca381c
5 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloudwatch/cloudwatch.go
+2 -3
View File
@@ -17,7 +17,6 @@ import (
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/cloudwatch"
cwapi "github.com/grafana/grafana/pkg/api/cloudwatch"
"github.com/grafana/grafana/pkg/components/null"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/metrics"
@@ -128,7 +127,7 @@ func (e *CloudWatchExecutor) getClient(region string) (*cloudwatch.CloudWatch, e
}
}
datasourceInfo := &cwapi.DatasourceInfo{
datasourceInfo := &DatasourceInfo{
Region: region,
Profile: e.DataSource.Database,
AssumeRoleArn: assumeRoleArn,
@@ -136,7 +135,7 @@ func (e *CloudWatchExecutor) getClient(region string) (*cloudwatch.CloudWatch, e
SecretKey: secretKey,
}
credentials, err := cwapi.GetCredentials(datasourceInfo)
credentials, err := GetCredentials(datasourceInfo)
if err != nil {
return nil, err
}