TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 17:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: compatibility for cockroach v22.1 (#3754)

Browse Source 
* fix: compatability for cockroach v22.1

* update cr version in docs and compose

* bind dev cockroach to 127.0.0.1

* Revert "bind dev cockroach to 127.0.0.1"

This reverts commit 1c7c6304ae.

* remove --listen-addr flag

* use v2.0.0-v2-alpha.16

* use v2.0.0-v2-alpha.17

Co-authored-by: Elio Bischof <eliobischof@gmail.com>
This commit is contained in:
Livio Amstutz
2022-06-01 11:41:01 +02:00
committed by GitHub
parent 66b6ef7f04
commit 32afa77b97
7 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/admin/initialise/sql/01_user.sql
View File

@@ -1 +1,2 @@
CREATE USER $1 WITH PASSWORD $2
-- replace %[1]s with the name of the user
CREATE USER %[1]s WITH PASSWORD $1

3
cmd/admin/initialise/verify_user.go
View File

@@ -3,6 +3,7 @@ package initialise
import (
"database/sql"
_ "embed"
"fmt"
"github.com/spf13/cobra"
"github.com/spf13/viper"
@@ -43,7 +44,7 @@ func VerifyUser(username, password string) func(*sql.DB) error {
logging.WithFields("username", username).Info("verify user")
return verify(db,
exists(searchUser, username),
exec(createUserStmt, username, &sql.NullString{String: password, Valid: password != ""}),
exec(fmt.Sprintf(createUserStmt, username), &sql.NullString{String: password, Valid: password != ""}),
)
}
}

6
cmd/admin/initialise/verify_user_test.go
View File

@@ -31,7 +31,7 @@ func Test_verifyUser(t *testing.T) {
args: args{
db: prepareDB(t,
expectExists("SELECT EXISTS(SELECT username FROM [show roles] WHERE username = $1)", false, "zitadel-user"),
expectExec("CREATE USER $1 WITH PASSWORD $2", sql.ErrTxDone, "zitadel-user", nil),
expectExec("CREATE USER zitadel-user WITH PASSWORD $1", sql.ErrTxDone, nil),
),
username: "zitadel-user",
password: "",
@@ -43,7 +43,7 @@ func Test_verifyUser(t *testing.T) {
args: args{
db: prepareDB(t,
expectExists("SELECT EXISTS(SELECT username FROM [show roles] WHERE username = $1)", false, "zitadel-user"),
expectExec("CREATE USER $1 WITH PASSWORD $2", nil, "zitadel-user", nil),
expectExec("CREATE USER zitadel-user WITH PASSWORD $1", nil, nil),
),
username: "zitadel-user",
password: "",
@@ -55,7 +55,7 @@ func Test_verifyUser(t *testing.T) {
args: args{
db: prepareDB(t,
expectExists("SELECT EXISTS(SELECT username FROM [show roles] WHERE username = $1)", false, "zitadel-user"),
expectExec("CREATE USER $1 WITH PASSWORD $2", nil, "zitadel-user", "password"),
expectExec("CREATE USER zitadel-user WITH PASSWORD $1", nil, "password"),
),
username: "zitadel-user",
password: "password",