fix: remove references to admindbuser user in admindb migrations (#200)

Signed-off-by: niravparikh05 <nir.parikh05@gmail.com>
Signed-off-by: Nirav Parikh <52062717+niravparikh05@users.noreply.github.com>
Co-authored-by: Akshay Gaikwad <akshay196@users.noreply.github.com>

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## Fixed
+- Migrate admindb fails when user not admindbuser from [niravparikh05](https://github.com/niravparikh05)
+
 ## [0.2.2] - 2023-03-31
 
 ## Added

CONTRIBUTING.md

@@ -71,22 +71,12 @@ docker run --network host \
     -it postgres
 ```
 
-##### Elasticsearch
-
-```bash
-docker run --network host \
-    -v elastic-data:/usr/share/elasticsearch/data \
-    -e "discovery.type=single-node" \
-    -e "xpack.security.enabled=false" \
-    -it docker.elastic.co/elasticsearch/elasticsearch:8.0.0
-```
-
 #### Create the initial db and user
 
 ```sql
-create database admindb;
-CREATE ROLE admindbuser WITH LOGIN PASSWORD '<your_password>';
-GRANT ALL PRIVILEGES ON DATABASE admindb to admindbuser;
+create database <db_name>;
+CREATE ROLE <db_user> WITH LOGIN PASSWORD '<your_password>';
+GRANT ALL PRIVILEGES ON DATABASE <db_name> to <db_user>;
 ```
 
 #### Ory Kratos
@@ -98,7 +88,7 @@ documentation.
 Perform the Kratos migrations:
 
 ```bash
-export DSN='postgres://<user>:<pass>@<host>:<port>/admindb?sslmode=disable'
+export DSN='postgres://<db_user>:<db_password>@<host>:<port>/<db_name>?sslmode=disable'
 kratos -c <kratos-config> migrate sql -e --yes
 ```
 
@@ -124,7 +114,7 @@ You can refer to the [guide](https://github.com/golang-migrate/migrate/tree/mast
 _It is required to perform Kratos migrations before this step._
 
 ```shell
-export POSTGRESQL_URL='postgres://<user>:<pass>@<host>:<port>/admindb?sslmode=disable'
+export POSTGRESQL_URL='postgres://<db_user>:<db_password>@<host>:<port>/<db_name>?sslmode=disable'
 migrate -path ./persistence/migrations/admindb -database "$POSTGRESQL_URL" up
 ```
 

persistence/migrations/admindb/000001_authsrv_partner.up.sql

@@ -1,5 +1,4 @@
 CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
-GRANT EXECUTE ON FUNCTION uuid_generate_v4() TO admindbuser;
 CREATE TABLE IF NOT EXISTS authsrv_partner (
     id uuid NOT NULL default uuid_generate_v4(),
     name character varying(256) NOT NULL,
@@ -23,9 +22,6 @@ CREATE TABLE IF NOT EXISTS authsrv_partner (
     is_synthetic_partner_enabled boolean NOT NULL
 );
 
-
-ALTER TABLE authsrv_partner OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_partner ADD CONSTRAINT authsrv_partner_pkey PRIMARY KEY (id);
 
 CREATE UNIQUE index authsrv_partner_unique_name ON authsrv_partner (name) WHERE trash IS false;

persistence/migrations/admindb/000002_authsrv_organization.up.sql

@@ -28,8 +28,6 @@ CREATE TABLE IF NOT EXISTS authsrv_organization (
     referer character varying(30)
 );
 
-ALTER TABLE authsrv_organization OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_organization
     ADD CONSTRAINT authsrv_organization_name_partner_id_7d1113b9_uniq UNIQUE (name, partner_id);
 

persistence/migrations/admindb/000003_authsrv_project.up.sql

@@ -10,8 +10,6 @@ CREATE TABLE IF NOT EXISTS authsrv_project (
     "default" boolean NOT NULL
 );
 
-ALTER TABLE authsrv_project OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_project ADD CONSTRAINT authsrv_project_pkey PRIMARY KEY (id);
 
 -- update when we have more than one org

persistence/migrations/admindb/000004_authsrv_account.up.sql

@@ -16,8 +16,6 @@ CREATE TABLE IF NOT EXISTS authsrv_ssoaccount (
     last_logout timestamp with time zone
 );
 
-ALTER TABLE authsrv_ssoaccount OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_ssoaccount ADD CONSTRAINT authsrv_ssoaccount_pkey PRIMARY KEY (id);
 
 ALTER TABLE ONLY authsrv_ssoaccount ADD CONSTRAINT authsrv_ssoaccount_username_key UNIQUE (username);

persistence/migrations/admindb/000005_authsrv_group.up.sql

@@ -10,8 +10,6 @@ CREATE TABLE IF NOT EXISTS authsrv_group (
     type character varying(64) NOT NULL
 );
 
-ALTER TABLE authsrv_group OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_group ADD CONSTRAINT authsrv_group_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_group_name_d90b4524 ON authsrv_group USING btree (name);

persistence/migrations/admindb/000007_authsrv_resourcerole.up.sql

@@ -12,8 +12,6 @@ CREATE TABLE IF NOT EXISTS authsrv_resourcerole (
     partner_id uuid
 );
 
-ALTER TABLE authsrv_resourcerole OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_resourcerole ADD CONSTRAINT authsrv_resourcerole_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_resourcerole_name_a93b875a ON authsrv_resourcerole USING btree (name);

persistence/migrations/admindb/000008_authsrv_resourcepermission.up.sql

@@ -11,8 +11,6 @@ CREATE TABLE IF NOT EXISTS authsrv_resourcepermission (
     resource_action_urls jsonb NOT NULL
 );
 
-ALTER TABLE authsrv_resourcepermission OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_resourcepermission ADD CONSTRAINT authsrv_resourcepermission_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_resourcepermission_name_97f09d50 ON authsrv_resourcepermission USING btree (name);

persistence/migrations/admindb/000009_authsrv_resourcerolepermission.up.sql

@@ -9,8 +9,6 @@ CREATE TABLE IF NOT EXISTS authsrv_resourcerolepermission (
     resource_role_id uuid NOT NULL
 );
 
-ALTER TABLE authsrv_resourcerolepermission OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_resourcerolepermission ADD CONSTRAINT authsrv_resourcerolepermission_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_resourcerolepermission_name_a65794e7 ON authsrv_resourcerolepermission USING btree (name);

persistence/migrations/admindb/000010_authsrv_projectaccountresourcerole.up.sql

@@ -14,8 +14,6 @@ CREATE TABLE IF NOT EXISTS authsrv_projectaccountresourcerole (
     role_id uuid NOT NULL
 );
 
-ALTER TABLE authsrv_projectaccountresourcerole OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_projectaccountresourcerole ADD CONSTRAINT authsrv_projectaccountresourcerole_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_projectaccountresourcerole_account_id_532ce8df ON authsrv_projectaccountresourcerole USING btree (account_id);

persistence/migrations/admindb/000011_authsrv_projectaccountnamespacerole.up.sql

@@ -14,8 +14,6 @@ CREATE TABLE IF NOT EXISTS authsrv_projectaccountnamespacerole (
     role_id uuid NOT NULL
 );
 
-ALTER TABLE authsrv_projectaccountnamespacerole OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_projectaccountnamespacerole ADD CONSTRAINT authsrv_projectaccountnamespacerole_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_projectaccountnamespacerole_account_id_4fac0ac2 ON authsrv_projectaccountnamespacerole USING btree (account_id);

persistence/migrations/admindb/000012_authsrv_projectgroupnamespacerole.up.sql

@@ -14,8 +14,6 @@ CREATE TABLE IF NOT EXISTS authsrv_projectgroupnamespacerole (
     role_id uuid NOT NULL
 );
 
-ALTER TABLE authsrv_projectgroupnamespacerole OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_projectgroupnamespacerole ADD CONSTRAINT authsrv_projectgroupnamespacerole_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_projectgroupnamespacerole_group_id_15ba5c48 ON authsrv_projectgroupnamespacerole USING btree (group_id);

persistence/migrations/admindb/000013_authsrv_projectgrouprole.up.sql

@@ -14,8 +14,6 @@ CREATE TABLE IF NOT EXISTS authsrv_projectgrouprole (
     role_id uuid NOT NULL
 );
 
-ALTER TABLE authsrv_projectgrouprole OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_projectgrouprole ADD CONSTRAINT authsrv_projectgrouprole_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_projectgrouprole_group_id_bda11774 ON authsrv_projectgrouprole USING btree (group_id);

persistence/migrations/admindb/000014_authsrv_groupaccount.up.sql

@@ -10,8 +10,6 @@ CREATE TABLE IF NOT EXISTS authsrv_groupaccount (
     active boolean not null default true
 );
 
-ALTER TABLE authsrv_groupaccount OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_groupaccount ADD CONSTRAINT authsrv_groupaccount_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_groupaccount_account_id_041e4e98 ON authsrv_groupaccount USING btree (account_id);

persistence/migrations/admindb/000015_authsrv_grouprole.up.sql

@@ -13,8 +13,6 @@ CREATE TABLE IF NOT EXISTS authsrv_grouprole (
     role_id uuid NOT NULL
 );
 
-ALTER TABLE authsrv_grouprole OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_grouprole ADD CONSTRAINT authsrv_grouprole_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_grouprole_group_id_2f1402a5 ON authsrv_grouprole USING btree (group_id);

persistence/migrations/admindb/000016_authsrv_accountresourcerole.up.sql

@@ -13,8 +13,6 @@ CREATE TABLE IF NOT EXISTS authsrv_accountresourcerole (
     role_id uuid NOT NULL
 );
 
-ALTER TABLE authsrv_accountresourcerole OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_accountresourcerole ADD CONSTRAINT authsrv_accountresourcerole_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_accountresourcerole_account_id_229069ae ON authsrv_accountresourcerole USING btree (account_id);

persistence/migrations/admindb/000017_authsrv_template.up.sql

@@ -10,8 +10,6 @@ CREATE TABLE IF NOT EXISTS authsrv_template (
     partner_id uuid NOT NULL
 );
 
-ALTER TABLE authsrv_template OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_template ADD CONSTRAINT authsrv_template_pkey PRIMARY KEY (id);
 
 CREATE INDEX authsrv_template_name_274ef2d3 ON authsrv_template USING btree (name);

persistence/migrations/admindb/000018_sentry_bootstrap_infra.up.sql

@@ -17,8 +17,6 @@ CREATE TABLE IF NOT EXISTS sentry_bootstrap_infra (
     ca_key text NOT NULL
 );
 
-ALTER TABLE sentry_bootstrap_infra OWNER TO admindbuser;
-
 ALTER TABLE ONLY sentry_bootstrap_infra ADD CONSTRAINT sentry_bootstrap_infra_pkey PRIMARY KEY (name);
 
 ALTER TABLE ONLY sentry_bootstrap_infra

persistence/migrations/admindb/000019_sentry_bootstrap_agent_template.up.sql

@@ -24,8 +24,6 @@ CREATE TABLE IF NOT EXISTS sentry_bootstrap_agent_template (
     outofcluster_template text NOT NULL
 );
 
-ALTER TABLE sentry_bootstrap_agent_template OWNER TO admindbuser;
-
 ALTER TABLE ONLY sentry_bootstrap_agent_template ADD CONSTRAINT sentry_bootstrap_agent_template_pkey PRIMARY KEY (name);
 
 ALTER TABLE ONLY sentry_bootstrap_agent_template

persistence/migrations/admindb/000020_sentry_bootstrap_agent.up.sql

@@ -23,8 +23,6 @@ CREATE TABLE IF NOT EXISTS sentry_bootstrap_agent (
     fingerprint character varying(256) NOT NULL
 );
 
-ALTER TABLE sentry_bootstrap_agent OWNER TO admindbuser;
-
 ALTER TABLE ONLY sentry_bootstrap_agent ADD CONSTRAINT sentry_bootstrap_agent_pkey PRIMARY KEY (id);
 
 ALTER TABLE ONLY sentry_bootstrap_agent

persistence/migrations/admindb/000024_sentry_kubeconfig_revocation.up.sql

@@ -8,8 +8,6 @@ CREATE TABLE IF NOT EXISTS sentry_kubeconfig_revocation (
     is_sso_user boolean default FALSE
 );
 
-ALTER TABLE sentry_kubeconfig_revocation OWNER TO admindbuser;
-
 ALTER TABLE ONLY sentry_kubeconfig_revocation ADD CONSTRAINT sentry_kubeconfig_revocation_pkey PRIMARY KEY (id);
 
 ALTER TABLE ONLY sentry_kubeconfig_revocation

persistence/migrations/admindb/000025_sentry_kubeconfig_setting.up.sql

@@ -19,8 +19,6 @@ CREATE TABLE IF NOT EXISTS sentry_kubeconfig_setting (
     enforce_orgadmin_secret_access boolean default false
 );
 
-ALTER TABLE sentry_kubeconfig_setting OWNER TO admindbuser;
-
 ALTER TABLE ONLY sentry_kubeconfig_setting ADD CONSTRAINT sentry_kubeconfig_setting_pkey PRIMARY KEY (id);
 
 ALTER TABLE ONLY sentry_kubeconfig_setting

persistence/migrations/admindb/000027_sentry_kubectl_cluster_settings.up.sql

@@ -9,8 +9,6 @@ CREATE TABLE IF NOT EXISTS sentry_kubectl_cluster_settings (
     deleted_at timestamp WITH time zone
 );
 
-ALTER TABLE sentry_kubectl_cluster_settings OWNER TO admindbuser;
-
 ALTER TABLE ONLY sentry_kubectl_cluster_settings ADD CONSTRAINT sentry_kubectl_cluster_settings_pkey PRIMARY KEY (name);
 
 ALTER TABLE ONLY sentry_kubectl_cluster_settings

persistence/migrations/admindb/000028_authsrv_idp.up.sql

@@ -20,8 +20,6 @@ CREATE TABLE IF NOT EXISTS authsrv_idp (
     is_sae_enabled boolean default false
 );
 
-ALTER TABLE authsrv_idp OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_idp ADD CONSTRAINT authsrv_idp_pkey PRIMARY KEY (id);
 
 ALTER TABLE ONLY authsrv_idp ADD CONSTRAINT authsrv_idp_partner_id_domain_5669b152_uniq UNIQUE (partner_id, domain);

persistence/migrations/admindb/000029_authsrv_oidc_provider.up.sql

@@ -21,8 +21,6 @@ CREATE TABLE IF NOT EXISTS authsrv_oidc_provider (
     trash boolean NOT NULL
 );
 
-ALTER TABLE authsrv_oidc_provider OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_oidc_provider ADD CONSTRAINT authsrv_oidc_provider_pkey PRIMARY KEY (id);
 
 CREATE UNIQUE index authsrv_oidc_provider_issuer_url ON authsrv_oidc_provider (issuer_url) WHERE trash IS false;

persistence/migrations/admindb/000031_cluster_metro.up.sql

@@ -15,6 +15,4 @@ CREATE TABLE IF NOT EXISTS cluster_metro (
     partner_id uuid NOT NULL
 );
 
-ALTER TABLE cluster_metro OWNER TO admindbuser;
-
 ALTER TABLE ONLY cluster_metro ADD CONSTRAINT cluster_metro_pkey PRIMARY KEY (id);

persistence/migrations/admindb/000032_cluster_operator_bootstrap.up.sql

@@ -5,5 +5,3 @@ CREATE TABLE IF NOT EXISTS cluster_operator_bootstrap (
     trash boolean DEFAULT false NOT NULL,
     yaml_content text
 );
-
-ALTER TABLE cluster_operator_bootstrap OWNER TO admindbuser;

persistence/migrations/admindb/000033_cluster_tokens.up.sql

@@ -15,6 +15,4 @@ CREATE TABLE IF NOT EXISTS cluster_tokens (
     state varchar NOT NULL
 );
 
-ALTER TABLE cluster_tokens OWNER TO admindbuser;
-
 ALTER TABLE ONLY cluster_tokens ADD CONSTRAINT cluster_tokens_pkey PRIMARY KEY (name);

persistence/migrations/admindb/000034_cluster_clusters.up.sql

@@ -26,8 +26,6 @@ CREATE TABLE IF NOT EXISTS cluster_clusters (
     proxy_config jsonb
 );
 
-ALTER TABLE cluster_clusters OWNER TO admindbuser;
-
 ALTER TABLE ONLY cluster_clusters ADD CONSTRAINT cluster_clusters_pkey PRIMARY KEY (id);
 
 CREATE INDEX cluster_clusters_name_organization_id_partner_id_key ON cluster_clusters USING btree (name, organization_id, partner_id);

persistence/migrations/admindb/000035_cluster_project_cluster.up.sql

@@ -4,8 +4,6 @@ CREATE TABLE IF NOT EXISTS cluster_project_cluster (
     trash boolean NOT NULL default false
 );
 
-ALTER TABLE cluster_project_cluster OWNER TO admindbuser;
-
 CREATE INDEX cluster_project_cluster_project_id_cluster_id_key ON cluster_project_cluster USING btree (project_id, cluster_id);
 
 ALTER TABLE ONLY cluster_project_cluster

persistence/migrations/admindb/000036_cluster_namespaces.up.sql

@@ -9,8 +9,6 @@ CREATE TABLE IF NOT EXISTS cluster_namespaces (
     status jsonb not null default '{}'::jsonb
 );
 
-ALTER TABLE cluster_namespaces OWNER TO admindbuser;
-
 ALTER TABLE ONLY cluster_namespaces ADD CONSTRAINT cluster_namespaces_pkey PRIMARY KEY (cluster_id, name);
 
 ALTER TABLE ONLY cluster_namespaces

persistence/migrations/admindb/000037_authsrv_apikey.up.sql

@@ -13,6 +13,4 @@ CREATE TABLE IF NOT EXISTS authsrv_apikey (
     secret text not null
 );
 
-ALTER TABLE authsrv_apikey OWNER TO admindbuser;
-
 ALTER TABLE ONLY authsrv_apikey ADD CONSTRAINT authsrv_apikey_pkey PRIMARY KEY (id);