Skip to content

Commit 24d2ac8

Browse files
authored
{storage-preview} Remove az storage blob service-properties command group (Azure#3244)
1 parent 57e1bec commit 24d2ac8

File tree

6 files changed

+6
-82
lines changed

6 files changed

+6
-82
lines changed

src/storage-preview/HISTORY.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
33
Release History
44
===============
5+
0.7.2(2021-04-09)
6+
++++++++++++++++++
7+
* Remove `az storage blob service-properties` as it is supported in storage-blob-preview extension and Azure CLI
8+
59
0.7.1(2021-04-06)
610
++++++++++++++++++
711
* `az storage account file-service-properties`: Add support for secured SMB
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"azext.minCliCoreVersion": "2.13.0",
2+
"azext.minCliCoreVersion": "2.21.0",
33
"azext.isPreview": true
44
}

src/storage-preview/azext_storage_preview/commands.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,6 @@ def get_custom_sdk(custom_module, client_factory, resource_type=CUSTOM_DATA_STOR
9494
g.custom_command('list', 'list_network_rules')
9595
g.custom_command('remove', 'remove_network_rule')
9696

97-
base_blob_sdk = CliCommandType(
98-
operations_tmpl='azext_storage_preview.vendored_sdks.azure_storage.blob.baseblobservice#BaseBlobService.{}',
99-
client_factory=blob_data_service_factory,
100-
resource_type=CUSTOM_DATA_STORAGE)
101-
102-
with self.command_group('storage blob service-properties', command_type=base_blob_sdk) as g:
103-
g.storage_command_oauth('show', 'get_blob_service_properties', exception_handler=show_exception_handler)
104-
g.storage_command_oauth('update', generic_update=True, getter_name='get_blob_service_properties',
105-
setter_type=get_custom_sdk('blob', cf_blob_data_gen_update),
106-
setter_name='set_service_properties',
107-
client_factory=cf_blob_data_gen_update)
108-
10997
block_blob_sdk = CliCommandType(
11098
operations_tmpl='azure.multiapi.storage.blob.blockblobservice#BlockBlobService.{}',
11199
client_factory=blob_data_service_factory,

src/storage-preview/azext_storage_preview/operations/blob.py

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,11 @@
66
from __future__ import print_function
77

88
from urllib.parse import quote
9-
from knack.util import CLIError
109
from knack.log import get_logger
1110

1211
logger = get_logger(__name__)
1312

1413

15-
def set_service_properties(client, parameters, delete_retention=None, days_retained=None, static_website=None,
16-
index_document=None, error_document_404_path=None):
17-
# update
18-
kwargs = {}
19-
if any([delete_retention, days_retained]):
20-
kwargs['delete_retention_policy'] = parameters.delete_retention_policy
21-
if delete_retention is not None:
22-
parameters.delete_retention_policy.enabled = delete_retention
23-
if days_retained is not None:
24-
parameters.delete_retention_policy.days = days_retained
25-
26-
if any([static_website, index_document, error_document_404_path]):
27-
if getattr(parameters, 'static_website', None) is None:
28-
raise CLIError('Static websites are only supported for StorageV2 (general-purpose v2) accounts.')
29-
kwargs['static_website'] = parameters.static_website
30-
if static_website is not None:
31-
parameters.static_website.enabled = static_website
32-
if index_document is not None:
33-
parameters.static_website.index_document = index_document
34-
if error_document_404_path is not None:
35-
parameters.static_website.error_document_404_path = error_document_404_path
36-
37-
# checks
38-
policy = parameters.delete_retention_policy
39-
if policy.enabled and not policy.days:
40-
raise CLIError("must specify days-retained")
41-
42-
client.set_blob_service_properties(**kwargs)
43-
return client.get_blob_service_properties()
44-
45-
4614
def show_directory(client, container_name, directory_name, snapshot=None, lease_id=None,
4715
if_modified_since=None, if_unmodified_since=None, if_match=None,
4816
if_none_match=None, timeout=None):

src/storage-preview/azext_storage_preview/tests/latest/test_storage_blob_scenarios.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/storage-preview/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from codecs import open
99
from setuptools import setup, find_packages
1010

11-
VERSION = "0.7.1"
11+
VERSION = "0.7.2"
1212

1313
CLASSIFIERS = [
1414
'Development Status :: 4 - Beta',

0 commit comments

Comments
 (0)