Workflow and test minor changes

Signed-off-by: Alok Kumar Singh <[email protected]>
jaegertracing · Nov 29, 2024 · ddf4fc0 · ddf4fc0
1 parent 35c26b5
commit ddf4fc0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/ci-e2e-cassandra.yml b/.github/workflows/ci-e2e-cassandra.yml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         jaeger-version: [v1, v2]
-        skip-apply-schema: [true, false]
+        create-schema: [manual, auto]
         version:
         - distribution: cassandra
           major: 4.x
@@ -34,7 +34,7 @@ jobs:
         # Exclude v1 as create schema on fly is available for v2 only
         - jaeger-version: v1
           skip-apply-schema: true
-    name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.jaeger-version }} ${{ matrix.skip-apply-schema == true && 'auto' || 'manual' }}
+    name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.jaeger-version }} ${{ matrix.create-schema }} 
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
@@ -51,7 +51,8 @@ jobs:
       id: test-execution
       run: bash scripts/cassandra-integration-test.sh ${{ matrix.version.major }} ${{ matrix.version.schema }} ${{ matrix.jaeger-version }}
       env:
-        CASSANDRA_CREATE_SCHEMA: ${{ matrix.skip-apply-schema }}
+        CASSANDRA_CREATE_SCHEMA: ${{ matrix.create-schema == 'auto' && true || false }}
+        SKIP_APPLY_SCHEMA: ${{ matrix.create-schema == 'auto' && true || false }}
 
     - name: Upload coverage to codecov
       uses: ./.github/actions/upload-codecov

diff --git a/pkg/cassandra/config/config_test.go b/pkg/cassandra/config/config_test.go
@@ -112,4 +112,9 @@ func TestConfigSchemaValidation(t *testing.T) {
 	cfg.Schema.CompactionWindow = time.Minute - 1
 	err = cfg.Validate()
 	require.Error(t, err)
+
+	cfg.Schema.CompactionWindow = time.Minute
+	cfg.Schema.DependenciesTTL = time.Second - 1
+	err = cfg.Validate()
+	require.Error(t, err)
 }
diff --git a/pkg/cassandra/config/schema.go b/pkg/cassandra/config/schema.go
@@ -95,7 +95,7 @@ func (*schemaCreator) getQueriesFromBytes(queryFile []byte) ([]string, error) {
 	}
 
 	if len(queryString) > 0 {
-		return nil, errors.New(`invalid template`)
+		return nil, errors.New(`query exists in template without ";"`)
 	}
 
 	return queries, nil