mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Merge pull request #12776 from appwrite/claude/usage-reporting-resource-id-tq7wpb
Fix usage attribution for database read endpoints
This commit is contained in:
24 files changed
+26
-26
No files matched your search
+1
-1
@@ -45,7 +45,7 @@ class Get extends Action
|
||||
->desc('Get attribute')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ class XList extends Action
|
||||
->desc('List attributes')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
@@ -34,7 +34,7 @@ class Get extends Action
|
||||
->desc('Get collection')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'databases',
|
||||
|
||||
@@ -35,7 +35,7 @@ class Get extends Action
|
||||
->desc('Get index')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ class XList extends Action
|
||||
->desc('List indexes')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
@@ -43,8 +43,8 @@ class Update extends Action
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('event', 'databases.[databaseId].collections.[collectionId].update')
|
||||
->label('audits.event', 'collection.update')
|
||||
->label('audits.resource', 'database/{request.databaseId}/collections/{request.collectionId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collections/{request.collectionId}')
|
||||
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('sdk', new Method(
|
||||
namespace: 'databases',
|
||||
group: $this->getSDKGroup(),
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ class Get extends DocumentGet
|
||||
->desc('Get document')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'documents.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'documentsDB',
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ class XList extends DocumentXList
|
||||
->desc('List documents')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'documents.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'documentsDB',
|
||||
|
||||
@@ -31,7 +31,7 @@ class Get extends CollectionGet
|
||||
->desc('Get collection')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'documentsDB',
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ class Get extends IndexGet
|
||||
->desc('Get index')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'documentsDB',
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ class XList extends IndexXList
|
||||
->desc('List indexes')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'documentsDB',
|
||||
|
||||
@@ -43,7 +43,7 @@ class Get extends AttributesGet
|
||||
->desc('Get column')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', ['tables.read', 'collections.read', 'columns.read', 'attributes.read'])
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/table/{request.tableId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
@@ -34,7 +34,7 @@ class XList extends AttributesXList
|
||||
->desc('List columns')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', ['tables.read', 'collections.read', 'columns.read', 'attributes.read'])
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/table/{request.tableId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
@@ -32,7 +32,7 @@ class Get extends CollectionGet
|
||||
->desc('Get table')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', ['tables.read', 'collections.read'])
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/table/{request.tableId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
@@ -33,7 +33,7 @@ class Get extends IndexGet
|
||||
->desc('Get index')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', ['tables.read', 'collections.read', 'indexes.read'])
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/table/{request.tableId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
@@ -34,7 +34,7 @@ class XList extends IndexXList
|
||||
->desc('List indexes')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', ['tables.read', 'collections.read', 'indexes.read'])
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/table/{request.tableId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
@@ -35,7 +35,7 @@ class Get extends DocumentGet
|
||||
->desc('Get row')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', ['rows.read', 'documents.read'])
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/table/{request.tableId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
@@ -37,7 +37,7 @@ class XList extends DocumentXList
|
||||
->desc('List rows')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', ['rows.read', 'documents.read'])
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/table/{request.tableId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: $this->getSDKNamespace(),
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ class Get extends DocumentGet
|
||||
->desc('Get document')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'documents.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'vectorsDB',
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ class XList extends DocumentXList
|
||||
->desc('List documents')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'documents.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'vectorsDB',
|
||||
|
||||
@@ -31,7 +31,7 @@ class Get extends CollectionGet
|
||||
->desc('Get collection')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'vectorsDB',
|
||||
|
||||
+2
-2
@@ -41,8 +41,8 @@ class Create extends IndexCreate
|
||||
->label('scope', 'collections.write')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('audits.event', 'index.create')
|
||||
->label('audits.resource', 'database/{request.databaseId}/collection/{request.tableId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.tableId}')
|
||||
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('sdk', new Method(
|
||||
namespace: 'vectorsDB',
|
||||
group: $this->getSdkGroup(),
|
||||
|
||||
@@ -32,7 +32,7 @@ class Get extends IndexGet
|
||||
->desc('Get index')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'vectorsDB',
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ class XList extends IndexXList
|
||||
->desc('List indexes')
|
||||
->groups(['api', 'database'])
|
||||
->label('scope', 'collections.read')
|
||||
->label('usage.resource', 'database/{request.databaseId}')
|
||||
->label('usage.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
|
||||
->label('resourceType', RESOURCE_TYPE_DATABASES)
|
||||
->label('sdk', new Method(
|
||||
namespace: 'vectorsDB',
|
||||
|
||||
Reference in new issue
Block a user