From 704a12146b482c3ed0bf3c4a8ccf64a860015b0b Mon Sep 17 00:00:00 2001 From: Ilya Shmygol Date: Thu, 12 Dec 2019 10:49:07 +0100 Subject: [PATCH] Improve error reporting for missing index --- moto/dynamodb2/responses.py | 9 ++++++--- tests/test_dynamodb2/test_dynamodb.py | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/moto/dynamodb2/responses.py b/moto/dynamodb2/responses.py index 46cfaa239e9d..c9f3529a959e 100644 --- a/moto/dynamodb2/responses.py +++ b/moto/dynamodb2/responses.py @@ -438,9 +438,12 @@ def query(self): all_indexes = (table.global_indexes or []) + (table.indexes or []) indexes_by_name = dict((i["IndexName"], i) for i in all_indexes) if index_name not in indexes_by_name: - raise ValueError( - "Invalid index: %s for table: %s. Available indexes are: %s" - % (index_name, name, ", ".join(indexes_by_name.keys())) + er = "com.amazonaws.dynamodb.v20120810#ResourceNotFoundException" + return self.error( + er, + "Invalid index: {} for table: {}. Available indexes are: {}".format( + index_name, name, ", ".join(indexes_by_name.keys()) + ), ) index = indexes_by_name[index_name]["KeySchema"] diff --git a/tests/test_dynamodb2/test_dynamodb.py b/tests/test_dynamodb2/test_dynamodb.py index 698353a20d85..1a8a7061519c 100644 --- a/tests/test_dynamodb2/test_dynamodb.py +++ b/tests/test_dynamodb2/test_dynamodb.py @@ -2655,14 +2655,15 @@ def test_query_by_non_exists_index(): ], ) - with assert_raises(ValueError) as ex: + with assert_raises(ClientError) as ex: dynamodb.query( TableName="test", IndexName="non_exists_index", KeyConditionExpression="CarModel=M", ) - str(ex.exception).should.equal( + ex.exception.response["Error"]["Code"].should.equal("ResourceNotFoundException") + ex.exception.response["Error"]["Message"].should.equal( "Invalid index: non_exists_index for table: test. Available indexes are: test_gsi" )