Cassgo 97

.github/workflows/main.yml

@@ -3,13 +3,10 @@ name: Build
 on:
   push:
     branches:
-      - master
+      - trunk
   pull_request:
     types: [ opened, synchronize, reopened ]
 
-env:
-  CCM_VERSION: "6e71061146f7ae67b84ccd2b1d90d7319b640e4c"
-
 jobs:
   build:
     name: Unit tests
@@ -22,9 +19,11 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
-      - run: go vet
+      - name: Run linting
+        run: make check
       - name: Run unit tests
-        run: go test -v -tags unit -race
+        run: make test-unit
+
   integration-cassandra:
     timeout-minutes: 15
     needs:
@@ -35,7 +34,7 @@ jobs:
       fail-fast: false
       matrix:
         go: [ '1.22', '1.23' ]
-        cassandra_version: [ '4.0.13', '4.1.6' ]
+        cassandra_version: [ '4.1.6', '5.0.3' ]
         auth: [ "false" ]
         compressor: [ "no-compression", "snappy", "lz4" ]
         tags: [ "cassandra", "integration", "ccm" ]
@@ -45,82 +44,51 @@ jobs:
             compressor: "snappy"
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
-      - uses: actions/cache@v4
-        id: gomod-cache
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('go.mod') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment
-      - name: Start cassandra nodes
-        run: |
-          source ~/venv/bin/activate
-          VERSION=${{ matrix.cassandra_version }}
-          keypath="$(pwd)/testdata/pki"
-          conf=(
-              "client_encryption_options.enabled: true"
-              "client_encryption_options.keystore: $keypath/.keystore"
-              "client_encryption_options.keystore_password: cassandra"
-              "client_encryption_options.require_client_auth: true"
-              "client_encryption_options.truststore: $keypath/.truststore"
-              "client_encryption_options.truststore_password: cassandra"
-              "concurrent_reads: 2"
-              "concurrent_writes: 2"
-              "write_request_timeout_in_ms: 5000"
-              "read_request_timeout_in_ms: 5000"
-          )
-
-          if [[ $VERSION == 3.*.* ]]; then
-              conf+=(
-                "rpc_server_type: sync"
-                "rpc_min_threads: 2"
-                "rpc_max_threads: 2"
-                "enable_user_defined_functions: true"
-                "enable_materialized_views: true"
-              )
-          elif [[ $VERSION == 4.0.* ]]; then
-              conf+=(
-                "enable_user_defined_functions: true"
-                "enable_materialized_views: true"
-              )
-          else
-              conf+=(
-                "user_defined_functions_enabled: true"
-                "materialized_views_enabled: true"
-              )
-          fi
 
-          ccm remove test || true
-
-          ccm create test -v $VERSION -n 3 -d --vnodes --jvm_arg="-Xmx256m -XX:NewSize=100m"
-          ccm updateconf "${conf[@]}"
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+          cache: 'pip'
+          cache-dependency-path: Makefile
 
-          export JVM_EXTRA_OPTS=" -Dcassandra.test.fail_writes_ks=test -Dcassandra.custom_query_handler_class=org.apache.cassandra.cql3.CustomPayloadMirroringQueryHandler"
+      - name: Set up cache for SDKMAN
+        uses: actions/cache@v3
+        with:
+          path: ~/.sdkman
+          key: ${{ runner.os }}-sdkman
 
-          ccm start --wait-for-binary-proto --verbose
-          ccm status
-          ccm node1 nodetool status
+      - name: Set up cache for CCM
+        uses: actions/cache@v4
+        with:
+          path: ~/.ccm/repository
+          key: ${{ runner.os }}-ccm-${{ matrix.cassandra_version }}
 
-          args="-gocql.timeout=60s -runssl -proto=${{ matrix.proto_version }} -rf=3 -clusterSize=3 -autowait=2000ms -compressor=${{ matrix.compressor }} -gocql.cversion=$VERSION -cluster=$(ccm liveset) ./..."
+      - name: Start cassandra nodes
+        env:
+          CASSANDRA_VERSION: ${{ matrix.cassandra_version }}
+        run: |
+          make cassandra-start
+          sleep 30s
 
-          echo "args=$args" >> $GITHUB_ENV
-          echo "JVM_EXTRA_OPTS=$JVM_EXTRA_OPTS" >> $GITHUB_ENV
       - name: Integration tests
+        env:
+          CASSANDRA_VERSION: ${{ matrix.cassandra_version }}
+          TEST_CQL_PROTOCOL: ${{ matrix.proto_version }}
+          TEST_COMPRESSOR: ${{ matrix.compressor }}
+          TEST_INTEGRATION_TAGS: ${{ matrix.tags }}
         run: |
-          source ~/venv/bin/activate
-          export JVM_EXTRA_OPTS="${{env.JVM_EXTRA_OPTS}}"
-          go test -v -tags "${{ matrix.tags }} gocql_debug" -timeout=5m -race ${{ env.args }}
+          make test-integration
+
       - name: 'Save ccm logs'
         if: 'failure()'
         uses: actions/upload-artifact@v4
         with:
           name: ccm-cluster-cassandra-${{ matrix.cassandra_version }}-go-${{ matrix.go }}-tag-${{ matrix.tags }}-proto-version-${{ matrix.proto_version }}-compressor-${{ matrix.compressor }}
