feat(testutils/db): make alternator setup more interesting

Author: Michal-Leszczynski

pkg/service/backup/service_backup_integration_test.go

@@ -2264,8 +2264,8 @@ func TestBackupAlternatorIntegration(t *testing.T) {
 
 	accessKeyID, secretAccessKey := GetAlternatorCreds(t, clusterSession, "")
 	client := CreateAlternatorClient(t, h.Client, ManagedClusterHost(), accessKeyID, secretAccessKey)
-	CreateAlternatorTable(t, client, testTable)
-	FillAlternatorTable(t, client, testTable, rowCnt)
+	CreateAlternatorTable(t, client, 0, testTable)
+	InsertAlternatorTableData(t, client, rowCnt, testTable)
 
 	Print("When: validate data insertion")
 	selectStmt := fmt.Sprintf("SELECT COUNT(*) FROM %q.%q", testKeyspace, testTable)
@@ -2714,13 +2714,16 @@ func TestTGetDescribeSchemaIntegration(t *testing.T) {
 
 	// Second backup with table created with Alternator
 	const (
-		tabAlt    = "tab_alt"
-		tabAltLSI = tabAlt + "_LSI"
-		tabAltGSI = tabAlt + "_GSI"
-		tabAltTag = tabAlt + "_tag"
-		tabAltTTL = tabAlt + "_TTL"
+		tabAlt        = "tab_alt_" + AlternatorProblematicTableChars
+		tabAltLSI     = AlternatorLSIPrefix + "0"
+		tabAltGSI     = "gsi_alt" + AlternatorProblematicTableChars
+		tabAltTag     = "tab_alt_tag"
+		tabAltTTLAttr = "tab_alt_ttl_attr"
 	)
-	CreateInterestingAlternatorSchema(t, client, "tab_alt")
+	CreateAlternatorTable(t, client, 1, tabAlt)
+	CreateAlternatorGSI(t, client, tabAlt, tabAltGSI)
+	TagAlternatorTable(t, client, tabAlt, tabAltTag)
+	UpdateAlternatorTableTTL(t, client, tabAlt, tabAltTTLAttr, true)
 	cqlSchema2, err := query.DescribeSchemaWithInternals(clusterSession)
 	tag2 := makeBackup()
 
@@ -2838,8 +2841,8 @@ func TestTGetDescribeSchemaIntegration(t *testing.T) {
 			if *altTab.Tags[0].Key != tabAltTag {
 				t.Fatalf("Expected alternator tag: %s, got: %s", tabAltTag, *altTab.Tags[0].Key)
 			}
-			if *altTab.TTL.AttributeName != tabAltTTL {
-				t.Fatalf("Expected alternator TTL: %s, got: %s", tabAltTTL, *altTab.TTL.AttributeName)
+			if *altTab.TTL.AttributeName != tabAltTTLAttr {
+				t.Fatalf("Expected alternator TTL: %s, got: %s", tabAltTTLAttr, *altTab.TTL.AttributeName)
 			}
 		})
 	}

pkg/service/repair/service_repair_integration_test.go

@@ -1891,8 +1891,8 @@ func TestServiceRepairIntegration(t *testing.T) {
 		Print("When: create alternator table with 1 row")
 		accessKeyID, secretAccessKey := GetAlternatorCreds(t, clusterSession, "")
 		client := CreateAlternatorClient(t, h.Client, ManagedClusterHost(), accessKeyID, secretAccessKey)
-		CreateAlternatorTable(t, client, testTable)
-		FillAlternatorTable(t, client, testTable, 100)
+		CreateAlternatorTable(t, client, 0, testTable)
+		InsertAlternatorTableData(t, client, 100, testTable)
 		defer dropKeyspace(t, clusterSession, testKeyspace)
 
 		h := newRepairTestHelper(t, session, defaultConfig())

pkg/service/restore/restore_integration_test.go

@@ -6,6 +6,7 @@
 package restore_test
 
 import (
+	"cmp"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -21,6 +22,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb"
+	"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
 	"github.com/pkg/errors"
 	"github.com/scylladb/gocqlx/v2/qb"
 	"github.com/scylladb/scylla-manager/backupspec"
@@ -136,8 +138,19 @@ func TestRestoreSchemaRoundtripIntegration(t *testing.T) {
 	ExecStmt(t, h.srcCluster.rootSession, fmt.Sprintf(tabStmt, cqlKs, cqlTab, tabOpt))
 
 	Print("Prepare alternator schema")
-	altTab := "roundtrip_Tab_le-With1.da_sh2-aNd.d33ot.-"
-	CreateInterestingAlternatorSchema(t, h.srcCluster.altClient, altTab)
+	altTab1 := "roundtrip_1_" + AlternatorProblematicTableChars
+	altTab2 := "roundtrip_2_" + AlternatorProblematicTableChars
+	altGSI1 := "gsi_1_" + AlternatorProblematicTableChars
+	altGSI2 := "gsi_2_" + AlternatorProblematicTableChars
+	altTag := "tag"
+	altTTLAttr := "ttl_attr"
+	CreateAlternatorTable(t, h.srcCluster.altClient, 2, altTab1, altTab2)
+	CreateAlternatorGSI(t, h.srcCluster.altClient, altTab1, altGSI1, altGSI2)
+	CreateAlternatorGSI(t, h.srcCluster.altClient, altTab2, altGSI1, altGSI2)
+	TagAlternatorTable(t, h.srcCluster.altClient, altTab1, altTag)
+	TagAlternatorTable(t, h.srcCluster.altClient, altTab2, altTag)
+	UpdateAlternatorTableTTL(t, h.srcCluster.altClient, altTab1, altTTLAttr, true)
+	UpdateAlternatorTableTTL(t, h.srcCluster.altClient, altTab2, altTTLAttr, true)
 
 	Print("Save src CQL schema")
 	srcCQLSchema, err := query.DescribeSchemaWithInternals(h.srcCluster.rootSession)
@@ -160,7 +173,11 @@ func TestRestoreSchemaRoundtripIntegration(t *testing.T) {
 	ExecStmt(t, h.srcCluster.rootSession, "DROP KEYSPACE "+cqlKs)
 
 	Print("Drop backed-up src cluster alternator schema")
-	_, err = h.srcCluster.altClient.DeleteTable(context.Background(), &dynamodb.DeleteTableInput{TableName: aws.String(altTab)})
+	_, err = h.srcCluster.altClient.DeleteTable(context.Background(), &dynamodb.DeleteTableInput{TableName: aws.String(altTab1)})
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = h.srcCluster.altClient.DeleteTable(context.Background(), &dynamodb.DeleteTableInput{TableName: aws.String(altTab2)})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -215,7 +232,7 @@ func TestRestoreSchemaRoundtripIntegration(t *testing.T) {
 			continue
 		}
 		// Don't validate alternator schema CQL statements
-		if row.Keyspace == fmt.Sprintf("%q", "alternator_"+altTab) {
+		if strings.HasPrefix(row.Keyspace, "\"alternator_") {
 			continue
 		}
 		m1[row] = struct{}{}
@@ -230,12 +247,12 @@ func TestRestoreSchemaRoundtripIntegration(t *testing.T) {
 		t.Fatalf("Src CQL schema: %v, is missing created objects: %v", m1, objWithOpt)
 	}
 	for _, row := range dstCQLSchemaSrcBackup {
-		if row.Keyspace != "" && row.Keyspace != fmt.Sprintf("%q", "alternator_"+altTab) {
+		if row.Keyspace != "" && !strings.HasPrefix(row.Keyspace, "\"alternator_") {
 			m2[row] = struct{}{}
 		}
 	}
 	for _, row := range srcCQLSchemaDstBackup {
-		if row.Keyspace != "" && row.Keyspace != fmt.Sprintf("%q", "alternator_"+altTab) {
+		if row.Keyspace != "" && !strings.HasPrefix(row.Keyspace, "\"alternator_") {
 			m3[row] = struct{}{}
 		}
 	}
@@ -249,6 +266,10 @@ func TestRestoreSchemaRoundtripIntegration(t *testing.T) {
 
 	Print("Validate alternator schema")
 	sanitizeAltSchema := func(schema backupspec.AlternatorSchema) {
+		// Sort so that we can compare raw json encoding later
+		slices.SortFunc(schema.Tables, func(a, b backupspec.AlternatorTableSchema) int {
+			return cmp.Compare(*a.Describe.TableName, *b.Describe.TableName)
+		})
 		for i := range schema.Tables {
 			// Set TTL to nil as we don't restore it
 			schema.Tables[i].TTL = nil
@@ -259,6 +280,12 @@ func TestRestoreSchemaRoundtripIntegration(t *testing.T) {
 			schema.Tables[i].Describe.ProvisionedThroughput.LastIncreaseDateTime = nil
 			// Set table ID to ni as it is expected to differ
 			schema.Tables[i].Describe.TableId = nil
+			slices.SortFunc(schema.Tables[i].Describe.GlobalSecondaryIndexes, func(a, b types.GlobalSecondaryIndexDescription) int {
+				return cmp.Compare(*a.IndexName, *b.IndexName)
+			})
+			slices.SortFunc(schema.Tables[i].Describe.LocalSecondaryIndexes, func(a, b types.LocalSecondaryIndexDescription) int {
+				return cmp.Compare(*a.IndexName, *b.IndexName)
+			})
 		}
 	}
 	sanitizeAltSchema(srcAltSchema)