Skip to content

fix typo of feature flag everywhere. Is this an API breaking change? #2562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jschaul wants to merge 1 commit into from
Closed

fix typo of feature flag everywhere. Is this an API breaking change? #2562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/galley/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ data:
searchVisibilityInbound:
{{- toYaml .settings.featureFlags.searchVisibilityInbound | nindent 10 }}
{{- end }}
{{- if .settings.featureFlags.validateSAMLemails }}
validateSAMLemails:
{{- toYaml .settings.featureFlags.validateSAMLemails | nindent 10 }}
{{- if .settings.featureFlags.validateSAMLEmails }}
validateSAMLEmails:
{{- toYaml .settings.featureFlags.validateSAMLEmails | nindent 10 }}
{{- end }}
{{- if .settings.featureFlags.appLock }}
appLock:
Expand Down
2 changes: 1 addition & 1 deletion charts/galley/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ config:
status: disabled
sso: disabled-by-default
teamSearchVisibility: disabled-by-default
validateSAMLemails:
validateSAMLEmails:
defaults:
status: enabled

Expand Down
2 changes: 1 addition & 1 deletion docs/legacy/reference/spar-braindump.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ work fine.
When users are SAML-authenticated with an email address under NameID,
that email address is used by wire as an opaque identifier, not to
send actual emails. In order to *also* assign the user that email
address, you can enable the feature flag `validateSAMLemails`. This
address, you can enable the feature flag `validateSAMLEmails`. This
will trigger the regular email validation flow that is also triggered
when the user changes their email themselves.

Expand Down
2 changes: 1 addition & 1 deletion docs/src/release-notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2029,7 +2029,7 @@ Bug fixes and other updates
Documentation
-------------

- [SCIM] Document ``validateSAMLemails`` feature in
- [SCIM] Document ``validateSAMLEmails`` feature in
docs/reference/spar-braindump.md (#1299)

Internal changes
Expand Down
2 changes: 1 addition & 1 deletion libs/wire-api/src/Wire/API/Team/Feature.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ instance ToSchema ValidateSAMLEmailsConfig where
schema = object "ValidateSAMLEmailsConfig" objectSchema

instance IsFeatureConfig ValidateSAMLEmailsConfig where
type FeatureSymbol ValidateSAMLEmailsConfig = "validateSAMLemails"
type FeatureSymbol ValidateSAMLEmailsConfig = "validateSAMLEmails"
Copy link
Contributor

@battermann battermann Jul 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be a breaking change because URL should be case-sensitive, however in practice they might not be.

defFeatureStatus = WithStatus FeatureStatusEnabled LockStatusUnlocked ValidateSAMLEmailsConfig
objectSchema = pure ValidateSAMLEmailsConfig

Expand Down
2 changes: 1 addition & 1 deletion services/spar/src/Spar/Intra/Galley.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ assertSSOEnabled tid = do

isEmailValidationEnabledTeam :: (HasCallStack, MonadSparToGalley m) => TeamId -> m Bool
isEmailValidationEnabledTeam tid = do
resp <- call $ method GET . paths ["i", "teams", toByteString' tid, "features", "validateSAMLemails"]
resp <- call $ method GET . paths ["i", "teams", toByteString' tid, "features", "validateSAMLEmails"]
Copy link
Contributor

@battermann battermann Jul 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
resp <- call $ method GET . paths ["i", "teams", toByteString' tid, "features", "validateSAMLEmails"]
resp <- call $ method GET . paths ["i", "teams", toByteString' tid, "features", featureNameBS @ValidateSAMLEmailsConfig]

pure
( statusCode resp == 200
&& ( (wsStatus <$> responseJsonMaybe @(WithStatus ValidateSAMLEmailsConfig) resp)
Expand Down