Merge pull request #827 from ydb-platform/23-3

23.3 integration tests

Author: asmyasnikov

.github/workflows/tests.yml

@@ -45,7 +45,7 @@ jobs:
       fail-fast: false
       matrix:
         go-version: [1.17.x, 1.20.x, 1.21.x]
-        ydb-version: [22.5, 23.1, 23.2, 23.2-slim]
+        ydb-version: [22.5, 23.1, 23.2, 23.3]
     services:
       ydb:
         image: cr.yandex/yc/yandex-docker-local-ydb:${{ matrix.ydb-version }}

tests/integration/database_sql_static_credentials_test.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/version"
 )
 
 func TestDatabaseSqlStaticCredentials(t *testing.T) {
@@ -36,7 +37,11 @@ func TestDatabaseSqlStaticCredentials(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	u.User = url.UserPassword("root", "")
+	if version.Gte(os.Getenv("YDB_VERSION"), "23.3") {
+		u.User = url.UserPassword("root", "1234")
+	} else {
+		u.User = url.User("root")
+	}
 
 	t.Run("sql.Open", func(t *testing.T) {
 		var db *sql.DB
@@ -53,7 +58,10 @@ func TestDatabaseSqlStaticCredentials(t *testing.T) {
 	t.Run("sql.OpenDB", func(t *testing.T) {
 		var cc *ydb.Driver
 		cc, err = ydb.Open(ctx, os.Getenv("YDB_CONNECTION_STRING"),
-			ydb.WithCredentials(credentials.NewStaticCredentials("root", "", u.Host, func() grpc.DialOption {
+			ydb.WithCredentials(credentials.NewStaticCredentials(u.User.Username(), func() string {
+				password, _ := u.User.Password()
+				return password
+			}(), u.Host, func() grpc.DialOption {
 				if u.Scheme == "grpcs" { //nolint:goconst
 					transportCredentials, transportCredentialsErr := grpcCredentials.NewClientTLSFromFile(
 						os.Getenv("YDB_SSL_ROOT_CERTIFICATES_FILE"), u.Hostname(),
@@ -64,7 +72,8 @@ func TestDatabaseSqlStaticCredentials(t *testing.T) {
 					return grpc.WithTransportCredentials(transportCredentials)
 				}
 				return grpc.WithTransportCredentials(insecure.NewCredentials())
-			}())))
+			}())),
+		)
 		require.NoError(t, err)
 
 		defer func() {

tests/integration/kv_test.go

@@ -40,7 +40,10 @@ func TestKeyValue(t *testing.T) {
 
 	// get
 	err = driver.Table().Do(scope.Ctx, func(ctx context.Context, s table.Session) error {
-		rows, err := s.ReadRows(ctx, tablePath, types.ListValue(types.Int64Value(id)),
+		rows, err := s.ReadRows(ctx, tablePath,
+			types.ListValue(types.StructValue(
+				types.StructFieldValue("id", types.Int64Value(id)),
+			)),
 			options.ReadColumn("val"),
 		)
 		if err != nil {
@@ -49,10 +52,10 @@ func TestKeyValue(t *testing.T) {
 		defer func() {
 			_ = rows.Close()
 		}()
-		if !rows.HasNextResultSet() {
+		if !rows.NextResultSet(ctx) {
 			return fmt.Errorf("no result sets")
 		}
-		if !rows.HasNextRow() {
+		if !rows.NextRow() {
 			return fmt.Errorf("no rows")
 		}
 		if rows.CurrentResultSet().RowCount() != 1 {
@@ -61,10 +64,11 @@ func TestKeyValue(t *testing.T) {
 		if rows.CurrentResultSet().ColumnCount() != 1 {
 			return fmt.Errorf("wrong column count (%d)", rows.CurrentResultSet().ColumnCount())
 		}
-		var actualValue int64
-		if err := rows.ScanNamed(named.Optional("val", &actualValue)); err != nil {
+		var actualValue string
+		if err := rows.ScanNamed(named.OptionalWithDefault("val", &actualValue)); err != nil {
 			return err
 		}
+		t.Logf("%s[%d] = %q", tablePath, id, actualValue)
 		return rows.Err()
 	})
 	scope.Require.NoError(err)

tests/integration/static_credentials_test.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/credentials"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/version"
 )
 
 func TestStaticCredentials(t *testing.T) {
@@ -30,15 +31,24 @@ func TestStaticCredentials(t *testing.T) {
 		dsn = v
 	}
 
-	url, err := url.Parse(dsn)
+	u, err := url.Parse(dsn)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	staticCredentials := credentials.NewStaticCredentials("root", "", url.Host, func() grpc.DialOption {
-		if url.Scheme == "grpcs" {
+	if version.Gte(os.Getenv("YDB_VERSION"), "23.3") {
+		u.User = url.UserPassword("root", "1234")
+	} else {
+		u.User = url.User("root")
+	}
+
+	staticCredentials := credentials.NewStaticCredentials(u.User.Username(), func() string {
+		password, _ := u.User.Password()
+		return password
+	}(), u.Host, func() grpc.DialOption {
+		if u.Scheme == "grpcs" {
 			transportCredentials, transportCredentialsErr := grpcCredentials.NewClientTLSFromFile(
-				os.Getenv("YDB_SSL_ROOT_CERTIFICATES_FILE"), url.Hostname(),
+				os.Getenv("YDB_SSL_ROOT_CERTIFICATES_FILE"), u.Hostname(),
 			)
 			if err != nil {
 				t.Fatalf("cannot create transport credentials: %v", transportCredentialsErr)