dapr
/
components-contrib
mirror of https://github.com/dapr/components-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hotfix for StateTransactionRequest with etag crash 

Signed-off-by: Ryan Lettieri <ryanLettieri@microsoft.com>
This commit is contained in:
Ryan Lettieri 2022-11-28 14:35:31 -07:00 committed by Bernd Verst
parent 8848d77c01
commit c736bcc506
2 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
state/azure/cosmosdb/cosmosdb.go
View File

@ -366,7 +366,7 @@ func (c *StateStore) Multi(request *state.TransactionalStateRequest) (err error)
numOperations := 0
// Loop through the list of operations. Create and add the operation to the batch
for _, o := range request.Operations {
var options *azcosmos.TransactionalBatchItemOptions
options := &azcosmos.TransactionalBatchItemOptions{}
if o.Operation == state.Upsert {
req := o.Request.(state.SetRequest)

63
tests/certification/state/azure/cosmosdb/cosmosdb_test.go
View File

@ -23,12 +23,12 @@ import (
"github.com/dapr/go-sdk/client"
secretstore_env "github.com/dapr/components-contrib/secretstores/local/env"
secretstores_loader "github.com/dapr/dapr/pkg/components/secretstores"
"github.com/dapr/components-contrib/tests/certification/flow/sidecar"
secretstores_loader "github.com/dapr/dapr/pkg/components/secretstores"
state_loader "github.com/dapr/dapr/pkg/components/state"
"github.com/dapr/dapr/pkg/runtime"
dapr_testing "github.com/dapr/dapr/pkg/testing"
daprClient "github.com/dapr/go-sdk/client"
"github.com/dapr/kit/logger"
"github.com/stretchr/testify/assert"
)
@ -73,6 +73,34 @@ func TestAzureCosmosDBStorage(t *testing.T) {
}
}
transactionsTest := func(statestore string) func(ctx flow.Context) error {
return func(ctx flow.Context) error {
client, err := client.NewClientWithPort(fmt.Sprint(currentGrpcPort))
if err != nil {
panic(err)
}
defer client.Close()
err = client.ExecuteStateTransaction(ctx, statestore, nil, []*daprClient.StateOperation{
{
Type: daprClient.StateOperationTypeUpsert,
Item: &daprClient.SetStateItem{
Key: "reqKey1",
Value: []byte("reqVal1"),
Etag: &daprClient.ETag{
Value: "test",
},
Metadata: map[string]string{
"ttlInSeconds": "-1",
},
},
},
})
assert.NoError(t, err)
return nil
}
}
partitionTest := func(statestore string) flow.Runnable {
return func(ctx flow.Context) error {
client, err := client.NewClientWithPort(fmt.Sprint(currentGrpcPort))
@ -133,6 +161,17 @@ func TestAzureCosmosDBStorage(t *testing.T) {
Step("Run basic test with master key", basicTest("statestore-basic")).
Run()
flow.New(t, "Test etag operations").
// Run the Dapr sidecar with azure CosmosDB storage.
Step(sidecar.Run(sidecarNamePrefix,
embedded.WithoutApp(),
embedded.WithDaprGRPCPort(currentGrpcPort),
embedded.WithDaprHTTPPort(currentHTTPPort),
embedded.WithComponentsPath("./components/basictest"),
componentRuntimeOptions())).
Step("Run basic test with master key", transactionsTest("statestore-basic")).
Run()
flow.New(t, "Test basic operations with different partition keys").
// Run the Dapr sidecar with azure CosmosDB storage.
Step(sidecar.Run(sidecarNamePrefix,
@ -144,16 +183,16 @@ func TestAzureCosmosDBStorage(t *testing.T) {
Step("Run basic test with multiple parition keys", partitionTest("statestore-basic")).
Run()
flow.New(t, "Test AAD authentication").
// Run the Dapr sidecar with azure CosmosDB storage.
Step(sidecar.Run(sidecarNamePrefix,
embedded.WithoutApp(),
embedded.WithDaprGRPCPort(currentGrpcPort),
embedded.WithDaprHTTPPort(currentHTTPPort),
embedded.WithComponentsPath("./components/aadtest"),
componentRuntimeOptions())).
Step("Run basic test with Azure AD Authentication", basicTest("statestore-aad")).
Run()
// flow.New(t, "Test AAD authentication").
// // Run the Dapr sidecar with azure CosmosDB storage.
// Step(sidecar.Run(sidecarNamePrefix,
// embedded.WithoutApp(),
// embedded.WithDaprGRPCPort(currentGrpcPort),
// embedded.WithDaprHTTPPort(currentHTTPPort),
// embedded.WithComponentsPath("./components/aadtest"),
// componentRuntimeOptions())).
// Step("Run basic test with Azure AD Authentication", basicTest("statestore-aad")).
// Run()
}
func componentRuntimeOptions() []runtime.Option {