public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.4.x] ExtSvcAccounts: FIX prevent service account deletion (#84511)

Browse Source 
* ExtSvcAccounts: FIX prevent service account deletion (#84502)

* ExtSvcAccounts: Fix External Service Accounts Login check

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

* Remove service accounts assignments and permissions on delete

* Fix first set of tests

* Fix second batch of tests

* Fix third batch of tests

---------

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
(cherry picked from commit 2795f9827a)

* ExtSvcAccounts: FIX tests that accidently depended on enterprise (#84535)

* ExtSvcAccounts: FIX tests that accidently depended on enterprise

* fix

---------

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Charandas <charandas@users.noreply.github.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-03-15 14:59:00 +01:00
committed by GitHub
co-authored by Gabriel MABILLE Charandas
parent 0f1651658b
commit 7db05f5d38
10 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/extsvcauth/models.go
+2 -1
View File
@@ -11,7 +11,8 @@ const (
ServiceAccounts AuthProvider = "ServiceAccounts"
// TmpOrgID is the orgID we use while global service accounts are not supported.
TmpOrgID int64 = 1
TmpOrgIDStr string = "1"
TmpOrgID int64 = 1
)
type AuthProvider string