From 831ee9ee1696c0aa7a6e4ca022ddfc0ab28b86dc Mon Sep 17 00:00:00 2001 From: linoman <2051016+linoman@users.noreply.github.com> Date: Thu, 14 Mar 2024 05:04:45 -0600 Subject: [PATCH] samlsettings: add sso settings saml feature flag (#84433) * add feature flag for ssosettings saml configuration * add generated files --- .../src/types/featureToggles.gen.ts | 1 + pkg/services/featuremgmt/registry.go | 8 ++++++++ pkg/services/featuremgmt/toggles_gen.csv | 1 + pkg/services/featuremgmt/toggles_gen.go | 4 ++++ pkg/services/featuremgmt/toggles_gen.json | 17 +++++++++++++++++ 5 files changed, 31 insertions(+) diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index a5fd29e7768..7005c830c44 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -181,4 +181,5 @@ export interface FeatureToggles { alertingUpgradeDryrunOnStart?: boolean; scopeFilters?: boolean; emailVerificationEnforcement?: boolean; + ssoSettingsSAML?: boolean; } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index be7308d1c47..92ba54685aa 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1217,6 +1217,14 @@ var ( HideFromDocs: true, HideFromAdminPage: true, }, + { + Name: "ssoSettingsSAML", + Description: "Use the new SSO Settings API to configure the SAML connector", + Stage: FeatureStageExperimental, + Owner: identityAccessTeam, + HideFromDocs: true, + HideFromAdminPage: true, + }, } ) diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 9b224b77b81..dc766a2a79d 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -162,3 +162,4 @@ betterPageScrolling,GA,@grafana/grafana-frontend-platform,false,false,true alertingUpgradeDryrunOnStart,GA,@grafana/alerting-squad,false,true,false scopeFilters,experimental,@grafana/dashboards-squad,false,false,false emailVerificationEnforcement,experimental,@grafana/identity-access-team,false,false,false +ssoSettingsSAML,experimental,@grafana/identity-access-team,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 2e18559919f..a78d806b0c0 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -658,4 +658,8 @@ const ( // FlagEmailVerificationEnforcement // Force email verification for users, even when authenticating through sso. FlagEmailVerificationEnforcement = "emailVerificationEnforcement" + + // FlagSsoSettingsSAML + // Use the new SSO Settings API to configure the SAML connector + FlagSsoSettingsSAML = "ssoSettingsSAML" ) diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index ea61f7f6bb5..4202850a8ac 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2118,6 +2118,23 @@ "hideFromAdminPage": true, "hideFromDocs": true } + }, + { + "metadata": { + "name": "ssoSettingsSAML", + "resourceVersion": "1710411764296", + "creationTimestamp": "2024-03-14T09:41:17Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-03-14 10:22:44.296694 +0000 UTC" + } + }, + "spec": { + "description": "Use the new SSO Settings API to configure the SAML connector", + "stage": "experimental", + "codeowner": "@grafana/identity-access-team", + "hideFromAdminPage": true, + "hideFromDocs": true + } } ] } \ No newline at end of file