TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-13 19:09:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: compatability for cockroach v22.1

Browse Source
This commit is contained in:
Livio Amstutz
2022-06-01 10:49:36 +02:00
parent 66b6ef7f04
commit dad9adfcb2
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/zitadel/Dockerfile
View File

@@ -89,9 +89,9 @@ RUN apt install openssl tzdata tar
# cockroach binary used to backup database # cockroach binary used to backup database
RUN mkdir /usr/local/lib/cockroach RUN mkdir /usr/local/lib/cockroach
RUN wget -qO- https://binaries.cockroachdb.com/cockroach-v21.2.9.linux-amd64.tgz \ RUN wget -qO- https://binaries.cockroachdb.com/cockroach-v22.1.0.linux-amd64.tgz \
| tar xvz && cp -i cockroach-v21.2.9.linux-amd64/cockroach /usr/local/bin/ | tar xvz && cp -i cockroach-v22.1.0.linux-amd64/cockroach /usr/local/bin/
RUN rm -r cockroach-v21.2.9.linux-amd64 RUN rm -r cockroach-v22.1.0.linux-amd64
# Migrations for cockroach-secure # Migrations for cockroach-secure
RUN go install github.com/rakyll/statik \ RUN go install github.com/rakyll/statik \

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 ( import (
"database/sql" "database/sql"
_ "embed" _ "embed"
"fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
@@ -43,7 +44,7 @@ func VerifyUser(username, password string) func(*sql.DB) error {
logging.WithFields("username", username).Info("verify user") logging.WithFields("username", username).Info("verify user")
return verify(db, return verify(db,
exists(searchUser, username), 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{ args: args{
db: prepareDB(t, db: prepareDB(t,
expectExists("SELECT EXISTS(SELECT username FROM [show roles] WHERE username = $1)", false, "zitadel-user"), 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", username: "zitadel-user",
password: "", password: "",
@@ -43,7 +43,7 @@ func Test_verifyUser(t *testing.T) {
args: args{ args: args{
db: prepareDB(t, db: prepareDB(t,
expectExists("SELECT EXISTS(SELECT username FROM [show roles] WHERE username = $1)", false, "zitadel-user"), 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", username: "zitadel-user",
password: "", password: "",
@@ -55,7 +55,7 @@ func Test_verifyUser(t *testing.T) {
args: args{ args: args{
db: prepareDB(t, db: prepareDB(t,
expectExists("SELECT EXISTS(SELECT username FROM [show roles] WHERE username = $1)", false, "zitadel-user"), 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", username: "zitadel-user",
password: "password", password: "password",