Merge pull request #1041 Fixed fixenv usage

Author: rekby

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Fixed fixenv usage (related to tests only)
+
 ## v3.56.0
 * Fixed handle of operational errors in topic streams
 * The minimum version of Go in `ydb-go-sdk` has been raised to `go1.21`

tests/integration/helpers_test.go

@@ -67,16 +67,6 @@ func (scope *scopeT) Failed() bool {
 	return scope.t.Failed()
 }
 
-// CacheWithCleanup wrap new interface as deprecated - for prevent re-write a lot of code
-// in new code prefer to use generic version of cache: fixenv.CacheResult(env, ...)
-func (scope *scopeT) CacheWithCleanup(cacheKey interface{}, opt *fixenv.FixtureOptions, f fixenv.FixtureCallbackWithCleanupFunc) interface{} {
-	fWrap := func() (*fixenv.Result, error) {
-		res, cleanup, err := f()
-		return fixenv.NewResultWithCleanup(res, cleanup), err
-	}
-	return scope.CacheResult(fWrap)
-}
-
 func (scope *scopeT) ConnectionString() string {
 	if envString := os.Getenv("YDB_CONNECTION_STRING"); envString != "" {
 		return envString
@@ -89,7 +79,7 @@ func (scope *scopeT) AuthToken() string {
 }
 
 func (scope *scopeT) Driver(opts ...ydb.Option) *ydb.Driver {
-	return scope.CacheWithCleanup("", nil, func() (res interface{}, cleanup fixenv.FixtureCleanupFunc, err error) {
+	f := func() (*fixenv.GenericResult[*ydb.Driver], error) {
 		connectionString := scope.ConnectionString()
 		scope.Logf("Connect with connection string: %v", connectionString)
 
@@ -115,8 +105,11 @@ func (scope *scopeT) Driver(opts ...ydb.Option) *ydb.Driver {
 		clean := func() {
 			scope.Require.NoError(driver.Close(scope.Ctx))
 		}
-		return driver, clean, err
-	}).(*ydb.Driver)
+
+		return fixenv.NewGenericResultWithCleanup(driver, clean), err
+	}
+
+	return fixenv.CacheResult(scope.Env, f)
 }
 
 func (scope *scopeT) SQLDriver(opts ...ydb.ConnectorOption) *sql.DB {
@@ -146,7 +139,7 @@ func (scope *scopeT) SQLDriverWithFolder(opts ...ydb.ConnectorOption) *sql.DB {
 }
 
 func (scope *scopeT) Folder() string {
-	return scope.CacheWithCleanup(nil, nil, func() (res interface{}, cleanup fixenv.FixtureCleanupFunc, err error) {
+	f := func() (*fixenv.GenericResult[string], error) {
 		driver := scope.Driver()
 		folderPath := path.Join(driver.Name(), scope.T().Name())
 		scope.Require.NoError(sugar.RemoveRecursive(scope.Ctx, driver, folderPath))
@@ -158,8 +151,9 @@ func (scope *scopeT) Folder() string {
 				scope.Require.NoError(sugar.RemoveRecursive(scope.Ctx, driver, folderPath))
 			}
 		}
-		return folderPath, clean, nil
-	}).(string)
+		return fixenv.NewGenericResultWithCleanup(folderPath, clean), nil
+	}
+	return fixenv.CacheResult(scope.Env, f)
 }
 
 func (scope *scopeT) Logger() *testLogger {
@@ -179,57 +173,62 @@ func (scope *scopeT) TopicConsumerName() string {
 }
 
 func (scope *scopeT) TopicPath() string {
-	return scope.CacheWithCleanup(nil, nil, func() (res interface{}, cleanup fixenv.FixtureCleanupFunc, err error) {
+	f := func() (*fixenv.GenericResult[string], error) {
 		topicName := strings.Replace(scope.T().Name(), "/", "__", -1)
 		topicPath := path.Join(scope.Folder(), topicName)
 		client := scope.Driver().Topic()
 
-		cleanup = func() {
+		cleanup := func() {
 			if !scope.Failed() {
 				_ = client.Drop(scope.Ctx, topicPath)
 			}
 		}
 		cleanup()
 
-		err = client.Create(scope.Ctx, topicPath, topicoptions.CreateWithConsumer(
+		err := client.Create(scope.Ctx, topicPath, topicoptions.CreateWithConsumer(
 			topictypes.Consumer{
 				Name: scope.TopicConsumerName(),
 			},
 		))
 
-		return topicPath, cleanup, err
-	}).(string)
+		return fixenv.NewGenericResultWithCleanup(topicPath, cleanup), err
+	}
+	return fixenv.CacheResult(scope.Env, f)
 }
 
 func (scope *scopeT) TopicReader() *topicreader.Reader {
-	return scope.CacheWithCleanup(nil, nil, func() (res interface{}, cleanup fixenv.FixtureCleanupFunc, err error) {
+	f := func() (*fixenv.GenericResult[*topicreader.Reader], error) {
 		reader, err := scope.Driver().Topic().StartReader(
 			scope.TopicConsumerName(),
 			topicoptions.ReadTopic(scope.TopicPath()),
 		)
-		cleanup = func() {
+		cleanup := func() {
 			if reader != nil {
 				_ = reader.Close(scope.Ctx)
 			}
 		}
-		return reader, cleanup, err
-	}).(*topicreader.Reader)
+		return fixenv.NewGenericResultWithCleanup(reader, cleanup), err
+	}
+
+	return fixenv.CacheResult(scope.Env, f)
 }
 
 func (scope *scopeT) TopicWriter() *topicwriter.Writer {
-	return scope.CacheWithCleanup(nil, nil, func() (res interface{}, cleanup fixenv.FixtureCleanupFunc, err error) {
+	f := func() (*fixenv.GenericResult[*topicwriter.Writer], error) {
 		writer, err := scope.Driver().Topic().StartWriter(
 			scope.TopicPath(),
 			topicoptions.WithWriterProducerID(scope.TopicWriterProducerID()),
 			topicoptions.WithWriterWaitServerAck(true),
 		)
-		cleanup = func() {
+		cleanup := func() {
 			if writer != nil {
 				_ = writer.Close(scope.Ctx)
 			}
 		}
-		return writer, cleanup, err
-	}).(*topicwriter.Writer)
+		return fixenv.NewGenericResultWithCleanup(writer, cleanup), err
+	}
+
+	return fixenv.CacheResult(scope.Env, f)
 }
 
 func (scope *scopeT) TopicWriterProducerID() string {