From c4c934e0bd24e8ec5c0d8b38a4cd3f97ca9cf6c0 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 23 Jan 2025 13:34:48 +0300
Subject: [PATCH] SQL/Storage: Remove SkipDataMigration flag (#99404)

---
 pkg/storage/unified/sql/backend.go      | 27 +++++++++++--------------
 pkg/storage/unified/sql/backend_test.go | 11 ++++------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/pkg/storage/unified/sql/backend.go b/pkg/storage/unified/sql/backend.go
index 2ece455f44c..d56cd87b2e1 100644
--- a/pkg/storage/unified/sql/backend.go
+++ b/pkg/storage/unified/sql/backend.go
@@ -34,10 +34,9 @@ type Backend interface {
 }
 
 type BackendOptions struct {
-	DBProvider        db.DBProvider
-	Tracer            trace.Tracer
-	PollingInterval   time.Duration
-	SkipDataMigration bool
+	DBProvider      db.DBProvider
+	Tracer          trace.Tracer
+	PollingInterval time.Duration
 }
 
 func NewBackend(opts BackendOptions) (Backend, error) {
@@ -54,13 +53,12 @@ func NewBackend(opts BackendOptions) (Backend, error) {
 		pollingInterval = defaultPollingInterval
 	}
 	return &backend{
-		done:              ctx.Done(),
-		cancel:            cancel,
-		log:               log.New("sql-resource-server"),
-		tracer:            opts.Tracer,
-		dbProvider:        opts.DBProvider,
-		pollingInterval:   pollingInterval,
-		skipDataMigration: opts.SkipDataMigration,
+		done:            ctx.Done(),
+		cancel:          cancel,
+		log:             log.New("sql-resource-server"),
+		tracer:          opts.Tracer,
+		dbProvider:      opts.DBProvider,
+		pollingInterval: pollingInterval,
 	}, nil
 }
 
@@ -76,10 +74,9 @@ type backend struct {
 	tracer trace.Tracer
 
 	// database
-	dbProvider        db.DBProvider
-	db                db.DB
-	dialect           sqltemplate.Dialect
-	skipDataMigration bool
+	dbProvider db.DBProvider
+	db         db.DB
+	dialect    sqltemplate.Dialect
 
 	// watch streaming
 	//stream chan *resource.WatchEvent
diff --git a/pkg/storage/unified/sql/backend_test.go b/pkg/storage/unified/sql/backend_test.go
index 25cfdbcd440..1703c34384b 100644
--- a/pkg/storage/unified/sql/backend_test.go
+++ b/pkg/storage/unified/sql/backend_test.go
@@ -62,10 +62,7 @@ func setupBackendTest(t *testing.T) (testBackend, context.Context) {
 
 	ctx := testutil.NewDefaultTestContext(t)
 	dbp := test.NewDBProviderMatchWords(t)
-	b, err := NewBackend(BackendOptions{
-		DBProvider:        dbp,
-		SkipDataMigration: true, // Calling migrations makes startup SQL calls (avoid the mock)
-	})
+	b, err := NewBackend(BackendOptions{DBProvider: dbp})
 	require.NoError(t, err)
 	require.NotNil(t, b)
 
@@ -112,7 +109,7 @@ func TestBackend_Init(t *testing.T) {
 
 		ctx := testutil.NewDefaultTestContext(t)
 		dbp := test.NewDBProviderWithPing(t)
-		b, err := NewBackend(BackendOptions{DBProvider: dbp, SkipDataMigration: true})
+		b, err := NewBackend(BackendOptions{DBProvider: dbp})
 		require.NoError(t, err)
 		require.NotNil(t, b)
 
@@ -169,7 +166,7 @@ func TestBackend_Init(t *testing.T) {
 
 		ctx := testutil.NewDefaultTestContext(t)
 		dbp := test.NewDBProviderWithPing(t)
-		b, err := NewBackend(BackendOptions{DBProvider: dbp, SkipDataMigration: true})
+		b, err := NewBackend(BackendOptions{DBProvider: dbp})
 		require.NoError(t, err)
 		require.NotNil(t, dbp.DB)
 
@@ -185,7 +182,7 @@ func TestBackend_IsHealthy(t *testing.T) {
 
 	ctx := testutil.NewDefaultTestContext(t)
 	dbp := test.NewDBProviderWithPing(t)
-	b, err := NewBackend(BackendOptions{DBProvider: dbp, SkipDataMigration: true})
+	b, err := NewBackend(BackendOptions{DBProvider: dbp})
 	require.NoError(t, err)
 	require.NotNil(t, dbp.DB)