mirror of
https://github.com/grafana/grafana.git
synced 2024-11-30 20:54:22 -06:00
6dbb6408d4
* Add extra fields to OSS types to support enterprise * Create a service account at the same time as the API key * Use service account credentials when accessing API with APIkey * Add GetRole to service, merge RoleDTO and Role structs This patch merges the identical OSS and Enterprise data structures, which improves the code for two reasons: 1. Makes switching between OSS and Enterprise easier 2. Reduces the chance of incompatibilities developing between the same functions in OSS and Enterprise * If API key is not linked to a service account, continue login as usual * Fallback to old auth if no service account linked to key * Add CloneUserToServiceAccount * Adding LinkAPIKeyToServiceAccount * Handle api key link error * Better error messages for OSS accesscontrol * Set an invalid user id as default * Re-arrange field names * ServiceAccountId is integer * Better error messages Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
90 lines
3.2 KiB
Go
90 lines
3.2 KiB
Go
package migrations
|
|
|
|
import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
|
|
|
|
func addApiKeyMigrations(mg *Migrator) {
|
|
apiKeyV1 := Table{
|
|
Name: "api_key",
|
|
Columns: []*Column{
|
|
{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
|
|
{Name: "account_id", Type: DB_BigInt, Nullable: false},
|
|
{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
|
|
{Name: "key", Type: DB_Varchar, Length: 64, Nullable: false},
|
|
{Name: "role", Type: DB_NVarchar, Length: 255, Nullable: false},
|
|
{Name: "created", Type: DB_DateTime, Nullable: false},
|
|
{Name: "updated", Type: DB_DateTime, Nullable: false},
|
|
},
|
|
Indices: []*Index{
|
|
{Cols: []string{"account_id"}},
|
|
{Cols: []string{"key"}, Type: UniqueIndex},
|
|
{Cols: []string{"account_id", "name"}, Type: UniqueIndex},
|
|
},
|
|
}
|
|
|
|
// create table
|
|
mg.AddMigration("create api_key table", NewAddTableMigration(apiKeyV1))
|
|
// create indices
|
|
mg.AddMigration("add index api_key.account_id", NewAddIndexMigration(apiKeyV1, apiKeyV1.Indices[0]))
|
|
mg.AddMigration("add index api_key.key", NewAddIndexMigration(apiKeyV1, apiKeyV1.Indices[1]))
|
|
mg.AddMigration("add index api_key.account_id_name", NewAddIndexMigration(apiKeyV1, apiKeyV1.Indices[2]))
|
|
|
|
// ---------------------
|
|
// account -> org changes
|
|
|
|
// drop indexes
|
|
addDropAllIndicesMigrations(mg, "v1", apiKeyV1)
|
|
// rename table
|
|
addTableRenameMigration(mg, "api_key", "api_key_v1", "v1")
|
|
|
|
apiKeyV2 := Table{
|
|
Name: "api_key",
|
|
Columns: []*Column{
|
|
{Name: "id", Type: DB_BigInt, IsPrimaryKey: true, IsAutoIncrement: true},
|
|
{Name: "org_id", Type: DB_BigInt, Nullable: false},
|
|
{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
|
|
{Name: "key", Type: DB_Varchar, Length: 190, Nullable: false},
|
|
{Name: "role", Type: DB_NVarchar, Length: 255, Nullable: false},
|
|
{Name: "created", Type: DB_DateTime, Nullable: false},
|
|
{Name: "updated", Type: DB_DateTime, Nullable: false},
|
|
},
|
|
Indices: []*Index{
|
|
{Cols: []string{"org_id"}},
|
|
{Cols: []string{"key"}, Type: UniqueIndex},
|
|
{Cols: []string{"org_id", "name"}, Type: UniqueIndex},
|
|
},
|
|
}
|
|
|
|
// create v2 table
|
|
mg.AddMigration("create api_key table v2", NewAddTableMigration(apiKeyV2))
|
|
|
|
// add v2 indíces
|
|
addTableIndicesMigrations(mg, "v2", apiKeyV2)
|
|
|
|
//------- copy data from v1 to v2 -------------------
|
|
mg.AddMigration("copy api_key v1 to v2", NewCopyTableDataMigration("api_key", "api_key_v1", map[string]string{
|
|
"id": "id",
|
|
"org_id": "account_id",
|
|
"name": "name",
|
|
"key": "key",
|
|
"role": "role",
|
|
"created": "created",
|
|
"updated": "updated",
|
|
}))
|
|
|
|
mg.AddMigration("Drop old table api_key_v1", NewDropTableMigration("api_key_v1"))
|
|
|
|
mg.AddMigration("Update api_key table charset", NewTableCharsetMigration("api_key", []*Column{
|
|
{Name: "name", Type: DB_NVarchar, Length: 190, Nullable: false},
|
|
{Name: "key", Type: DB_Varchar, Length: 190, Nullable: false},
|
|
{Name: "role", Type: DB_NVarchar, Length: 255, Nullable: false},
|
|
}))
|
|
|
|
mg.AddMigration("Add expires to api_key table", NewAddColumnMigration(apiKeyV2, &Column{
|
|
Name: "expires", Type: DB_BigInt, Nullable: true,
|
|
}))
|
|
|
|
mg.AddMigration("Add service account foreign key", NewAddColumnMigration(apiKeyV2, &Column{
|
|
Name: "service_account_id", Type: DB_BigInt, Nullable: true,
|
|
}))
|
|
}
|