Skip to content
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.

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

SSO: Convert numeric durations to strings in SSO settings #1838

Merged
merged 1 commit into from
Oct 11, 2024
Merged
Changes from all commits
Commits
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
38 changes: 38 additions & 0 deletions internal/resources/grafana/resource_sso_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"net/url"
"strconv"
"strings"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
Expand Down Expand Up @@ -941,6 +942,10 @@ func getSettingsForTF(payload *models.GetProviderSettingsOKBody) (map[string]any
settings["config"] = []any{settings["config"]}
}

if payload.Provider == "saml" {
settings = convertNumericDurationsToStrings(settings)
}

return settings, nil
}

Expand Down Expand Up @@ -1128,6 +1133,39 @@ func isSecret(fieldName string) bool {
return false
}

func convertNumericDurationsToStrings(settings map[string]any) map[string]any {
newSettings := make(map[string]any)

for key, value := range settings {
if isDuration(key) {
switch value := value.(type) {
case float64:
newSettings[key] = strconv.FormatFloat(value, 'f', -1, 64)
default:
newSettings[key] = value
}
} else {
newSettings[key] = value
}
}

return newSettings
}

func isDuration(fieldName string) bool {
durationFieldPatterns := []string{
"max_issue_delay", "maxIssueDelay",
"metadata_valid_duration", "metadataValidDuration",
}

for _, v := range durationFieldPatterns {
if strings.Contains(strings.ToLower(fieldName), strings.ToLower(v)) {
return true
}
}
return false
}

func validateOAuth2CustomFields(settings map[string]any) diag.Diagnostics {
for key := range settings[customFieldsKey].(map[string]any) {
if _, ok := oauth2SettingsSchema.Schema[key]; ok {
Expand Down
Loading