fix: BED-5288 - reorder graph schema assertions and update migration …

…information on every application version bump (#1064)
SpecterOps · Jan 9, 2025 · 05cfad3 · 05cfad3
1 parent 6937675
commit 05cfad3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cmd/api/src/migrations/graph.go b/cmd/api/src/migrations/graph.go
@@ -155,6 +155,10 @@ func (s *GraphMigrator) executeMigrations(ctx context.Context, originalVersion v
 		}
 	}
 
+	if releaseVersion := version.GetVersion(); releaseVersion.GreaterThan(mostRecentVersion) {
+		mostRecentVersion = releaseVersion
+	}
+
 	if mostRecentVersion.GreaterThan(originalVersion) {
 		return UpdateMigrationData(ctx, s.db, mostRecentVersion)
 	}

diff --git a/cmd/api/src/migrations/manifest.go b/cmd/api/src/migrations/manifest.go
@@ -43,7 +43,7 @@ func RequiresMigration(ctx context.Context, db graph.Database) (bool, error) {
 			return false, fmt.Errorf("unable to get graph db migration data: %w", err)
 		}
 	} else {
-		return LatestGraphMigrationVersion().GreaterThan(currentMigration), nil
+		return version.GetVersion().GreaterThan(currentMigration), nil
 	}
 }
 

diff --git a/packages/go/dawgs/drivers/pg/pg.go b/packages/go/dawgs/drivers/pg/pg.go
@@ -107,8 +107,6 @@ func init() {
 			return nil, fmt.Errorf("expected string for configuration type but got %T", cfg)
 		} else if graphDB, err := newDatabase(connectionString); err != nil {
 			return nil, err
-		} else if err := graphDB.AssertSchema(ctx, graph.Schema{}); err != nil {
-			return nil, err
 		} else {
 			return graphDB, nil
 		}