-          path: /home/runner/.ccm/test
+          path: /home/runner/.ccm/gocql_integration_test
           retention-days: 5
   integration-auth-cassandra:
     timeout-minutes: 15
@@ -144,69 +112,37 @@ jobs:
       - uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
-      - name: Setup environment
-        uses: ./.github/actions/setup-environment
-      - name: Start cassandra nodes
-        run: |
-          source ~/venv/bin/activate
-          VERSION=${{ matrix.cassandra_version }}
-          keypath="$(pwd)/testdata/pki"
-          conf=(
-              "client_encryption_options.enabled: true"
-              "client_encryption_options.keystore: $keypath/.keystore"
-              "client_encryption_options.keystore_password: cassandra"
-              "client_encryption_options.require_client_auth: true"
-              "client_encryption_options.truststore: $keypath/.truststore"
-              "client_encryption_options.truststore_password: cassandra"
-              "concurrent_reads: 2"
-              "concurrent_writes: 2"
-              "write_request_timeout_in_ms: 5000"
-              "read_request_timeout_in_ms: 5000"
-              "authenticator: PasswordAuthenticator"
-              "authorizer: CassandraAuthorizer"
-              "enable_user_defined_functions: true"
-          )
-
-          if [[ $VERSION == 3.*.* ]]; then
-              conf+=(
-                "rpc_server_type: sync"
-                "rpc_min_threads: 2"
-                "rpc_max_threads: 2"
-                "enable_user_defined_functions: true"
-                "enable_materialized_views: true"
-              )
-          elif [[ $VERSION == 4.0.* ]]; then
-              conf+=(
-                "enable_user_defined_functions: true"
-                "enable_materialized_views: true"
-              )
-          else
-              conf+=(
-                "user_defined_functions_enabled: true"
-                "materialized_views_enabled: true"
-              )
-          fi
-
-          ccm remove test || true
-
-          ccm create test -v $VERSION -n 1 -d --vnodes --jvm_arg="-Xmx256m -XX:NewSize=100m"
-          ccm updateconf "${conf[@]}"
-
-          rm -rf $HOME/.ccm/test/node1/data/system_auth
 
-          export JVM_EXTRA_OPTS=" -Dcassandra.test.fail_writes_ks=test -Dcassandra.custom_query_handler_class=org.apache.cassandra.cql3.CustomPayloadMirroringQueryHandler"
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+          cache: 'pip'
+          cache-dependency-path: Makefile
 
-          ccm start --wait-for-binary-proto --verbose
-          ccm status
-          ccm node1 nodetool status
+      - name: Set up cache for SDKMAN
+        uses: actions/cache@v3
+        with:
+          path: ~/.sdkman
+          key: ${{ runner.os }}-sdkman
 
-          args="-gocql.timeout=60s -runssl -proto=${{ matrix.proto_version }} -rf=3 -clusterSize=1 -autowait=2000ms -compressor=${{ matrix.compressor }} -gocql.cversion=$VERSION -cluster=$(ccm liveset) ./..."
+      - name: Set up cache for CCM
+        uses: actions/cache@v4
+        with:
+          path: ~/.ccm/repository
+          key: ${{ runner.os }}-ccm-${{ matrix.cassandra_version }}
 
-          echo "args=$args" >> $GITHUB_ENV
-          echo "JVM_EXTRA_OPTS=$JVM_EXTRA_OPTS" >> $GITHUB_ENV
+      - name: Start cassandra nodes
+        env:
+          CASSANDRA_VERSION: ${{ matrix.cassandra_version }}
+        run: |
+          make cassandra-start
           sleep 30s
+
       - name: Integration tests
+        env:
+          CASSANDRA_VERSION: ${{ matrix.cassandra_version }}
+          TEST_CQL_PROTOCOL: ${{ matrix.proto_version }}
+          TEST_COMPRESSOR: ${{ matrix.compressor }}
+          TEST_INTEGRATION_TAGS: ${{ matrix.tags }}
         run: |
-          source ~/venv/bin/activate
-          export JVM_EXTRA_OPTS="${{env.JVM_EXTRA_OPTS}}"
-          go test -v -run=TestAuthentication -tags "${{ matrix.tags }} gocql_debug" -timeout=15s -runauth ${{ env.args }}
+          make test-integration-auth

.golangci.yml

@@ -0,0 +1,34 @@
+version: "2"
+
+issues:
+  max-same-issues: 50
+
+formatters:
+  enable:
+    - goimports
+
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/gocql/gocql
+        - github.com/apache/cassandra-gocql-driver
+        - github.com/apache/cassandra-gocql-driver/v2
+    golines:
+      max-len: 120
+
+linters:
+  default: none
+  enable:
+    - nolintlint
+    - govet
+  settings:
+    govet:
+      enable-all: true
+      disable:
+        - shadow
+        - fieldalignment
+
+    nolintlint:
+      allow-no-explanation: [ golines ]
+      require-explanation: true
+      require-specific: true