Merge branch 'master' into fork/issues/850/flush

Author: rekby

.github/scripts/format-go-code.sh

@@ -6,12 +6,15 @@ FILEPATH="$1"
 
 gofmt -s -w "$FILEPATH"
 
-# https://github.com/rinchsan/gosimports
+# https://github.com/daixiang0/gci
 if [[ "$FILEPATH" == *"tests/slo/"* ]]
 then
-  gosimports -local slo -w "$FILEPATH"
+  gci write --skip-generated -s standard -s default -s "prefix(slo)" "$FILEPATH"
+elif [[ "$FILEPATH" == *"examples/"* ]]
+then
+  gci write --skip-generated -s standard -s default -s "prefix(examples)" "$FILEPATH"
 else
-  gosimports -local github.com/ydb-platform/ydb-go-sdk/v3 -w "$FILEPATH"
+  gci write --skip-generated -s standard -s default -s "prefix(github.com/ydb-platform/ydb-go-sdk/v3)" "$FILEPATH"
 fi
 
 

.github/workflows/breaking.yml

@@ -11,17 +11,22 @@ jobs:
       group: broken-changes-${{ github.ref }}
       cancel-in-progress: true
     runs-on: ubuntu-latest
+    permissions: 
+      pull-requests: write
+      contents: read
     steps:
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install gorelease
         run: test -e ~/go/bin/gorelease || go install golang.org/x/exp/cmd/gorelease@latest
       - name: Check broken API changes
         run: gorelease -base=$GITHUB_BASE_REF 2>&1 > changes.txt | true
+      - name: Print API changes
+        run: cat changes.txt
       - name: Comment Report
         if: always()
         uses: marocchino/sticky-pull-request-comment@v2

.github/workflows/changelog.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Changelog updated
         uses: Zomzog/[email protected]

.github/workflows/check-codegen.yml

@@ -14,14 +14,14 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        go-version: [1.20.x, 1.21.x]
+        go-version: [1.21.x, 1.22.x]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go-version }}
 
@@ -32,13 +32,18 @@ jobs:
     - name: Build
       run: |
         go install ./internal/cmd/gtrace
