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:
@@ -0,0 +1,64 @@
|
||||
terraform {
|
||||
required_providers {
|
||||
grafana = {
|
||||
source = "grafana/grafana"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Configure the Grafana Provider
|
||||
provider "grafana" {
|
||||
url = "http://localhost:3000/"
|
||||
auth = "admin:admin"
|
||||
}
|
||||
|
||||
// login conflict
|
||||
// Creating the grafana-login
|
||||
resource "grafana_user" "grafana-login" {
|
||||
email = "grafana_login@grafana.com"
|
||||
login = "GRAFANA_LOGIN@grafana.com"
|
||||
password = "grafana_login@grafana.com"
|
||||
is_admin = false
|
||||
}
|
||||
|
||||
// Creating the grafana-login
|
||||
resource "grafana_user" "grafana-login-2" {
|
||||
email = "grafana_login_2@grafana.com"
|
||||
login = "grafana_login@grafana.com"
|
||||
password = "grafana_login@grafana.com"
|
||||
is_admin = false
|
||||
}
|
||||
|
||||
// email conflict
|
||||
// Creating the grafana-email
|
||||
resource "grafana_user" "grafana-email" {
|
||||
email = "grafana_email@grafana.com"
|
||||
login = "grafana_email@grafana.com"
|
||||
password = "grafana_email@grafana.com"
|
||||
is_admin = false
|
||||
}
|
||||
|
||||
// Creating the grafana-email
|
||||
resource "grafana_user" "grafana-email-2" {
|
||||
email = "GRAFANA_EMAIL@grafana.com"
|
||||
login = "grafana_email_2@grafana.com"
|
||||
password = "grafana_email@grafana.com"
|
||||
is_admin = false
|
||||
}
|
||||
|
||||
// email and login conflict
|
||||
// Creating the grafana-user
|
||||
resource "grafana_user" "grafana-user" {
|
||||
email = "grafana_user@grafana.com"
|
||||
login = "grafana_user@grafana.com"
|
||||
password = "grafana_user@grafana.com"
|
||||
is_admin = false
|
||||
}
|
||||
|
||||
// Creating the grafana-user
|
||||
resource "grafana_user" "grafana-user-2" {
|
||||
email = "GRAFANA_USER@grafana.com"
|
||||
login = "GRAFANA_USER@grafana.com"
|
||||
password = "grafana_user@grafana.com"
|
||||
is_admin = false
|
||||
}
|
||||
Reference in New Issue
Block a user