Added db password in cassandra-integration-test

.github/workflows/ci-cassandra.yml

@@ -34,13 +34,13 @@ jobs:
       uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
-
+        
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
       with:
         go-version: 1.22.x
-
+        
     - name: Run cassandra integration tests
       id: test-execution
       run: bash scripts/cassandra-integration-test.sh ${{ matrix.version.major }} ${{ matrix.version.schema }} ${{ matrix.jaeger-version }}

cmd/jaeger/config-cassandra.yaml

@@ -23,6 +23,9 @@ extensions:
           tags: true
           logs: true
           process_tags: true
+        username: "${CASSANDRA_MAIN_USERNAME}"
+        password: "${CASSANDRA_MAIN_PASSWORD}"
+
       cassandra_archive:
         servers: 127.0.0.1
         port: 9042
@@ -32,6 +35,9 @@ extensions:
           tags: true
           logs: true
           process_tags: true
+        username: "${CASSANDRA_ARCHIVE_USERNAME}"
+        password: "${CASSANDRA_ARCHIVE_PASSWORD}"
+
 receivers:
   otlp:
     protocols:

docker-compose/cassandra/v3/docker-compose.yaml

@@ -6,6 +6,8 @@ services:
     ports:
       - "9042:9042"
       - "9160:9160"
+    environment:
+      - DB_PASSWORD=${DB_PASSWORD}  
     networks:
       - cassandra-net
     healthcheck:

docker-compose/cassandra/v4/docker-compose.yaml

@@ -6,6 +6,8 @@ services:
     ports:
       - "9042:9042"
       - "9160:9160"
+    environment:
+      - DB_PASSWORD=${DB_PASSWORD}    
     networks:
       - cassandra-net
     healthcheck:

plugin/storage/integration/cassandra_test.go

@@ -17,6 +17,7 @@ package integration
 
 import (
 	"context"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -54,16 +55,26 @@ func (*CassandraStorageIntegration) initializeCassandraFactory(t *testing.T, fla
 	logger := zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller()))
 	f := cassandra.NewFactory()
 	v, command := config.Viperize(f.AddFlags)
+
+	// Modify to fetch password from environment variable
+	password := os.Getenv("DB_PASSWORD")
+	require.NotEmpty(t, password, "DB_PASSWORD environment variable must be set")
+
+	// Add the Cassandra password flag
+	flags = append(flags, "--cassandra.password="+password)
+
 	require.NoError(t, command.ParseFlags(flags))
 	f.InitFromViper(v, logger)
 	require.NoError(t, f.Initialize(metrics.NullFactory, logger))
 	return f
 }
 
 func (s *CassandraStorageIntegration) initializeCassandra(t *testing.T) {
+	password := os.Getenv("DB_PASSWORD")
+
 	f := s.initializeCassandraFactory(t, []string{
 		"--cassandra.basic.allowed-authenticators=",
-		"--cassandra.password=password",
+		"--cassandra.password=" + password,
 		"--cassandra.username=username",
 		"--cassandra.keyspace=jaeger_v1_dc1",
 		"--cassandra-archive.keyspace=jaeger_v1_dc1_archive",

scripts/cassandra-integration-test.sh

@@ -3,7 +3,7 @@
 set -uxf -o pipefail
 
 usage() {
-  echo $"Usage: $0 <cassandra_version> <schema_version>"
+  echo $"Usage: $0 <cassandra_version> <schema_version> <jaeger_version>"
   exit 1
 }
 
@@ -37,6 +37,8 @@ apply_schema() {
     --env CQLSH_PORT=9042
     --env "TEMPLATE=/cassandra-schema/${schema_version}.cql.tmpl"
     --env "KEYSPACE=${keyspace}"
+    --env "DB_USERNAME=testUserName"
+    --env "DB_PASSWORD=testPwd"
     --network host
   )
   docker build -t ${image} ${schema_dir}