Provisioning: set stable datasource UID with provisioning (#41769)

This commit is contained in:
Ryan McKinley 2021-11-17 16:18:08 -08:00 committed by GitHub
parent bf85ae44a2
commit 7ef05588ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 1 deletions

View File

@ -2,6 +2,7 @@ package datasources
import (
"context"
"crypto/sha256"
"fmt"
"io/ioutil"
"os"
@ -35,6 +36,12 @@ func (cr *configReader) readConfig(ctx context.Context, path string) ([]*configs
}
if datasource != nil {
for _, ds := range datasource.Datasources {
if ds.UID == "" && ds.Name != "" {
ds.UID = safeUIDFromName(ds.Name)
}
}
datasources = append(datasources, datasource)
}
}
@ -138,3 +145,10 @@ func (cr *configReader) validateAccessAndOrgID(ctx context.Context, ds *upsertDa
}
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]))
}

View File

@ -50,6 +50,8 @@ func TestDatasourceAsConfig(t *testing.T) {
require.Equal(t, len(fakeRepo.inserted), 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].Name, "My datasource name")
require.Equal(t, fakeRepo.inserted[0].Uid, "P2AD1F727255C56BA")
})
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) {
require.Equal(t, len(dsCfg.DeleteDatasources), 1)
deleteDs := dsCfg.DeleteDatasources[0]

View File

@ -1,5 +1,5 @@
apiVersion: 1
datasources:
- name: $TEST_VAR
- name: My datasource name
type: type