Merge branch 'master' into master

Author: artursouza

state/memcached/memcached.go

@@ -18,6 +18,7 @@ const (
 	hosts              = "hosts"
 	maxIdleConnections = "maxIdleConnections"
 	timeout            = "timeout"
+	ttlInSeconds       = "ttlInSeconds"
 	// These defaults are already provided by gomemcache
 	defaultMaxIdleConnections = 2
 	defaultTimeout            = 1000 * time.Millisecond
@@ -102,10 +103,33 @@ func getMemcachedMetadata(metadata state.Metadata) (*memcachedMetadata, error) {
 	return &meta, nil
 }
 
+func (m *Memcached) parseTTL(req *state.SetRequest) (*int32, error) {
+	if val, ok := req.Metadata[ttlInSeconds]; ok && val != "" {
+		parsedVal, err := strconv.ParseInt(val, 10, 0)
+		if err != nil {
+			return nil, err
+		}
+		parsedInt := int32(parsedVal)
+
+		return &parsedInt, nil
+	}
+
+	return nil, nil
+}
+
 func (m *Memcached) setValue(req *state.SetRequest) error {
 	var bt []byte
+	ttl, err := m.parseTTL(req)
+	if err != nil {
+		return fmt.Errorf("failed to parse ttl %s: %s", req.Key, err)
+	}
+
 	bt, _ = utils.Marshal(req.Value, m.json.Marshal)
-	err := m.client.Set(&memcache.Item{Key: req.Key, Value: bt})
+	if ttl != nil {
+		err = m.client.Set(&memcache.Item{Key: req.Key, Value: bt, Expiration: *ttl})
+	} else {
+		err = m.client.Set(&memcache.Item{Key: req.Key, Value: bt})
+	}
 	if err != nil {
 		return fmt.Errorf("failed to set key %s: %s", req.Key, err)
 	}

state/memcached/memcached_test.go

@@ -1,11 +1,13 @@
 package memcached
 
 import (
+	"strconv"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/dapr/components-contrib/state"
+	"github.com/dapr/kit/logger"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -65,3 +67,52 @@ func TestMemcachedMetadata(t *testing.T) {
 		assert.Equal(t, 5000*time.Millisecond, metadata.timeout)
 	})
 }
+
+func TestParseTTL(t *testing.T) {
+	store := NewMemCacheStateStore(logger.NewLogger("test"))
+	t.Run("TTL Not an integer", func(t *testing.T) {
+		ttlInSeconds := "not an integer"
+		ttl, err := store.parseTTL(&state.SetRequest{
+			Metadata: map[string]string{
+				"ttlInSeconds": ttlInSeconds,
+			},
+		})
+
+		assert.NotNil(t, err, "tll is not an integer")
+		assert.Nil(t, ttl)
+	})
+	t.Run("TTL specified with wrong key", func(t *testing.T) {
+		ttlInSeconds := 12345
+		ttl, err := store.parseTTL(&state.SetRequest{
+			Metadata: map[string]string{
+				"expirationTime": strconv.Itoa(ttlInSeconds),
+			},
+		})
+
+		assert.NoError(t, err)
+		assert.Nil(t, ttl)
+	})
+	t.Run("TTL is a number", func(t *testing.T) {
+		ttlInSeconds := 12345
+		ttl, err := store.parseTTL(&state.SetRequest{
+			Metadata: map[string]string{
+				"ttlInSeconds": strconv.Itoa(ttlInSeconds),
+			},
+		})
+
+		assert.NoError(t, err)
+		assert.Equal(t, int(*ttl), ttlInSeconds)
+	})
+
+	t.Run("TTL never expires", func(t *testing.T) {
+		ttlInSeconds := 0
+		ttl, err := store.parseTTL(&state.SetRequest{
+			Metadata: map[string]string{
+				"ttlInSeconds": strconv.Itoa(ttlInSeconds),
+			},
+		})
+
+		assert.NoError(t, err)
+		assert.Equal(t, int(*ttl), ttlInSeconds)
+	})
+}