Global TTL of 0 or lower should never expire

Signed-off-by: Zeynel Koca <[email protected]>

Author: ZeynelKoca

state/aws/dynamodb/dynamodb.go

@@ -423,13 +423,21 @@ func (d *StateStore) parseTTL(req *state.SetRequest) (*int64, error) {
 			if err != nil {
 				return nil, err
 			}
+			// Values <= 0 mean no TTL (never expires)
+			if parsedVal <= 0 {
+				return nil, nil
+			}
 			// DynamoDB expects an epoch timestamp in seconds.
 			expirationTime := time.Now().Unix() + parsedVal
 
 			return &expirationTime, nil
 		}
 		// apply global TTL if no explicit TTL in request metadata
 		if d.ttlInSeconds != nil {
+			// Values <= 0 mean no TTL (never expires)
+			if *d.ttlInSeconds <= 0 {
+				return nil, nil
+			}
 			expirationTime := time.Now().Unix() + int64(*d.ttlInSeconds)
 			return &expirationTime, nil
 		}

state/aws/dynamodb/dynamodb_test.go

@@ -1287,7 +1287,7 @@ func TestParseTTLWithDefault(t *testing.T) {
 		assert.Nil(t, ttl) // Should return nil when TTL not enabled
 	})
 
-	t.Run("Explicit TTL with value -1", func(t *testing.T) {
+	t.Run("Explicit TTL with value -1 means no expiration", func(t *testing.T) {
 		defaultTTL := 600
 		s := StateStore{
 			ttlAttributeName: "expiresAt",
@@ -1303,11 +1303,8 @@ func TestParseTTLWithDefault(t *testing.T) {
 
 		ttl, err := s.parseTTL(req)
 		require.NoError(t, err)
-		require.NotNil(t, ttl)
-		
-		// -1 should result in immediate expiration (now + -1)
-		expectedTime := time.Now().Unix() - 1
-		assert.InDelta(t, expectedTime, *ttl, 2)
+		// -1 means never expire
+		assert.Nil(t, ttl)
 	})
 
 	t.Run("Default TTL with large value", func(t *testing.T) {
@@ -1350,7 +1347,7 @@ func TestParseTTLWithDefault(t *testing.T) {
 		assert.Contains(t, err.Error(), "invalid syntax")
 	})
 
-	t.Run("Explicit TTL overrides default in request with empty metadata", func(t *testing.T) {
+	t.Run("Explicit TTL with value 0 means no expiration", func(t *testing.T) {
 		defaultTTL := 1200
 		s := StateStore{
 			ttlAttributeName: "expiresAt",
@@ -1366,10 +1363,43 @@ func TestParseTTLWithDefault(t *testing.T) {
 
 		ttl, err := s.parseTTL(req)
 		require.NoError(t, err)
-		require.NotNil(t, ttl)
-		
-		// Should use explicit value 0, not default
-		expectedTime := time.Now().Unix()
-		assert.InDelta(t, expectedTime, *ttl, 2)
+		// 0 means never expire, overriding default
+		assert.Nil(t, ttl)
+	})
+
+	t.Run("Default TTL with value 0 means no expiration", func(t *testing.T) {
+		defaultTTL := 0
+		s := StateStore{
+			ttlAttributeName: "expiresAt",
+			ttlInSeconds:     &defaultTTL,
+		}
+
+		req := &state.SetRequest{
+			Key:      "test-key",
+			Metadata: map[string]string{},
+		}
+
+		ttl, err := s.parseTTL(req)
+		require.NoError(t, err)
+		// Default of 0 means never expire
+		assert.Nil(t, ttl)
+	})
+
+	t.Run("Default TTL with negative value means no expiration", func(t *testing.T) {
+		defaultTTL := -1
+		s := StateStore{
+			ttlAttributeName: "expiresAt",
+			ttlInSeconds:     &defaultTTL,
+		}
+
+		req := &state.SetRequest{
+			Key:      "test-key",
+			Metadata: map[string]string{},
+		}
+
+		ttl, err := s.parseTTL(req)
+		require.NoError(t, err)
+		// Default of -1 means never expire
+		assert.Nil(t, ttl)
 	})
 }