Merge #913.

moto/dynamodb2/models.py

@@ -200,6 +200,11 @@ class Table(BaseModel):
         self.global_indexes = global_indexes if global_indexes else []
         self.created_at = datetime.datetime.utcnow()
         self.items = defaultdict(dict)
+        self.table_arn = self._generate_arn(table_name)
+        self.tags = []
+
+    def _generate_arn(self, name):
+        return 'arn:aws:dynamodb:us-east-1:123456789011:table/' + name
 
     def describe(self, base_key='TableDescription'):
         results = {
@@ -209,11 +214,12 @@ class Table(BaseModel):
                 'TableSizeBytes': 0,
                 'TableName': self.name,
                 'TableStatus': 'ACTIVE',
+                'TableArn': self.table_arn,
                 'KeySchema': self.schema,
                 'ItemCount': len(self),
                 'CreationDateTime': unix_time(self.created_at),
                 'GlobalSecondaryIndexes': [index for index in self.global_indexes],
-                'LocalSecondaryIndexes': [index for index in self.indexes]
+                'LocalSecondaryIndexes': [index for index in self.indexes],
             }
         }
         return results
@@ -505,6 +511,18 @@ class DynamoDBBackend(BaseBackend):
     def delete_table(self, name):
         return self.tables.pop(name, None)
 
+    def tag_resource(self, table_arn, tags):
+        for table in self.tables:
+            if self.tables[table].table_arn == table_arn:
+                self.tables[table].tags.extend(tags)
+
+    def list_tags_of_resource(self, table_arn):
+        required_table = None
+        for table in self.tables:
+            if self.tables[table].table_arn == table_arn:
+                required_table = self.tables[table]
+        return required_table.tags
+
     def update_table_throughput(self, name, throughput):
         table = self.tables[name]
         table.throughput = throughput

moto/dynamodb2/responses.py

@@ -73,7 +73,7 @@ class DynamoHandler(BaseResponse):
 
     def list_tables(self):
         body = self.body
-        limit = body.get('Limit')
+        limit = body.get('Limit', 100)
         if body.get("ExclusiveStartTableName"):
             last = body.get("ExclusiveStartTableName")
             start = list(dynamodb_backend2.tables.keys()).index(last) + 1
@@ -124,6 +124,35 @@ class DynamoHandler(BaseResponse):
             er = 'com.amazonaws.dynamodb.v20111205#ResourceNotFoundException'
             return self.error(er)
 
+    def tag_resource(self):
+        tags = self.body['Tags']
+        table_arn = self.body['ResourceArn']
+        dynamodb_backend2.tag_resource(table_arn, tags)
+        return json.dumps({})
+
+    def list_tags_of_resource(self):
+        try:
+            table_arn = self.body['ResourceArn']
+            all_tags = dynamodb_backend2.list_tags_of_resource(table_arn)
+            all_tag_keys = [tag['Key'] for tag in all_tags]
+            marker = self.body.get('NextToken')
+            if marker:
+                start = all_tag_keys.index(marker) + 1
+            else:
+                start = 0
+            max_items = 10  # there is no default, but using 10 to make testing easier
+            tags_resp = all_tags[start:start + max_items]
+            next_marker = None
+            if len(all_tags) > start + max_items:
+                next_marker = tags_resp[-1]['Key']
+            if next_marker:
+                return json.dumps({'Tags': tags_resp,
+                                   'NextToken': next_marker})
+            return json.dumps({'Tags': tags_resp})
+        except AttributeError:
+            er = 'com.amazonaws.dynamodb.v20111205#ResourceNotFoundException'
+            return self.error(er)
+
     def update_table(self):
         name = self.body['TableName']
         if 'GlobalSecondaryIndexUpdates' in self.body: