From dad9adfcb240c75f5647a73fba28741d0e9ebd6b Mon Sep 17 00:00:00 2001
From: Livio Amstutz <livio.a@gmail.com>
Date: Wed, 1 Jun 2022 10:49:36 +0200
Subject: [PATCH] fix: compatability for cockroach v22.1

---
 build/zitadel/Dockerfile                 | 6 +++---
 cmd/admin/initialise/sql/01_user.sql     | 3 ++-
 cmd/admin/initialise/verify_user.go      | 3 ++-
 cmd/admin/initialise/verify_user_test.go | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build/zitadel/Dockerfile b/build/zitadel/Dockerfile
index ee47132de5..d57b21238b 100644
--- a/build/zitadel/Dockerfile
+++ b/build/zitadel/Dockerfile
@@ -89,9 +89,9 @@ RUN apt install openssl tzdata tar
 
 # cockroach binary used to backup database
 RUN mkdir /usr/local/lib/cockroach
-RUN wget -qO- https://binaries.cockroachdb.com/cockroach-v21.2.9.linux-amd64.tgz \
-    | tar  xvz && cp -i cockroach-v21.2.9.linux-amd64/cockroach /usr/local/bin/
-RUN rm -r cockroach-v21.2.9.linux-amd64
+RUN wget -qO- https://binaries.cockroachdb.com/cockroach-v22.1.0.linux-amd64.tgz \
+    | tar  xvz && cp -i cockroach-v22.1.0.linux-amd64/cockroach /usr/local/bin/
+RUN rm -r cockroach-v22.1.0.linux-amd64
 
 # Migrations for cockroach-secure
 RUN go install github.com/rakyll/statik \
diff --git a/cmd/admin/initialise/sql/01_user.sql b/cmd/admin/initialise/sql/01_user.sql
index 967c7f2b7d..194b848f19 100644
--- a/cmd/admin/initialise/sql/01_user.sql
+++ b/cmd/admin/initialise/sql/01_user.sql
@@ -1 +1,2 @@
-CREATE USER $1 WITH PASSWORD $2
\ No newline at end of file
+-- replace %[1]s with the name of the user
+CREATE USER %[1]s WITH PASSWORD $1
diff --git a/cmd/admin/initialise/verify_user.go b/cmd/admin/initialise/verify_user.go
index 1ad3c2d1b5..386bab96b4 100644
--- a/cmd/admin/initialise/verify_user.go
+++ b/cmd/admin/initialise/verify_user.go
@@ -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 != ""}),
 		)
 	}
 }
diff --git a/cmd/admin/initialise/verify_user_test.go b/cmd/admin/initialise/verify_user_test.go
index 6d7b272f5a..52d220cecf 100644
--- a/cmd/admin/initialise/verify_user_test.go
+++ b/cmd/admin/initialise/verify_user_test.go
@@ -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",