IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Datasource: Prefix SigV4 json data keys with sigV4 (#28195)

Browse Source 
Prefixes SigV4 json data and secure json data keys with sigV4 to make 
sure they don't collide with any other settings. Also minor fixes to UI.

Ref #27552
This commit is contained in:
Marcus Efraimsson 2020-10-12 17:52:17 +02:00 committed by GitHub
parent 7b5decdbb0
commit 519ec93c7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
packages/grafana-ui/src/components/DataSourceSettings/SigV4AuthSettings.tsx
View File

@ -84,7 +84,7 @@ export const SigV4AuthSettings: React.FC<HttpSettingsProps> = props => {
return ( return (
<> <>
<h3 className="page-heading">Sigv4 Details</h3> <h6>SigV4 Auth Details</h6>
<div className="gf-form-group"> <div className="gf-form-group">
<div className="gf-form-inline"> <div className="gf-form-inline">
<div className="gf-form"> <div className="gf-form">
@ -97,21 +97,17 @@ export const SigV4AuthSettings: React.FC<HttpSettingsProps> = props => {
<Select <Select
className="width-30" className="width-30"
value={authProviderOptions.find( value={authProviderOptions.find(
authProvider => authProvider.value === dataSourceConfig.jsonData.authType authProvider => authProvider.value === dataSourceConfig.jsonData.sigV4AuthType
)} )}
options={authProviderOptions} options={authProviderOptions}
defaultValue={dataSourceConfig.jsonData.authType || 'keys'} defaultValue={dataSourceConfig.jsonData.sigV4AuthType || 'keys'}
onChange={option => { onChange={option => {
if (dataSourceConfig.jsonData.authType === 'arn' && option.value !== 'arn') { onJsonDataChange('sigV4AuthType', option.value);
delete dataSourceConfig.jsonData.assumeRoleArn;
delete dataSourceConfig.jsonData.externalId;
}
onJsonDataChange('authType', option.value);
}} }}
/> />
</div> </div>
</div> </div>
{dataSourceConfig.jsonData.authType === 'credentials' && ( {dataSourceConfig.jsonData.sigV4AuthType === 'credentials' && (
<div className="gf-form-inline"> <div className="gf-form-inline">
<div className="gf-form"> <div className="gf-form">
<InlineFormLabel <InlineFormLabel
@ -124,16 +120,16 @@ export const SigV4AuthSettings: React.FC<HttpSettingsProps> = props => {
<Input <Input
className="width-30" className="width-30"
placeholder="default" placeholder="default"
value={dataSourceConfig.jsonData.profile || ''} value={dataSourceConfig.jsonData.sigV4Profile || ''}
onChange={e => onJsonDataChange('profile', e.currentTarget.value)} onChange={e => onJsonDataChange('sigV4Profile', e.currentTarget.value)}
/> />
</div> </div>
</div> </div>
</div> </div>
)} )}
{dataSourceConfig.jsonData.authType === 'keys' && ( {dataSourceConfig.jsonData.sigV4AuthType === 'keys' && (
<div> <div>
{dataSourceConfig.secureJsonFields?.accessKey ? ( {dataSourceConfig.secureJsonFields?.sigV4AccessKey ? (
<div className="gf-form-inline"> <div className="gf-form-inline">
<div className="gf-form"> <div className="gf-form">
<InlineFormLabel className="width-14">Access Key ID</InlineFormLabel> <InlineFormLabel className="width-14">Access Key ID</InlineFormLabel>
@ -141,7 +137,7 @@ export const SigV4AuthSettings: React.FC<HttpSettingsProps> = props => {
</div> </div>
<div className="gf-form"> <div className="gf-form">
<div className="max-width-30 gf-form-inline"> <div className="max-width-30 gf-form-inline">
<Button variant="secondary" type="button" onClick={e => onSecureJsonDataReset('accessKey')}> <Button variant="secondary" type="button" onClick={e => onSecureJsonDataReset('sigV4AccessKey')}>
Reset Reset
</Button> </Button>
</div> </div>
@ -154,14 +150,14 @@ export const SigV4AuthSettings: React.FC<HttpSettingsProps> = props => {
<div className="width-30"> <div className="width-30">
<Input <Input
className="width-30" className="width-30"
value={dataSourceConfig.secureJsonData?.accessKey || ''} value={dataSourceConfig.secureJsonData?.sigV4AccessKey || ''}
onChange={e => onSecureJsonDataChange('accessKey', e.currentTarget.value)} onChange={e => onSecureJsonDataChange('sigV4AccessKey', e.currentTarget.value)}
/> />
</div> </div>
</div> </div>
</div> </div>
)} )}
{dataSourceConfig.secureJsonFields?.secretKey ? ( {dataSourceConfig.secureJsonFields?.sigV4SecretKey ? (
<div className="gf-form-inline"> <div className="gf-form-inline">
<div className="gf-form"> <div className="gf-form">
<InlineFormLabel className="width-14">Secret Access Key</InlineFormLabel> <InlineFormLabel className="width-14">Secret Access Key</InlineFormLabel>
@ -169,7 +165,7 @@ export const SigV4AuthSettings: React.FC<HttpSettingsProps> = props => {
</div> </div>
<div className="gf-form"> <div className="gf-form">
<div className="max-width-30 gf-form-inline"> <div className="max-width-30 gf-form-inline">
<Button variant="secondary" type="button" onClick={e => onSecureJsonDataReset('secretKey')}> <Button variant="secondary" type="button" onClick={e => onSecureJsonDataReset('sigV4SecretKey')}>
Reset Reset
</Button> </Button>
</div> </div>
@ -182,8 +178,8 @@ export const SigV4AuthSettings: React.FC<HttpSettingsProps> = props => {
<div className="width-30"> <div className="width-30">
<Input <Input
className="width-30" className="width-30"
value={dataSourceConfig.secureJsonData?.secretKey || ''} value={dataSourceConfig.secureJsonData?.sigV4SecretKey || ''}
onChange={e => onSecureJsonDataChange('secretKey', e.currentTarget.value)} onChange={e => onSecureJsonDataChange('sigV4SecretKey', e.currentTarget.value)}
/> />
</div> </div>
</div> </div>
@ -203,8 +199,8 @@ export const SigV4AuthSettings: React.FC<HttpSettingsProps> = props => {
<Input <Input
className="width-30" className="width-30"
placeholder="arn:aws:iam:*" placeholder="arn:aws:iam:*"
value={dataSourceConfig.jsonData.assumeRoleArn || ''} value={dataSourceConfig.jsonData.sigV4AssumeRoleArn || ''}
onChange={e => onJsonDataChange('assumeRoleArn', e.currentTarget.value)} onChange={e => onJsonDataChange('sigV4AssumeRoleArn', e.currentTarget.value)}
/> />
</div> </div>
</div> </div>
@ -220,8 +216,8 @@ export const SigV4AuthSettings: React.FC<HttpSettingsProps> = props => {
<Input <Input
className="width-30" className="width-30"
placeholder="External ID" placeholder="External ID"
value={dataSourceConfig.jsonData.externalId || ''} value={dataSourceConfig.jsonData.sigV4ExternalId || ''}
onChange={e => onJsonDataChange('externalId', e.currentTarget.value)} onChange={e => onJsonDataChange('sigV4ExternalId', e.currentTarget.value)}
/> />
</div> </div>
</div> </div>
@ -237,10 +233,10 @@ export const SigV4AuthSettings: React.FC<HttpSettingsProps> = props => {
</InlineFormLabel> </InlineFormLabel>
<Select <Select
className="width-30" className="width-30"
value={regions.find(region => region.value === dataSourceConfig.jsonData.region)} value={regions.find(region => region.value === dataSourceConfig.jsonData.sigV4Region)}
options={regions} options={regions}
defaultValue={dataSourceConfig.jsonData.region || ''} defaultValue={dataSourceConfig.jsonData.sigV4Region || ''}
onChange={option => onJsonDataChange('region', option.value)} onChange={option => onJsonDataChange('sigV4Region', option.value)}
/> />
</div> </div>
</div> </div>

14
pkg/models/datasource_cache.go
View File

@ -193,13 +193,13 @@ func (ds *DataSource) sigV4Middleware(next http.RoundTripper) http.RoundTripper
return &SigV4Middleware{ return &SigV4Middleware{
Config: &Config{ Config: &Config{
AccessKey: decrypted["accessKey"], AccessKey: decrypted["sigV4AccessKey"],
SecretKey: decrypted["secretKey"], SecretKey: decrypted["sigV4SecretKey"],
Region: ds.JsonData.Get("region").MustString(), Region: ds.JsonData.Get("sigV4Region").MustString(),
AssumeRoleARN: ds.JsonData.Get("assumeRoleArn").MustString(), AssumeRoleARN: ds.JsonData.Get("sigV4AssumeRoleArn").MustString(),
AuthType: ds.JsonData.Get("authType").MustString(), AuthType: ds.JsonData.Get("sigV4AuthType").MustString(),
ExternalID: ds.JsonData.Get("externalId").MustString(), ExternalID: ds.JsonData.Get("sigV4ExternalId").MustString(),
Profile: ds.JsonData.Get("profile").MustString(), Profile: ds.JsonData.Get("sigV4Profile").MustString(),
}, },
Next: next, Next: next,
} }