IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Allow self-serve for ssoSettingsApi feature toggle (#83140)

Browse Source 
* Set AllowSelfServe to true ssoSettingsApi

* Align ft registry validation with latest changes
This commit is contained in:
Misi 2024-02-22 17:33:27 +01:00 committed by GitHub
parent 18ec6fcdd3
commit 1ef2e8d366
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/services/featuremgmt/registry.go
View File

@ -988,11 +988,12 @@ var (
Owner: grafanaSharingSquad,
},
{
Name: "ssoSettingsApi",
Description: "Enables the SSO settings API and the OAuth configuration UIs in Grafana",
Stage: FeatureStagePublicPreview,
FrontendOnly: false,
Owner: identityAccessTeam,
Name: "ssoSettingsApi",
Description: "Enables the SSO settings API and the OAuth configuration UIs in Grafana",
Stage: FeatureStagePublicPreview,
AllowSelfServe: true,
FrontendOnly: false,
Owner: identityAccessTeam,
},
{
Name: "canvasPanelPanZoom",

10
pkg/services/featuremgmt/toggles_gen.json
View File

@ -480,13 +480,17 @@
{
"metadata": {
"name": "ssoSettingsApi",
"resourceVersion": "1708108588074",
"creationTimestamp": "2024-02-16T18:36:28Z"
"resourceVersion": "1708503560010",
"creationTimestamp": "2024-02-16T18:36:28Z",
"annotations": {
"grafana.app/updatedTimestamp": "2024-02-21 08:19:20.010283 +0000 UTC"
}
},
"spec": {
"description": "Enables the SSO settings API and the OAuth configuration UIs in Grafana",
"stage": "preview",
"codeowner": "@grafana/identity-access-team"
"codeowner": "@grafana/identity-access-team",
"allowSelfServe": true
}
},
{

4
pkg/services/featuremgmt/toggles_gen_test.go
View File

@ -49,8 +49,8 @@ func TestFeatureToggleFiles(t *testing.T) {
if flag.Name != strings.TrimSpace(flag.Name) {
t.Errorf("flag Name should not start/end with spaces. See: %s", flag.Name)
}
if flag.AllowSelfServe && flag.Stage != FeatureStageGeneralAvailability {
t.Errorf("only allow self-serving GA toggles")
if flag.AllowSelfServe && !(flag.Stage == FeatureStageGeneralAvailability || flag.Stage == FeatureStagePublicPreview || flag.Stage == FeatureStageDeprecated) {
t.Errorf("only allow self-serving GA, PublicPreview and Deprecated toggles")
}
if flag.Owner == "" {
t.Errorf("feature %s does not have an owner. please fill the FeatureFlag.Owner property", flag.Name)