From 51a76150cae1dda90631f84f6aa6eb3e7f87bd6a Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Mon, 29 Mar 2021 13:38:04 +0200 Subject: [PATCH] fix: revert migration V1.13 (#1466) * fix: revert migration V1.13 * fix: set project changes correctly in application view model (#1469) * fix: import user, hide login name suffix (#1474) * fix: import user, and label policy command side * feat: Import user and hide loginname suffix (#1464) * fix: import user * fix: label policy * fix: label policy * fix: label policy * fix: migrations * fix: migrations * fix: migrations * fix: label policy * loginSuffix in login ui * suffix * fix cursor on disabled user selection Co-authored-by: Livio Amstutz (cherry picked from commit 03ddb8fc388494d6ec99b1db9e16d16c28ee9649) * feat: Import user and hide loginname suffix (#1464) * fix: import user * fix: label policy * fix: label policy * fix: label policy * fix: migrations * fix: migrations * fix: migrations * fix: label policy * loginSuffix in login ui * suffix * fix cursor on disabled user selection Co-authored-by: Livio Amstutz (cherry picked from commit 03ddb8fc388494d6ec99b1db9e16d16c28ee9649) * feat: Import user and hide loginname suffix (#1464) * fix: import user * fix: label policy * fix: label policy * fix: label policy * fix: migrations * fix: migrations * fix: migrations * fix: label policy * loginSuffix in login ui * suffix * fix cursor on disabled user selection Co-authored-by: Livio Amstutz (cherry picked from commit 03ddb8fc388494d6ec99b1db9e16d16c28ee9649) * fix: label policy events * loginname placeholder * fix: tests * fix: tests * Update internal/command/iam_policy_label_model.go Co-authored-by: Livio Amstutz Co-authored-by: Livio Amstutz * fix: console eventstore (#1476) * fix org switch * user grants * fix project grants, user grant update * fix idp removal, prettier buttons, attribute names * fix: operator reconciling (#1478) * fix(operator): align backup and restore commands (#1465) * fix: crd mode broke backup and restore commands * fix: remove obscure gitops-per-operator flags (cherry picked from commit 041cacc4af8aeb89723a049bc4dbfcbc33cd987f) * fix: gitops backup and restore need a kubernetes client too (#1475) (cherry picked from commit 50bc317d2797b819124cdb1119db76bb00ab0df6) Co-authored-by: Elio Bischof * feat: features (#1427) * features * features * features * fix json tags * add features handler to auth * mocks for tests * add setup step * fixes * add featurelist to auth api * grandfather state and typos * typo * merge new-eventstore * fix login policy tests * label policy in features * audit log retention * fix: new es bug fixes (#1477) * fix: displayname on members * fix: user grant update * fix: user grant id * console grantid Co-authored-by: Max Peintner * fix: backend (#1481) * fix: check ids in proto * fix sign out * improve displayed login name after user selection * fix init user in login * fix init password in login Co-authored-by: fabi * feat: console feature api (#1480) * fix: changes (#1482) * fix: changes * change listquery to changequery * fix: changes in auth Co-authored-by: Max Peintner * test without transaction * test without transaction Co-authored-by: Livio Amstutz Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Max Peintner Co-authored-by: fabi --- internal/eventstore/local_crdb_test.go | 21 +------------------ .../repository/sql/local_crdb_test.go | 21 +------------------ .../cockroach/V1.13__machine_keys_public.sql | 13 ------------ 3 files changed, 2 insertions(+), 53 deletions(-) diff --git a/internal/eventstore/local_crdb_test.go b/internal/eventstore/local_crdb_test.go index 15997e52cd..fe8ffedfaa 100644 --- a/internal/eventstore/local_crdb_test.go +++ b/internal/eventstore/local_crdb_test.go @@ -10,7 +10,6 @@ import ( "strconv" "strings" "testing" - "time" "github.com/caos/logging" "github.com/cockroachdb/cockroach-go/v2/testserver" @@ -62,27 +61,9 @@ func executeMigrations() error { return err } migration := os.ExpandEnv(string(migrationData)) - transactionInMigration := strings.Contains(migration, "BEGIN;") - exec := testCRDBClient.Exec - var tx *sql.Tx - if !transactionInMigration { - tx, err = testCRDBClient.Begin() - if err != nil { - return fmt.Errorf("begin file: %v || err: %w", file, err) - } - exec = tx.Exec - } - if _, err = exec(migration); err != nil { + if _, err = testCRDBClient.Exec(migration); err != nil { return fmt.Errorf("exec file: %v || err: %w", file, err) } - duration := 1 * time.Second - if !transactionInMigration { - if err = tx.Commit(); err != nil { - return fmt.Errorf("commit file: %v || err: %w", file, err) - } - duration = 0 - } - time.Sleep(duration) } return nil } diff --git a/internal/eventstore/repository/sql/local_crdb_test.go b/internal/eventstore/repository/sql/local_crdb_test.go index e88e189008..e67c314c4a 100644 --- a/internal/eventstore/repository/sql/local_crdb_test.go +++ b/internal/eventstore/repository/sql/local_crdb_test.go @@ -10,7 +10,6 @@ import ( "strconv" "strings" "testing" - "time" "github.com/caos/logging" "github.com/cockroachdb/cockroach-go/v2/testserver" @@ -66,27 +65,9 @@ func executeMigrations() error { return err } migration := os.ExpandEnv(string(migrationData)) - transactionInMigration := strings.Contains(migration, "BEGIN;") - exec := testCRDBClient.Exec - var tx *sql.Tx - if !transactionInMigration { - tx, err = testCRDBClient.Begin() - if err != nil { - return fmt.Errorf("begin file: %v || err: %w", file, err) - } - exec = tx.Exec - } - if _, err = exec(migration); err != nil { + if _, err = testCRDBClient.Exec(migration); err != nil { return fmt.Errorf("exec file: %v || err: %w", file, err) } - duration := 1 * time.Second - if !transactionInMigration { - if err = tx.Commit(); err != nil { - return fmt.Errorf("commit file: %v || err: %w", file, err) - } - duration = 0 - } - time.Sleep(duration) } return nil } diff --git a/migrations/cockroach/V1.13__machine_keys_public.sql b/migrations/cockroach/V1.13__machine_keys_public.sql index 605ad1723e..45f622bc92 100644 --- a/migrations/cockroach/V1.13__machine_keys_public.sql +++ b/migrations/cockroach/V1.13__machine_keys_public.sql @@ -1,18 +1,5 @@ --- table manipulations need to be in seperate transactions --- (see: https://github.com/cockroachdb/cockroach/issues/13380#issuecomment-306560448) - -BEGIN; ALTER TABLE management.machine_keys DROP COLUMN IF EXISTS public_key; -COMMIT; - -BEGIN; ALTER TABLE management.machine_keys ADD COLUMN public_key BYTES; -COMMIT; -BEGIN; ALTER TABLE auth.machine_keys DROP COLUMN IF EXISTS public_key; -COMMIT; - -BEGIN; ALTER TABLE auth.machine_keys ADD COLUMN public_key BYTES; -COMMIT; \ No newline at end of file