Skip to content

Commit e8816f9

Browse files
committed
rename scheme to prefix
1 parent c826075 commit e8816f9

2 files changed

Lines changed: 21 additions & 9 deletions

File tree

open-api/rest-catalog-open-api.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,10 @@ class Schema(StructType):
14241424

14251425
class ADLSCredential(BaseModel):
14261426
type: Literal['adls']
1427-
scheme: str
1427+
prefix: Optional[str] = Field(
1428+
None,
1429+
description='Indicates a storage location prefix where the credential is relevant. Clients should choose the most specific prefix if several credentials of the same type are available.',
1430+
)
14281431
sas_token: str = Field(..., alias='sas-token')
14291432
expires_at_ms: int = Field(
14301433
...,
@@ -1435,7 +1438,10 @@ class ADLSCredential(BaseModel):
14351438

14361439
class GCSCredential(BaseModel):
14371440
type: Literal['gcs']
1438-
scheme: str
1441+
prefix: Optional[str] = Field(
1442+
None,
1443+
description='Indicates a storage location prefix where the credential is relevant. Clients should choose the most specific prefix if several credentials of the same type are available.',
1444+
)
14391445
token: str
14401446
expires_at_ms: int = Field(
14411447
...,
@@ -1446,7 +1452,10 @@ class GCSCredential(BaseModel):
14461452

14471453
class S3Credential(BaseModel):
14481454
type: Literal['s3']
1449-
scheme: str
1455+
prefix: Optional[str] = Field(
1456+
None,
1457+
description='Indicates a storage location prefix where the credential is relevant. Clients should choose the most specific prefix if several credentials of the same type are available.',
1458+
)
14501459
access_key_id: str = Field(..., alias='access-key-id')
14511460
secret_access_key: str = Field(..., alias='secret-access-key')
14521461
session_token: str = Field(..., alias='session-token')

open-api/rest-catalog-open-api.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3109,15 +3109,16 @@ components:
31093109
- $ref: '#/components/schemas/Credential'
31103110
required:
31113111
- type
3112-
- scheme
31133112
- sas-token
31143113
- expires-at-ms
31153114
properties:
31163115
type:
31173116
type: string
31183117
enum: [ "adls" ]
3119-
scheme:
3118+
prefix:
31203119
type: string
3120+
description: Indicates a storage location prefix where the credential is relevant. Clients should choose the most
3121+
specific prefix if several credentials of the same type are available.
31213122
sas-token:
31223123
type: string
31233124
expires-at-ms:
@@ -3132,15 +3133,16 @@ components:
31323133
- $ref: '#/components/schemas/Credential'
31333134
required:
31343135
- type
3135-
- scheme
31363136
- token
31373137
- expires-at-ms
31383138
properties:
31393139
type:
31403140
type: string
31413141
enum: [ "gcs" ]
3142-
scheme:
3142+
prefix:
31433143
type: string
3144+
description: Indicates a storage location prefix where the credential is relevant. Clients should choose the most
3145+
specific prefix if several credentials of the same type are available.
31443146
token:
31453147
type: string
31463148
expires-at-ms:
@@ -3154,7 +3156,6 @@ components:
31543156
- $ref: '#/components/schemas/Credential'
31553157
required:
31563158
- type
3157-
- scheme
31583159
- access-key-id
31593160
- secret-access-key
31603161
- session-token
@@ -3163,8 +3164,10 @@ components:
31633164
type:
31643165
type: string
31653166
enum: [ "s3" ]
3166-
scheme:
3167+
prefix:
31673168
type: string
3169+
description: Indicates a storage location prefix where the credential is relevant. Clients should choose the most
3170+
specific prefix if several credentials of the same type are available.
31683171
access-key-id:
31693172
type: string
31703173
secret-access-key:

0 commit comments

Comments
 (0)