Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
cd7b454e
Commit
cd7b454e
authored
Oct 09, 2018
by
Erik Sundell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stackdriver: add default value for authentication type
parent
823838a8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
pkg/api/pluginproxy/ds_auth_provider.go
+1
-1
pkg/tsdb/stackdriver/test_datasource_query.go
+1
-1
No files found.
pkg/api/pluginproxy/ds_auth_provider.go
View file @
cd7b454e
...
@@ -55,7 +55,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
...
@@ -55,7 +55,7 @@ func ApplyRoute(ctx context.Context, req *http.Request, proxyPath string, route
}
}
}
}
authenticationType
:=
ds
.
JsonData
.
Get
(
"authenticationType"
)
.
MustString
()
authenticationType
:=
ds
.
JsonData
.
Get
(
"authenticationType"
)
.
MustString
(
"jwt"
)
if
route
.
JwtTokenAuth
!=
nil
&&
authenticationType
==
"jwt"
{
if
route
.
JwtTokenAuth
!=
nil
&&
authenticationType
==
"jwt"
{
logger
.
Info
(
"authenticationType"
,
"authenticationType"
,
"jwt"
)
logger
.
Info
(
"authenticationType"
,
"authenticationType"
,
"jwt"
)
if
token
,
err
:=
tokenProvider
.
getJwtAccessToken
(
ctx
,
data
);
err
!=
nil
{
if
token
,
err
:=
tokenProvider
.
getJwtAccessToken
(
ctx
,
data
);
err
!=
nil
{
...
...
pkg/tsdb/stackdriver/test_datasource_query.go
View file @
cd7b454e
...
@@ -17,7 +17,7 @@ import (
...
@@ -17,7 +17,7 @@ import (
)
)
func
(
e
*
StackdriverExecutor
)
executeTestDataSource
(
ctx
context
.
Context
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
(
*
tsdb
.
Response
,
error
)
{
func
(
e
*
StackdriverExecutor
)
executeTestDataSource
(
ctx
context
.
Context
,
tsdbQuery
*
tsdb
.
TsdbQuery
)
(
*
tsdb
.
Response
,
error
)
{
authenticationType
:=
e
.
dsInfo
.
JsonData
.
Get
(
"authenticationType"
)
.
MustString
()
authenticationType
:=
e
.
dsInfo
.
JsonData
.
Get
(
"authenticationType"
)
.
MustString
(
"jwt"
)
if
authenticationType
==
"gce"
{
if
authenticationType
==
"gce"
{
defaultProject
,
err
:=
e
.
getDefaultProject
(
ctx
)
defaultProject
,
err
:=
e
.
getDefaultProject
(
ctx
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment