Skip to content

Commit 8be2477

Browse files
xiafu-msftxiafu-msft
authored
[STG78]Address comments (Azure#20539)
1 parent e089b1b commit 8be2477

File tree

10 files changed

+34
-23
lines changed

10 files changed

+34
-23
lines changed

‎sdk/storage/azure-storage-blob/azure/storage/blob/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
)
2626
from ._generated.models import (
2727
RehydratePriority,
28-
BlobImmutabilityPolicyMode
2928
)
3029
from ._models import (
3130
BlobType,
3231
BlockState,
3332
StandardBlobTier,
3433
PremiumPageBlobTier,
34+
BlobImmutabilityPolicyMode,
3535
SequenceNumberAction,
3636
PublicAccess,
3737
BlobAnalyticsLogging,

‎sdk/storage/azure-storage-blob/azure/storage/blob/_models.py‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,17 @@ class PublicAccess(str, Enum):
120120
"""
121121

122122

123+
class BlobImmutabilityPolicyMode(str, Enum):
124+
"""
125+
Specifies the immutability policy mode to set on the blob.
126+
"Mutable" can only be returned by service, don't set to "Mutable".
127+
"""
128+
129+
Unlocked = "Unlocked"
130+
Locked = "Locked"
131+
Mutable = "Mutable"
132+
133+
123134
class BlobAnalyticsLogging(GeneratedLogging):
124135
"""Azure Analytics Logging settings.
125136
@@ -441,17 +452,17 @@ class ImmutabilityPolicy(DictMixin):
441452
.. versionadded:: 12.10.0
442453
This was introduced in API version '2020-10-02'.
443454
444-
:param ~datetime.datetime expiry_time:
455+
:keyword ~datetime.datetime expiry_time:
445456
Specifies the date time when the blobs immutability policy is set to expire.
446-
:param str or ~azure.storage.blob.BlobImmutabilityPolicyMode policy_mode:
457+
:keyword str or ~azure.storage.blob.BlobImmutabilityPolicyMode policy_mode:
447458
Specifies the immutability policy mode to set on the blob.
448459
Possible values to set include: "Locked", "Unlocked".
449460
"Mutable" can only be returned by service, don't set to "Mutable".
450461
"""
451462

452-
def __init__(self, expiry_time=None, policy_mode=None):
453-
self.expiry_time = expiry_time
454-
self.policy_mode = policy_mode
463+
def __init__(self, **kwargs):
464+
self.expiry_time = kwargs.pop('expiry_time', None)
465+
self.policy_mode = kwargs.pop('policy_mode', None)
455466

456467
@classmethod
457468
def _from_generated(cls, generated):

‎sdk/storage/azure-storage-blob/tests/test_append_blob.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1363,7 +1363,7 @@ def test_create_append_blob_with_immutability_policy(self, resource_group, locat
13631363
blob = bsc.get_blob_client(container_name, blob_name)
13641364

13651365
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
1366-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
1366+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
13671367
blob.create_append_blob(immutability_policy=immutability_policy,
13681368
legal_hold=True)
13691369

‎sdk/storage/azure-storage-blob/tests/test_append_blob_async.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,7 @@ async def test_create_append_blob_with_immutability_policy_async(self, resource_
14461446
blob = bsc.get_blob_client(container_name, blob_name)
14471447

14481448
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
1449-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
1449+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
14501450
await blob.create_append_blob(immutability_policy=immutability_policy,
14511451
legal_hold=True)
14521452

‎sdk/storage/azure-storage-blob/tests/test_block_blob.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ def test_put_block_with_immutability_policy(self, resource_group, location, stor
477477
# Act
478478
block_list = [BlobBlock(block_id='1'), BlobBlock(block_id='2'), BlobBlock(block_id='3')]
479479
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
480-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
480+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
481481
put_block_list_resp = blob.commit_block_list(block_list,
482482
immutability_policy=immutability_policy,
483483
legal_hold=True,

‎sdk/storage/azure-storage-blob/tests/test_block_blob_async.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ async def test_put_block_with_immutability_policy(self, resource_group, location
584584
# Act
585585
block_list = [BlobBlock(block_id='1'), BlobBlock(block_id='2'), BlobBlock(block_id='3')]
586586
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
587-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
587+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
588588
put_block_list_resp = await blob.commit_block_list(block_list,
589589
immutability_policy=immutability_policy,
590590
legal_hold=True,

‎sdk/storage/azure-storage-blob/tests/test_common_blob.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ def test_copy_blob_with_immutability_policy(self, resource_group, location, stor
12221222

12231223
copyblob = self.bsc.get_blob_client(container_name, 'blob1copy')
12241224
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
1225-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
1225+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
12261226
copy = copyblob.start_copy_from_url(sourceblob, immutability_policy=immutability_policy,
12271227
legal_hold=True,
12281228
)
@@ -1837,7 +1837,7 @@ def test_set_immutability_policy_using_sas(self, resource_group, location, stora
18371837
blob = BlobClient(
18381838
self.bsc.url, container_name= container_name, blob_name=blob_name, credential=account_sas_token)
18391839
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
1840-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
1840+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
18411841
resp_with_account_sas = blob.set_immutability_policy(immutability_policy=immutability_policy)
18421842
blob_response = requests.get(blob.url)
18431843

@@ -1858,7 +1858,7 @@ def test_set_immutability_policy_using_sas(self, resource_group, location, stora
18581858
self.bsc.url, container_name=container_name, blob_name=blob_name, credential=container_sas_token)
18591859

18601860
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
1861-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
1861+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
18621862
resp_with_container_sas = blob1.set_immutability_policy(immutability_policy=immutability_policy)
18631863
# Assert response using container sas
18641864
self.assertIsNotNone(resp_with_container_sas['immutability_policy_until_date'])
@@ -1876,7 +1876,7 @@ def test_set_immutability_policy_using_sas(self, resource_group, location, stora
18761876
blob2 = BlobClient(
18771877
self.bsc.url, container_name=container_name, blob_name=blob_name, credential=blob_sas_token)
18781878
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
1879-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
1879+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
18801880
resp_with_blob_sas = blob2.set_immutability_policy(immutability_policy=immutability_policy)
18811881

18821882
# Assert response using blob sas
@@ -2586,7 +2586,7 @@ def test_blob_immutability_policy(self, resource_group, location, storage_accoun
25862586
blob = self.bsc.get_blob_client(container_name, blob_name)
25872587
blob.upload_blob(b"abc", overwrite=True)
25882588
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
2589-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
2589+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
25902590
resp = blob.set_immutability_policy(immutability_policy=immutability_policy)
25912591

25922592
# Assert
@@ -2668,7 +2668,7 @@ def test_download_blob_with_immutability_policy(self, resource_group, location,
26682668
content = b"abcedfg"
26692669

26702670
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
2671-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
2671+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
26722672
blob.upload_blob(content,
26732673
immutability_policy=immutability_policy,
26742674
legal_hold=True,
@@ -2710,7 +2710,7 @@ def test_list_blobs_with_immutability_policy(self, resource_group, location, sto
27102710
content = b"abcedfg"
27112711

27122712
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
2713-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
2713+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
27142714
blob.upload_blob(content,immutability_policy=immutability_policy,
27152715
legal_hold=True,
27162716
overwrite=True)

‎sdk/storage/azure-storage-blob/tests/test_common_blob_async.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@ async def test_copy_blob_with_immutability_policy(self, resource_group, location
14971497
copyblob = self.bsc.get_blob_client(container_name, 'blob1copy')
14981498

14991499
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
1500-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
1500+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
15011501

15021502
copy = await copyblob.start_copy_from_url(sourceblob, immutability_policy=immutability_policy,
15031503
legal_hold=True,
@@ -2594,7 +2594,7 @@ async def test_blob_immutability_policy(self, resource_group, location, storage_
25942594
await blob.upload_blob(b"abc", overwrite=True)
25952595

25962596
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
2597-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
2597+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
25982598
resp = await blob.set_immutability_policy(
25992599
immutability_policy=immutability_policy)
26002600

@@ -2677,7 +2677,7 @@ async def test_download_blob_with_immutability_policy(self, resource_group, loca
26772677
content = b"abcedfg"
26782678

26792679
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
2680-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
2680+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
26812681
await blob.upload_blob(content,
26822682
immutability_policy=immutability_policy,
26832683
legal_hold=True,
@@ -2722,7 +2722,7 @@ async def test_list_blobs_with_immutability_policy(self, resource_group, locatio
27222722
content = b"abcedfg"
27232723

27242724
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
2725-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
2725+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
27262726
await blob.upload_blob(content,
27272727
immutability_policy=immutability_policy,
27282728
legal_hold=True,

‎sdk/storage/azure-storage-blob/tests/test_page_blob.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def test_create_blob_with_immutability_policy(self, resource_group, location, st
165165

166166
# Act
167167
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
168-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
168+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
169169
resp = blob.create_page_blob(1024, immutability_policy=immutability_policy,
170170
legal_hold=True)
171171
props = blob.get_blob_properties()

‎sdk/storage/azure-storage-blob/tests/test_page_blob_async.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ async def test_create_blob_with_immutability_policy(self, resource_group, locati
211211

212212
# Act
213213
immutability_policy = ImmutabilityPolicy(expiry_time=datetime.utcnow() + timedelta(seconds=5),
214-
policy_mode=BlobImmutabilityPolicyMode.UNLOCKED)
214+
policy_mode=BlobImmutabilityPolicyMode.Unlocked)
215215
resp = await blob.create_page_blob(1024,
216216
immutability_policy=immutability_policy,
217217
legal_hold=True)

0 commit comments

Comments
 (0)