mirror of
https://github.com/grafana/grafana.git
synced 2025-09-28 15:13:38 +08:00
Auth: conflicting users validation improvements (#58136)
* WIP * add: better validation of conflict file * add: better description of validation and ingest command * add: check for at least one user to delete * add: example in terraform to setup for conflicts * Update pkg/cmd/grafana-cli/commands/conflict_user_command.go Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> * Add: print of conflict block for error - adds conflict block to error output for validation of the file to easier diagnose in the file * fix: formatting of errors * fix: info strings improvements * add: default 0 to blocks to check for users * fixed: tests * test integration * fix strings fmt * set store in resolver Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
This commit is contained in:
@ -219,7 +219,7 @@ var adminCommands = []*cli.Command{
|
||||
},
|
||||
{
|
||||
Name: "ingest-file",
|
||||
Usage: "ingests the conflict users file",
|
||||
Usage: "ingests the conflict users file. > Note: This is irreversible it will change the state of the database.",
|
||||
Action: runIngestConflictUsersFile(),
|
||||
},
|
||||
},
|
||||
|
Reference in New Issue
Block a user