DynamoDB: fix wrong error message when key schema invalid (#7685)

projectnessie · Nov 3, 2023 · 6d69653 · 6d69653
1 parent 4deb4ac
commit 6d69653
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...c/intTest/java/org/projectnessie/versioned/storage/dynamodb/ITDynamoDBBackendFactory.java b/...c/intTest/java/org/projectnessie/versioned/storage/dynamodb/ITDynamoDBBackendFactory.java
@@ -163,7 +163,10 @@ public void verifyKeySchema() {
         try (DynamoDBBackend backend = testFactory.createNewBackend()) {
           soft.assertThatIllegalStateException()
               .isThrownBy(backend::setupSchema)
-              .withMessageStartingWith("Invalid key schema for table: ");
+              .withMessage(
+                  "Invalid key schema for table: %s. "
+                      + "Key schema should be a hash partitioned attribute with the name '%s'.",
+                  TABLE_REFS, KEY_NAME);
         }
 
         client.deleteTable(b -> b.tableName(TABLE_REFS));
@@ -187,7 +190,10 @@ public void verifyKeySchema() {
         try (DynamoDBBackend backend = testFactory.createNewBackend()) {
           soft.assertThatIllegalStateException()
               .isThrownBy(backend::setupSchema)
-              .withMessageStartingWith("Invalid key schema for table: ");
+              .withMessage(
+                  "Invalid key schema for table: %s. "
+                      + "Key schema should be a hash partitioned attribute with the name '%s'.",
+                  TABLE_REFS, KEY_NAME);
         }
       }
     } finally {

diff --git a/.../dynamodb/src/main/java/org/projectnessie/versioned/storage/dynamodb/DynamoDBBackend.java b/.../dynamodb/src/main/java/org/projectnessie/versioned/storage/dynamodb/DynamoDBBackend.java
@@ -136,8 +136,8 @@ private static void verifyKeySchema(TableDescription description) {
     throw new IllegalStateException(
         String.format(
             "Invalid key schema for table: %s. Key schema should be a hash partitioned "
-                + "attribute with the name 'id'.",
-            description.tableName()));
+                + "attribute with the name '%s'.",
+            description.tableName(), KEY_NAME));
   }
 
   @Override