RHINENG-25867: update old migrations that depend on cyndi

Author: xbhouse

database_admin/migrations/100_create_schema.up.sql

@@ -1088,4 +1088,12 @@ GRANT cyndi_reader to evaluator;
 GRANT cyndi_reader to manager;
 GRANT cyndi_reader TO vmaas_sync;
 
-GRANT cyndi_admin to cyndi;
+
+-- Grant cyndi the cyndi_admin role if cyndi exists
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_catalog.pg_roles WHERE rolname = 'cyndi') THEN
+        GRANT cyndi_admin to cyndi;
+    END IF;
+END
+$$;

database_admin/migrations/146_system_inventory_new_workspaces_field.down.sql

@@ -7,10 +7,17 @@ ALTER TABLE system_inventory DROP COLUMN workspaces;
 -- rename the old workspaces field to groups
 ALTER TABLE system_inventory ADD COLUMN workspaces TEXT ARRAY CHECK (array_length(workspaces,1) > 0 or workspaces is null);
 
-UPDATE system_inventory si
-SET workspaces = ARRAY(SELECT jsonb_array_elements(ih.groups)->>'id')
-FROM inventory.hosts ih
-WHERE ih.id = si.inventory_id;
+-- copy data from old inventory.hosts table if it exists
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = 'inventory' AND table_name = 'hosts') THEN
+        UPDATE system_inventory si
+        SET workspaces = ARRAY(SELECT jsonb_array_elements(ih.groups)->>'id')
+        FROM inventory.hosts ih
+        WHERE ih.id = si.inventory_id;
+    END IF;
+END
+$$;
 
 -- create index on new workspaces field
 CREATE INDEX IF NOT EXISTS system_inventory_workspaces_index ON system_inventory USING GIN (workspaces);

database_admin/migrations/146_system_inventory_new_workspaces_field.up.sql

@@ -7,11 +7,17 @@ ALTER TABLE system_inventory DROP COLUMN workspaces;
 -- add the new workspaces field
 ALTER TABLE system_inventory ADD COLUMN workspaces JSONB;
 
--- copy the data from old inventory_hosts.groups to new workspaces field
-UPDATE system_inventory si
-SET workspaces = ih.groups
-FROM inventory.hosts ih
-WHERE ih.id = si.inventory_id;
+-- copy the data from old inventory_hosts.groups (if it exists) to new workspaces field
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = 'inventory' AND table_name = 'hosts') THEN
+        UPDATE system_inventory si
+        SET workspaces = ih.groups
+        FROM inventory.hosts ih
+        WHERE ih.id = si.inventory_id;
+    END IF;
+END
+$$;
 
 -- create index on new workspaces field
 CREATE INDEX IF NOT EXISTS system_inventory_workspaces_index ON system_inventory USING GIN (workspaces);

database_admin/migrations/147_trigger_migration.down.sql

@@ -1 +1,7 @@
-SELECT 1 FROM inventory.hosts LIMIT 1;
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = 'inventory' AND table_name = 'hosts') THEN
+        PERFORM 1 FROM inventory.hosts LIMIT 1;
+    END IF;
+END
+$$;

database_admin/migrations/147_trigger_migration.up.sql

@@ -1,2 +1,8 @@
 -- just to trigger the migration
-SELECT 1 FROM inventory.hosts LIMIT 1;
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = 'inventory' AND table_name = 'hosts') THEN
+        PERFORM 1 FROM inventory.hosts LIMIT 1;
+    END IF;
+END
+$$;

database_admin/schema_test.go

@@ -94,6 +94,32 @@ func TestSchemaCompatiblity(t *testing.T) {
 	assert.Equal(t, 0, len(diff))
 }
 
+// checks that all migrations succeed without creating cyndi user or inventory.hosts table
+func TestMigrationsWithoutCyndi(t *testing.T) {
+	utils.SkipWithoutDB(t)
+	cfg := postgres.Config{
+		DatabaseName:    "patchman",
+		SchemaName:      "public",
+		MigrationsTable: "schema_migrations",
+	}
+	database.Configure()
+
+	err := database.ExecFile("./schema/clear_db.sql")
+	assert.NoError(t, err)
+
+	sqlDB, err := database.DB.DB()
+	assert.NoError(t, err)
+	driver, err := postgres.WithInstance(sqlDB, &cfg)
+	assert.NoError(t, err)
+
+	m, err := migrate.NewWithDatabaseInstance("file://migrations",
+		utils.FailIfEmpty(utils.CoreCfg.DBName, "DB_NAME"), driver)
+	assert.NoError(t, err)
+
+	err = m.Up()
+	assert.NoError(t, err)
+}
+
 func TestSchemaEmptyText(t *testing.T) {
 	utils.SkipWithoutDB(t)
 	database.Configure()