diff --git a/sdk/storage/azure-storage-blob/HISTORY.md b/sdk/storage/azure-storage-blob/HISTORY.md index e7da37f03795..fa5e07d3928d 100644 --- a/sdk/storage/azure-storage-blob/HISTORY.md +++ b/sdk/storage/azure-storage-blob/HISTORY.md @@ -8,6 +8,7 @@ - NoRetry policy has been removed. Use keyword argument `retry_total=0` for no retries. - Removed types that were accidentally exposed from two modules. Only `BlobServiceClient`, `ContainerClient`, `BlobClient` and `LeaseClient` should be imported from azure.storage.blob.aio +- `Logging` has been renamed to `BlobAnalyticsLogging`. **New features** diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/__init__.py b/sdk/storage/azure-storage-blob/azure/storage/blob/__init__.py index 5bab6a093b5d..67f9b3cc4409 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/__init__.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/__init__.py @@ -31,7 +31,7 @@ PremiumPageBlobTier, SequenceNumberAction, PublicAccess, - Logging, + BlobAnalyticsLogging, Metrics, RetentionPolicy, StaticWebsite, @@ -69,7 +69,7 @@ 'PremiumPageBlobTier', 'SequenceNumberAction', 'PublicAccess', - 'Logging', + 'BlobAnalyticsLogging', 'Metrics', 'RetentionPolicy', 'StaticWebsite', diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/blob_service_client_async.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/blob_service_client_async.py index ac2942cad0d0..cca75e3c69c0 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/blob_service_client_async.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/blob_service_client_async.py @@ -36,7 +36,7 @@ from .lease_async import LeaseClient from ..models import ( BlobProperties, - Logging, + BlobAnalyticsLogging, Metrics, RetentionPolicy, StaticWebsite, @@ -236,7 +236,7 @@ async def get_service_properties(self, **kwargs): @distributed_trace_async async def set_service_properties( - self, logging=None, # type: Optional[Logging] + self, analytics_logging=None, # type: Optional[BlobAnalyticsLogging] hour_metrics=None, # type: Optional[Metrics] minute_metrics=None, # type: Optional[Metrics] cors=None, # type: Optional[List[CorsRule]] @@ -249,12 +249,12 @@ async def set_service_properties( """Sets the properties of a storage account's Blob service, including Azure Storage Analytics. - If an element (e.g. Logging) is left as None, the + If an element (e.g. analytics_logging) is left as None, the existing settings on the service for that functionality are preserved. - :param logging: + :param analytics_logging: Groups the Azure Analytics Logging settings. - :type logging: ~azure.storage.blob.Logging + :type analytics_logging: ~azure.storage.blob.BlobAnalyticsLogging :param hour_metrics: The hour metrics settings provide a summary of request statistics grouped by API in hourly aggregates for blobs. @@ -293,7 +293,7 @@ async def set_service_properties( :caption: Setting service properties for the blob service. """ props = StorageServiceProperties( - logging=logging, + logging=analytics_logging, hour_metrics=hour_metrics, minute_metrics=minute_metrics, cors=cors, diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/blob_service_client.py b/sdk/storage/azure-storage-blob/azure/storage/blob/blob_service_client.py index 2a9d87b22598..de298072a45e 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/blob_service_client.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/blob_service_client.py @@ -38,7 +38,7 @@ from .lease import LeaseClient from .models import ( BlobProperties, - Logging, + BlobAnalyticsLogging, Metrics, RetentionPolicy, StaticWebsite, @@ -354,7 +354,7 @@ def get_service_properties(self, **kwargs): @distributed_trace def set_service_properties( - self, logging=None, # type: Optional[Logging] + self, analytics_logging=None, # type: Optional[BlobAnalyticsLogging] hour_metrics=None, # type: Optional[Metrics] minute_metrics=None, # type: Optional[Metrics] cors=None, # type: Optional[List[CorsRule]] @@ -367,12 +367,12 @@ def set_service_properties( """Sets the properties of a storage account's Blob service, including Azure Storage Analytics. - If an element (e.g. Logging) is left as None, the + If an element (e.g. analytics_logging) is left as None, the existing settings on the service for that functionality are preserved. - :param logging: + :param analytics_logging: Groups the Azure Analytics Logging settings. - :type logging: ~azure.storage.blob.Logging + :type analytics_logging: ~azure.storage.blob.BlobAnalyticsLogging :param hour_metrics: The hour metrics settings provide a summary of request statistics grouped by API in hourly aggregates for blobs. @@ -411,7 +411,7 @@ def set_service_properties( :caption: Setting service properties for the blob service. """ props = StorageServiceProperties( - logging=logging, + logging=analytics_logging, hour_metrics=hour_metrics, minute_metrics=minute_metrics, cors=cors, diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/models.py b/sdk/storage/azure-storage-blob/azure/storage/blob/models.py index 30e2d7a7f454..79d477db923b 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/models.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/models.py @@ -114,7 +114,7 @@ class PublicAccess(str, Enum): """ -class Logging(GeneratedLogging): +class BlobAnalyticsLogging(GeneratedLogging): """Azure Analytics Logging settings. :param str version: diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties.test_blob_service_properties.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties.test_blob_service_properties.yaml index ff0ca6fd3700..2ace7aa83f10 100644 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties.test_blob_service_properties.yaml +++ b/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties.test_blob_service_properties.yaml @@ -63,8 +63,8 @@ interactions: uri: https://remotestoragename.blob.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0falsefalsefalsefalse1.0falsefalse1.0falsefalsefalsetrueindex.html2014-02-14" + string: "\uFEFF1.0falsefalsefalsefalse1.0falsefalse1.0falsefalsefalsetrueindex.html2014-02-14" headers: Content-Type: - application/xml @@ -147,8 +147,8 @@ interactions: uri: https://storagename.blob.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0falsefalsefalsefalse1.0falsefalse1.0falsefalsefalsetrueindex.html2014-02-14" + string: "\uFEFF1.0falsefalsefalsefalse1.0falsefalse1.0falsefalsefalsetrueindex.html2014-02-14" headers: Content-Type: - application/xml @@ -167,4 +167,88 @@ interactions: status: code: 200 message: OK +- request: + body: ' + + 1.0falsefalsefalsefalse1.0falsefalse1.0falsefalse2014-02-14' + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '585' + Content-Type: + - application/xml; charset=utf-8 + User-Agent: + - azsdk-python-storage-blob/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) + x-ms-client-request-id: + - 19134036-f033-11e9-a231-b831b58100e8 + x-ms-date: + - Wed, 16 Oct 2019 16:36:26 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/?restype=service&comp=properties + response: + body: + string: '' + headers: + Content-Length: + - '0' + Date: + - Wed, 16 Oct 2019 16:36:26 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-request-id: + - aa29e103-401e-000d-773f-848b0c000000 + x-ms-version: + - '2019-02-02' + status: + code: 202 + message: Accepted +- request: + body: null + headers: + Accept: + - application/xml + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + User-Agent: + - azsdk-python-storage-blob/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) + x-ms-client-request-id: + - 194772b8-f033-11e9-9f32-b831b58100e8 + x-ms-date: + - Wed, 16 Oct 2019 16:36:26 GMT + x-ms-version: + - '2019-02-02' + method: GET + uri: https://blobstoragename.blob.core.windows.net/?restype=service&comp=properties + response: + body: + string: "\uFEFF1.0falsefalsefalsefalse1.0falsefalse1.0falsefalsefalsetrueindex.html2014-02-14" + headers: + Content-Type: + - application/xml + Date: + - Wed, 16 Oct 2019 16:36:26 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + Transfer-Encoding: + - chunked + Vary: + - Origin + x-ms-request-id: + - aa29e120-401e-000d-0d3f-848b0c000000 + x-ms-version: + - '2019-02-02' + status: + code: 200 + message: OK version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties.test_set_logging.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties.test_set_logging.yaml index 168ff108acd8..2dbf07e6fbdc 100644 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties.test_set_logging.yaml +++ b/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties.test_set_logging.yaml @@ -62,8 +62,8 @@ interactions: uri: https://remotestoragename.blob.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0truetruetruetrue51.0truetruetrue51.0falsefalseGETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500falsefalse2014-02-14" + string: "\uFEFF1.0truetruetruetrue51.0truetruetrue51.0falsefalseGETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500falsefalse2014-02-14" headers: Content-Type: - application/xml @@ -145,8 +145,8 @@ interactions: uri: https://storagename.blob.core.windows.net/?restype=service&comp=properties response: body: - string: "\uFEFF1.0truetruetruetrue51.0truetruetrue51.0falsefalseGETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500falsefalse2014-02-14" + string: "\uFEFF1.0truetruetruetrue51.0truetruetrue51.0falsefalseGETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500falsefalse2014-02-14" headers: Content-Type: - application/xml @@ -165,4 +165,87 @@ interactions: status: code: 200 message: OK +- request: + body: ' + + 1.0truetruetruetrue5' + headers: + Accept: + - '*/*' + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + Content-Length: + - '262' + Content-Type: + - application/xml; charset=utf-8 + User-Agent: + - azsdk-python-storage-blob/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) + x-ms-client-request-id: + - efb3f422-f032-11e9-80bf-b831b58100e8 + x-ms-date: + - Wed, 16 Oct 2019 16:35:17 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/?restype=service&comp=properties + response: + body: + string: '' + headers: + Content-Length: + - '0' + Date: + - Wed, 16 Oct 2019 16:35:17 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-request-id: + - 5b54fe89-a01e-008f-463f-842a5c000000 + x-ms-version: + - '2019-02-02' + status: + code: 202 + message: Accepted +- request: + body: null + headers: + Accept: + - application/xml + Accept-Encoding: + - gzip, deflate + Connection: + - keep-alive + User-Agent: + - azsdk-python-storage-blob/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) + x-ms-client-request-id: + - f097f7fa-f032-11e9-99ee-b831b58100e8 + x-ms-date: + - Wed, 16 Oct 2019 16:35:18 GMT + x-ms-version: + - '2019-02-02' + method: GET + uri: https://blobstoragename.blob.core.windows.net/?restype=service&comp=properties + response: + body: + string: "\uFEFF1.0truetruetruetrue51.0truetruetrue51.0truetruetrue5GETwww.xyz.com0falsetrueindex.html2014-02-14" + headers: + Content-Type: + - application/xml + Date: + - Wed, 16 Oct 2019 16:35:17 GMT + Server: + - Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + Transfer-Encoding: + - chunked + Vary: + - Origin + x-ms-request-id: + - 5b54febc-a01e-008f-6b3f-842a5c000000 + x-ms-version: + - '2019-02-02' + status: + code: 200 + message: OK version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties_async.test_blob_service_properties_async.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties_async.test_blob_service_properties_async.yaml index 484f6457b1ed..2838efc00b57 100644 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties_async.test_blob_service_properties_async.yaml +++ b/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties_async.test_blob_service_properties_async.yaml @@ -95,4 +95,95 @@ interactions: - / - restype=service&comp=properties - '' +- request: + body: ' + + 1.0falsefalsefalsefalse1.0falsefalse1.0falsefalse2014-02-14' + headers: + Content-Length: + - '585' + Content-Type: + - application/xml; charset=utf-8 + User-Agent: + - azsdk-python-storage-blob/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) + x-ms-client-request-id: + - ab4e3df4-f033-11e9-840e-b831b58100e8 + x-ms-date: + - Wed, 16 Oct 2019 16:40:31 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/?restype=service&comp=properties + response: + body: + string: '' + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Length + : '0' + ? !!python/object/new:multidict._istr.istr + - Date + : Wed, 16 Oct 2019 16:40:31 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-request-id: 0db8308d-001e-000a-3140-847d89000000 + x-ms-version: '2019-02-02' + status: + code: 202 + message: Accepted + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - / + - restype=service&comp=properties + - '' +- request: + body: null + headers: + Accept: + - application/xml + User-Agent: + - azsdk-python-storage-blob/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) + x-ms-client-request-id: + - ab7d62fa-f033-11e9-bfba-b831b58100e8 + x-ms-date: + - Wed, 16 Oct 2019 16:40:32 GMT + x-ms-version: + - '2019-02-02' + method: GET + uri: https://blobstoragename.blob.core.windows.net/?restype=service&comp=properties + response: + body: + string: "\uFEFF1.0falsefalsefalsefalse1.0falsefalse1.0falsefalsefalsetrueindex.html2014-02-14" + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Type + : application/xml + ? !!python/object/new:multidict._istr.istr + - Date + : Wed, 16 Oct 2019 16:40:32 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + ? !!python/object/new:multidict._istr.istr + - Transfer-Encoding + : chunked + x-ms-request-id: 0db830ac-001e-000a-4240-847d89000000 + x-ms-version: '2019-02-02' + status: + code: 200 + message: OK + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - / + - restype=service&comp=properties + - '' version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties_async.test_set_logging_async.yaml b/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties_async.test_set_logging_async.yaml index 58d0f403c9b2..90e81922d09f 100644 --- a/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties_async.test_set_logging_async.yaml +++ b/sdk/storage/azure-storage-blob/tests/recordings/test_blob_service_properties_async.test_set_logging_async.yaml @@ -94,4 +94,97 @@ interactions: - / - restype=service&comp=properties - '' +- request: + body: ' + + 1.0truetruetruetrue5' + headers: + Content-Length: + - '262' + Content-Type: + - application/xml; charset=utf-8 + User-Agent: + - azsdk-python-storage-blob/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) + x-ms-client-request-id: + - f0b2a480-f033-11e9-8adb-b831b58100e8 + x-ms-date: + - Wed, 16 Oct 2019 16:42:28 GMT + x-ms-version: + - '2019-02-02' + method: PUT + uri: https://blobstoragename.blob.core.windows.net/?restype=service&comp=properties + response: + body: + string: '' + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Length + : '0' + ? !!python/object/new:multidict._istr.istr + - Date + : Wed, 16 Oct 2019 16:42:27 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + x-ms-request-id: 09959a93-e01e-00aa-5940-84b2ef000000 + x-ms-version: '2019-02-02' + status: + code: 202 + message: Accepted + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - / + - restype=service&comp=properties + - '' +- request: + body: null + headers: + Accept: + - application/xml + User-Agent: + - azsdk-python-storage-blob/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) + x-ms-client-request-id: + - f0d5e4ba-f033-11e9-b17a-b831b58100e8 + x-ms-date: + - Wed, 16 Oct 2019 16:42:28 GMT + x-ms-version: + - '2019-02-02' + method: GET + uri: https://blobstoragename.blob.core.windows.net/?restype=service&comp=properties + response: + body: + string: "\uFEFF1.0truetruetruetrue51.0truetruetrue51.0truetruetrue5GETwww.xyz.com0GET,PUTwww.xyz.com,www.ab.com,www.bc.comx-ms-meta-xyz,x-ms-meta-foo,x-ms-meta-data*,x-ms-meta-target*x-ms-meta-abc,x-ms-meta-bcd,x-ms-meta-data*,x-ms-meta-source*500falsetrueindex.html2014-02-14" + headers: + ? !!python/object/new:multidict._istr.istr + - Content-Type + : application/xml + ? !!python/object/new:multidict._istr.istr + - Date + : Wed, 16 Oct 2019 16:42:28 GMT + ? !!python/object/new:multidict._istr.istr + - Server + : Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0 + ? !!python/object/new:multidict._istr.istr + - Transfer-Encoding + : chunked + ? !!python/object/new:multidict._istr.istr + - Vary + : Origin + x-ms-request-id: 09959a9c-e01e-00aa-5b40-84b2ef000000 + x-ms-version: '2019-02-02' + status: + code: 200 + message: OK + url: !!python/object/new:yarl.URL + state: !!python/tuple + - !!python/object/new:urllib.parse.SplitResult + - https + - amqptest.blob.core.windows.net + - / + - restype=service&comp=properties + - '' version: 1 diff --git a/sdk/storage/azure-storage-blob/tests/test_blob_samples_service.py b/sdk/storage/azure-storage-blob/tests/test_blob_samples_service.py index d32b6b3fadc0..dadf12a24979 100644 --- a/sdk/storage/azure-storage-blob/tests/test_blob_samples_service.py +++ b/sdk/storage/azure-storage-blob/tests/test_blob_samples_service.py @@ -45,10 +45,10 @@ def test_blob_service_properties(self): # [START set_blob_service_properties] # Create service properties - from azure.storage.blob import Logging, Metrics, CorsRule, RetentionPolicy + from azure.storage.blob import BlobAnalyticsLogging, Metrics, CorsRule, RetentionPolicy # Create logging settings - logging = Logging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) + logging = BlobAnalyticsLogging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) # Create metrics for requests statistics hour_metrics = Metrics(enabled=True, include_apis=True, retention_policy=RetentionPolicy(enabled=True, days=5)) diff --git a/sdk/storage/azure-storage-blob/tests/test_blob_samples_service_async.py b/sdk/storage/azure-storage-blob/tests/test_blob_samples_service_async.py index dc4a8d22bf6f..2b9b8440fbec 100644 --- a/sdk/storage/azure-storage-blob/tests/test_blob_samples_service_async.py +++ b/sdk/storage/azure-storage-blob/tests/test_blob_samples_service_async.py @@ -51,10 +51,10 @@ async def _test_blob_service_properties_async(self): # [START set_blob_service_properties] # Create service properties - from azure.storage.blob import Logging, Metrics, CorsRule, RetentionPolicy + from azure.storage.blob import BlobAnalyticsLogging, Metrics, CorsRule, RetentionPolicy # Create logging settings - logging = Logging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) + logging = BlobAnalyticsLogging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) # Create metrics for requests statistics hour_metrics = Metrics(enabled=True, include_apis=True, retention_policy=RetentionPolicy(enabled=True, days=5)) diff --git a/sdk/storage/azure-storage-blob/tests/test_blob_service_properties.py b/sdk/storage/azure-storage-blob/tests/test_blob_service_properties.py index af9c2dbb45f7..257fb86a60bd 100644 --- a/sdk/storage/azure-storage-blob/tests/test_blob_service_properties.py +++ b/sdk/storage/azure-storage-blob/tests/test_blob_service_properties.py @@ -14,7 +14,7 @@ BlobServiceClient, ContainerClient, BlobClient, - Logging, + BlobAnalyticsLogging, Metrics, CorsRule, RetentionPolicy, @@ -43,7 +43,7 @@ def setUp(self): def _assert_properties_default(self, prop): self.assertIsNotNone(prop) - self._assert_logging_equal(prop.logging, Logging()) + self._assert_logging_equal(prop.logging, BlobAnalyticsLogging()) self._assert_metrics_equal(prop.hour_metrics, Metrics()) self._assert_metrics_equal(prop.minute_metrics, Metrics()) self._assert_cors_equal(prop.cors, list()) @@ -122,7 +122,7 @@ def test_blob_service_properties(self): # Act resp = self.bsc.set_service_properties( - logging=Logging(), + analytics_logging=BlobAnalyticsLogging(), hour_metrics=Metrics(), minute_metrics=Metrics(), cors=list(), @@ -310,10 +310,10 @@ def test_set_static_website_properties_does_not_impact_other_properties(self): @record def test_set_logging(self): # Arrange - logging = Logging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) + logging = BlobAnalyticsLogging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) # Act - self.bsc.set_service_properties(logging=logging) + self.bsc.set_service_properties(analytics_logging=logging) # Assert received_props = self.bsc.get_service_properties() diff --git a/sdk/storage/azure-storage-blob/tests/test_blob_service_properties_async.py b/sdk/storage/azure-storage-blob/tests/test_blob_service_properties_async.py index 06c0d82ca499..79fd1ef6e713 100644 --- a/sdk/storage/azure-storage-blob/tests/test_blob_service_properties_async.py +++ b/sdk/storage/azure-storage-blob/tests/test_blob_service_properties_async.py @@ -22,7 +22,7 @@ from multidict import CIMultiDict, CIMultiDictProxy from azure.storage.blob import ( - Logging, + BlobAnalyticsLogging, Metrics, CorsRule, RetentionPolicy, @@ -60,7 +60,7 @@ def setUp(self): def _assert_properties_default(self, prop): self.assertIsNotNone(prop) - self._assert_logging_equal(prop.logging, Logging()) + self._assert_logging_equal(prop.logging, BlobAnalyticsLogging()) self._assert_metrics_equal(prop.hour_metrics, Metrics()) self._assert_metrics_equal(prop.minute_metrics, Metrics()) self._assert_cors_equal(prop.cors, list()) @@ -138,7 +138,7 @@ async def _test_blob_service_properties_async(self): # Act resp = await self.bsc.set_service_properties( - logging=Logging(), + analytics_logging=BlobAnalyticsLogging(), hour_metrics=Metrics(), minute_metrics=Metrics(), cors=list(), @@ -362,10 +362,10 @@ def test_set_static_website_properties_does_not_impact_other_properties_async(se async def _test_set_logging_async(self): # Arrange - logging = Logging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) + logging = BlobAnalyticsLogging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) # Act - await self.bsc.set_service_properties(logging=logging) + await self.bsc.set_service_properties(analytics_logging=logging) # Assert received_props = await self.bsc.get_service_properties() diff --git a/sdk/storage/azure-storage-queue/HISTORY.md b/sdk/storage/azure-storage-queue/HISTORY.md index 22ee55bc6981..bdbd883e6ad0 100644 --- a/sdk/storage/azure-storage-queue/HISTORY.md +++ b/sdk/storage/azure-storage-queue/HISTORY.md @@ -18,6 +18,7 @@ should be imported from azure.storage.queue.aio - `timeout` etc. - `QueueMessage` has had its parameters renamed from `insertion_time`, `time_next_visible`, `expiration_time` to `inserted_on`, `next_visible_on`, `expires_on`, respectively. +- `Logging` has been renamed to `QueueAnalyticsLogging`. - `enqueue_message` is now called `send_message`. **New features** diff --git a/sdk/storage/azure-storage-queue/azure/storage/queue/__init__.py b/sdk/storage/azure-storage-queue/azure/storage/queue/__init__.py index aaa2da80ea8f..15bbdf3d4ff1 100644 --- a/sdk/storage/azure-storage-queue/azure/storage/queue/__init__.py +++ b/sdk/storage/azure-storage-queue/azure/storage/queue/__init__.py @@ -27,7 +27,7 @@ QueueProperties, QueueSasPermissions, AccessPolicy, - Logging, + QueueAnalyticsLogging, Metrics, CorsRule, RetentionPolicy, @@ -54,7 +54,7 @@ 'BinaryBase64DecodePolicy', 'TextXMLEncodePolicy', 'TextXMLDecodePolicy', - 'Logging', + 'QueueAnalyticsLogging', 'Metrics', 'CorsRule', 'RetentionPolicy', diff --git a/sdk/storage/azure-storage-queue/azure/storage/queue/aio/queue_service_client_async.py b/sdk/storage/azure-storage-queue/azure/storage/queue/aio/queue_service_client_async.py index ee7835eb5044..6693601a3fa2 100644 --- a/sdk/storage/azure-storage-queue/azure/storage/queue/aio/queue_service_client_async.py +++ b/sdk/storage/azure-storage-queue/azure/storage/queue/aio/queue_service_client_async.py @@ -34,7 +34,7 @@ from azure.core.pipeline.policies import HTTPPolicy from ..models import ( QueueProperties, - Logging, + QueueAnalyticsLogging, Metrics, CorsRule, ) @@ -168,7 +168,7 @@ async def get_service_properties(self, **kwargs): # type: ignore @distributed_trace_async async def set_service_properties( # type: ignore - self, logging=None, # type: Optional[Logging] + self, analytics_logging=None, # type: Optional[QueueAnalyticsLogging] hour_metrics=None, # type: Optional[Metrics] minute_metrics=None, # type: Optional[Metrics] cors=None, # type: Optional[List[CorsRule]] @@ -178,12 +178,12 @@ async def set_service_properties( # type: ignore """Sets the properties of a storage account's Queue service, including Azure Storage Analytics. - If an element (e.g. Logging) is left as None, the + If an element (e.g. analytics_logging) is left as None, the existing settings on the service for that functionality are preserved. - :param logging: + :param analytics_logging: Groups the Azure Analytics Logging settings. - :type logging: ~azure.storage.queue.Logging + :type analytics_logging: ~azure.storage.queue.QueueAnalyticsLogging :param hour_metrics: The hour metrics settings provide a summary of request statistics grouped by API in hourly aggregates for queues. @@ -212,7 +212,7 @@ async def set_service_properties( # type: ignore """ timeout = kwargs.pop('timeout', None) props = StorageServiceProperties( - logging=logging, + logging=analytics_logging, hour_metrics=hour_metrics, minute_metrics=minute_metrics, cors=cors diff --git a/sdk/storage/azure-storage-queue/azure/storage/queue/models.py b/sdk/storage/azure-storage-queue/azure/storage/queue/models.py index 87a3992de8c8..d0eef3d745f0 100644 --- a/sdk/storage/azure-storage-queue/azure/storage/queue/models.py +++ b/sdk/storage/azure-storage-queue/azure/storage/queue/models.py @@ -18,7 +18,7 @@ from ._generated.models import CorsRule as GeneratedCorsRule -class Logging(GeneratedLogging): +class QueueAnalyticsLogging(GeneratedLogging): """Azure Analytics Logging settings. All required parameters must be populated in order to send to Azure. diff --git a/sdk/storage/azure-storage-queue/azure/storage/queue/queue_service_client.py b/sdk/storage/azure-storage-queue/azure/storage/queue/queue_service_client.py index 86f6ea6c6d67..c0eed0def23f 100644 --- a/sdk/storage/azure-storage-queue/azure/storage/queue/queue_service_client.py +++ b/sdk/storage/azure-storage-queue/azure/storage/queue/queue_service_client.py @@ -32,7 +32,7 @@ from ._shared.models import AccountSasPermissions, ResourceTypes from .models import ( QueueProperties, - Logging, + QueueAnalyticsLogging, Metrics, CorsRule ) @@ -267,7 +267,7 @@ def get_service_properties(self, **kwargs): # type: ignore @distributed_trace def set_service_properties( # type: ignore - self, logging=None, # type: Optional[Logging] + self, analytics_logging=None, # type: Optional[QueueAnalyticsLogging] hour_metrics=None, # type: Optional[Metrics] minute_metrics=None, # type: Optional[Metrics] cors=None, # type: Optional[List[CorsRule]] @@ -277,12 +277,12 @@ def set_service_properties( # type: ignore """Sets the properties of a storage account's Queue service, including Azure Storage Analytics. - If an element (e.g. Logging) is left as None, the + If an element (e.g. analytics_logging) is left as None, the existing settings on the service for that functionality are preserved. - :param logging: + :param analytics_logging: Groups the Azure Analytics Logging settings. - :type logging: ~azure.storage.queue.Logging + :type analytics_logging: ~azure.storage.queue.QueueAnalyticsLogging :param hour_metrics: The hour metrics settings provide a summary of request statistics grouped by API in hourly aggregates for queues. @@ -311,7 +311,7 @@ def set_service_properties( # type: ignore """ timeout = kwargs.pop('timeout', None) props = StorageServiceProperties( - logging=logging, + logging=analytics_logging, hour_metrics=hour_metrics, minute_metrics=minute_metrics, cors=cors diff --git a/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties.test_queue_service_properties.yaml b/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties.test_queue_service_properties.yaml index a544746cf191..8714f48f1bd6 100644 --- a/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties.test_queue_service_properties.yaml +++ b/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties.test_queue_service_properties.yaml @@ -16,9 +16,9 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) x-ms-date: - - Wed, 16 Oct 2019 06:57:13 GMT + - Wed, 16 Oct 2019 16:45:37 GMT x-ms-version: - '2018-03-28' method: PUT @@ -30,7 +30,7 @@ interactions: content-length: - '0' date: - - Wed, 16 Oct 2019 06:57:13 GMT + - Wed, 16 Oct 2019 16:45:38 GMT server: - Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0 x-ms-version: @@ -48,9 +48,9 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) x-ms-date: - - Wed, 16 Oct 2019 06:57:14 GMT + - Wed, 16 Oct 2019 16:45:38 GMT x-ms-version: - '2018-03-28' method: GET @@ -65,7 +65,7 @@ interactions: content-type: - application/xml date: - - Wed, 16 Oct 2019 06:57:13 GMT + - Wed, 16 Oct 2019 16:45:38 GMT server: - Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: diff --git a/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties.test_set_logging.yaml b/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties.test_set_logging.yaml index d934a5144d11..36da6f47eb92 100644 --- a/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties.test_set_logging.yaml +++ b/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties.test_set_logging.yaml @@ -15,9 +15,9 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) x-ms-date: - - Wed, 16 Oct 2019 06:57:16 GMT + - Wed, 16 Oct 2019 16:38:05 GMT x-ms-version: - '2018-03-28' method: PUT @@ -29,7 +29,7 @@ interactions: content-length: - '0' date: - - Wed, 16 Oct 2019 06:57:15 GMT + - Wed, 16 Oct 2019 16:38:05 GMT server: - Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0 x-ms-version: @@ -47,9 +47,9 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) x-ms-date: - - Wed, 16 Oct 2019 06:57:16 GMT + - Wed, 16 Oct 2019 16:38:05 GMT x-ms-version: - '2018-03-28' method: GET @@ -64,7 +64,7 @@ interactions: content-type: - application/xml date: - - Wed, 16 Oct 2019 06:57:15 GMT + - Wed, 16 Oct 2019 16:38:05 GMT server: - Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: diff --git a/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties_async.test_queue_service_properties.yaml b/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties_async.test_queue_service_properties.yaml index a183cc5de258..8c237eef9399 100644 --- a/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties_async.test_queue_service_properties.yaml +++ b/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties_async.test_queue_service_properties.yaml @@ -10,9 +10,9 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) x-ms-date: - - Wed, 16 Oct 2019 06:57:37 GMT + - Wed, 16 Oct 2019 16:47:37 GMT x-ms-version: - '2018-03-28' method: PUT @@ -22,7 +22,7 @@ interactions: string: '' headers: content-length: '0' - date: Wed, 16 Oct 2019 06:57:36 GMT + date: Wed, 16 Oct 2019 16:47:37 GMT server: Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0 x-ms-version: '2018-03-28' status: @@ -42,9 +42,9 @@ interactions: Accept: - application/xml User-Agent: - - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) x-ms-date: - - Wed, 16 Oct 2019 06:57:37 GMT + - Wed, 16 Oct 2019 16:47:37 GMT x-ms-version: - '2018-03-28' method: GET @@ -56,7 +56,7 @@ interactions: headers: cache-control: no-cache content-type: application/xml - date: Wed, 16 Oct 2019 06:57:36 GMT + date: Wed, 16 Oct 2019 16:47:37 GMT server: Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked x-ms-version: '2018-03-28' diff --git a/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties_async.test_set_logging.yaml b/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties_async.test_set_logging.yaml index 7ecfcff6aa4d..50a88c430296 100644 --- a/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties_async.test_set_logging.yaml +++ b/sdk/storage/azure-storage-queue/tests/recordings/test_queue_service_properties_async.test_set_logging.yaml @@ -9,9 +9,9 @@ interactions: Content-Type: - application/xml; charset=utf-8 User-Agent: - - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) x-ms-date: - - Wed, 16 Oct 2019 06:57:33 GMT + - Wed, 16 Oct 2019 16:48:30 GMT x-ms-version: - '2018-03-28' method: PUT @@ -21,7 +21,7 @@ interactions: string: '' headers: content-length: '0' - date: Wed, 16 Oct 2019 06:57:37 GMT + date: Wed, 16 Oct 2019 16:48:30 GMT server: Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0 x-ms-version: '2018-03-28' status: @@ -41,9 +41,9 @@ interactions: Accept: - application/xml User-Agent: - - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.17763-SP0) + - azsdk-python-storage-queue/12.0.0b4 Python/3.7.3 (Windows-10-10.0.18362-SP0) x-ms-date: - - Wed, 16 Oct 2019 06:57:38 GMT + - Wed, 16 Oct 2019 16:48:30 GMT x-ms-version: - '2018-03-28' method: GET @@ -55,7 +55,7 @@ interactions: headers: cache-control: no-cache content-type: application/xml - date: Wed, 16 Oct 2019 06:57:38 GMT + date: Wed, 16 Oct 2019 16:48:30 GMT server: Windows-Azure-Queue/1.0 Microsoft-HTTPAPI/2.0 transfer-encoding: chunked x-ms-version: '2018-03-28' diff --git a/sdk/storage/azure-storage-queue/tests/test_queue_samples_service.py b/sdk/storage/azure-storage-queue/tests/test_queue_samples_service.py index 259439dae379..46564ab05ff3 100644 --- a/sdk/storage/azure-storage-queue/tests/test_queue_samples_service.py +++ b/sdk/storage/azure-storage-queue/tests/test_queue_samples_service.py @@ -23,10 +23,10 @@ def test_queue_service_properties(self, resource_group, location, storage_accoun # [START set_queue_service_properties] # Create service properties - from azure.storage.queue import Logging, Metrics, CorsRule, RetentionPolicy + from azure.storage.queue import QueueAnalyticsLogging, Metrics, CorsRule, RetentionPolicy # Create logging settings - logging = Logging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) + logging = QueueAnalyticsLogging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) # Create metrics for requests statistics hour_metrics = Metrics(enabled=True, include_apis=True, retention_policy=RetentionPolicy(enabled=True, days=5)) diff --git a/sdk/storage/azure-storage-queue/tests/test_queue_samples_service_async.py b/sdk/storage/azure-storage-queue/tests/test_queue_samples_service_async.py index 93b724d83983..f7c50b4ea87c 100644 --- a/sdk/storage/azure-storage-queue/tests/test_queue_samples_service_async.py +++ b/sdk/storage/azure-storage-queue/tests/test_queue_samples_service_async.py @@ -26,10 +26,10 @@ async def test_queue_service_properties(self, resource_group, location, storage_ # [START async_set_queue_service_properties] # Create service properties - from azure.storage.queue import Logging, Metrics, CorsRule, RetentionPolicy + from azure.storage.queue import QueueAnalyticsLogging, Metrics, CorsRule, RetentionPolicy # Create logging settings - logging = Logging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) + logging = QueueAnalyticsLogging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) # Create metrics for requests statistics hour_metrics = Metrics(enabled=True, include_apis=True, retention_policy=RetentionPolicy(enabled=True, days=5)) diff --git a/sdk/storage/azure-storage-queue/tests/test_queue_service_properties.py b/sdk/storage/azure-storage-queue/tests/test_queue_service_properties.py index abe20183ddb1..a0b06baceb3a 100644 --- a/sdk/storage/azure-storage-queue/tests/test_queue_service_properties.py +++ b/sdk/storage/azure-storage-queue/tests/test_queue_service_properties.py @@ -14,7 +14,7 @@ from azure.storage.queue import ( QueueServiceClient, QueueClient, - Logging, + QueueAnalyticsLogging, Metrics, CorsRule, RetentionPolicy, @@ -33,7 +33,7 @@ class QueueServicePropertiesTest(QueueTestCase): def _assert_properties_default(self, prop): self.assertIsNotNone(prop) - self._assert_logging_equal(prop.logging, Logging()) + self._assert_logging_equal(prop.logging, QueueAnalyticsLogging()) self._assert_metrics_equal(prop.hour_metrics, Metrics()) self._assert_metrics_equal(prop.minute_metrics, Metrics()) self._assert_cors_equal(prop.cors, list()) @@ -113,7 +113,7 @@ def test_queue_service_properties(self, resource_group, location, storage_accoun qsc = QueueServiceClient(self._account_url(storage_account.name), storage_account_key) # Act resp = qsc.set_service_properties( - logging=Logging(), + analytics_logging=QueueAnalyticsLogging(), hour_metrics=Metrics(), minute_metrics=Metrics(), cors=list()) @@ -130,10 +130,10 @@ def test_queue_service_properties(self, resource_group, location, storage_accoun def test_set_logging(self, resource_group, location, storage_account, storage_account_key): # Arrange qsc = QueueServiceClient(self._account_url(storage_account.name), storage_account_key) - logging = Logging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) + logging = QueueAnalyticsLogging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) # Act - qsc.set_service_properties(logging=logging) + qsc.set_service_properties(analytics_logging=logging) # Assert received_props = qsc.get_service_properties() diff --git a/sdk/storage/azure-storage-queue/tests/test_queue_service_properties_async.py b/sdk/storage/azure-storage-queue/tests/test_queue_service_properties_async.py index dfa6091b4a07..9581ac77089e 100644 --- a/sdk/storage/azure-storage-queue/tests/test_queue_service_properties_async.py +++ b/sdk/storage/azure-storage-queue/tests/test_queue_service_properties_async.py @@ -13,7 +13,7 @@ from multidict import CIMultiDict, CIMultiDictProxy from azure.core.exceptions import HttpResponseError from azure.storage.queue import ( - Logging, + QueueAnalyticsLogging, Metrics, CorsRule, RetentionPolicy @@ -43,7 +43,7 @@ class QueueServicePropertiesTest(AsyncQueueTestCase): def _assert_properties_default(self, prop): self.assertIsNotNone(prop) - self._assert_logging_equal(prop.logging, Logging()) + self._assert_logging_equal(prop.logging, QueueAnalyticsLogging()) self._assert_metrics_equal(prop.hour_metrics, Metrics()) self._assert_metrics_equal(prop.minute_metrics, Metrics()) self._assert_cors_equal(prop.cors, list()) @@ -125,7 +125,7 @@ async def test_queue_service_properties(self, resource_group, location, storage_ # Act resp = await qsc.set_service_properties( - logging=Logging(), + analytics_logging=QueueAnalyticsLogging(), hour_metrics=Metrics(), minute_metrics=Metrics(), cors=list()) @@ -142,10 +142,10 @@ async def test_queue_service_properties(self, resource_group, location, storage_ async def test_set_logging(self, resource_group, location, storage_account, storage_account_key): # Arrange qsc = QueueServiceClient(self._account_url(storage_account.name), storage_account_key, transport=AiohttpTestTransport()) - logging = Logging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) + logging = QueueAnalyticsLogging(read=True, write=True, delete=True, retention_policy=RetentionPolicy(enabled=True, days=5)) # Act - await qsc.set_service_properties(logging=logging) + await qsc.set_service_properties(analytics_logging=logging) # Assert received_props = await qsc.get_service_properties()