mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Provisioning: set stable datasource UID with provisioning (#41769)
This commit is contained in:
parent
bf85ae44a2
commit
7ef05588ea
@ -2,6 +2,7 @@ package datasources
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/sha256"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
@ -35,6 +36,12 @@ func (cr *configReader) readConfig(ctx context.Context, path string) ([]*configs
|
|||||||
}
|
}
|
||||||
|
|
||||||
if datasource != nil {
|
if datasource != nil {
|
||||||
|
for _, ds := range datasource.Datasources {
|
||||||
|
if ds.UID == "" && ds.Name != "" {
|
||||||
|
ds.UID = safeUIDFromName(ds.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
datasources = append(datasources, datasource)
|
datasources = append(datasources, datasource)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -138,3 +145,10 @@ func (cr *configReader) validateAccessAndOrgID(ctx context.Context, ds *upsertDa
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func safeUIDFromName(name string) string {
|
||||||
|
h := sha256.New()
|
||||||
|
_, _ = h.Write([]byte(name))
|
||||||
|
bs := h.Sum(nil)
|
||||||
|
return strings.ToUpper(fmt.Sprintf("P%x", bs[:8]))
|
||||||
|
}
|
||||||
|
@ -50,6 +50,8 @@ func TestDatasourceAsConfig(t *testing.T) {
|
|||||||
require.Equal(t, len(fakeRepo.inserted), 1)
|
require.Equal(t, len(fakeRepo.inserted), 1)
|
||||||
require.Equal(t, fakeRepo.inserted[0].OrgId, int64(1))
|
require.Equal(t, fakeRepo.inserted[0].OrgId, int64(1))
|
||||||
require.Equal(t, fakeRepo.inserted[0].Access, models.DsAccess("proxy"))
|
require.Equal(t, fakeRepo.inserted[0].Access, models.DsAccess("proxy"))
|
||||||
|
require.Equal(t, fakeRepo.inserted[0].Name, "My datasource name")
|
||||||
|
require.Equal(t, fakeRepo.inserted[0].Uid, "P2AD1F727255C56BA")
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("no datasource in database", func(t *testing.T) {
|
t.Run("no datasource in database", func(t *testing.T) {
|
||||||
@ -220,6 +222,14 @@ func TestDatasourceAsConfig(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestUIDFromNames(t *testing.T) {
|
||||||
|
t.Run("generate safe uid from name", func(t *testing.T) {
|
||||||
|
require.Equal(t, safeUIDFromName("Hello world"), "P64EC88CA00B268E5")
|
||||||
|
require.Equal(t, safeUIDFromName("Hello World"), "PA591A6D40BF42040")
|
||||||
|
require.Equal(t, safeUIDFromName("AAA"), "PCB1AD2119D8FAFB6")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func validateDeleteDatasources(t *testing.T, dsCfg *configs) {
|
func validateDeleteDatasources(t *testing.T, dsCfg *configs) {
|
||||||
require.Equal(t, len(dsCfg.DeleteDatasources), 1)
|
require.Equal(t, len(dsCfg.DeleteDatasources), 1)
|
||||||
deleteDs := dsCfg.DeleteDatasources[0]
|
deleteDs := dsCfg.DeleteDatasources[0]
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
apiVersion: 1
|
apiVersion: 1
|
||||||
|
|
||||||
datasources:
|
datasources:
|
||||||
- name: $TEST_VAR
|
- name: My datasource name
|
||||||
type: type
|
type: type
|
||||||
|
Loading…
Reference in New Issue
Block a user