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

Auth: SSO settings foundations (#77724)

Browse Source 
* inital changes, db migration

* changes

* Implement basic GetAll, Delete

* Add first batch of tests

* Add more tests

* Add service tests for GetForProvider, List

* Update http_server.go + wire.go

* Lint + update fixed role

* Update CODEOWNERS

* Change API init

* Change roles, rename

* Review with @kalleep

* Revert a mistakenly changed part

* Updates based on @dmihai 's feedback

---------

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
This commit is contained in:
Misi
2023-11-08 10:50:01 +01:00
committed by GitHub
co-authored by Karl Persson
parent 8a46dc39d0
commit 5285e9503b
24 changed files with 1436 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/migrations/migrations.go
+3
View File
@@ -7,6 +7,7 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/anonservice"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/oauthserver"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/signingkeys"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/ssosettings"
"github.com/grafana/grafana/pkg/services/sqlstore/migrations/ualert"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
)
@@ -106,6 +107,8 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
ualert.CreatedFoldersMigration(mg)
dashboardFolderMigrations.AddDashboardFolderMigrations(mg)
ssosettings.AddMigration(mg)
}
func addStarMigrations(mg *Migrator) {
pkg/services/sqlstore/migrations/ssosettings/migrations.go
+19
View File
@@ -0,0 +1,19 @@
package ssosettings
import "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
func AddMigration(mg *migrator.Migrator) {
var ssoSettingV1 = migrator.Table{
Name: "sso_setting",
Columns: []*migrator.Column{
{Name: "id", Type: migrator.DB_NVarchar, Length: 40, IsPrimaryKey: true}, // Store uuidv4
{Name: "provider", Type: migrator.DB_NVarchar, Length: 255, Nullable: false},
{Name: "settings", Type: migrator.DB_Text, Nullable: false},
{Name: "created", Type: migrator.DB_DateTime, Nullable: false},
{Name: "updated", Type: migrator.DB_DateTime, Nullable: false},
{Name: "is_deleted", Type: migrator.DB_Bool, Nullable: false, Default: "0"},
},
}
mg.AddMigration("create sso_setting table", migrator.NewAddTableMigration(ssoSettingV1))
}