Should fix dynamodb

Signed-off-by: ItalyPaleAle <[email protected]>
dapr · Aug 2, 2023 · fa715be · fa715be
1 parent 577fd09
commit fa715be
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/.github/infrastructure/terraform/conformance/state/aws/dynamodb/dynamodb.tf b/.github/infrastructure/terraform/conformance/state/aws/dynamodb/dynamodb.tf
@@ -34,6 +34,10 @@ resource "aws_dynamodb_table" "conformance_test_basic_table" {
   billing_mode   = "PROVISIONED"
   read_capacity  = "10"
   write_capacity = "10"
+  ttl {
+    attribute_name = "expiresAt"
+    enabled        = true
+  }
   attribute {
     name = "key"
     type = "S"

diff --git a/state/aws/dynamodb/dynamodb.go b/state/aws/dynamodb/dynamodb.go
@@ -92,6 +92,14 @@ func (d *StateStore) Init(_ context.Context, metadata state.Metadata) error {
 
 // Features returns the features available in this state store.
 func (d *StateStore) Features() []state.Feature {
+	// TTLs are enabled only if ttlAttributeName is set
+	if d.ttlAttributeName == "" {
+		return []state.Feature{
+			state.FeatureETag,
+			state.FeatureTransactional,
+		}
+	}
+
 	return []state.Feature{
 		state.FeatureETag,
 		state.FeatureTransactional,

diff --git a/tests/config/state/aws/dynamodb/terraform/statestore.yml b/tests/config/state/aws/dynamodb/terraform/statestore.yml
@@ -13,4 +13,6 @@ spec:
     - name: region
       value: "us-east-1"
     - name: table
-      value: ${{STATE_AWS_DYNAMODB_TABLE_1}}
+      value: ${{STATE_AWS_DYNAMODB_TABLE_1}}
+    - name: ttlAttributeName
+      value: "expiresAt"
diff --git a/tests/config/state/tests.yml b/tests/config/state/tests.yml
@@ -75,7 +75,8 @@ components:
   - component: in-memory
     operations: [ "transaction", "etag",  "first-write", "ttl" ]
   - component: aws.dynamodb.docker
-    operations: [ "transaction", "etag", "first-write", "ttl" ]
+    # In the Docker variant, we do not set ttlAttributeName in the metadata, so TTLs are not enabled
+    operations: [ "transaction", "etag", "first-write" ]
   - component: aws.dynamodb.terraform
     operations: [ "transaction", "etag", "first-write", "ttl" ]
   - component: etcd.v1