Skip to content
Snippets Groups Projects
Commit d67ce292 authored by Fabian Seidl's avatar Fabian Seidl
Browse files

Resolve "Clean up deafult pnd uuid in toml files"

See merge request !400
parent 975fce76
Branches
Tags
2 merge requests!400Resolve "Clean up deafult pnd uuid in toml files",!382Develop
Pipeline #119173 passed
...@@ -51,6 +51,7 @@ stores/*.json ...@@ -51,6 +51,7 @@ stores/*.json
# gosdn # gosdn
configs/gosdn.toml configs/gosdn.toml
config/.gosdnc.toml
applications/venv-manager/*.clab.yaml applications/venv-manager/*.clab.yaml
......
cli_pnd = '5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d'
cli_sbi = 'ca29311a-3b17-4385-96f8-515b602a97ac'
controllerapiendpoint = 'localhost:55055'
user_token = ''
basepnduuid = "5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d" basepnduuid = "5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d"
basesouthboundtype = 1 basesouthboundtype = 1
basesouthbounduuid = "ca29311a-3b17-4385-96f8-515b602a97ac" basesouthbounduuid = "ca29311a-3b17-4385-96f8-515b602a97ac"
cli_pnd = "0455b241-5863-4660-ad15-dfde7617738e"
cli_sbi = "a249f2d2-f7da-481d-8a99-b7f11471e0af"
csbi-orchestrator = "clab-gosdn_csbi_arista_base-csbi-orchestrator:55056" csbi-orchestrator = "clab-gosdn_csbi_arista_base-csbi-orchestrator:55056"
help = false help = false
plugin-folder = "plugins" plugin-folder = "plugins"
log-level = "debug" log-level = "debug"
pnduuid = "bf8160d4-4659-4a1b-98fd-f409a04111ec"
socket = ":55055" socket = ":55055"
databaseConnection = "mongodb://root:example@clab-gosdn_csbi_arista_base-mongodb:27017" databaseConnection = "mongodb://root:example@clab-gosdn_csbi_arista_base-mongodb:27017"
filesystemPathToStores = "stores" filesystemPathToStores = "stores"
......
basepnduuid = "5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d" basepnduuid = "5f20f34b-cbd0-4511-9ddc-c50cf6a3b49d"
basesouthboundtype = 1 basesouthboundtype = 1
basesouthbounduuid = "ca29311a-3b17-4385-96f8-515b602a97ac" basesouthbounduuid = "ca29311a-3b17-4385-96f8-515b602a97ac"
cli_pnd = "0455b241-5863-4660-ad15-dfde7617738e"
cli_sbi = "a249f2d2-f7da-481d-8a99-b7f11471e0af"
csbi-orchestrator = "localhost:55056" csbi-orchestrator = "localhost:55056"
help = false help = false
plugin-folder = "plugins" plugin-folder = "plugins"
log-level = "debug" log-level = "debug"
pnduuid = "bf8160d4-4659-4a1b-98fd-f409a04111ec"
socket = ":55055" socket = ":55055"
databaseConnection = "mongodb://root:example@localhost:27017" databaseConnection = "mongodb://root:example@localhost:27017"
filesystemPathToStores = "stores" filesystemPathToStores = "stores"
......
...@@ -65,9 +65,7 @@ func (u UserServer) CreateUsers(ctx context.Context, request *apb.CreateUsersReq ...@@ -65,9 +65,7 @@ func (u UserServer) CreateUsers(ctx context.Context, request *apb.CreateUsersReq
hashedPassword := base64.RawStdEncoding.EncodeToString(argon2.IDKey([]byte(user.Password), []byte(salt), 1, 64*1024, 4, 32)) hashedPassword := base64.RawStdEncoding.EncodeToString(argon2.IDKey([]byte(user.Password), []byte(salt), 1, 64*1024, 4, 32))
user := rbac.NewUser(uuid.New(), user.Name, roles, string(hashedPassword), user.Token, salt, conflict.Metadata{ user := rbac.NewUser(uuid.New(), user.Name, roles, string(hashedPassword), user.Token, salt, conflict.Metadata{ResourceVersion: 0})
ResourceVersion: int(user.Metadata.ResourceVersion),
})
err = u.userService.Add(user) err = u.userService.Add(user)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment