IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Ensure SA migrations doesn't hit migrated SAs if rerun (#94347)

Browse Source 
* ensure mig doesn't hit migrated SAs if rerun

* Fix small issue with the test

---------

Co-authored-by: gamab <gabriel.mabille@grafana.com>
This commit is contained in:
Jo 2024-10-08 09:45:14 +02:00 committed by GitHub
parent f70fefc67c
commit 945dd052b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 74 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
pkg/services/sqlstore/migrations/usermig/service_account_multiple_org_login_migrator.go
View File

@ -35,32 +35,42 @@ func (p *ServiceAccountsSameLoginCrossOrgs) Exec(sess *xorm.Session, mg *migrato
var err error
switch p.dialect.DriverName() {
case migrator.Postgres:
_, err = p.sess.Exec(`UPDATE "user"
SET login = 'sa-' || org_id::text || '-' ||
CASE
WHEN login LIKE 'sa-%' THEN SUBSTRING(login FROM 4)
ELSE login
END
WHERE login IS NOT NULL AND is_service_account = true;`,
)
_, err = p.sess.Exec(`
UPDATE "user"
SET login = 'sa-' || org_id::text || '-' ||
CASE
WHEN login LIKE 'sa-%' THEN SUBSTRING(login FROM 4)
ELSE login
END
WHERE login IS NOT NULL
AND is_service_account = true
AND login NOT LIKE 'sa-' || org_id::text || '-%';
`)
case migrator.MySQL:
_, err = p.sess.Exec(`UPDATE user
SET login = CONCAT('sa-', CAST(org_id AS CHAR), '-',
CASE
WHEN login LIKE 'sa-%' THEN SUBSTRING(login, 4)
ELSE login
END)
WHERE login IS NOT NULL AND is_service_account = 1;`,
)
_, err = p.sess.Exec(`
UPDATE user
SET login = CONCAT('sa-', CAST(org_id AS CHAR), '-',
CASE
WHEN login LIKE 'sa-%' THEN SUBSTRING(login, 4)
ELSE login
END
)
WHERE login IS NOT NULL
AND is_service_account = 1
AND login NOT LIKE CONCAT('sa-', org_id, '-%');
`)
case migrator.SQLite:
_, err = p.sess.Exec(`Update ` + p.dialect.Quote("user") + `
SET login = 'sa-' || CAST(org_id AS TEXT) || '-' ||
CASE
WHEN SUBSTR(login, 1, 3) = 'sa-' THEN SUBSTR(login, 4)
ELSE login
END
WHERE login IS NOT NULL AND is_service_account = 1;`,
)
_, err = p.sess.Exec(`
UPDATE ` + p.dialect.Quote("user") + `
SET login = 'sa-' || CAST(org_id AS TEXT) || '-' ||
CASE
WHEN SUBSTR(login, 1, 3) = 'sa-' THEN SUBSTR(login, 4)
ELSE login
END
WHERE login IS NOT NULL
AND is_service_account = 1
AND login NOT LIKE 'sa-' || CAST(org_id AS TEXT) || '-%';
`)
default:
return fmt.Errorf("dialect not supported: %s", p.dialect)
}

40
pkg/services/sqlstore/migrations/usermig/test/service_account_test.go
View File

@ -15,6 +15,9 @@ import (
)
func TestIntegrationServiceAccountMigration(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
// Run initial migration to have a working DB
x := setupTestDB(t)
@ -211,6 +214,43 @@ func TestIntegrationServiceAccountMigration(t *testing.T) {
},
},
},
{
desc: "avoid reapply of migration",
serviceAccounts: []*user.User{
{
ID: 11,
UID: "u11",
Name: "sa-1-extsvc-bug",
Login: "sa-1-extsvc-bug",
Email: "sa-1-extsvc-bug@org.com",
OrgID: 1,
Created: now,
Updated: now,
IsServiceAccount: true,
},
{
ID: 12,
UID: "u12",
Name: "sa-2-extsvc-bug2",
Login: "sa-2-extsvc-bug2",
Email: "sa-2-extsvc-bug2@org.com",
OrgID: 2,
Created: now,
Updated: now,
IsServiceAccount: true,
},
},
wantServiceAccounts: []*user.User{
{
ID: 11,
Login: "sa-1-extsvc-bug",
},
{
ID: 12,
Login: "sa-2-extsvc-bug2",
},
},
},
}
for _, tc := range testCases {