chore!: Introduce ZITADEL v3 (#9645)

This PR summarizes multiple changes specifically only available with
ZITADEL v3:

- feat: Web Keys management
(https://github.com/zitadel/zitadel/pull/9526)
- fix(cmd): ensure proper working of mirror
(https://github.com/zitadel/zitadel/pull/9509)
- feat(Authz): system user support for permission check v2
(https://github.com/zitadel/zitadel/pull/9640)
- chore(license): change from Apache to AGPL
(https://github.com/zitadel/zitadel/pull/9597)
- feat(console): list v2 sessions
(https://github.com/zitadel/zitadel/pull/9539)
- fix(console): add loginV2 feature flag
(https://github.com/zitadel/zitadel/pull/9682)
- fix(feature flags): allow reading "own" flags
(https://github.com/zitadel/zitadel/pull/9649)
- feat(console): add Actions V2 UI
(https://github.com/zitadel/zitadel/pull/9591)

BREAKING CHANGE
- feat(webkey): migrate to v2beta API
(https://github.com/zitadel/zitadel/pull/9445)
- chore!: remove CockroachDB Support
(https://github.com/zitadel/zitadel/pull/9444)
- feat(actions): migrate to v2beta API
(https://github.com/zitadel/zitadel/pull/9489)

---------

Co-authored-by: Livio Spring <livio.a@gmail.com>
Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
Co-authored-by: Silvan <27845747+adlerhurst@users.noreply.github.com>
Co-authored-by: Ramon <mail@conblem.me>
Co-authored-by: Elio Bischof <elio@zitadel.com>
Co-authored-by: Kenta Yamaguchi <56732734+KEY60228@users.noreply.github.com>
Co-authored-by: Harsha Reddy <harsha.reddy@klaviyo.com>
Co-authored-by: Livio Spring <livio@zitadel.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Iraq <66622793+kkrime@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@zitadel.com>
Co-authored-by: Tim Möhlmann <tim+github@zitadel.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Max Peintner <peintnerm@gmail.com>

.github/ISSUE_TEMPLATE/BUG_REPORT.yaml

@@ -40,7 +40,7 @@ body:
     label: Database
     description: What database are you using? (self-hosters only)
     options:
-    - CockroachDB
+    - CockroachDB (Zitadel v2)
     - PostgreSQL
     - Other (describe below!)
 - type: input

.github/pull_request_template.md

@@ -1,3 +1,8 @@
+<!--
+Please inform yourself about the contribution guidelines on submitting a PR here: https://github.com/zitadel/zitadel/blob/main/CONTRIBUTING.md#submit-a-pull-request-pr. Take note of how PR/commit titles should be written and replace the template texts in the sections below. Don't remove any of the sections. It is important that the commit history clearly shows what is changed and why.
+Important: By submitting a contribution you agree to the terms from our Licensing Policy as described here: https://github.com/zitadel/zitadel/blob/main/LICENSING.md#community-contributions.
+-->
+
 # Which Problems Are Solved
 
 Replace this example text with a concise list of problems that this PR solves.

.github/workflows/core-integration-test.yml

@@ -73,7 +73,6 @@ jobs:
         if: ${{ steps.cache.outputs.cache-hit != 'true' }}
         env:
           ZITADEL_MASTERKEY: MasterkeyNeedsToHave32Characters
-          INTEGRATION_DB_FLAVOR: postgres
         run: make core_integration_test
       -
         name: upload server logs
@@ -99,71 +98,3 @@ jobs:
         with:
           key: integration-test-postgres-${{ inputs.core_cache_key }}
           path: ${{ steps.go-cache-path.outputs.GO_CACHE_PATH }}
-
-  # TODO: produces the following output: ERROR: unknown command "cockroach start-single-node --insecure" for "cockroach"
-  # cockroach:
-  #   runs-on: ubuntu-latest
-  #   services:
-  #     cockroach:
-  #       image: cockroachdb/cockroach:latest
-  #       ports:
-  #         - 26257:26257
-  #         - 8080:8080
-  #       env:
-  #         COCKROACH_ARGS: "start-single-node --insecure"
-  #       options: >-
-  #         --health-cmd "curl http://localhost:8080/health?ready=1 || exit 1"
-  #         --health-interval 10s
-  #         --health-timeout 5s
-  #         --health-retries 5
-  #         --health-start-period 10s
-  #   steps:
-  #     - 
-  #       uses: actions/checkout@v4
-  #     -
-  #       uses: actions/setup-go@v5
-  #       with:
-  #         go-version: ${{ inputs.go_version }}
-  #     - 
-  #       uses: actions/cache/restore@v4
-  #       timeout-minutes: 1
-  #       name: restore core
-  #       with:
-  #         path: ${{ inputs.core_cache_path }}
-  #         key: ${{ inputs.core_cache_key }}
-  #         fail-on-cache-miss: true
-  #     -
-  #       id: go-cache-path
-  #       name: set cache path
-  #       run: echo "GO_CACHE_PATH=$(go env GOCACHE)" >> $GITHUB_OUTPUT
-  #     - 
-  #       uses: actions/cache/restore@v4
-  #       id: cache
-  #       timeout-minutes: 1
-  #       name: restore previous results
-  #       with:
-  #         key: integration-test-crdb-${{ inputs.core_cache_key }}
-  #         restore-keys: |
-  #           integration-test-crdb-core-
-  #         path: ${{ steps.go-cache-path.outputs.GO_CACHE_PATH }}
-  #     - 
-  #       name: test
-  #       if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-  #       env:
-  #         ZITADEL_MASTERKEY: MasterkeyNeedsToHave32Characters
-  #         INTEGRATION_DB_FLAVOR: cockroach
-  #       run: make core_integration_test
-  #     - 
-  #       name: publish coverage
-  #       uses: codecov/codecov-action@v4.3.0
-  #       with:
-  #         file: profile.cov
-  #         name: core-integration-tests-cockroach
-  #         flags: core-integration-tests-cockroach
-  #     - 
-  #       uses: actions/cache/save@v4
-  #       name: cache results
-  #       if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-  #       with:
-  #         key: integration-test-crdb-${{ inputs.core_cache_key }}
-  #         path: ${{ steps.go-cache-path.outputs.GO_CACHE_PATH }}

.gitignore

@@ -36,7 +36,6 @@ load-test/.keys
 # dumps
 .backups
 
-cockroach-data/*
 .local/*
 .build/
 
@@ -71,7 +70,6 @@ zitadel-*-*
 
 # local
 build/local/*.env
-migrations/cockroach/migrate_cloud.go
 .notifications
 /.artifacts/*
 !/.artifacts/zitadel

CONTRIBUTING.md

@@ -165,7 +165,7 @@ ZITADEL serves traffic as soon as you can see the following log line:
 ### Backend/login
 
 By executing the commands from this section, you run everything you need to develop the ZITADEL backend locally.
-Using [Docker Compose](https://docs.docker.com/compose/), you run a [CockroachDB](https://www.cockroachlabs.com/docs/stable/start-a-local-cluster-in-docker-mac.html) on your local machine.
+Using [Docker Compose](https://docs.docker.com/compose/), you run a [PostgreSQL](https://www.postgresql.org/download/) on your local machine.
 With [make](https://www.gnu.org/software/make/), you build a debuggable ZITADEL binary and run it using [delve](https://github.com/go-delve/delve).
 Then, you test your changes via the console your binary is serving at http://<span because="breaks the link"></span>localhost:8080 and by verifying the database.
 Once you are happy with your changes, you run end-to-end tests and tear everything down.
@@ -200,7 +200,7 @@ make compile
 
 You can now run and debug the binary in .artifacts/zitadel/zitadel using your favourite IDE, for example GoLand.
 You can test if ZITADEL does what you expect by using the UI at http://localhost:8080/ui/console.
-Also, you can verify the data by running `cockroach sql --database zitadel --insecure` and running SQL queries.
+Also, you can verify the data by running `psql "host=localhost dbname=zitadel sslmode=disable"` and running SQL queries.
 
 #### Run Local Unit Tests
 
@@ -216,12 +216,6 @@ Integration tests are run as gRPC clients against a running ZITADEL server binar
 The server binary is typically [build with coverage enabled](https://go.dev/doc/build-cover).
 It is also possible to run a ZITADEL sever in a debugger and run the integrations tests like that. In order to run the server, a database is required.
 
-The database flavor can **optionally** be set in the environment to `cockroach` or `postgres`. The default is `postgres`.
-
-```bash
-export INTEGRATION_DB_FLAVOR="cockroach"
-```
-
 In order to prepare the local system, the following will bring up the database, builds a coverage binary, initializes the database and starts the sever.
 
 ```bash
@@ -306,7 +300,7 @@ docker compose --file ./e2e/config/host.docker.internal/docker-compose.yaml down
 ### Console
 
 By executing the commands from this section, you run everything you need to develop the console locally.
-Using [Docker Compose](https://docs.docker.com/compose/), you run [CockroachDB](https://www.cockroachlabs.com/docs/stable/start-a-local-cluster-in-docker-mac.html) and the [latest release of ZITADEL](https://github.com/zitadel/zitadel/releases/latest) on your local machine.
+Using [Docker Compose](https://docs.docker.com/compose/), you run [PostgreSQL](https://www.postgresql.org/download/) and the [latest release of ZITADEL](https://github.com/zitadel/zitadel/releases/latest) on your local machine.
 You use the ZITADEL container as backend for your console.
 The console is run in your [Node](https://nodejs.org/en/about/) environment using [a local development server for Angular](https://angular.io/cli/serve#ng-serve), so you have fast feedback about your changes.
 

LICENSE

@@ -1,201 +1,661 @@
-                                 Apache License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
-                           Version 2.0, January 2004
+                       Version 3, 19 November 2007
-                        http://www.apache.org/licenses/
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-   1. Definitions.
+                            Preamble
 
-      "License" shall mean the terms and conditions for use, reproduction,
+  The GNU Affero General Public License is a free, copyleft license for
-      and distribution as defined by Sections 1 through 9 of this document.
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
+  The licenses for most software and other practical works are designed
-      the copyright owner that is granting the License.
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
 
-      "Legal Entity" shall mean the union of the acting entity and all
+  When we speak of free software, we are referring to freedom, not
-      other entities that control, are controlled by, or are under common
+price.  Our General Public Licenses are designed to make sure that you
-      control with that entity. For the purposes of this definition,
+have the freedom to distribute copies of free software (and charge for
-      "control" means (i) the power, direct or indirect, to cause the
+them if you wish), that you receive source code or can get it if you
-      direction or management of such entity, whether by contract or
+want it, that you can change the software or use pieces of it in new
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+free programs, and that you know you can do these things.
-      outstanding shares, or (iii) beneficial ownership of such entity.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
+  Developers that use our General Public Licenses protect your rights
-      exercising permissions granted by this License.
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-      "Source" form shall mean the preferred form for making modifications,
+  A secondary benefit of defending all users' freedom is that
-      including but not limited to software source code, documentation
+improvements made in alternate versions of the program, if they
-      source, and configuration files.
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-      "Object" form shall mean any form resulting from mechanical
+  The GNU Affero General Public License is designed specifically to
-      transformation or translation of a Source form, including but
+ensure that, in such cases, the modified source code becomes available
-      not limited to compiled object code, generated documentation,
+to the community.  It requires the operator of a network server to
-      and conversions to other media types.
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-      "Work" shall mean the work of authorship, whether in Source or
+  An older license, called the Affero General Public License and
-      Object form, made available under the License, as indicated by a
+published by Affero, was designed to accomplish similar goals.  This is
-      copyright notice that is included in or attached to the work
+a different license, not a version of the Affero GPL, but Affero has
-      (an example is provided in the Appendix below).
+released a new version of the Affero GPL which permits relicensing under
+this license.
 
-      "Derivative Works" shall mean any work, whether in Source or Object
+  The precise terms and conditions for copying, distribution and
-      form, that is based on (or derived from) the Work and for which the
+modification follow.
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
 
-      "Contribution" shall mean any work of authorship, including
+                       TERMS AND CONDITIONS
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
+  0. Definitions.
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
+  "This License" refers to version 3 of the GNU Affero General Public License.
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
 
-   3. Grant of Patent License. Subject to the terms and conditions of
+  "Copyright" also means copyright-like laws that apply to other kinds of
-      this License, each Contributor hereby grants to You a perpetual,
+works, such as semiconductor masks.
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
 
-   4. Redistribution. You may reproduce and distribute copies of the
+  "The Program" refers to any copyrightable work licensed under this
-      Work or Derivative Works thereof in any medium, with or without
+License.  Each licensee is addressed as "you".  "Licensees" and
-      modifications, and in Source or Object form, provided that You
+"recipients" may be individuals or organizations.
-      meet the following conditions:
 
-      (a) You must give any other recipients of the Work or
+  To "modify" a work means to copy from or adapt all or part of the work
-          Derivative Works a copy of this License; and
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-      (b) You must cause any modified files to carry prominent notices
+  A "covered work" means either the unmodified Program or a work based
-          stating that You changed the files; and
+on the Program.
 
-      (c) You must retain, in the Source form of any Derivative Works
+  To "propagate" a work means to do anything with it that, without
-          that You distribute, all copyright, patent, trademark, and
+permission, would make you directly or secondarily liable for
-          attribution notices from the Source form of the Work,
+infringement under applicable copyright law, except executing it on a
-          excluding those notices that do not pertain to any part of
+computer or modifying a private copy.  Propagation includes copying,
-          the Derivative Works; and
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-      (d) If the Work includes a "NOTICE" text file as part of its
+  To "convey" a work means any kind of propagation that enables other
-          distribution, then any Derivative Works that You distribute must
+parties to make or receive copies.  Mere interaction with a user through
-          include a readable copy of the attribution notices contained
+a computer network, with no transfer of a copy, is not conveying.
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
 
-      You may add Your own copyright statement to Your modifications and
+  An interactive user interface displays "Appropriate Legal Notices"
-      may provide additional or different license terms and conditions
+to the extent that it includes a convenient and prominently visible
-      for use, reproduction, or distribution of Your modifications, or
+feature that (1) displays an appropriate copyright notice, and (2)
-      for any such Derivative Works as a whole, provided Your use,
+tells the user that there is no warranty for the work (except to the
-      reproduction, and distribution of the Work otherwise complies with
+extent that warranties are provided), that licensees may convey the
-      the conditions stated in this License.
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-   5. Submission of Contributions. Unless You explicitly state otherwise,
+  1. Source Code.
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
 
-   6. Trademarks. This License does not grant permission to use the trade
+  The "source code" for a work means the preferred form of the work
-      names, trademarks, service marks, or product names of the Licensor,
+for making modifications to it.  "Object code" means any non-source
-      except as required for reasonable and customary use in describing the
+form of a work.
-      origin of the Work and reproducing the content of the NOTICE file.
 
-   7. Disclaimer of Warranty. Unless required by applicable law or
+  A "Standard Interface" means an interface that either is an official
-      agreed to in writing, Licensor provides the Work (and each
+standard defined by a recognized standards body, or, in the case of
-      Contributor provides its Contributions) on an "AS IS" BASIS,
+interfaces specified for a particular programming language, one that
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+is widely used among developers working in that language.
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
 
-   8. Limitation of Liability. In no event and under no legal theory,
+  The "System Libraries" of an executable work include anything, other
-      whether in tort (including negligence), contract, or otherwise,
+than the work as a whole, that (a) is included in the normal form of
-      unless required by applicable law (such as deliberate and grossly
+packaging a Major Component, but which is not part of that Major
-      negligent acts) or agreed to in writing, shall any Contributor be
+Component, and (b) serves only to enable use of the work with that
-      liable to You for damages, including any direct, indirect, special,
+Major Component, or to implement a Standard Interface for which an
-      incidental, or consequential damages of any character arising as a
+implementation is available to the public in source code form.  A
-      result of this License or out of the use or inability to use the
+"Major Component", in this context, means a major essential component
-      Work (including but not limited to damages for loss of goodwill,
+(kernel, window system, and so on) of the specific operating system
-      work stoppage, computer failure or malfunction, or any and all
+(if any) on which the executable work runs, or a compiler used to
-      other commercial damages or losses), even if such Contributor
+produce the work, or an object code interpreter used to run it.
-      has been advised of the possibility of such damages.
 
-   9. Accepting Warranty or Additional Liability. While redistributing
+  The "Corresponding Source" for a work in object code form means all
-      the Work or Derivative Works thereof, You may choose to offer,
+the source code needed to generate, install, and (for an executable
-      and charge a fee for, acceptance of support, warranty, indemnity,
+work) run the object code and to modify the work, including scripts to
-      or other liability obligations and/or rights consistent with this
+control those activities.  However, it does not include the work's
-      License. However, in accepting such obligations, You may act only
+System Libraries, or general-purpose tools or generally available free
-      on Your own behalf and on Your sole responsibility, not on behalf
+programs which are used unmodified in performing those activities but
-      of any other Contributor, and only if You agree to indemnify,
+which are not part of the work.  For example, Corresponding Source
-      defend, and hold each Contributor harmless for any liability
+includes interface definition files associated with source files for
-      incurred by, or claims asserted against, such Contributor by reason
+the work, and the source code for shared libraries and dynamically
-      of your accepting any such warranty or additional liability.
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-   END OF TERMS AND CONDITIONS
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-   APPENDIX: How to apply the Apache License to your work.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-      To apply the Apache License to your work, attach the following
+  2. Basic Permissions.
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
 
-   Copyright 2020 CAOS AG
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-   Licensed under the Apache License, Version 2.0 (the "License");
+  You may make, run and propagate covered works that you do not
-   you may not use this file except in compliance with the License.
+convey, without conditions so long as your license otherwise remains
-   You may obtain a copy of the License at
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
 
-   Unless required by applicable law or agreed to in writing, software
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-   distributed under the License is distributed on an "AS IS" BASIS,
+
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  No covered work shall be deemed part of an effective technological
-   See the License for the specific language governing permissions and
+measure under any applicable law fulfilling obligations under article
-   limitations under the License.
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

LICENSING.md

@@ -0,0 +1,25 @@
+# Licensing Policy
+
+This repository is licensed under the [GNU Affero General Public License v3.0](LICENSE) (AGPL-3.0-only). We use the [SPDX License List](https://spdx.org/licenses/) for standard license naming.
+
+## AGPL-3.0-only Compliance
+
+ZITADEL is open-source software intended for community use. Determining your application's compliance with the AGPL-3.0-only license is your responsibility.
+
+**We strongly recommend consulting with legal counsel or licensing specialists to ensure your usage of ZITADEL, and any other integrated open-source projects, adheres to their respective licenses. AGPL-3.0-only compliance can be complex.**
+
+If your application triggers AGPL-3.0-only obligations and you wish to avoid them (e.g., you do not plan to open-source your modifications or application), please [contact us](https://zitadel.com/contact) to discuss commercial licensing options. Using ZITADEL without verifying your license compliance is at your own risk.
+
+## Exceptions to AGPL-3.0-only
+
+The following files and directories, including their subdirectories, are licensed under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0):
+
+```
+proto/
+```
+
+## Community Contributions
+
+To maintain a clear licensing structure and facilitate community contributions, all contributions must be licensed under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) to be accepted. By submitting a contribution, you agree to this licensing.
+
+This approach avoids the need for a Contributor License Agreement (CLA) while ensuring clarity regarding license terms. We will only accept contributions licensed under Apache 2.0.

Makefile

@@ -8,10 +8,9 @@ COMMIT_SHA ?= $(shell git rev-parse HEAD)
 ZITADEL_IMAGE ?= zitadel:local
 
 GOCOVERDIR = tmp/coverage
-INTEGRATION_DB_FLAVOR ?= postgres
 ZITADEL_MASTERKEY ?= MasterkeyNeedsToHave32Characters
 
-export GOCOVERDIR INTEGRATION_DB_FLAVOR ZITADEL_MASTERKEY
+export GOCOVERDIR ZITADEL_MASTERKEY
 
 .PHONY: compile
 compile: core_build console_build compile_pipeline
@@ -113,7 +112,7 @@ core_unit_test:
 
 .PHONY: core_integration_db_up
 core_integration_db_up:
-	docker compose -f internal/integration/config/docker-compose.yaml up --pull always --wait $${INTEGRATION_DB_FLAVOR} cache
+	docker compose -f internal/integration/config/docker-compose.yaml up --pull always --wait cache
 
 .PHONY: core_integration_db_down
 core_integration_db_down:
@@ -123,13 +122,13 @@ core_integration_db_down:
 core_integration_setup:
 	go build -cover -race -tags integration -o zitadel.test main.go
 	mkdir -p $${GOCOVERDIR}
-	GORACE="halt_on_error=1" ./zitadel.test init --config internal/integration/config/zitadel.yaml --config internal/integration/config/${INTEGRATION_DB_FLAVOR}.yaml
+	GORACE="halt_on_error=1" ./zitadel.test init --config internal/integration/config/zitadel.yaml --config internal/integration/config/postgres.yaml
-	GORACE="halt_on_error=1" ./zitadel.test setup --masterkeyFromEnv --init-projections --config internal/integration/config/zitadel.yaml --config internal/integration/config/${INTEGRATION_DB_FLAVOR}.yaml --steps internal/integration/config/steps.yaml
+	GORACE="halt_on_error=1" ./zitadel.test setup --masterkeyFromEnv --init-projections --config internal/integration/config/zitadel.yaml --config internal/integration/config/postgres.yaml --steps internal/integration/config/steps.yaml
 
 .PHONY: core_integration_server_start
 core_integration_server_start: core_integration_setup
 	GORACE="log_path=tmp/race.log" \
-	./zitadel.test start --masterkeyFromEnv --config internal/integration/config/zitadel.yaml --config internal/integration/config/${INTEGRATION_DB_FLAVOR}.yaml \
+	./zitadel.test start --masterkeyFromEnv --config internal/integration/config/zitadel.yaml --config internal/integration/config/postgres.yaml \
 	  > tmp/zitadel.log 2>&1 \
 	  & printf $$! > tmp/zitadel.pid
 

README.md

@@ -107,7 +107,7 @@ Yet it offers everything you need for a customer identity ([CIAM](https://zitade
 - [Actions](https://zitadel.com/docs/apis/actions/introduction) to react on events with custom code and extended ZITADEL for you needs
 - [Branding](https://zitadel.com/docs/guides/manage/customize/branding) for a uniform user experience across multiple organizations
 - [Self-service](https://zitadel.com/docs/concepts/features/selfservice) for end-users, business customers, and administrators
-- [CockroachDB](https://www.cockroachlabs.com/) or a [Postgres](https://www.postgresql.org/) database as reliable and widespread storage option
+- [Postgres](https://www.postgresql.org/) database as reliable and widespread storage option
 
 ## Features
 
@@ -151,7 +151,7 @@ Self-Service
 - [Administration UI (Console)](https://zitadel.com/docs/guides/manage/console/overview)
 
 Deployment
-- [Postgres](https://zitadel.com/docs/self-hosting/manage/database#postgres) (version >= 14) or [CockroachDB](https://zitadel.com/docs/self-hosting/manage/database#cockroach) (version latest stable)
+- [Postgres](https://zitadel.com/docs/self-hosting/manage/database#postgres) (version >= 14)
 - [Zero Downtime Updates](https://zitadel.com/docs/concepts/architecture/solution#zero-downtime-updates)
 - [High scalability](https://zitadel.com/docs/self-hosting/manage/production)
 

build/workflow.Dockerfile

@@ -199,7 +199,6 @@ ENV PATH="/go/bin:/usr/local/go/bin:${PATH}"
 WORKDIR /go/src/github.com/zitadel/zitadel
 
 # default vars
-ENV DB_FLAVOR=postgres
 ENV POSTGRES_USER=zitadel
 ENV POSTGRES_DB=zitadel
 ENV POSTGRES_PASSWORD=postgres
@@ -231,12 +230,6 @@ COPY --from=test-core-unit /go/src/github.com/zitadel/zitadel/profile.cov /cover
 # integration test core
 # #######################################
 FROM test-core-base AS test-core-integration
-ENV DB_FLAVOR=cockroach
-
-# install cockroach
-COPY --from=cockroachdb/cockroach:latest-v24.3 /cockroach/cockroach /usr/local/bin/
-ENV COCKROACH_BINARY=/cockroach/cockroach
-
 ENV ZITADEL_MASTERKEY=MasterkeyNeedsToHave32Characters
 
 COPY build/core-integration-test.sh /usr/local/bin/run-tests.sh

cmd/defaults.yaml

@@ -113,67 +113,36 @@ PublicHostHeaders: # ZITADEL_PUBLICHOSTHEADERS
 WebAuthNName: ZITADEL # ZITADEL_WEBAUTHNNAME
 
 Database:
-  # CockroachDB is the default database of ZITADEL
+  # Postgres is the default database of ZITADEL
-  cockroach:
+  postgres:
-    Host: localhost # ZITADEL_DATABASE_COCKROACH_HOST
+    Host: localhost # ZITADEL_DATABASE_POSTGRES_HOST
-    Port: 26257 # ZITADEL_DATABASE_COCKROACH_PORT
+    Port: 5432 # ZITADEL_DATABASE_POSTGRES_PORT
-    Database: zitadel # ZITADEL_DATABASE_COCKROACH_DATABASE
+    Database: zitadel # ZITADEL_DATABASE_POSTGRES_DATABASE
-    MaxOpenConns: 5 # ZITADEL_DATABASE_COCKROACH_MAXOPENCONNS
+    MaxOpenConns: 10 # ZITADEL_DATABASE_POSTGRES_MAXOPENCONNS
-    MaxIdleConns: 2 # ZITADEL_DATABASE_COCKROACH_MAXIDLECONNS
+    MaxIdleConns: 5 # ZITADEL_DATABASE_POSTGRES_MAXIDLECONNS
-    MaxConnLifetime: 30m # ZITADEL_DATABASE_COCKROACH_MAXCONNLIFETIME
+    MaxConnLifetime: 30m # ZITADEL_DATABASE_POSTGRES_MAXCONNLIFETIME
-    MaxConnIdleTime: 5m # ZITADEL_DATABASE_COCKROACH_MAXCONNIDLETIME
+    MaxConnIdleTime: 5m # ZITADEL_DATABASE_POSTGRES_MAXCONNIDLETIME
-    Options: "" # ZITADEL_DATABASE_COCKROACH_OPTIONS
+    Options: "" # ZITADEL_DATABASE_POSTGRES_OPTIONS
     User:
-      Username: zitadel # ZITADEL_DATABASE_COCKROACH_USER_USERNAME
+      Username: zitadel # ZITADEL_DATABASE_POSTGRES_USER_USERNAME
-      Password: "" # ZITADEL_DATABASE_COCKROACH_USER_PASSWORD
+      Password: "" # ZITADEL_DATABASE_POSTGRES_USER_PASSWORD
       SSL:
-        Mode: disable # ZITADEL_DATABASE_COCKROACH_USER_SSL_MODE
+        Mode: disable # ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE
-        RootCert: "" # ZITADEL_DATABASE_COCKROACH_USER_SSL_ROOTCERT
+        RootCert: "" # ZITADEL_DATABASE_POSTGRES_USER_SSL_ROOTCERT
-        Cert: "" # ZITADEL_DATABASE_COCKROACH_USER_SSL_CERT
+        Cert: "" # ZITADEL_DATABASE_POSTGRES_USER_SSL_CERT
-        Key: "" # ZITADEL_DATABASE_COCKROACH_USER_SSL_KEY
+        Key: "" # ZITADEL_DATABASE_POSTGRES_USER_SSL_KEY
     Admin:
       # By default, ExistingDatabase is not specified in the connection string
       # If the connection resolves to a database that is not existing in your system, configure an existing one here
-      # It is used in zitadel init to connect to cockroach and create a dedicated database for ZITADEL.
-      ExistingDatabase: # ZITADEL_DATABASE_COCKROACH_ADMIN_EXISTINGDATABASE
-      Username: root # ZITADEL_DATABASE_COCKROACH_ADMIN_USERNAME
-      Password: "" # ZITADEL_DATABASE_COCKROACH_ADMIN_PASSWORD
-      SSL:
-        Mode: disable # ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_MODE
-        RootCert: "" # ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_ROOTCERT
-        Cert: "" # ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_CERT
-        Key: "" # ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_KEY
-  # Postgres is used as soon as a value is set
-  # The values describe the possible fields to set values
-  postgres:
-    Host: # ZITADEL_DATABASE_POSTGRES_HOST
-    Port: # ZITADEL_DATABASE_POSTGRES_PORT
-    Database: # ZITADEL_DATABASE_POSTGRES_DATABASE
-    MaxOpenConns: # ZITADEL_DATABASE_POSTGRES_MAXOPENCONNS
-    MaxIdleConns: # ZITADEL_DATABASE_POSTGRES_MAXIDLECONNS
-    MaxConnLifetime: # ZITADEL_DATABASE_POSTGRES_MAXCONNLIFETIME
-    MaxConnIdleTime: # ZITADEL_DATABASE_POSTGRES_MAXCONNIDLETIME
-    Options: # ZITADEL_DATABASE_POSTGRES_OPTIONS
-    User:
-      Username: # ZITADEL_DATABASE_POSTGRES_USER_USERNAME
-      Password: # ZITADEL_DATABASE_POSTGRES_USER_PASSWORD
-      SSL:
-        Mode: # ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE
-        RootCert: # ZITADEL_DATABASE_POSTGRES_USER_SSL_ROOTCERT
-        Cert: # ZITADEL_DATABASE_POSTGRES_USER_SSL_CERT
-        Key: # ZITADEL_DATABASE_POSTGRES_USER_SSL_KEY
-    Admin:
-      # The default ExistingDatabase is postgres
-      # If your db system doesn't have a database named postgres, configure an existing database here
       # It is used in zitadel init to connect to postgres and create a dedicated database for ZITADEL.
       ExistingDatabase: # ZITADEL_DATABASE_POSTGRES_ADMIN_EXISTINGDATABASE
-      Username: # ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME
+      Username: postgres # ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME
-      Password: # ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD
+      Password: postgres # ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD
       SSL:
-        Mode: # ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE
+        Mode: disable # ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE
-        RootCert: # ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_ROOTCERT
+        RootCert: "" # ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_ROOTCERT
-        Cert: # ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_CERT
+        Cert: "" # ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_CERT
-        Key: # ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_KEY
+        Key: "" # ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_KEY
 
 # Caches are EXPERIMENTAL. The following config may have breaking changes in the future.
 # If no config is provided, caching is disabled by default.
@@ -447,19 +416,30 @@ Projections:
 Notifications:
   # Notifications can be processed by either a sequential mode (legacy) or a new parallel mode.
   # The parallel mode is currently only recommended for Postgres databases.
-  # For CockroachDB, the sequential mode is recommended, see: https://github.com/zitadel/zitadel/issues/9002
   # If legacy mode is enabled, the worker config below is ignored.
   LegacyEnabled: true # ZITADEL_NOTIFICATIONS_LEGACYENABLED
   # The amount of workers processing the notification request events.
   # If set to 0, no notification request events will be handled. This can be useful when running in
   # multi binary / pod setup and allowing only certain executables to process the events.
-  Workers: 1 # ZITADEL_NOTIFIACATIONS_WORKERS
+  Workers: 1 # ZITADEL_NOTIFICATIONS_WORKERS
   # The maximum duration a job can do it's work before it is considered as failed.
-  TransactionDuration: 10s # ZITADEL_NOTIFIACATIONS_TRANSACTIONDURATION
+  TransactionDuration: 10s # ZITADEL_NOTIFICATIONS_TRANSACTIONDURATION
   # Automatically cancel the notification after the amount of failed attempts
-  MaxAttempts: 3 # ZITADEL_NOTIFIACATIONS_MAXATTEMPTS
+  MaxAttempts: 3 # ZITADEL_NOTIFICATIONS_MAXATTEMPTS
   # Automatically cancel the notification if it cannot be handled within a specific time
-  MaxTtl: 5m  # ZITADEL_NOTIFIACATIONS_MAXTTL
+  MaxTtl: 5m  # ZITADEL_NOTIFICATIONS_MAXTTL
+
+Executions:
+  # The amount of workers processing the execution request events.
+  # If set to 0, no execution request events will be handled. This can be useful when running in
+  # multi binary / pod setup and allowing only certain executables to process the events.
+  Workers: 1 # ZITADEL_EXECUTIONS_WORKERS
+  # The maximum duration a job can do it's work before it is considered as failed.
+  # This maximum duration is prioritized in case that the sum of the target's timeouts is higher,
+  # to limit the runtime of a singular execution.
+  TransactionDuration: 10s # ZITADEL_EXECUTIONS_TRANSACTIONDURATION
+  # Automatically cancel the notification if it cannot be handled within a specific time
+  MaxTtl: 5m  # ZITADEL_EXECUTIONS_MAXTTL
 
 Auth:
   # See Projections.BulkLimit
@@ -1733,6 +1713,298 @@ InternalAuthZ:
         - "user.grant.read"
         - "user.membership.read"
 
+SystemAuthZ:
+  RolePermissionMappings:
+    - Role: "SYSTEM_OWNER"
+      Permissions:
+        - "system.instance.read"
+        - "system.instance.write"
+        - "system.instance.delete"
+        - "system.domain.read"
+        - "system.domain.write"
+        - "system.domain.delete"
+        - "system.debug.read"
+        - "system.debug.write"
+        - "system.debug.delete"
+        - "system.feature.read"
+        - "system.feature.write"
+        - "system.feature.delete"
+        - "system.limits.write"
+        - "system.limits.delete"
+        - "system.quota.write"
+        - "system.quota.delete"
+        - "system.iam.member.read"
+    - Role: "SYSTEM_OWNER_VIEWER"
+      Permissions:
+        - "system.instance.read"
+        - "system.domain.read"
+        - "system.debug.read"
+        - "system.feature.read"
+        - "system.iam.member.read"
+    - Role: "IAM_OWNER"
+      Permissions:
+        - "iam.read"
+        - "iam.write"
+        - "iam.policy.read"
+        - "iam.policy.write"
+        - "iam.policy.delete"
+        - "iam.member.read"
+        - "iam.member.write"
+        - "iam.member.delete"
+        - "iam.idp.read"
+        - "iam.idp.write"
+        - "iam.idp.delete"
+        - "iam.action.read"
+        - "iam.action.write"
+        - "iam.action.delete"
+        - "iam.flow.read"
+        - "iam.flow.write"
+        - "iam.flow.delete"
+        - "iam.feature.read"
+        - "iam.feature.write"
+        - "iam.feature.delete"
+        - "iam.restrictions.read"
+        - "iam.restrictions.write"
+        - "iam.web_key.write"
+        - "iam.web_key.delete"
+        - "iam.web_key.read"
+        - "iam.debug.write"
+        - "iam.debug.read"
+        - "org.read"
+        - "org.global.read"
+        - "org.create"
+        - "org.write"
+        - "org.delete"
+        - "org.member.read"
+        - "org.member.write"
+        - "org.member.delete"
+        - "org.idp.read"
+        - "org.idp.write"
+        - "org.idp.delete"
+        - "org.action.read"
+        - "org.action.write"
+        - "org.action.delete"
+        - "org.flow.read"
+        - "org.flow.write"
+        - "org.flow.delete"
+        - "org.feature.read"
+        - "org.feature.write"
+        - "org.feature.delete"
+        - "user.read"
+        - "user.global.read"
+        - "user.write"
+        - "user.delete"
+        - "user.grant.read"
+        - "user.grant.write"
+        - "user.grant.delete"
+        - "user.membership.read"
+        - "user.credential.write"
+        - "user.passkey.write"
+        - "user.feature.read"
+        - "user.feature.write"
+        - "user.feature.delete"
+        - "policy.read"
+        - "policy.write"
+        - "policy.delete"
+        - "project.read"
+        - "project.create"
+        - "project.write"
+        - "project.delete"
+        - "project.member.read"
+        - "project.member.write"
+        - "project.member.delete"
+        - "project.role.read"
+        - "project.role.write"
+        - "project.role.delete"
+        - "project.app.read"
+        - "project.app.write"
+        - "project.app.delete"
+        - "project.grant.read"
+        - "project.grant.write"
+        - "project.grant.delete"
+        - "project.grant.member.read"
+        - "project.grant.member.write"
+        - "project.grant.member.delete"
+        - "events.read"
+        - "milestones.read"
+        - "session.read"
+        - "session.delete"
+        - "action.target.read"
+        - "action.target.write"
+        - "action.target.delete"
+        - "action.execution.read"
+        - "action.execution.write"
+        - "userschema.read"
+        - "userschema.write"
+        - "userschema.delete"
+        - "session.read"
+        - "session.delete"
+    - Role: "IAM_OWNER_VIEWER"
+      Permissions:
+        - "iam.read"
+        - "iam.policy.read"
+        - "iam.member.read"
+        - "iam.idp.read"
+        - "iam.action.read"
+        - "iam.flow.read"
+        - "iam.restrictions.read"
+        - "iam.feature.read"
+        - "iam.web_key.read"
+        - "iam.debug.read"
+        - "org.read"
+        - "org.member.read"
+        - "org.idp.read"
+        - "org.action.read"
+        - "org.flow.read"
+        - "org.feature.read"
+        - "user.read"
+        - "user.global.read"
+        - "user.grant.read"
+        - "user.membership.read"
+        - "user.feature.read"
+        - "policy.read"
+        - "project.read"
+        - "project.member.read"
+        - "project.role.read"
+        - "project.app.read"
+        - "project.grant.read"
+        - "project.grant.member.read"
+        - "events.read"
+        - "milestones.read"
+        - "action.target.read"
+        - "action.execution.read"
+        - "userschema.read"
+        - "session.read"
+    - Role: "IAM_ORG_MANAGER"
+      Permissions:
+        - "org.read"
+        - "org.global.read"
+        - "org.create"
+        - "org.write"
+        - "org.delete"
+        - "org.member.read"
+        - "org.member.write"
+        - "org.member.delete"
+        - "org.idp.read"
+        - "org.idp.write"
+        - "org.idp.delete"
+        - "org.action.read"
+        - "org.action.write"
+        - "org.action.delete"
+        - "org.flow.read"
+        - "org.flow.write"
+        - "org.flow.delete"
+        - "org.feature.read"
+        - "org.feature.write"
+        - "org.feature.delete"
+        - "user.read"
+        - "user.global.read"
+        - "user.write"
+        - "user.delete"
+        - "user.grant.read"
+        - "user.grant.write"
+        - "user.grant.delete"
+        - "user.membership.read"
+        - "user.credential.write"
+        - "user.passkey.write"
+        - "user.feature.read"
+        - "user.feature.write"
+        - "user.feature.delete"
+        - "policy.read"
+        - "policy.write"
+        - "policy.delete"
+        - "project.read"
+        - "project.create"
+        - "project.write"
+        - "project.delete"
+        - "project.member.read"
+        - "project.member.write"
+        - "project.member.delete"
+        - "project.role.read"
+        - "project.role.write"
+        - "project.role.delete"
+        - "project.app.read"
+        - "project.app.write"
+        - "project.app.delete"
+        - "project.grant.read"
+        - "project.grant.write"
+        - "project.grant.delete"
+        - "project.grant.member.read"
+        - "project.grant.member.write"
+        - "project.grant.member.delete"
+        - "session.delete"
+    - Role: "IAM_USER_MANAGER"
+      Permissions:
+        - "org.read"
+        - "org.global.read"
+        - "org.member.read"
+        - "org.member.delete"
+        - "user.read"
+        - "user.global.read"
+        - "user.write"
+        - "user.delete"
+        - "user.grant.read"
+        - "user.grant.write"
+        - "user.grant.delete"
+        - "user.membership.read"
+        - "user.passkey.write"
+        - "user.feature.read"
+        - "user.feature.write"
+        - "user.feature.delete"
+        - "project.read"
+        - "project.member.read"
+        - "project.role.read"
+        - "project.app.read"
+        - "project.grant.read"
+        - "project.grant.write"
+        - "project.grant.delete"
+        - "project.grant.member.read"
+        - "session.delete"
+    - Role: "IAM_ADMIN_IMPERSONATOR"
+      Permissions:
+        - "admin.impersonation"
+        - "impersonation"
+    - Role: "IAM_END_USER_IMPERSONATOR"
+      Permissions:
+        - "impersonation"
+    - Role: "IAM_LOGIN_CLIENT"
+      Permissions:
+        - "iam.read"
+        - "iam.policy.read"
+        - "iam.member.read"
+        - "iam.member.write"
+        - "iam.idp.read"
+        - "iam.feature.read"
+        - "iam.restrictions.read"
+        - "org.read"
+        - "org.member.read"
+        - "org.member.write"
+        - "org.idp.read"
+        - "org.feature.read"
+        - "user.read"
+        - "user.write"
+        - "user.grant.read"
+        - "user.grant.write"
+        - "user.membership.read"
+        - "user.credential.write"
+        - "user.passkey.write"
+        - "user.feature.read"
+        - "policy.read"
+        - "project.read"
+        - "project.member.read"
+        - "project.member.write"
+        - "project.role.read"
+        - "project.app.read"
+        - "project.member.read"
+        - "project.member.write"
+        - "project.grant.read"
+        - "project.grant.member.read"
+        - "project.grant.member.write"
+        - "session.read"
+        - "session.link"
+        - "session.delete"
+        - "userschema.read"
+
 # If a new projection is introduced it will be prefilled during the setup process (if enabled)
 # This can prevent serving outdated data after a version upgrade, but might require a longer setup / upgrade process:
 # https://zitadel.com/docs/self-hosting/manage/updating_scaling

cmd/initialise/config.go

@@ -19,7 +19,7 @@ func MustNewConfig(v *viper.Viper) *Config {
 	config := new(Config)
 	err := v.Unmarshal(config,
 		viper.DecodeHook(mapstructure.ComposeDecodeHookFunc(
-			database.DecodeHook,
+			database.DecodeHook(false),
 			mapstructure.TextUnmarshallerHookFunc(),
 		)),
 	)

cmd/initialise/init.go

@@ -12,20 +12,17 @@ import (
 )
 
 var (
-	//go:embed sql/cockroach/*
+	//go:embed sql/*.sql
-	//go:embed sql/postgres/*
 	stmts embed.FS
 
 	createUserStmt           string
 	grantStmt                string
-	settingsStmt             string
 	databaseStmt             string
 	createEventstoreStmt     string
 	createProjectionsStmt    string
 	createSystemStmt         string
 	createEncryptionKeysStmt string
 	createEventsStmt         string
-	createSystemSequenceStmt string
 	createUniqueConstraints  string
 
 	roleAlreadyExistsCode = "42710"
@@ -39,7 +36,7 @@ func New() *cobra.Command {
 		Long: `Sets up the minimum requirements to start ZITADEL.
 
 Prerequisites:
-- database (PostgreSql or cockroachdb)
+- PostgreSql database
 
 The user provided by flags needs privileges to
 - create the database if it does not exist
@@ -53,7 +50,7 @@ The user provided by flags needs privileges to
 		},
 	}
 
-	cmd.AddCommand(newZitadel(), newDatabase(), newUser(), newGrant(), newSettings())
+	cmd.AddCommand(newZitadel(), newDatabase(), newUser(), newGrant())
 	return cmd
 }
 
@@ -62,7 +59,6 @@ func InitAll(ctx context.Context, config *Config) {
 		VerifyUser(config.Database.Username(), config.Database.Password()),
 		VerifyDatabase(config.Database.DatabaseName()),
 		VerifyGrant(config.Database.DatabaseName(), config.Database.Username()),
-		VerifySettings(config.Database.DatabaseName(), config.Database.Username()),
 	)
 	logging.OnError(err).Fatal("unable to initialize the database")
 
@@ -73,7 +69,7 @@ func InitAll(ctx context.Context, config *Config) {
 func initialise(ctx context.Context, config database.Config, steps ...func(context.Context, *database.DB) error) error {
 	logging.Info("initialization started")
 
-	err := ReadStmts(config.Type())
+	err := ReadStmts()
 	if err != nil {
 		return err
 	}
@@ -97,58 +93,48 @@ func Init(ctx context.Context, db *database.DB, steps ...func(context.Context, *
 	return nil
 }
 
-func ReadStmts(typ string) (err error) {
+func ReadStmts() (err error) {
-	createUserStmt, err = readStmt(typ, "01_user")
+	createUserStmt, err = readStmt("01_user")
 	if err != nil {
 		return err
 	}
 
-	databaseStmt, err = readStmt(typ, "02_database")
+	databaseStmt, err = readStmt("02_database")
 	if err != nil {
 		return err
 	}
 
-	grantStmt, err = readStmt(typ, "03_grant_user")
+	grantStmt, err = readStmt("03_grant_user")
 	if err != nil {
 		return err
 	}
 
-	createEventstoreStmt, err = readStmt(typ, "04_eventstore")
+	createEventstoreStmt, err = readStmt("04_eventstore")
 	if err != nil {
 		return err
 	}
 
-	createProjectionsStmt, err = readStmt(typ, "05_projections")
+	createProjectionsStmt, err = readStmt("05_projections")
 	if err != nil {
 		return err
 	}
 
-	createSystemStmt, err = readStmt(typ, "06_system")
+	createSystemStmt, err = readStmt("06_system")
 	if err != nil {
 		return err
 	}
 
-	createEncryptionKeysStmt, err = readStmt(typ, "07_encryption_keys_table")
+	createEncryptionKeysStmt, err = readStmt("07_encryption_keys_table")
 	if err != nil {
 		return err
 	}
 
-	createEventsStmt, err = readStmt(typ, "08_events_table")
+	createEventsStmt, err = readStmt("08_events_table")
 	if err != nil {
 		return err
 	}
 
-	createSystemSequenceStmt, err = readStmt(typ, "09_system_sequence")
+	createUniqueConstraints, err = readStmt("10_unique_constraints_table")
-	if err != nil {
-		return err
-	}
-
-	createUniqueConstraints, err = readStmt(typ, "10_unique_constraints_table")
-	if err != nil {
-		return err
-	}
-
-	settingsStmt, err = readStmt(typ, "11_settings")
 	if err != nil {
 		return err
 	}
@@ -156,7 +142,7 @@ func ReadStmts(typ string) (err error) {
 	return nil
 }
 
-func readStmt(typ, step string) (string, error) {
+func readStmt(step string) (string, error) {
-	stmt, err := stmts.ReadFile("sql/" + typ + "/" + step + ".sql")
+	stmt, err := stmts.ReadFile("sql/" + step + ".sql")
 	return string(stmt), err
 }

cmd/initialise/sql/01_user.sql

@@ -1,2 +1,2 @@
 -- replace %[1]s with the name of the user
-CREATE USER IF NOT EXISTS "%[1]s"
+CREATE USER "%[1]s"

cmd/initialise/sql/02_database.sql

@@ -1,2 +1,2 @@
 -- replace %[1]s with the name of the database
-CREATE DATABASE IF NOT EXISTS "%[1]s";
+CREATE DATABASE "%[1]s"

cmd/initialise/sql/README.md

@@ -11,6 +11,5 @@ The sql-files in this folder initialize the ZITADEL database and user. These obj
 - 05_projections.sql: creates the schema needed to read the data
 - 06_system.sql: creates the schema needed for ZITADEL itself
 - 07_encryption_keys_table.sql: creates the table for encryption keys (for event data)
-- files 08_enable_hash_sharded_indexes.sql and 09_events_table.sql must run in the same session
+- 08_events_table.sql creates the table for eventsourcing
-  - 08_enable_hash_sharded_indexes.sql enables the [hash sharded index](https://www.cockroachlabs.com/docs/stable/hash-sharded-indexes.html) feature for this session
+- 10_unique_constraints_table.sql creates the table to check unique constraints for events
-  - 09_events_table.sql creates the table for eventsourcing

cmd/initialise/sql/cockroach/03_grant_user.sql

@@ -1,4 +0,0 @@
--- replace the first %[1]s with the database
--- replace the second \%[2]s with the user
-GRANT ALL ON DATABASE "%[1]s" TO "%[2]s";
-GRANT SYSTEM VIEWACTIVITY TO "%[2]s";

cmd/initialise/sql/cockroach/08_events_table.sql

@@ -1,116 +0,0 @@
-CREATE TABLE IF NOT EXISTS eventstore.events2 (
-    instance_id TEXT NOT NULL
-    , aggregate_type TEXT NOT NULL
-    , aggregate_id TEXT NOT NULL
-    
-    , event_type TEXT NOT NULL
-    , "sequence" BIGINT NOT NULL
-    , revision SMALLINT NOT NULL
-    , created_at TIMESTAMPTZ NOT NULL
-    , payload JSONB
-    , creator TEXT NOT NULL
-    , "owner" TEXT NOT NULL
-    
-    , "position" DECIMAL NOT NULL
-    , in_tx_order INTEGER NOT NULL
-
-    , PRIMARY KEY (instance_id, aggregate_type, aggregate_id, "sequence")
-	, INDEX es_active_instances (created_at DESC) STORING ("position")
-    , INDEX es_wm (aggregate_id, instance_id, aggregate_type, event_type)
-    , INDEX es_projection (instance_id, aggregate_type, event_type, "position" DESC)
-);
-
--- represents an event to be created.
-CREATE TYPE IF NOT EXISTS eventstore.command AS (
-    instance_id TEXT
-    , aggregate_type TEXT
-    , aggregate_id TEXT
-    , command_type TEXT
-    , revision INT2
-    , payload JSONB
-    , creator TEXT
-    , owner TEXT
-);
-
-CREATE OR REPLACE FUNCTION eventstore.commands_to_events(commands eventstore.command[]) RETURNS SETOF eventstore.events2 VOLATILE AS $$
-SELECT
-    ("c").instance_id
-    , ("c").aggregate_type
-    , ("c").aggregate_id
-    , ("c").command_type AS event_type
-    , cs.sequence + ROW_NUMBER() OVER (PARTITION BY ("c").instance_id, ("c").aggregate_type, ("c").aggregate_id ORDER BY ("c").in_tx_order) AS sequence
-    , ("c").revision
-    , hlc_to_timestamp(cluster_logical_timestamp()) AS created_at
-    , ("c").payload
-    , ("c").creator
-    , cs.owner
-    , cluster_logical_timestamp() AS position
-    , ("c").in_tx_order   
-FROM (
-    SELECT 
-        ("c").instance_id
-        , ("c").aggregate_type
-        , ("c").aggregate_id
-        , ("c").command_type
-        , ("c").revision
-        , ("c").payload
-        , ("c").creator
-        , ("c").owner
-        , ROW_NUMBER() OVER () AS in_tx_order
-    FROM 
-        UNNEST(commands) AS "c"
-) AS "c"
-JOIN (
-    SELECT
-        cmds.instance_id
-        , cmds.aggregate_type
-        , cmds.aggregate_id
-        , CASE WHEN (e.owner IS NOT NULL OR e.owner <> '') THEN e.owner ELSE command_owners.owner END AS owner
-        , COALESCE(MAX(e.sequence), 0) AS sequence
-    FROM (
-        SELECT DISTINCT
-            ("cmds").instance_id
-            , ("cmds").aggregate_type
-            , ("cmds").aggregate_id
-            , ("cmds").owner
-        FROM UNNEST(commands) AS "cmds"
-    ) AS cmds
-    LEFT JOIN eventstore.events2 AS e
-        ON cmds.instance_id = e.instance_id
-        AND cmds.aggregate_type = e.aggregate_type
-        AND cmds.aggregate_id = e.aggregate_id
-    JOIN (
-        SELECT
-            DISTINCT ON (
-                ("c").instance_id
-                , ("c").aggregate_type
-                , ("c").aggregate_id
-            )
-            ("c").instance_id
-            , ("c").aggregate_type
-            , ("c").aggregate_id
-            , ("c").owner
-        FROM
-            UNNEST(commands) AS "c"
-    ) AS command_owners ON
-        cmds.instance_id = command_owners.instance_id
-        AND cmds.aggregate_type = command_owners.aggregate_type
-        AND cmds.aggregate_id = command_owners.aggregate_id
-    GROUP BY
-        cmds.instance_id
-        , cmds.aggregate_type
-        , cmds.aggregate_id
-        , 4 -- owner
-) AS cs
-    ON ("c").instance_id = cs.instance_id
-    AND ("c").aggregate_type = cs.aggregate_type
-    AND ("c").aggregate_id = cs.aggregate_id
-ORDER BY
-    in_tx_order
-$$ LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION eventstore.push(commands eventstore.command[]) RETURNS SETOF eventstore.events2 AS $$
-    INSERT INTO eventstore.events2
-    SELECT * FROM eventstore.commands_to_events(commands)
-    RETURNING *
-$$ LANGUAGE SQL;

cmd/initialise/sql/cockroach/09_system_sequence.sql

@@ -1 +0,0 @@
-CREATE SEQUENCE IF NOT EXISTS eventstore.system_seq

cmd/initialise/sql/cockroach/10_unique_constraints_table.sql

@@ -1,6 +0,0 @@
-CREATE TABLE IF NOT EXISTS eventstore.unique_constraints (
-    instance_id TEXT,
-    unique_type TEXT,
-    unique_field TEXT,
-    PRIMARY KEY (instance_id, unique_type, unique_field)
-)

cmd/initialise/sql/cockroach/11_settings.sql

@@ -1,4 +0,0 @@
--- replace the first %[1]q with the database in double quotes
--- replace the second \%[2]q with the user in double quotes$
--- For more information see technical advisory 10009 (https://zitadel.com/docs/support/advisory/a10009)
-ALTER ROLE %[2]q IN DATABASE %[1]q SET enable_durable_locking_for_serializable = on;

cmd/initialise/sql/postgres/01_user.sql

@@ -1 +0,0 @@
-CREATE USER "%[1]s"

cmd/initialise/sql/postgres/02_database.sql

@@ -1 +0,0 @@
-CREATE DATABASE "%[1]s"

cmd/initialise/sql/postgres/04_eventstore.sql

@@ -1,3 +0,0 @@
-CREATE SCHEMA IF NOT EXISTS eventstore;
-
-GRANT ALL ON ALL TABLES IN SCHEMA eventstore TO "%[1]s";

cmd/initialise/sql/postgres/05_projections.sql

@@ -1,3 +0,0 @@
-CREATE SCHEMA IF NOT EXISTS projections;
-
-GRANT ALL ON ALL TABLES IN SCHEMA projections TO "%[1]s";

cmd/initialise/sql/postgres/06_system.sql

@@ -1,3 +0,0 @@
-CREATE SCHEMA IF NOT EXISTS system;
-
-GRANT ALL ON ALL TABLES IN SCHEMA system TO "%[1]s";

cmd/initialise/sql/postgres/07_encryption_keys_table.sql

@@ -1,6 +0,0 @@
-CREATE TABLE IF NOT EXISTS system.encryption_keys (
-	id TEXT NOT NULL
-	, key TEXT NOT NULL
-
-	, PRIMARY KEY (id)
-);

cmd/initialise/sql/postgres/09_system_sequence.sql

@@ -1 +0,0 @@
-CREATE SEQUENCE IF NOT EXISTS eventstore.system_seq;

cmd/initialise/verify_database.go

@@ -19,7 +19,7 @@ func newDatabase() *cobra.Command {
 		Long: `Sets up the ZITADEL database.
 
 Prerequisites:
-- cockroachDB or postgreSQL
+- postgreSQL
 
 The user provided by flags needs privileges to 
 - create the database if it does not exist

cmd/initialise/verify_database_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func Test_verifyDB(t *testing.T) {
-	err := ReadStmts("cockroach") //TODO: check all dialects
+	err := ReadStmts()
 	if err != nil {
 		t.Errorf("unable to read stmts: %v", err)
 		t.FailNow()
@@ -27,7 +27,7 @@ func Test_verifyDB(t *testing.T) {
 			name: "doesn't exists, create fails",
 			args: args{
 				db: prepareDB(t,
-					expectExec("-- replace zitadel with the name of the database\nCREATE DATABASE IF NOT EXISTS \"zitadel\"", sql.ErrTxDone),
+					expectExec("-- replace zitadel with the name of the database\nCREATE DATABASE \"zitadel\"", sql.ErrTxDone),
 				),
 				database: "zitadel",
 			},
@@ -37,7 +37,7 @@ func Test_verifyDB(t *testing.T) {
 			name: "doesn't exists, create successful",
 			args: args{
 				db: prepareDB(t,
-					expectExec("-- replace zitadel with the name of the database\nCREATE DATABASE IF NOT EXISTS \"zitadel\"", nil),
+					expectExec("-- replace zitadel with the name of the database\nCREATE DATABASE \"zitadel\"", nil),
 				),
 				database: "zitadel",
 			},
@@ -47,7 +47,7 @@ func Test_verifyDB(t *testing.T) {
 			name: "already exists",
 			args: args{
 				db: prepareDB(t,
-					expectExec("-- replace zitadel with the name of the database\nCREATE DATABASE IF NOT EXISTS \"zitadel\"", nil),
+					expectExec("-- replace zitadel with the name of the database\nCREATE DATABASE \"zitadel\"", nil),
 				),
 				database: "zitadel",
 			},

cmd/initialise/verify_grant.go

@@ -19,7 +19,7 @@ func newGrant() *cobra.Command {
 		Long: `Sets ALL grant to the database user.
 
 Prerequisites:
-- cockroachDB or postgreSQL
+- postgreSQL
 `,
 		Run: func(cmd *cobra.Command, args []string) {
 			config := MustNewConfig(viper.GetViper())

cmd/initialise/verify_settings.go

@@ -1,45 +0,0 @@
-package initialise
-
-import (
-	"context"
-	_ "embed"
-	"fmt"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"github.com/zitadel/logging"
-
-	"github.com/zitadel/zitadel/internal/database"
-)
-
-func newSettings() *cobra.Command {
-	return &cobra.Command{
-		Use:   "settings",
-		Short: "Ensures proper settings on the database",
-		Long: `Ensures proper settings on the database.
-
-Prerequisites:
-- cockroachDB or postgreSQL
-
-Cockroach
-- Sets enable_durable_locking_for_serializable to on for the zitadel user and database
-`,
-		Run: func(cmd *cobra.Command, args []string) {
-			config := MustNewConfig(viper.GetViper())
-
-			err := initialise(cmd.Context(), config.Database, VerifySettings(config.Database.DatabaseName(), config.Database.Username()))
-			logging.OnError(err).Fatal("unable to set settings")
-		},
-	}
-}
-
-func VerifySettings(databaseName, username string) func(context.Context, *database.DB) error {
-	return func(ctx context.Context, db *database.DB) error {
-		if db.Type() == "postgres" {
-			return nil
-		}
-		logging.WithFields("user", username, "database", databaseName).Info("verify settings")
-
-		return exec(ctx, db, fmt.Sprintf(settingsStmt, databaseName, username), nil)
-	}
-}

cmd/initialise/verify_user.go

@@ -19,7 +19,7 @@ func newUser() *cobra.Command {
 		Long: `Sets up the ZITADEL database user.
 
 Prerequisites:
-- cockroachDB or postgreSQL
+- postgreSQL
 
 The user provided by flags needs privileges to 
 - create the database if it does not exist

cmd/initialise/verify_user_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func Test_verifyUser(t *testing.T) {
-	err := ReadStmts("cockroach") //TODO: check all dialects
+	err := ReadStmts()
 	if err != nil {
 		t.Errorf("unable to read stmts: %v", err)
 		t.FailNow()
@@ -28,7 +28,7 @@ func Test_verifyUser(t *testing.T) {
 			name: "doesn't exists, create fails",
 			args: args{
 				db: prepareDB(t,
-					expectExec("-- replace zitadel-user with the name of the user\nCREATE USER IF NOT EXISTS \"zitadel-user\"", sql.ErrTxDone),
+					expectExec("-- replace zitadel-user with the name of the user\nCREATE USER \"zitadel-user\"", sql.ErrTxDone),
 				),
 				username: "zitadel-user",
 				password: "",
@@ -39,7 +39,7 @@ func Test_verifyUser(t *testing.T) {
 			name: "correct without password",
 			args: args{
 				db: prepareDB(t,
-					expectExec("-- replace zitadel-user with the name of the user\nCREATE USER IF NOT EXISTS \"zitadel-user\"", nil),
+					expectExec("-- replace zitadel-user with the name of the user\nCREATE USER \"zitadel-user\"", nil),
 				),
 				username: "zitadel-user",
 				password: "",
@@ -50,7 +50,7 @@ func Test_verifyUser(t *testing.T) {
 			name: "correct with password",
 			args: args{
 				db: prepareDB(t,
-					expectExec("-- replace zitadel-user with the name of the user\nCREATE USER IF NOT EXISTS \"zitadel-user\" WITH PASSWORD 'password'", nil),
+					expectExec("-- replace zitadel-user with the name of the user\nCREATE USER \"zitadel-user\" WITH PASSWORD 'password'", nil),
 				),
 				username: "zitadel-user",
 				password: "password",
@@ -61,7 +61,7 @@ func Test_verifyUser(t *testing.T) {
 			name: "already exists",
 			args: args{
 				db: prepareDB(t,
-					expectExec("-- replace zitadel-user with the name of the user\nCREATE USER IF NOT EXISTS \"zitadel-user\" WITH PASSWORD 'password'", nil),
+					expectExec("-- replace zitadel-user with the name of the user\nCREATE USER \"zitadel-user\" WITH PASSWORD 'password'", nil),
 				),
 				username: "zitadel-user",
 				password: "",

cmd/initialise/verify_zitadel.go

@@ -21,7 +21,7 @@ func newZitadel() *cobra.Command {
 		Long: `initialize ZITADEL internals.
 
 Prerequisites:
-- cockroachDB or postgreSQL with user and database
+- postgreSQL with user and database
 `,
 		Run: func(cmd *cobra.Command, args []string) {
 			config := MustNewConfig(viper.GetViper())
@@ -32,7 +32,7 @@ Prerequisites:
 }
 
 func VerifyZitadel(ctx context.Context, db *database.DB, config database.Config) error {
-	err := ReadStmts(config.Type())
+	err := ReadStmts()
 	if err != nil {
 		return err
 	}
@@ -68,11 +68,6 @@ func VerifyZitadel(ctx context.Context, db *database.DB, config database.Config)
 		return err
 	}
 
-	logging.WithFields().Info("verify system sequence")
-	if err := exec(ctx, conn, createSystemSequenceStmt, nil); err != nil {
-		return err
-	}
-
 	logging.WithFields().Info("verify unique constraints")
 	if err := exec(ctx, conn, createUniqueConstraints, nil); err != nil {
 		return err

cmd/initialise/verify_zitadel_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func Test_verifyEvents(t *testing.T) {
-	err := ReadStmts("cockroach") //TODO: check all dialects
+	err := ReadStmts()
 	if err != nil {
 		t.Errorf("unable to read stmts: %v", err)
 		t.FailNow()

cmd/key/key.go

@@ -40,7 +40,7 @@ func newKey() *cobra.Command {
 		Long: `create new encryption key(s) (encrypted by the provided master key)
 provide key(s) by YAML file and/or by argument
 Requirements:
-- cockroachdb`,
+- postgreSQL`,
 		Example: `new -f keys.yaml
 new key1=somekey key2=anotherkey
 new -f keys.yaml key2=anotherkey`,

cmd/mirror/config.go

@@ -71,7 +71,7 @@ func mustNewConfig(v *viper.Viper, config any) {
 			mapstructure.StringToTimeDurationHookFunc(),
 			mapstructure.StringToTimeHookFunc(time.RFC3339),
 			mapstructure.StringToSliceHookFunc(","),
-			database.DecodeHook,
+			database.DecodeHook(true),
 			actions.HTTPConfigDecodeHook,
 			hook.EnumHookFunc(internal_authz.MemberTypeString),
 			mapstructure.TextUnmarshallerHookFunc(),

cmd/mirror/defaults.yaml

@@ -5,8 +5,6 @@ Source:
     Database: zitadel # ZITADEL_DATABASE_COCKROACH_DATABASE
     MaxOpenConns: 6 # ZITADEL_DATABASE_COCKROACH_MAXOPENCONNS
     MaxIdleConns: 6 # ZITADEL_DATABASE_COCKROACH_MAXIDLECONNS
-    EventPushConnRatio: 0.33 # ZITADEL_DATABASE_COCKROACH_EVENTPUSHCONNRATIO
-    ProjectionSpoolerConnRatio: 0.33 # ZITADEL_DATABASE_COCKROACH_PROJECTIONSPOOLERCONNRATIO
     MaxConnLifetime: 30m # ZITADEL_DATABASE_COCKROACH_MAXCONNLIFETIME
     MaxConnIdleTime: 5m # ZITADEL_DATABASE_COCKROACH_MAXCONNIDLETIME
     Options: "" # ZITADEL_DATABASE_COCKROACH_OPTIONS
@@ -39,44 +37,23 @@ Source:
         Key: # ZITADEL_DATABASE_POSTGRES_USER_SSL_KEY
 
 Destination:
-  cockroach:
-    Host: localhost # ZITADEL_DATABASE_COCKROACH_HOST
-    Port: 26257 # ZITADEL_DATABASE_COCKROACH_PORT
-    Database: zitadel # ZITADEL_DATABASE_COCKROACH_DATABASE
-    MaxOpenConns: 0 # ZITADEL_DATABASE_COCKROACH_MAXOPENCONNS
-    MaxIdleConns: 0 # ZITADEL_DATABASE_COCKROACH_MAXIDLECONNS
-    MaxConnLifetime: 30m # ZITADEL_DATABASE_COCKROACH_MAXCONNLIFETIME
-    MaxConnIdleTime: 5m # ZITADEL_DATABASE_COCKROACH_MAXCONNIDLETIME
-    EventPushConnRatio: 0.01 # ZITADEL_DATABASE_COCKROACH_EVENTPUSHCONNRATIO
-    ProjectionSpoolerConnRatio: 0.5 # ZITADEL_DATABASE_COCKROACH_PROJECTIONSPOOLERCONNRATIO
-    Options: "" # ZITADEL_DATABASE_COCKROACH_OPTIONS
-    User:
-      Username: zitadel # ZITADEL_DATABASE_COCKROACH_USER_USERNAME
-      Password: "" # ZITADEL_DATABASE_COCKROACH_USER_PASSWORD
-      SSL:
-        Mode: disable # ZITADEL_DATABASE_COCKROACH_USER_SSL_MODE
-        RootCert: "" # ZITADEL_DATABASE_COCKROACH_USER_SSL_ROOTCERT
-        Cert: "" # ZITADEL_DATABASE_COCKROACH_USER_SSL_CERT
-        Key: "" # ZITADEL_DATABASE_COCKROACH_USER_SSL_KEY
-  # Postgres is used as soon as a value is set
-  # The values describe the possible fields to set values
   postgres:
-    Host: # ZITADEL_DATABASE_POSTGRES_HOST
+    Host: localhost # ZITADEL_DATABASE_POSTGRES_HOST
-    Port: # ZITADEL_DATABASE_POSTGRES_PORT
+    Port: 5432 # ZITADEL_DATABASE_POSTGRES_PORT
-    Database: # ZITADEL_DATABASE_POSTGRES_DATABASE
+    Database: zitadel # ZITADEL_DATABASE_POSTGRES_DATABASE
-    MaxOpenConns: # ZITADEL_DATABASE_POSTGRES_MAXOPENCONNS
+    MaxOpenConns: 5 # ZITADEL_DATABASE_POSTGRES_MAXOPENCONNS
-    MaxIdleConns: # ZITADEL_DATABASE_POSTGRES_MAXIDLECONNS
+    MaxIdleConns: 2 # ZITADEL_DATABASE_POSTGRES_MAXIDLECONNS
-    MaxConnLifetime: # ZITADEL_DATABASE_POSTGRES_MAXCONNLIFETIME
+    MaxConnLifetime: 30m # ZITADEL_DATABASE_POSTGRES_MAXCONNLIFETIME
-    MaxConnIdleTime: # ZITADEL_DATABASE_POSTGRES_MAXCONNIDLETIME
+    MaxConnIdleTime: 5m # ZITADEL_DATABASE_POSTGRES_MAXCONNIDLETIME
-    Options: # ZITADEL_DATABASE_POSTGRES_OPTIONS
+    Options: "" # ZITADEL_DATABASE_POSTGRES_OPTIONS
     User:
-      Username: # ZITADEL_DATABASE_POSTGRES_USER_USERNAME
+      Username: zitadel # ZITADEL_DATABASE_POSTGRES_USER_USERNAME
-      Password: # ZITADEL_DATABASE_POSTGRES_USER_PASSWORD
+      Password: "" # ZITADEL_DATABASE_POSTGRES_USER_PASSWORD
       SSL:
-        Mode: # ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE
+        Mode: disable # ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE
-        RootCert: # ZITADEL_DATABASE_POSTGRES_USER_SSL_ROOTCERT
+        RootCert: "" # ZITADEL_DATABASE_POSTGRES_USER_SSL_ROOTCERT
-        Cert: # ZITADEL_DATABASE_POSTGRES_USER_SSL_CERT
+        Cert: "" # ZITADEL_DATABASE_POSTGRES_USER_SSL_CERT
-        Key: # ZITADEL_DATABASE_POSTGRES_USER_SSL_KEY
+        Key: "" # ZITADEL_DATABASE_POSTGRES_USER_SSL_KEY
 
 EventBulkSize: 10000
 

cmd/mirror/event.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/zitadel/zitadel/internal/v2/eventstore"
-	"github.com/zitadel/zitadel/internal/v2/projection"
 	"github.com/zitadel/zitadel/internal/v2/readmodel"
 	"github.com/zitadel/zitadel/internal/v2/system"
 	mirror_event "github.com/zitadel/zitadel/internal/v2/system/mirror"
@@ -30,39 +29,6 @@ func queryLastSuccessfulMigration(ctx context.Context, destinationES *eventstore
 	return lastSuccess, nil
 }
 
-func writeMigrationStart(ctx context.Context, sourceES *eventstore.EventStore, id string, destination string) (_ float64, err error) {
-	var cmd *eventstore.Command
-	if len(instanceIDs) > 0 {
-		cmd, err = mirror_event.NewStartedInstancesCommand(destination, instanceIDs)
-		if err != nil {
-			return 0, err
-		}
-	} else {
-		cmd = mirror_event.NewStartedSystemCommand(destination)
-	}
-
-	var position projection.HighestPosition
-
-	err = sourceES.Push(
-		ctx,
-		eventstore.NewPushIntent(
-			system.AggregateInstance,
-			eventstore.AppendAggregate(
-				system.AggregateOwner,
-				system.AggregateType,
-				id,
-				eventstore.CurrentSequenceMatches(0),
-				eventstore.AppendCommands(cmd),
-			),
-			eventstore.PushReducer(&position),
-		),
-	)
-	if err != nil {
-		return 0, err
-	}
-	return position.Position, nil
-}
-
 func writeMigrationSucceeded(ctx context.Context, destinationES *eventstore.EventStore, id, source string, position float64) error {
 	return destinationES.Push(
 		ctx,

cmd/mirror/event_store.go

@@ -14,6 +14,7 @@ import (
 	"github.com/zitadel/logging"
 
 	db "github.com/zitadel/zitadel/internal/database"
+	"github.com/zitadel/zitadel/internal/database/dialect"
 	"github.com/zitadel/zitadel/internal/id"
 	"github.com/zitadel/zitadel/internal/v2/database"
 	"github.com/zitadel/zitadel/internal/v2/eventstore"
@@ -57,9 +58,9 @@ func copyEventstore(ctx context.Context, config *Migration) {
 
 func positionQuery(db *db.DB) string {
 	switch db.Type() {
-	case "postgres":
+	case dialect.DatabaseTypePostgres:
 		return "SELECT EXTRACT(EPOCH FROM clock_timestamp())"
-	case "cockroach":
+	case dialect.DatabaseTypeCockroach:
 		return "SELECT cluster_logical_timestamp()"
 	default:
 		logging.WithFields("db_type", db.Type()).Fatal("database type not recognized")
@@ -80,9 +81,6 @@ func copyEvents(ctx context.Context, source, dest *db.DB, bulkSize uint32) {
 	destConn, err := dest.Conn(ctx)
 	logging.OnError(err).Fatal("unable to acquire dest connection")
 
-	sourceES := eventstore.NewEventstoreFromOne(postgres.New(source, &postgres.Config{
-		MaxRetries: 3,
-	}))
 	destinationES := eventstore.NewEventstoreFromOne(postgres.New(dest, &postgres.Config{
 		MaxRetries: 3,
 	}))
@@ -90,8 +88,14 @@ func copyEvents(ctx context.Context, source, dest *db.DB, bulkSize uint32) {
 	previousMigration, err := queryLastSuccessfulMigration(ctx, destinationES, source.DatabaseName())
 	logging.OnError(err).Fatal("unable to query latest successful migration")
 
-	maxPosition, err := writeMigrationStart(ctx, sourceES, migrationID, dest.DatabaseName())
+	var maxPosition float64
-	logging.OnError(err).Fatal("unable to write migration started event")
+	err = source.QueryRowContext(ctx,
+		func(row *sql.Row) error {
+			return row.Scan(&maxPosition)
+		},
+		"SELECT MAX(position) FROM eventstore.events2 "+instanceClause(),
+	)
+	logging.OnError(err).Fatal("unable to query max position from source")
 
 	logging.WithFields("from", previousMigration.Position, "to", maxPosition).Info("start event migration")
 

cmd/mirror/mirror.go

@@ -56,7 +56,6 @@ Order of execution:
 			copyEventstore(cmd.Context(), config)
 
 			projections(cmd.Context(), projectionConfig, masterKey)
-			verifyMigration(cmd.Context(), config)
 		},
 	}
 

cmd/mirror/projections.go

@@ -84,6 +84,7 @@ type ProjectionsConfig struct {
 	ExternalDomain  string
 	ExternalSecure  bool
 	InternalAuthZ   internal_authz.Config
+	SystemAuthZ     internal_authz.Config
 	SystemDefaults  systemdefaults.SystemDefaults
 	Telemetry       *handlers.TelemetryPusherConfig
 	Login           login.Config
@@ -117,8 +118,11 @@ func projections(
 	staticStorage, err := config.AssetStorage.NewStorage(client.DB)
 	logging.OnError(err).Fatal("unable create static storage")
 
-	config.Eventstore.Querier = old_es.NewCRDB(client)
+	newEventstore := new_es.NewEventstore(client)
-	config.Eventstore.Pusher = new_es.NewEventstore(client)
+	config.Eventstore.Querier = old_es.NewPostgres(client)
+	config.Eventstore.Pusher = newEventstore
+	config.Eventstore.Searcher = newEventstore
+
 	es := eventstore.NewEventstore(config.Eventstore)
 	esV4 := es_v4.NewEventstoreFromOne(es_v4_pg.New(client, &es_v4_pg.Config{
 		MaxRetries: config.Eventstore.MaxRetries,
@@ -147,7 +151,7 @@ func projections(
 		sessionTokenVerifier,
 		func(q *query.Queries) domain.PermissionCheck {
 			return func(ctx context.Context, permission, orgID, resourceID string) (err error) {
-				return internal_authz.CheckPermission(ctx, &authz_es.UserMembershipRepo{Queries: q}, config.InternalAuthZ.RolePermissionMappings, permission, orgID, resourceID)
+				return internal_authz.CheckPermission(ctx, &authz_es.UserMembershipRepo{Queries: q}, config.SystemAuthZ.RolePermissionMappings, config.InternalAuthZ.RolePermissionMappings, permission, orgID, resourceID)
 			}
 		},
 		0,
@@ -184,7 +188,7 @@ func projections(
 		keys.Target,
 		&http.Client{},
 		func(ctx context.Context, permission, orgID, resourceID string) (err error) {
-			return internal_authz.CheckPermission(ctx, authZRepo, config.InternalAuthZ.RolePermissionMappings, permission, orgID, resourceID)
+			return internal_authz.CheckPermission(ctx, authZRepo, config.SystemAuthZ.RolePermissionMappings, config.InternalAuthZ.RolePermissionMappings, permission, orgID, resourceID)
 		},
 		sessionTokenVerifier,
 		config.OIDC.DefaultAccessTokenLifetime,
@@ -220,7 +224,6 @@ func projections(
 		keys.SMS,
 		keys.OIDC,
 		config.OIDC.DefaultBackChannelLogoutLifetime,
-		client,
 		nil,
 	)
 
@@ -248,7 +251,7 @@ func projections(
 		}
 	}()
 
-	for i := 0; i < int(config.Projections.ConcurrentInstances); i++ {
+	for range int(config.Projections.ConcurrentInstances) {
 		go execProjections(ctx, instances, failedInstances, &wg)
 	}
 
@@ -270,31 +273,39 @@ func execProjections(ctx context.Context, instances <-chan string, failedInstanc
 
 		err := projection.ProjectInstance(ctx)
 		if err != nil {
-			logging.WithFields("instance", instance).OnError(err).Info("trigger failed")
+			logging.WithFields("instance", instance).WithError(err).Info("trigger failed")
+			failedInstances <- instance
+			continue
+		}
+
+		err = projection.ProjectInstanceFields(ctx)
+		if err != nil {
+			logging.WithFields("instance", instance).WithError(err).Info("trigger fields failed")
 			failedInstances <- instance
 			continue
 		}
 
 		err = admin_handler.ProjectInstance(ctx)
 		if err != nil {
-			logging.WithFields("instance", instance).OnError(err).Info("trigger admin handler failed")
+			logging.WithFields("instance", instance).WithError(err).Info("trigger admin handler failed")
 			failedInstances <- instance
 			continue
 		}
 
 		err = auth_handler.ProjectInstance(ctx)
 		if err != nil {
-			logging.WithFields("instance", instance).OnError(err).Info("trigger auth handler failed")
+			logging.WithFields("instance", instance).WithError(err).Info("trigger auth handler failed")
 			failedInstances <- instance
 			continue
 		}
 
 		err = notification.ProjectInstance(ctx)
 		if err != nil {
-			logging.WithFields("instance", instance).OnError(err).Info("trigger notification failed")
+			logging.WithFields("instance", instance).WithError(err).Info("trigger notification failed")
 			failedInstances <- instance
 			continue
 		}
+
 		logging.WithFields("instance", instance).Info("projections done")
 	}
 	wg.Done()

cmd/setup/07.go

@@ -3,7 +3,7 @@ package setup
 import (
 	"context"
 	"database/sql"
-	"embed"
+	_ "embed"
 	"strings"
 
 	"github.com/zitadel/zitadel/internal/eventstore"
@@ -12,31 +12,20 @@ import (
 var (
 	//go:embed 07/logstore.sql
 	createLogstoreSchema07 string
-	//go:embed 07/cockroach/access.sql
+	//go:embed 07/access.sql
-	//go:embed 07/postgres/access.sql
+	createAccessLogsTable07 string
-	createAccessLogsTable07 embed.FS
+	//go:embed 07/execution.sql
-	//go:embed 07/cockroach/execution.sql
+	createExecutionLogsTable07 string
-	//go:embed 07/postgres/execution.sql
-	createExecutionLogsTable07 embed.FS
 )
 
 type LogstoreTables struct {
 	dbClient *sql.DB
 	username string
-	dbType   string
 }
 
 func (mig *LogstoreTables) Execute(ctx context.Context, _ eventstore.Event) error {
-	accessStmt, err := readStmt(createAccessLogsTable07, "07", mig.dbType, "access.sql")
+	stmt := strings.ReplaceAll(createLogstoreSchema07, "%[1]s", mig.username) + createAccessLogsTable07 + createExecutionLogsTable07
-	if err != nil {
+	_, err := mig.dbClient.ExecContext(ctx, stmt)
-		return err
-	}
-	executionStmt, err := readStmt(createExecutionLogsTable07, "07", mig.dbType, "execution.sql")
-	if err != nil {
-		return err
-	}
-	stmt := strings.ReplaceAll(createLogstoreSchema07, "%[1]s", mig.username) + accessStmt + executionStmt
-	_, err = mig.dbClient.ExecContext(ctx, stmt)
 	return err
 }
 

cmd/setup/07/cockroach/access.sql

@@ -1,14 +0,0 @@
-CREATE TABLE IF NOT EXISTS logstore.access (
-    log_date TIMESTAMPTZ NOT NULL
-    , protocol INT NOT NULL
-    , request_url TEXT NOT NULL
-    , response_status INT NOT NULL
-    , request_headers JSONB
-    , response_headers JSONB
-    , instance_id TEXT NOT NULL
-    , project_id TEXT NOT NULL
-    , requested_domain TEXT
-    , requested_host TEXT
-
-    , INDEX protocol_date_desc (instance_id, protocol, log_date DESC) STORING (request_url, response_status, request_headers)
-);

cmd/setup/07/cockroach/execution.sql

@@ -1,11 +0,0 @@
-CREATE TABLE IF NOT EXISTS logstore.execution (
-    log_date TIMESTAMPTZ NOT NULL
-    , took INTERVAL
-    , message TEXT NOT NULL
-    , loglevel INT NOT NULL
-    , instance_id TEXT NOT NULL
-    , action_id TEXT NOT NULL
-    , metadata JSONB
-
-    , INDEX log_date_desc (instance_id, log_date DESC) STORING (took)
-);

cmd/setup/08.go

@@ -2,16 +2,15 @@ package setup
 
 import (
 	"context"
-	"embed"
+	_ "embed"
 
 	"github.com/zitadel/zitadel/internal/database"
 	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 var (
-	//go:embed 08/cockroach/08.sql
+	//go:embed 08/08.sql
-	//go:embed 08/postgres/08.sql
+	tokenIndexes08 string
-	tokenIndexes08 embed.FS
 )
 
 type AuthTokenIndexes struct {
@@ -19,11 +18,7 @@ type AuthTokenIndexes struct {
 }
 
 func (mig *AuthTokenIndexes) Execute(ctx context.Context, _ eventstore.Event) error {
-	stmt, err := readStmt(tokenIndexes08, "08", mig.dbClient.Type(), "08.sql")
+	_, err := mig.dbClient.ExecContext(ctx, tokenIndexes08)
-	if err != nil {
-		return err
-	}
-	_, err = mig.dbClient.ExecContext(ctx, stmt)
 	return err
 }
 

cmd/setup/08/cockroach/08.sql

@@ -1,5 +0,0 @@
-CREATE INDEX IF NOT EXISTS inst_refresh_tkn_idx ON auth.tokens(instance_id, refresh_token_id);
-CREATE INDEX IF NOT EXISTS inst_app_tkn_idx ON auth.tokens(instance_id, application_id);
-CREATE INDEX IF NOT EXISTS inst_ro_tkn_idx ON auth.tokens(instance_id, resource_owner);
-DROP INDEX IF EXISTS auth.tokens@user_user_agent_idx;
-CREATE INDEX IF NOT EXISTS inst_usr_agnt_tkn_idx ON auth.tokens(instance_id, user_id, user_agent_id);

cmd/setup/10.go

@@ -3,7 +3,7 @@ package setup
 import (
 	"context"
 	"database/sql"
-	"embed"
+	_ "embed"
 	"time"
 
 	"github.com/cockroachdb/cockroach-go/v2/crdb"
@@ -18,9 +18,8 @@ var (
 	correctCreationDate10CreateTable string
 	//go:embed 10/10_fill_table.sql
 	correctCreationDate10FillTable string
-	//go:embed 10/cockroach/10_update.sql
+	//go:embed 10/10_update.sql
-	//go:embed 10/postgres/10_update.sql
+	correctCreationDate10Update string
-	correctCreationDate10Update embed.FS
 	//go:embed 10/10_count_wrong_events.sql
 	correctCreationDate10CountWrongEvents string
 	//go:embed 10/10_empty_table.sql
@@ -40,11 +39,6 @@ func (mig *CorrectCreationDate) Execute(ctx context.Context, _ eventstore.Event)
 		logging.WithFields("mig", mig.String(), "iteration", i).Debug("start iteration")
 		var affected int64
 		err = crdb.ExecuteTx(ctx, mig.dbClient.DB, nil, func(tx *sql.Tx) error {
-			if mig.dbClient.Type() == "cockroach" {
-				if _, err := tx.Exec("SET experimental_enable_temp_tables=on"); err != nil {
-					return err
-				}
-			}
 			_, err := tx.ExecContext(ctx, correctCreationDate10CreateTable)
 			if err != nil {
 				return err
@@ -66,11 +60,7 @@ func (mig *CorrectCreationDate) Execute(ctx context.Context, _ eventstore.Event)
 				return err
 			}
 
-			updateStmt, err := readStmt(correctCreationDate10Update, "10", mig.dbClient.Type(), "10_update.sql")
+			_, err = tx.ExecContext(ctx, correctCreationDate10Update)
-			if err != nil {
-				return err
-			}
-			_, err = tx.ExecContext(ctx, updateStmt)
 			if err != nil {
 				return err
 			}

cmd/setup/10/cockroach/10_update.sql

@@ -1 +0,0 @@
-UPDATE eventstore.events e SET (creation_date, "position") = (we.next_cd, we.next_cd::DECIMAL) FROM wrong_events we WHERE e.event_sequence = we.event_sequence AND e.instance_id = we.instance_id;

cmd/setup/14.go

@@ -15,8 +15,7 @@ import (
 )
 
 var (
-	//go:embed 14/cockroach/*.sql
+	//go:embed 14/*.sql
-	//go:embed 14/postgres/*.sql
 	newEventsTable embed.FS
 )
 
@@ -40,7 +39,7 @@ func (mig *NewEventsTable) Execute(ctx context.Context, _ eventstore.Event) erro
 		return err
 	}
 
-	statements, err := readStatements(newEventsTable, "14", mig.dbClient.Type())
+	statements, err := readStatements(newEventsTable, "14")
 	if err != nil {
 		return err
 	}

cmd/setup/14/cockroach/02_create_and_fill_events2.sql

@@ -1,33 +0,0 @@
-CREATE TABLE eventstore.events2 (
-    instance_id,
-    aggregate_type,
-    aggregate_id,
-    
-    event_type,
-    "sequence",
-    revision,
-    created_at,
-    payload,
-    creator,
-    "owner",
-    
-    "position",
-    in_tx_order,
-
-    PRIMARY KEY (instance_id, aggregate_type, aggregate_id, "sequence")
-) AS SELECT
-    instance_id,
-    aggregate_type,
-    aggregate_id,
-
-    event_type,
-    event_sequence,
-    substr(aggregate_version, 2)::SMALLINT,
-    creation_date,
-    event_data,
-    editor_user,
-    resource_owner,
-
-    creation_date::DECIMAL,
-    event_sequence
-FROM eventstore.events_old;

cmd/setup/14/cockroach/03_constraints.sql

@@ -1,7 +0,0 @@
-ALTER TABLE eventstore.events2 ALTER COLUMN event_type SET NOT NULL;
-ALTER TABLE eventstore.events2 ALTER COLUMN revision SET NOT NULL;
-ALTER TABLE eventstore.events2 ALTER COLUMN created_at SET NOT NULL;
-ALTER TABLE eventstore.events2 ALTER COLUMN creator SET NOT NULL;
-ALTER TABLE eventstore.events2 ALTER COLUMN "owner" SET NOT NULL;
-ALTER TABLE eventstore.events2 ALTER COLUMN "position" SET NOT NULL;
-ALTER TABLE eventstore.events2 ALTER COLUMN in_tx_order SET NOT NULL;

cmd/setup/14/cockroach/04_indexes.sql

@@ -1,3 +0,0 @@
-CREATE INDEX IF NOT EXISTS es_active_instances ON eventstore.events2 (created_at DESC) STORING ("position");
-CREATE INDEX IF NOT EXISTS es_wm ON eventstore.events2 (aggregate_id, instance_id, aggregate_type, event_type);
-CREATE INDEX IF NOT EXISTS es_projection ON eventstore.events2 (instance_id, aggregate_type, event_type, "position");

cmd/setup/14/postgres/01_disable_inserts.sql

@@ -1 +0,0 @@
-ALTER TABLE eventstore.events RENAME TO events_old;

cmd/setup/15.go

@@ -11,8 +11,7 @@ import (
 )
 
 var (
-	//go:embed 15/cockroach/*.sql
+	//go:embed 15/*.sql
-	//go:embed 15/postgres/*.sql
 	currentProjectionState embed.FS
 )
 
@@ -21,7 +20,7 @@ type CurrentProjectionState struct {
 }
 
 func (mig *CurrentProjectionState) Execute(ctx context.Context, _ eventstore.Event) error {
-	statements, err := readStatements(currentProjectionState, "15", mig.dbClient.Type())
+	statements, err := readStatements(currentProjectionState, "15")
 	if err != nil {
 		return err
 	}

cmd/setup/15/cockroach/02_fe_from_projections.sql

@@ -1,26 +0,0 @@
-INSERT INTO projections.failed_events2 (
-    projection_name
-    , instance_id
-    , aggregate_type
-    , aggregate_id
-    , event_creation_date
-    , failed_sequence
-    , failure_count
-    , error
-    , last_failed
-) SELECT 
-    fe.projection_name
-    , fe.instance_id
-    , e.aggregate_type
-    , e.aggregate_id
-    , e.created_at
-    , e.sequence
-    , fe.failure_count
-    , fe.error
-    , fe.last_failed
-FROM 
-    projections.failed_events fe
-JOIN eventstore.events2 e ON
-    e.instance_id = fe.instance_id 
-    AND e.sequence = fe.failed_sequence
-ON CONFLICT DO NOTHING;

cmd/setup/15/cockroach/06_cs_from_projections.sql

@@ -1,29 +0,0 @@
-INSERT INTO projections.current_states (
-    projection_name
-    , instance_id
-    , event_date
-    , "position"
-    , last_updated
-) (SELECT 
-    cs.projection_name
-    , cs.instance_id
-    , e.created_at
-    , e.position
-    , cs.timestamp
-FROM 
-    projections.current_sequences cs
-JOIN eventstore.events2 e ON
-    e.instance_id = cs.instance_id 
-    AND e.aggregate_type = cs.aggregate_type
-    AND e.sequence = cs.current_sequence 
-    AND cs.current_sequence = (
-        SELECT 
-            MAX(cs2.current_sequence)
-        FROM
-            projections.current_sequences cs2
-        WHERE
-            cs.projection_name = cs2.projection_name
-            AND cs.instance_id = cs2.instance_id
-    )
-)
-ON CONFLICT DO NOTHING;

cmd/setup/15/cockroach/07_cs_from_adminapi.sql

@@ -1,28 +0,0 @@
-INSERT INTO projections.current_states (
-    projection_name
-    , instance_id
-    , event_date
-    , "position"
-    , last_updated
-) (SELECT 
-    cs.view_name
-    , cs.instance_id
-    , e.created_at
-    , e.position
-    , cs.last_successful_spooler_run
-FROM 
-    adminapi.current_sequences cs
-JOIN eventstore.events2 e ON
-    e.instance_id = cs.instance_id 
-    AND e.sequence = cs.current_sequence 
-    AND cs.current_sequence = (
-        SELECT 
-            MAX(cs2.current_sequence)
-        FROM
-            adminapi.current_sequences cs2
-        WHERE
-            cs.view_name = cs2.view_name
-            AND cs.instance_id = cs2.instance_id
-    )
-)
-ON CONFLICT DO NOTHING;

cmd/setup/15/cockroach/08_cs_from_auth.sql

@@ -1,28 +0,0 @@
-INSERT INTO projections.current_states (
-    projection_name
-    , instance_id
-    , event_date
-    , "position"
-    , last_updated
-) (SELECT 
-    cs.view_name
-    , cs.instance_id
-    , e.created_at
-    , e.position
-    , cs.last_successful_spooler_run
-FROM 
-    auth.current_sequences cs
-JOIN eventstore.events2 e ON
-    e.instance_id = cs.instance_id 
-    AND e.sequence = cs.current_sequence 
-    AND cs.current_sequence = (
-        SELECT 
-            MAX(cs2.current_sequence)
-        FROM
-            auth.current_sequences cs2
-        WHERE
-            cs.view_name = cs2.view_name
-            AND cs.instance_id = cs2.instance_id
-    )
-)
-ON CONFLICT DO NOTHING;

cmd/setup/15/postgres/01_new_failed_events.sql

@@ -1,16 +0,0 @@
-CREATE TABLE IF NOT EXISTS projections.failed_events2 (
-    projection_name TEXT NOT NULL
-    , instance_id TEXT NOT NULL
-
-    , aggregate_type TEXT NOT NULL
-    , aggregate_id TEXT NOT NULL
-    , event_creation_date TIMESTAMPTZ NOT NULL
-    , failed_sequence INT8 NOT NULL
-
-    , failure_count INT2 NULL DEFAULT 0
-    , error TEXT
-    , last_failed TIMESTAMPTZ
-    
-    , PRIMARY KEY (projection_name, instance_id, aggregate_type, aggregate_id, failed_sequence)
-);
-CREATE INDEX IF NOT EXISTS fe2_instance_id_idx on projections.failed_events2 (instance_id);

cmd/setup/15/postgres/03_fe_from_adminapi.sql

@@ -1,26 +0,0 @@
-INSERT INTO projections.failed_events2 (
-    projection_name
-    , instance_id
-    , aggregate_type
-    , aggregate_id
-    , event_creation_date
-    , failed_sequence
-    , failure_count
-    , error
-    , last_failed
-) SELECT 
-    fe.view_name
-    , fe.instance_id
-    , e.aggregate_type
-    , e.aggregate_id
-    , e.created_at
-    , e.sequence
-    , fe.failure_count
-    , fe.err_msg
-    , fe.last_failed
-FROM 
-    adminapi.failed_events fe
-JOIN eventstore.events2 e ON
-    e.instance_id = fe.instance_id 
-    AND e.sequence = fe.failed_sequence 
-ON CONFLICT DO NOTHING;

cmd/setup/15/postgres/04_fe_from_auth.sql

@@ -1,26 +0,0 @@
-INSERT INTO projections.failed_events2 (
-    projection_name
-    , instance_id
-    , aggregate_type
-    , aggregate_id
-    , event_creation_date
-    , failed_sequence
-    , failure_count
-    , error
-    , last_failed
-) SELECT 
-    fe.view_name
-    , fe.instance_id
-    , e.aggregate_type
-    , e.aggregate_id
-    , e.created_at
-    , e.sequence
-    , fe.failure_count
-    , fe.err_msg
-    , fe.last_failed
-FROM 
-    auth.failed_events fe
-JOIN eventstore.events2 e ON
-    e.instance_id = fe.instance_id 
-    AND e.sequence = fe.failed_sequence 
-ON CONFLICT DO NOTHING;

cmd/setup/15/postgres/05_current_states.sql

@@ -1,15 +0,0 @@
-CREATE TABLE IF NOT EXISTS projections.current_states (
-    projection_name TEXT NOT NULL
-    , instance_id TEXT NOT NULL
-
-    , last_updated TIMESTAMPTZ
-
-    , aggregate_id TEXT
-    , aggregate_type TEXT
-    , "sequence" INT8
-    , event_date TIMESTAMPTZ
-    , "position" DECIMAL
-
-    , PRIMARY KEY (projection_name, instance_id)
-);
-CREATE INDEX IF NOT EXISTS cs_instance_id_idx ON projections.current_states (instance_id);

cmd/setup/34.go

@@ -3,17 +3,14 @@ package setup
 import (
 	"context"
 	_ "embed"
-	"fmt"
 
 	"github.com/zitadel/zitadel/internal/database"
 	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 var (
-	//go:embed 34/cockroach/34_cache_schema.sql
+	//go:embed 34/34_cache_schema.sql
-	addCacheSchemaCockroach string
+	addCacheSchema string
-	//go:embed 34/postgres/34_cache_schema.sql
-	addCacheSchemaPostgres string
 )
 
 type AddCacheSchema struct {
@@ -21,14 +18,7 @@ type AddCacheSchema struct {
 }
 
 func (mig *AddCacheSchema) Execute(ctx context.Context, _ eventstore.Event) (err error) {
-	switch mig.dbClient.Type() {
+	_, err = mig.dbClient.ExecContext(ctx, addCacheSchema)
-	case "cockroach":
-		_, err = mig.dbClient.ExecContext(ctx, addCacheSchemaCockroach)
-	case "postgres":
-		_, err = mig.dbClient.ExecContext(ctx, addCacheSchemaPostgres)
-	default:
-		err = fmt.Errorf("add cache schema: unsupported db type %q", mig.dbClient.Type())
-	}
 	return err
 }
 

cmd/setup/34/cockroach/34_cache_schema.sql

@@ -1,27 +0,0 @@
-create schema if not exists cache;
-
-create table if not exists cache.objects (
-	cache_name varchar not null,
-    id uuid not null default gen_random_uuid(),
-    created_at timestamptz not null default now(),
-	last_used_at timestamptz not null default now(),
-    payload jsonb not null,
-
-	primary key(cache_name, id)
-);
-
-create table if not exists cache.string_keys(
-    cache_name varchar not null check (cache_name <> ''),
-    index_id integer not null check (index_id > 0),
-    index_key varchar not null check (index_key <> ''),
-    object_id uuid not null,
-
-    primary key (cache_name, index_id, index_key),
-    constraint fk_object
-        foreign key(cache_name, object_id)
-        references cache.objects(cache_name, id)
-        on delete cascade
-);
-
-create index if not exists string_keys_object_id_idx
-    on cache.string_keys (cache_name, object_id); -- for delete cascade

cmd/setup/35.go

@@ -21,7 +21,7 @@ type AddPositionToIndexEsWm struct {
 }
 
 func (mig *AddPositionToIndexEsWm) Execute(ctx context.Context, _ eventstore.Event) error {
-	statements, err := readStatements(addPositionToEsWmIndex, "35", "")
+	statements, err := readStatements(addPositionToEsWmIndex, "35")
 	if err != nil {
 		return err
 	}

cmd/setup/40.go

@@ -24,8 +24,7 @@ const (
 )
 
 var (
-	//go:embed 40/cockroach/*.sql
+	//go:embed 40/*.sql
-	//go:embed 40/postgres/*.sql
 	initPushFunc embed.FS
 )
 
@@ -112,5 +111,5 @@ func (mig *InitPushFunc) inTxOrderType(ctx context.Context) (typeName string, er
 }
 
 func (mig *InitPushFunc) filePath(fileName string) string {
-	return path.Join("40", mig.dbClient.Type(), fileName)
+	return path.Join("40", fileName)
 }

cmd/setup/40/cockroach/01_type.sql

@@ -1,10 +0,0 @@
-CREATE TYPE IF NOT EXISTS eventstore.command AS (
-    instance_id TEXT
-    , aggregate_type TEXT
-    , aggregate_id TEXT
-    , command_type TEXT
-    , revision INT2
-    , payload JSONB
-    , creator TEXT
-    , owner TEXT
-);

cmd/setup/40/cockroach/02_func.sql

@@ -1,137 +0,0 @@
-CREATE OR REPLACE FUNCTION eventstore.latest_aggregate_state(
-    instance_id TEXT
-    , aggregate_type TEXT
-    , aggregate_id TEXT
-    
-    , sequence OUT BIGINT
-    , owner OUT TEXT
-)
-    LANGUAGE 'plpgsql'
-AS $$
-    BEGIN
-        SELECT
-            COALESCE(e.sequence, 0) AS sequence
-            , e.owner
-        INTO
-            sequence
-            , owner
-        FROM
-            eventstore.events2 e
-        WHERE
-            e.instance_id = $1
-            AND e.aggregate_type = $2
-            AND e.aggregate_id = $3
-        ORDER BY 
-            e.sequence DESC
-        LIMIT 1;
-
-        RETURN;
-    END;
-$$;
-
-CREATE OR REPLACE FUNCTION eventstore.commands_to_events2(commands eventstore.command[])
-    RETURNS eventstore.events2[]
-    LANGUAGE 'plpgsql'
-AS $$
-DECLARE
-    current_sequence BIGINT;
-    current_owner TEXT;
-
-    instance_id TEXT;
-    aggregate_type TEXT;
-    aggregate_id TEXT;
-
-    _events eventstore.events2[];
-
-    _aggregates CURSOR FOR 
-        select 
-            DISTINCT ("c").instance_id
-            , ("c").aggregate_type
-            , ("c").aggregate_id
-        FROM
-            UNNEST(commands) AS c;
-BEGIN
-    OPEN _aggregates;
-    LOOP
-        FETCH NEXT IN _aggregates INTO instance_id, aggregate_type, aggregate_id;
-        -- crdb does not support EXIT WHEN NOT FOUND
-        EXIT WHEN instance_id IS NULL;
-
-        SELECT 
-            * 
-        INTO
-            current_sequence
-            , current_owner 
-        FROM eventstore.latest_aggregate_state(
-            instance_id
-            , aggregate_type
-            , aggregate_id
-        );
-
-        -- RETURN QUERY is not supported by crdb: https://github.com/cockroachdb/cockroach/issues/105240
-        SELECT 
-            ARRAY_CAT(_events, ARRAY_AGG(e))
-        INTO
-            _events
-        FROM (
-            SELECT
-                ("c").instance_id
-                , ("c").aggregate_type
-                , ("c").aggregate_id
-                , ("c").command_type -- AS event_type
-                , COALESCE(current_sequence, 0) + ROW_NUMBER() OVER () -- AS sequence
-                , ("c").revision
-                , NOW() -- AS created_at
-                , ("c").payload
-                , ("c").creator
-                , COALESCE(current_owner, ("c").owner) -- AS owner
-                , cluster_logical_timestamp() -- AS position
-                , ordinality::{{ .InTxOrderType }} -- AS in_tx_order
-            FROM
-                UNNEST(commands) WITH ORDINALITY AS c
-            WHERE
-                ("c").instance_id = instance_id
-                AND ("c").aggregate_type = aggregate_type
-                AND ("c").aggregate_id = aggregate_id
-        ) AS e;
-    END LOOP;
-    CLOSE _aggregates;
-    RETURN _events;
-END;
-$$;
-
-CREATE OR REPLACE FUNCTION eventstore.push(commands eventstore.command[]) RETURNS SETOF eventstore.events2 AS $$
-    INSERT INTO eventstore.events2
-    SELECT
-        ("e").instance_id
-        , ("e").aggregate_type
-        , ("e").aggregate_id
-        , ("e").event_type
-        , ("e").sequence
-        , ("e").revision
-        , ("e").created_at
-        , ("e").payload
-        , ("e").creator
-        , ("e").owner
-        , ("e")."position"
-        , ("e").in_tx_order
-    FROM 
-        UNNEST(eventstore.commands_to_events2(commands)) e 
-    ORDER BY 
-        in_tx_order
-    RETURNING *
-$$ LANGUAGE SQL;
-
-/*
-select (c).* from UNNEST(eventstore.commands_to_events2(
-ARRAY[
-    ROW('', 'system', 'SYSTEM', 'ct1', 1, '{"key": "value"}', 'c1', 'SYSTEM')
-    , ROW('', 'system', 'SYSTEM', 'ct2', 1, '{"key": "value"}', 'c1', 'SYSTEM')
-    , ROW('289525561255060732', 'org', '289575074711790844', 'ct3', 1, '{"key": "value"}', 'c1', '289575074711790844')
-    , ROW('289525561255060732', 'user', '289575075164906748', 'ct3', 1, '{"key": "value"}', 'c1', '289575074711790844')
-    , ROW('289525561255060732', 'oidc_session', 'V2_289575178579535100', 'ct3', 1, '{"key": "value"}', 'c1', '289575074711790844')
-    , ROW('', 'system', 'SYSTEM', 'ct3', 1, '{"key": "value"}', 'c1', 'SYSTEM')
-]::eventstore.command[]
-) )c;
-*/
-

cmd/setup/40/postgres/00_in_tx_order_type.sql

@@ -1,5 +0,0 @@
-SELECT data_type
-FROM information_schema.columns
-WHERE table_schema = 'eventstore'
-AND table_name = 'events2'
-AND column_name = 'in_tx_order';

cmd/setup/43.go

@@ -12,8 +12,7 @@ import (
 )
 
 var (
-	//go:embed 43/cockroach/*.sql
+	//go:embed 43/*.sql
-	//go:embed 43/postgres/*.sql
 	createFieldsDomainIndex embed.FS
 )
 
@@ -22,7 +21,7 @@ type CreateFieldsDomainIndex struct {
 }
 
 func (mig *CreateFieldsDomainIndex) Execute(ctx context.Context, _ eventstore.Event) error {
-	statements, err := readStatements(createFieldsDomainIndex, "43", mig.dbClient.Type())
+	statements, err := readStatements(createFieldsDomainIndex, "43")
 	if err != nil {
 		return err
 	}