Skip to content

Commit 102d557

Browse files
zhuxiaolong37huiguangjun
authored andcommitted
normalize parameter naming
1 parent c2b0f15 commit 102d557

File tree

4 files changed

+594
-9
lines changed

4 files changed

+594
-9
lines changed

alibabacloud_oss_v2/models/object_basic.py

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ def __init__(
6363
request_payer: Optional[str] = None,
6464
body: Optional[BodyType] = None,
6565
progress_fn: Optional[Any] = None,
66+
object_acl: Optional[str] = None,
6667
**kwargs: Any
6768
) -> None:
6869
"""
@@ -96,11 +97,14 @@ def __init__(
9697
request_payer (str, optional): To indicate that the requester is aware that the request and data download will incur costs.
9798
body (BodyType,optional): Object data.
9899
progress_fn (Any,optional): Progress callback function.
100+
object_acl (str, optional): The access control list (ACL) of the object.
101+
The object_acl parameter has the same functionality as the acl parameter. it is the standardized name for acl.
102+
If both exist simultaneously, the value of object_acl will take precedence.
99103
"""
100104
super().__init__(**kwargs)
101105
self.bucket = bucket
102106
self.key = key
103-
self.acl = acl
107+
self.acl = object_acl if object_acl is not None else acl
104108
self.storage_class = storage_class
105109
self.metadata = metadata
106110
self.cache_control = cache_control
@@ -650,6 +654,7 @@ def __init__(
650654
request_payer: Optional[str] = None,
651655
body: Optional[BodyType] = None,
652656
progress_fn: Optional[Any] = None,
657+
object_acl: Optional[str] = None,
653658
**kwargs: Any
654659
) -> None:
655660
"""
@@ -686,12 +691,15 @@ def __init__(
686691
request_payer (str, optional): To indicate that the requester is aware that the request and data download will incur costs.
687692
body (BodyType,optional): Object data.
688693
progress_fn (Any,optional): Progress callback function.
694+
object_acl (str, optional): The access control list (ACL) of the object.
695+
The object_acl parameter has the same functionality as the acl parameter. it is the standardized name for acl.
696+
If both exist simultaneously, the value of object_acl will take precedence.
689697
"""
690698
super().__init__(**kwargs)
691699
self.bucket = bucket
692700
self.key = key
693701
self.position = position
694-
self.acl = acl
702+
self.acl = object_acl if object_acl is not None else acl
695703
self.storage_class = storage_class
696704
self.metadata = metadata
697705
self.cache_control = cache_control
@@ -823,6 +831,7 @@ def __init__(
823831
traffic_limit: Optional[int] = None,
824832
request_payer: Optional[str] = None,
825833
progress_fn: Optional[Any] = None,
834+
object_acl: Optional[str] = None,
826835
**kwargs: Any
827836
) -> None:
828837
"""
@@ -877,6 +886,9 @@ def __init__(
877886
The speed limit value ranges from 245760 to 838860800, with a unit of bit/s.
878887
request_payer (str, optional): To indicate that the requester is aware that the request and data download will incur costs.
879888
progress_fn (Any,optional): Progress callback function, it works in Copier.copy only.
889+
object_acl (str, optional): The access control list (ACL) of the object.
890+
The object_acl parameter has the same functionality as the acl parameter. it is the standardized name for acl.
891+
If both exist simultaneously, the value of object_acl will take precedence.
880892
"""
881893
super().__init__(**kwargs)
882894
self.bucket = bucket
@@ -888,7 +900,7 @@ def __init__(
888900
self.if_none_match = if_none_match
889901
self.if_modified_since = if_modified_since
890902
self.if_unmodified_since = if_unmodified_since
891-
self.acl = acl
903+
self.acl = object_acl if object_acl is not None else acl
892904
self.storage_class = storage_class
893905
self.metadata = metadata
894906
self.cache_control = cache_control
@@ -1434,6 +1446,7 @@ def __init__(
14341446
acl: Optional[str] = None,
14351447
version_id: Optional[str] = None,
14361448
request_payer: Optional[str] = None,
1449+
object_acl: Optional[str] = None,
14371450
**kwargs: Any
14381451
) -> None:
14391452
"""
@@ -1443,11 +1456,14 @@ def __init__(
14431456
acl (str, required): The access control list (ACL) of the object.
14441457
version_id (str, optional): The version ID of the source object.
14451458
request_payer (str, optional): To indicate that the requester is aware that the request and data download will incur costs
1459+
object_acl (str, optional): The access control list (ACL) of the object.
1460+
The object_acl parameter has the same functionality as the acl parameter. it is the standardized name for acl.
1461+
If both exist simultaneously, the value of object_acl will take precedence.
14461462
"""
14471463
super().__init__(**kwargs)
14481464
self.bucket = bucket
14491465
self.key = key
1450-
self.acl = acl
1466+
self.acl = object_acl if object_acl is not None else acl
14511467
self.version_id = version_id
14521468
self.request_payer = request_payer
14531469

@@ -1966,6 +1982,7 @@ def __init__(
19661982
forbid_overwrite: Optional[bool] = None,
19671983
encoding_type: Optional[str] = None,
19681984
request_payer: Optional[str] = None,
1985+
object_acl: Optional[str] = None,
19691986
**kwargs: Any
19701987
) -> None:
19711988
"""
@@ -1983,12 +2000,15 @@ def __init__(
19832000
overwrites an existing object that has the same name.
19842001
encoding_type (str, optional): The encoding type of the object names in the response. Valid value: url.
19852002
request_payer (str, optional): To indicate that the requester is aware that the request and data download will incur costs.
2003+
object_acl (str, optional): The access control list (ACL) of the object.
2004+
The object_acl parameter has the same functionality as the acl parameter. it is the standardized name for acl.
2005+
If both exist simultaneously, the value of object_acl will take precedence.
19862006
"""
19872007
super().__init__(**kwargs)
19882008
self.bucket = bucket
19892009
self.key = key
19902010
self.upload_id = upload_id
1991-
self.acl = acl
2011+
self.acl = object_acl if object_acl is not None else acl
19922012
self.complete_multipart_upload = complete_multipart_upload
19932013
self.complete_all = complete_all
19942014
self.callback = callback
@@ -2454,6 +2474,8 @@ def __init__(
24542474
metadata: Optional[MutableMapping] = None,
24552475
forbid_overwrite: Optional[bool] = None,
24562476
request_payer: Optional[str] = None,
2477+
object_acl: Optional[str] = None,
2478+
symlink_target: Optional[str] = None,
24572479
**kwargs: Any
24582480
) -> None:
24592481
"""
@@ -2467,12 +2489,18 @@ def __init__(
24672489
forbid_overwrite (bool, optional): Specifies whether the object that is uploaded by calling the PutObject operation
24682490
overwrites an existing object that has the same name.
24692491
request_payer (str, optional): To indicate that the requester is aware that the request and data download will incur costs.
2492+
object_acl (str, optional): The access control list (ACL) of the object.
2493+
The object_acl parameter has the same functionality as the acl parameter. it is the standardized name for acl.
2494+
If both exist simultaneously, the value of object_acl will take precedence.
2495+
symlink_target (str, optional): The destination object to which the symbolic link points.
2496+
The symlink_target parameter has the same functionality as the target parameter. it is the standardized name for target.
2497+
If both exist simultaneously, the value of symlink_target will take precedence.
24702498
"""
24712499
super().__init__(**kwargs)
24722500
self.bucket = bucket
24732501
self.key = key
2474-
self.target = target
2475-
self.acl = acl
2502+
self.target = symlink_target if symlink_target is not None else target
2503+
self.acl = object_acl if object_acl is not None else acl
24762504
self.storage_class = storage_class
24772505
self.metadata = metadata
24782506
self.forbid_overwrite = forbid_overwrite
@@ -2546,19 +2574,24 @@ def __init__(
25462574
target: Optional[str] = None,
25472575
etag: Optional[str] = None,
25482576
metadata: Optional[MutableMapping] = None,
2577+
symlink_target: Optional[str] = None,
25492578
**kwargs: Any
25502579
) -> None:
25512580
"""
25522581
Args:
25532582
version_id (str, optional): Version of the object.
25542583
target (str, optional): Indicates the target object that the symbol link directs to.
2584+
This parameter is deprecated. Use 'symlink_target' parameter instead
25552585
etag (str, optional): The entity tag (ETag).
25562586
An ETag is created when an object is created to identify the content of the object.
25572587
metadata (MutableMapping, optional): A map of metadata to store with the object.
2588+
symlink_target (str, optional): The destination object to which the symbolic link points.
2589+
The symlink_target parameter has the same functionality as the target parameter. it is the standardized name for target.
2590+
If both exist simultaneously, the value of symlink_target will take precedence.
25582591
"""
25592592
super().__init__(**kwargs)
25602593
self.version_id = version_id
2561-
self.target = target
2594+
self.target = symlink_target if symlink_target is not None else target
25622595
self.etag = etag
25632596
self.metadata = metadata
25642597

sample/put_object_acl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def main():
2828
result = client.put_object_acl(oss.PutObjectAclRequest(
2929
bucket=args.bucket,
3030
key=args.key,
31-
acl=args.acl,
31+
object_acl=args.acl,
3232
))
3333

3434
print(f'status code: {result.status_code},'

0 commit comments

Comments
 (0)