-        go install github.com/golang/mock/[email protected]        
+        go install ./internal/cmd/gstack
+        go install go.uber.org/mock/[email protected]
 
     - name: Clean and re-generate *_gtrace.go files
       run: |
         rm -f ./trace/*_gtrace.go
         go generate ./trace
         go generate ./...
 
+    - name: Re-generate stack.FunctionID calls
+      run: |
+        gstack .
+
     - name: Check repository diff
       run: bash ./.github/scripts/check-work-copy-equals-to-committed.sh "code-generation not equal with committed"

.github/workflows/codeql-analysis.yml

@@ -45,11 +45,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,4 +76,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/examples.yml

@@ -15,11 +15,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ydb-version: [ 22.5, 23.1, 23.2 ]
-        application: [ native, database_sql, gorm, xorm ]
+        ydb-version: [ 23.3, 24.1 ]
+        application: [ native/table, native/query, database_sql, gorm, xorm ]
     services:
       ydb:
-        image: cr.yandex/crpsjg1coh47p81vh2lc/yandex-docker-local-ydb:${{ matrix.ydb-version }}
+        image: ydbplatform/local-ydb:${{ matrix.ydb-version }}
         ports:
           - 2135:2135
           - 2136:2136
@@ -29,16 +29,18 @@ jobs:
         env:
           YDB_LOCAL_SURVIVE_RESTART: true
           YDB_USE_IN_MEMORY_PDISKS: true
+          YDB_TABLE_ENABLE_PREPARED_DDL: true
         options: '-h localhost'
     env:
       OS: ubuntu-latest
       YDB_CONNECTION_STRING: grpc://localhost:2136/local
       YDB_ANONYMOUS_CREDENTIALS: 1
+      YDB_VERSION: ${{ matrix.ydb-version }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           cache: true
       - name: Run basic example ${{ matrix.application }}
@@ -72,9 +74,9 @@ jobs:
       POSTGRES_CONNECTION_STRING: postgres://postgres:postgres@localhost:5432/basic?sslmode=disable
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           cache: true
       - name: Run basic example ${{ matrix.application }} with postgres
@@ -95,9 +97,9 @@ jobs:
       SQLITE_CONNECTION_STRING: ${{ matrix.application }}.db
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           cache: true
       - name: Run basic example ${{ matrix.application }} with sqlite

.github/workflows/lint.yml

@@ -6,6 +6,8 @@ on:
       - release-*
   pull_request:
   workflow_dispatch:
+env:
+  GOLANGCI_LINT_VERSION: v1.55.2
 jobs:
   golangci:
     name: golangci-lint
@@ -14,27 +16,27 @@ jobs:
       cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.52.0
+          version: ${{ env.GOLANGCI_LINT_VERSION }}
+          args: --timeout=5m
   golangci-examples:
     name: golangci-lint-examples
     concurrency:
       group: lint-golangci-examples-${{ github.ref }}
       cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-
+      - uses: actions/checkout@v4
       - name: generate examples golangci-lint config
         run: sed 's/github.com\/ydb-platform\/ydb-go-sdk\/v3/examples/g' .golangci.yml > examples/.golangci.yml
-
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.52.0
+          version: ${{ env.GOLANGCI_LINT_VERSION }}
+          args: --timeout=5m
           working-directory: examples
   golangci-slo:
     name: golangci-lint-slo
@@ -43,15 +45,14 @@ jobs:
       cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-
+      - uses: actions/checkout@v4
       - name: generate slo golangci-lint config
         run: sed 's/github.com\/ydb-platform\/ydb-go-sdk\/v3/slo/g' .golangci.yml > tests/slo/.golangci.yml
-
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.52.0
+          version: ${{ env.GOLANGCI_LINT_VERSION }}
+          args: --timeout=5m
           working-directory: tests/slo
   autoformatter:
     name: autoformat check
@@ -60,20 +61,16 @@ jobs:
       cancel-in-progress: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-
+      - uses: actions/checkout@v4
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
-
       - name: Install utilities
         run: |
           go install mvdan.cc/[email protected]
-          go install github.com/rinchsan/gosimports/cmd/[email protected]
-
+          go install github.com/daixiang0/[email protected]
       - name: format all files with auto-formatter
         run: bash ./.github/scripts/format-all-go-code.sh "$PWD"
-
       - name: Check repository diff
         run: bash ./.github/scripts/check-work-copy-equals-to-committed.sh "auto-format broken"

.github/workflows/publish.yml

@@ -28,7 +28,7 @@ jobs:
       CHANGELOG_FILE: CHANGELOG.md
       GITHUB_TOKEN: ${{ secrets.YDB_PLATFORM_BOT_TOKEN_REPO }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.YDB_PLATFORM_BOT_TOKEN_REPO }}
           fetch-depth: 0
@@ -70,7 +70,7 @@ jobs:
             TAG="v$MAJOR.$MINOR.$PATCH";
           fi;
           git tag $TAG
-          git push --tags && git push
+          git push && git push --tags
           CHANGELOG="$CHANGELOG
           
           Full Changelog: [$LAST_TAG...$TAG](https://github.com/ydb-platform/ydb-go-sdk/compare/$LAST_TAG...$TAG)"

.github/workflows/slo.yml

@@ -21,10 +21,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run SLO
         uses: ydb-platform/slo-tests@js-version
+        continue-on-error: true
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           KUBECONFIG_B64: ${{ secrets.SLO_KUBE_CONFIG }}
@@ -42,31 +43,37 @@ jobs:
           timeBetweenPhases: 30
           shutdownTime: 30
 
-          language_id0: 'native'
+          language_id0: 'native-table'
           workload_path0: 'tests/slo'
-          language0: 'Go SDK native'
+          language0: 'Native ydb-go-sdk/v3 over table-service'
           workload_build_context0: ../..
-          workload_build_options0: -f Dockerfile --build-arg SRC_PATH=native --build-arg JOB_NAME=workload-native
+          workload_build_options0: -f Dockerfile --build-arg SRC_PATH=native/table --build-arg JOB_NAME=workload-native-table
 
-          language_id1: 'databasesql'
+          language_id1: 'native-query'
           workload_path1: 'tests/slo'
-          language1: 'Go SDK database/sql'
+          language1: 'Native ydb-go-sdk/v3 over query-service'
           workload_build_context1: ../..
-          workload_build_options1: -f Dockerfile --build-arg SRC_PATH=database/sql --build-arg JOB_NAME=workload-databasesql
+          workload_build_options1: -f Dockerfile --build-arg SRC_PATH=native/query --build-arg JOB_NAME=workload-native-query
 
-          language_id2: 'gorm'
+          language_id2: 'database-sql'
           workload_path2: 'tests/slo'
-          language2: 'Go SDK gorm'
+          language2: 'Go SDK database/sql'
           workload_build_context2: ../..
-          workload_build_options2: -f Dockerfile --build-arg SRC_PATH=gorm --build-arg JOB_NAME=workload-gorm
+          workload_build_options2: -f Dockerfile --build-arg SRC_PATH=database/sql --build-arg JOB_NAME=workload-database-sql
 
-          language_id3: 'xorm'
+          language_id3: 'gorm'
           workload_path3: 'tests/slo'
-          language3: 'Go SDK xorm'
+          language3: 'Go SDK gorm'
           workload_build_context3: ../..
-          workload_build_options3: -f Dockerfile --build-arg SRC_PATH=xorm --build-arg JOB_NAME=workload-xorm
+          workload_build_options3: -f Dockerfile --build-arg SRC_PATH=gorm --build-arg JOB_NAME=workload-gorm
 
-      - uses: actions/upload-artifact@v3
+          language_id4: 'xorm'
+          workload_path4: 'tests/slo'
+          language4: 'Go SDK xorm'
+          workload_build_context4: ../..
+          workload_build_options4: -f Dockerfile --build-arg SRC_PATH=xorm --build-arg JOB_NAME=workload-xorm
+
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: slo-logs