Merge branch 'main' into 3318-RavenDB-state-store-new

Author: dapr-bot

common/proto/state/sqlserver/test.pb.go

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option go_package = "github.com/dapr/components-contrib/common/proto/state/sqlserver";
+
+import "google/protobuf/timestamp.proto";
+
+message TestEvent {
+  int32 eventId = 1;
+  google.protobuf.Timestamp timestamp = 2;
+}

common/proto/state/sqlserver/test.proto

@@ -16,6 +16,7 @@ package sqlserver
 import (
 	"context"
 	"database/sql"
+	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
@@ -287,8 +288,15 @@ func (s *SQLServer) Get(ctx context.Context, req *state.GetRequest) (*state.GetR
 		}
 	}
 
+	bytes, err := base64.StdEncoding.DecodeString(data)
+	if err != nil {
+		s.logger.
+			WithFields(map[string]any{"error": err}).
+			Debug("error decoding base64 data. Fallback to []byte")
+		bytes = []byte(data)
+	}
 	return &state.GetResponse{
-		Data:     []byte(data),
+		Data:     bytes,
 		ETag:     ptr.Of(etag),
 		Metadata: metadata,
 	}, nil
@@ -305,16 +313,23 @@ type dbExecutor interface {
 }
 
 func (s *SQLServer) executeSet(ctx context.Context, db dbExecutor, req *state.SetRequest) error {
-	var err error
-	var bytes []byte
-	bytes, err = utils.Marshal(req.Value, json.Marshal)
-	if err != nil {
-		return err
+	var reqValue string
+
+	bytes, ok := req.Value.([]byte)
+	if !ok {
+		bt, err := json.Marshal(req.Value)
+		if err != nil {
+			return err
+		}
+		reqValue = string(bt)
+	} else {
+		reqValue = base64.StdEncoding.EncodeToString(bytes)
 	}
+
 	etag := sql.Named(rowVersionColumnName, nil)
 	if req.HasETag() {
 		var b []byte
-		b, err = hex.DecodeString(*req.ETag)
+		b, err := hex.DecodeString(*req.ETag)
 		if err != nil {
 			return state.NewETagError(state.ETagInvalid, err)
 		}
@@ -327,13 +342,14 @@ func (s *SQLServer) executeSet(ctx context.Context, db dbExecutor, req *state.Se
 	}
 
 	var res sql.Result
+	var err error
 	if req.Options.Concurrency == state.FirstWrite {
 		res, err = db.ExecContext(ctx, s.upsertCommand, sql.Named(keyColumnName, req.Key),
-			sql.Named("Data", string(bytes)), etag,
+			sql.Named("Data", reqValue), etag,
 			sql.Named("FirstWrite", 1), sql.Named("TTL", ttl))
 	} else {
 		res, err = db.ExecContext(ctx, s.upsertCommand, sql.Named(keyColumnName, req.Key),
-			sql.Named("Data", string(bytes)), etag,
+			sql.Named("Data", reqValue), etag,
 			sql.Named("FirstWrite", 0), sql.Named("TTL", ttl))
 	}
 

state/sqlserver/sqlserver.go

@@ -30,10 +30,12 @@ import (
 	"testing"
 	"time"
 
-	uuid "github.com/google/uuid"
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/proto"
 
+	"github.com/dapr/components-contrib/common/proto/state/sqlserver"
 	"github.com/dapr/components-contrib/metadata"
 	"github.com/dapr/components-contrib/state"
 	"github.com/dapr/kit/logger"
@@ -42,7 +44,7 @@ import (
 const (
 	// connectionStringEnvKey defines the key containing the integration test connection string
 	// To use docker, server=localhost;user id=sa;password=Pass@Word1;port=1433;
-	// To use Azure SQL, server=<your-db-server-name>.database.windows.net;user id=<your-db-user>;port=1433;password=<your-password>;database=dapr_test;.
+	// To use Azure SQL, server=<your-db-server-name>.database.windows.net;User id=<your-db-user>;port=1433;password=<your-password>;database=dapr_test;.
 	connectionStringEnvKey = "DAPR_TEST_SQL_CONNSTRING"
 	usersTableName         = "Users"
 	beverageTea            = "tea"
@@ -77,6 +79,7 @@ func TestIntegrationCases(t *testing.T) {
 	t.Run("Multi operations", testMultiOperations)
 	t.Run("Insert and Update Set Record Dates", testInsertAndUpdateSetRecordDates)
 	t.Run("Multiple initializations", testMultipleInitializations)
+	t.Run("Should preserve byte data when not base64 encoded", testNonBase64ByteData)
 
 	// Run concurrent set tests 10 times
 	const executions = 10
@@ -112,6 +115,9 @@ func createMetadata(schema string, kt KeyType, indexedProperties string) state.M
 
 // Ensure the database is running
 // For docker, use: docker run --name sqlserver -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=Pass@Word1" -p 1433:1433 -d mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04.
+// For azure-sql-edge use:
+// docker volume create sqlvolume
+// docker run --name sqlserver -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=Pass@Word1" -e "MSSQL_PID=Developer" -e "MSSQL_AGENT_ENABLED=TRUE" -e "MSSQL_COLLATION=SQL_Latin1_General_CP1_CI_AS" -e "MSSQL_LCID=1033" -p 1433:1433 -v sqlvolume:/var/opt/mssql -d mcr.microsoft.com/azure-sql-edge:latest
 func getTestStore(t *testing.T, indexedProperties string) *SQLServer {
 	return getTestStoreWithKeyType(t, StringKeyType, indexedProperties)
 }
@@ -597,3 +603,23 @@ func testMultipleInitializations(t *testing.T) {
 		})
 	}
 }
+
+func testNonBase64ByteData(t *testing.T) {
+	t.Run("Set And Get", func(t *testing.T) {
+		store := getTestStore(t, "")
+		request := &sqlserver.TestEvent{
+			EventId: -1,
+		}
+		requestBytes, err := proto.Marshal(request)
+		require.NoError(t, err)
+		require.NoError(t, store.Set(t.Context(), &state.SetRequest{Key: "1", Value: requestBytes}))
+		resp, err := store.Get(t.Context(), &state.GetRequest{Key: "1"})
+		require.NoError(t, err)
+
+		response := &sqlserver.TestEvent{}
+		err = proto.Unmarshal(resp.Data, response)
+		require.NoError(t, err)
+
+		assert.EqualValues(t, request.GetEventId(), response.GetEventId())
+	})
+}