From 55a96ce9d482c2927b9014a02bd907732089bc20 Mon Sep 17 00:00:00 2001 From: Rick Ley Date: Mon, 8 Nov 2021 13:55:05 -0800 Subject: [PATCH] Premium file bandwidth limits (#25073) * Added service version. Updated sas recordings * Updated datalake version conversion * Updated customizations * Generated off swagger * Added support for feature * Added test * Removed unused import * Fixed broken recording * Recorded one of the tests * Added other recordings * Re-added annotation to test * Reverted to main swagger --- .../azure-storage-file-share/CHANGELOG.md | 2 + .../storage/file/share/ShareAsyncClient.java | 1 + .../AzureFileStorageImplBuilder.java | 33 ++++++++- .../models/SharePropertiesInternal.java | 26 +++++++ .../models/SharesGetPropertiesHeaders.java | 26 +++++++ .../implementation/util/ModelHelper.java | 1 + .../file/share/models/ShareProperties.java | 25 +++++++ .../file/share/FileServiceAPITests.groovy | 9 +++ .../storage/file/share/ShareAPITests.groovy | 1 + ...iceAPITestsListSharesWithPremiumShare.json | 61 ++++++---------- .../ShareAPITestsGetPropertiesPremium[0].json | 70 +++++++------------ .../ShareAPITestsGetPropertiesPremium[1].json | 70 +++++++------------ .../ShareAPITestsGetPropertiesPremium[2].json | 70 +++++++------------ .../ShareAPITestsGetPropertiesPremium[3].json | 70 +++++++------------ .../swagger/README.md | 2 +- .../ShareStorageCustomization.java | 6 +- 16 files changed, 246 insertions(+), 227 deletions(-) diff --git a/sdk/storage/azure-storage-file-share/CHANGELOG.md b/sdk/storage/azure-storage-file-share/CHANGELOG.md index 930089bc401d7..4ba0519d81e77 100644 --- a/sdk/storage/azure-storage-file-share/CHANGELOG.md +++ b/sdk/storage/azure-storage-file-share/CHANGELOG.md @@ -3,6 +3,8 @@ ## 12.12.0-beta.2 (Unreleased) ### Features Added +- Added support for the 2021-02-12 service version. +- Added support for new bandwidth limits. ### Breaking Changes diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareAsyncClient.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareAsyncClient.java index 669279232c3dd..49bf2b05c06b1 100644 --- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareAsyncClient.java +++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareAsyncClient.java @@ -1559,6 +1559,7 @@ private Response mapGetPropertiesResponse(SharesGetPropertiesRe .setNextAllowedQuotaDowngradeTime(headers.getXMsShareNextAllowedQuotaDowngradeTime()) .setProvisionedEgressMBps(headers.getXMsShareProvisionedEgressMbps()) .setProvisionedIngressMBps(headers.getXMsShareProvisionedIngressMbps()) + .setProvisionedBandwidthMiBps(headers.getXMsShareProvisionedBandwidthMibps()) .setProvisionedIops(headers.getXMsShareProvisionedIops()) .setLeaseDuration(headers.getXMsLeaseDuration()) .setLeaseState(headers.getXMsLeaseState()) diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/AzureFileStorageImplBuilder.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/AzureFileStorageImplBuilder.java index 4e49127b5857e..77c508b64935a 100644 --- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/AzureFileStorageImplBuilder.java +++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/AzureFileStorageImplBuilder.java @@ -6,8 +6,10 @@ import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.http.HttpClient; +import com.azure.core.http.HttpHeaders; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; +import com.azure.core.http.policy.AddHeadersPolicy; import com.azure.core.http.policy.CookiePolicy; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.http.policy.HttpLoggingPolicy; @@ -15,7 +17,9 @@ import com.azure.core.http.policy.HttpPolicyProviders; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.policy.UserAgentPolicy; +import com.azure.core.util.ClientOptions; import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; import java.util.ArrayList; @@ -173,6 +177,23 @@ public AzureFileStorageImplBuilder retryPolicy(RetryPolicy retryPolicy) { */ private final List pipelinePolicies; + /* + * The client options such as application ID and custom headers to set on a + * request. + */ + private ClientOptions clientOptions; + + /** + * Sets The client options such as application ID and custom headers to set on a request. + * + * @param clientOptions the clientOptions value. + * @return the AzureFileStorageImplBuilder. + */ + public AzureFileStorageImplBuilder clientOptions(ClientOptions clientOptions) { + this.clientOptions = clientOptions; + return this; + } + /** * Adds a custom Http pipeline policy. * @@ -209,11 +230,19 @@ private HttpPipeline createHttpPipeline() { if (httpLogOptions == null) { httpLogOptions = new HttpLogOptions(); } + if (clientOptions == null) { + clientOptions = new ClientOptions(); + } List policies = new ArrayList<>(); String clientName = properties.getOrDefault(SDK_NAME, "UnknownName"); String clientVersion = properties.getOrDefault(SDK_VERSION, "UnknownVersion"); - policies.add( - new UserAgentPolicy(httpLogOptions.getApplicationId(), clientName, clientVersion, buildConfiguration)); + String applicationId = CoreUtils.getApplicationId(clientOptions, httpLogOptions); + policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration)); + HttpHeaders headers = new HttpHeaders(); + clientOptions.getHeaders().forEach(header -> headers.set(header.getName(), header.getValue())); + if (headers.getSize() > 0) { + policies.add(new AddHeadersPolicy(headers)); + } HttpPolicyProviders.addBeforeRetryPolicies(policies); policies.add(retryPolicy == null ? new RetryPolicy() : retryPolicy); policies.add(new CookiePolicy()); diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/SharePropertiesInternal.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/SharePropertiesInternal.java index 18071b224e11d..d9d0e91181e04 100644 --- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/SharePropertiesInternal.java +++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/SharePropertiesInternal.java @@ -55,6 +55,12 @@ public final class SharePropertiesInternal { @JsonProperty(value = "ProvisionedEgressMBps") private Integer provisionedEgressMBps; + /* + * The ProvisionedBandwidthMiBps property. + */ + @JsonProperty(value = "ProvisionedBandwidthMiBps") + private Integer provisionedBandwidthMiBps; + /* * The NextAllowedQuotaDowngradeTime property. */ @@ -255,6 +261,26 @@ public SharePropertiesInternal setProvisionedEgressMBps(Integer provisionedEgres return this; } + /** + * Get the provisionedBandwidthMiBps property: The ProvisionedBandwidthMiBps property. + * + * @return the provisionedBandwidthMiBps value. + */ + public Integer getProvisionedBandwidthMiBps() { + return this.provisionedBandwidthMiBps; + } + + /** + * Set the provisionedBandwidthMiBps property: The ProvisionedBandwidthMiBps property. + * + * @param provisionedBandwidthMiBps the provisionedBandwidthMiBps value to set. + * @return the SharePropertiesInternal object itself. + */ + public SharePropertiesInternal setProvisionedBandwidthMiBps(Integer provisionedBandwidthMiBps) { + this.provisionedBandwidthMiBps = provisionedBandwidthMiBps; + return this; + } + /** * Get the nextAllowedQuotaDowngradeTime property: The NextAllowedQuotaDowngradeTime property. * diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/SharesGetPropertiesHeaders.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/SharesGetPropertiesHeaders.java index 4637b8d274508..4cdc2e1bfd8fc 100644 --- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/SharesGetPropertiesHeaders.java +++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/models/SharesGetPropertiesHeaders.java @@ -80,6 +80,12 @@ public final class SharesGetPropertiesHeaders { @JsonProperty(value = "x-ms-share-provisioned-ingress-mbps") private Integer xMsShareProvisionedIngressMbps; + /* + * The x-ms-share-provisioned-bandwidth-mibps property. + */ + @JsonProperty(value = "x-ms-share-provisioned-bandwidth-mibps") + private Integer xMsShareProvisionedBandwidthMibps; + /* * The x-ms-share-quota property. */ @@ -355,6 +361,26 @@ public SharesGetPropertiesHeaders setXMsShareProvisionedIngressMbps(Integer xMsS return this; } + /** + * Get the xMsShareProvisionedBandwidthMibps property: The x-ms-share-provisioned-bandwidth-mibps property. + * + * @return the xMsShareProvisionedBandwidthMibps value. + */ + public Integer getXMsShareProvisionedBandwidthMibps() { + return this.xMsShareProvisionedBandwidthMibps; + } + + /** + * Set the xMsShareProvisionedBandwidthMibps property: The x-ms-share-provisioned-bandwidth-mibps property. + * + * @param xMsShareProvisionedBandwidthMibps the xMsShareProvisionedBandwidthMibps value to set. + * @return the SharesGetPropertiesHeaders object itself. + */ + public SharesGetPropertiesHeaders setXMsShareProvisionedBandwidthMibps(Integer xMsShareProvisionedBandwidthMibps) { + this.xMsShareProvisionedBandwidthMibps = xMsShareProvisionedBandwidthMibps; + return this; + } + /** * Get the xMsShareQuota property: The x-ms-share-quota property. * diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/util/ModelHelper.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/util/ModelHelper.java index 6ed6ea8093757..2f0d7ddb71994 100644 --- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/util/ModelHelper.java +++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/implementation/util/ModelHelper.java @@ -139,6 +139,7 @@ public static ShareProperties populateShareProperties(SharePropertiesInternal sh properties.setProtocols(parseShareProtocols(sharePropertiesInternal.getEnabledProtocols())); properties.setRootSquash(sharePropertiesInternal.getRootSquash()); properties.setMetadata(sharePropertiesInternal.getMetadata()); + properties.setProvisionedBandwidthMiBps(sharePropertiesInternal.getProvisionedBandwidthMiBps()); return properties; } diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareProperties.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareProperties.java index 687522d12f128..c308e359027e2 100644 --- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareProperties.java +++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/models/ShareProperties.java @@ -126,6 +126,11 @@ public final class ShareProperties { @JsonProperty(value = "Metadata") private Map metadata; + /* + * The provisioned bandwidth. + */ + private Integer provisionedBandwidthMiBps; + /** * Get the lastModified property: The lastModified property. * @@ -257,6 +262,26 @@ public ShareProperties setProvisionedEgressMBps(Integer provisionedEgressMBps) { return this; } + /** + * Get the provisionedBandwidthMiBps property: The ProvisionedBandwidthMiBps property. + * + * @return the provisionedBandwidthMiBps value. + */ + public Integer getProvisionedBandwidthMiBps() { + return this.provisionedBandwidthMiBps; + } + + /** + * Set the provisionedBandwidthMiBps property: The ProvisionedBandwidthMiBps property. + * + * @param provisionedBandwidthMiBps the provisionedBandwidthMiBps value to set. + * @return the ShareProperties object itself. + */ + public ShareProperties setProvisionedBandwidthMiBps(Integer provisionedBandwidthMiBps) { + this.provisionedBandwidthMiBps = provisionedBandwidthMiBps; + return this; + } + /** * Get the nextAllowedQuotaDowngradeTime property: The * nextAllowedQuotaDowngradeTime property. diff --git a/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/FileServiceAPITests.groovy b/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/FileServiceAPITests.groovy index c3296477f1974..80aa335a71af5 100644 --- a/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/FileServiceAPITests.groovy +++ b/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/FileServiceAPITests.groovy @@ -4,6 +4,13 @@ package com.azure.storage.file.share import com.azure.core.util.Context +import com.azure.storage.blob.BlobContainerClient +import com.azure.storage.blob.BlobServiceVersion +import com.azure.storage.blob.models.BlobAnalyticsLogging +import com.azure.storage.blob.models.BlobContainerListDetails +import com.azure.storage.blob.models.BlobRetentionPolicy +import com.azure.storage.blob.models.BlobServiceProperties +import com.azure.storage.blob.models.ListBlobContainersOptions import com.azure.storage.common.StorageSharedKeyCredential import com.azure.storage.common.test.shared.extensions.PlaybackOnly import com.azure.storage.common.test.shared.extensions.RequiredServiceVersion @@ -244,6 +251,7 @@ class FileServiceAPITests extends APISpec { item.getProperties().getAccessTierTransitionState() == "pending-from-hot" } + @RequiredServiceVersion(clazz = ShareServiceVersion.class, min = "V2021_02_12") def "List shares with premium share"() { setup: def premiumShareName = generateShareName() @@ -262,6 +270,7 @@ class FileServiceAPITests extends APISpec { shareItem.getProperties().getProvisionedEgressMBps() shareItem.getProperties().getProvisionedIngressMBps() shareItem.getProperties().getProvisionedIops() + shareItem.getProperties().getProvisionedBandwidthMiBps() } } } diff --git a/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/ShareAPITests.groovy b/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/ShareAPITests.groovy index 5f3ae7305ba4b..18a5a0db853c8 100644 --- a/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/ShareAPITests.groovy +++ b/sdk/storage/azure-storage-file-share/src/test/java/com/azure/storage/file/share/ShareAPITests.groovy @@ -348,6 +348,7 @@ class ShareAPITests extends APISpec { shareProperties.getProvisionedEgressMBps() shareProperties.getProvisionedIngressMBps() shareProperties.getProvisionedIops() + shareProperties.getProvisionedBandwidthMiBps() shareProperties.getProtocols().toString() == enabledProtocol.toString() shareProperties.getRootSquash() == rootSquash diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileServiceAPITestsListSharesWithPremiumShare.json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileServiceAPITestsListSharesWithPremiumShare.json index 90fa0d8bfad59..8e6cb33f67736 100644 --- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileServiceAPITestsListSharesWithPremiumShare.json +++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/FileServiceAPITestsListSharesWithPremiumShare.json @@ -1,67 +1,46 @@ { "networkCallRecords" : [ { "Method" : "PUT", - "Uri" : "https://REDACTED.file.core.windows.net/51c57c98051c57c98f4f48896749239c6b8644d4daed?restype=share", + "Uri" : "https://REDACTED.file.preprod.core.windows.net/51c57c98051c57c9813955349f4ed3903d08b40fd8a5?restype=share", "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "f83c471d-4207-4c58-b341-a538d00fa8ef" + "x-ms-version" : "2021-02-12", + "User-Agent" : "azsdk-java-azure-storage-file-share/12.12.0-beta.1 (11.0.7; Windows 10; 10.0)", + "x-ms-client-request-id" : "628e5c62-99ca-4348-a5ee-ebe432097180" }, "Response" : { "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", + "x-ms-version" : "2021-02-12", "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D910031B83DD0E", - "Last-Modified" : "Wed, 05 May 2021 20:19:38 GMT", + "eTag" : "0x8D99D77E0407F2F", + "Last-Modified" : "Mon, 01 Nov 2021 20:40:43 GMT", "retry-after" : "0", "StatusCode" : "201", - "x-ms-request-id" : "aa3ba5c6-f01a-000c-2aeb-41a144000000", - "x-ms-client-request-id" : "f83c471d-4207-4c58-b341-a538d00fa8ef", - "Date" : "Wed, 05 May 2021 20:19:37 GMT" + "x-ms-request-id" : "e98e163f-401a-003c-0e60-cf5546000000", + "x-ms-client-request-id" : "628e5c62-99ca-4348-a5ee-ebe432097180", + "Date" : "Mon, 01 Nov 2021 20:40:43 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.file.core.windows.net?comp=list&include=", + "Uri" : "https://REDACTED.file.preprod.core.windows.net?comp=list&include=", "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "ae46349f-6659-440b-aaee-a66ed962fa7c" + "x-ms-version" : "2021-02-12", + "User-Agent" : "azsdk-java-azure-storage-file-share/12.12.0-beta.1 (11.0.7; Windows 10; 10.0)", + "x-ms-client-request-id" : "75a7518f-a1c9-45ff-8db9-750941bef32e" }, "Response" : { "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", + "x-ms-version" : "2021-02-12", "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", "retry-after" : "0", "StatusCode" : "200", - "x-ms-request-id" : "aa3ba5cc-f01a-000c-2ceb-41a144000000", - "Body" : "51c57c98051c57c98177984628b08a39401f84d35982Wed, 05 May 2021 19:16:15 GMT\"0x8D90FFA40DDED85\"unlockedavailable100Premium5004466Wed, 05 May 2021 19:16:15 GMT$account-encryption-keyfalse51c57c98051c57c983231618025b24f242d6f40c5b5dWed, 05 May 2021 20:04:18 GMT\"0x8D91000F75DA68D\"unlockedavailable100Premium5004466Wed, 05 May 2021 20:04:18 GMT$account-encryption-keyfalse51c57c98051c57c98f4f48896749239c6b8644d4daedWed, 05 May 2021 20:19:38 GMT\"0x8D910031B83DD0E\"unlockedavailable100Premium5004466Wed, 05 May 2021 20:19:38 GMT$account-encryption-keyfalsee1ae039b0e1ae039b8ed7631406c3a0f6907e4d7fa45Wed, 05 May 2021 20:04:19 GMT\"0x8D91000F7A6DA4E\"unlockedavailable100Premium5004466Wed, 05 May 2021 20:04:19 GMT$account-encryption-keyfalsee1ae039b0e1ae039bc02931343e5259114920490a9baWed, 05 May 2021 19:16:18 GMT\"0x8D90FFA42E53681\"unlockedavailable100Premium5004466Wed, 05 May 2021 19:16:18 GMT$account-encryption-keyfalsee1ae039b0e1ae039beb363014bb3dd0f1ca6744a9af6Wed, 05 May 2021 20:19:38 GMT\"0x8D910031B845322\"unlockedavailable100Premium5004466Wed, 05 May 2021 20:19:38 GMT$account-encryption-keyfalsejtsshareapitestsgetpropertiespremium05297687e65c4d0dTue, 12 May 2020 20:02:51 GMT\"0x8D7F6AF735E7E50\"unlockedavailable100Premium5004466Tue, 12 May 2020 20:02:51 GMT$account-encryption-keyfalse", - "x-ms-client-request-id" : "ae46349f-6659-440b-aaee-a66ed962fa7c", - "Date" : "Wed, 05 May 2021 20:19:37 GMT", - "Content-Type" : "application/xml" - }, - "Exception" : null - }, { - "Method" : "GET", - "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=51c57c98&include=", - "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "9653631f-c1b6-49e7-a363-5521f563852c" - }, - "Response" : { - "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", - "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", - "retry-after" : "0", - "StatusCode" : "200", - "x-ms-request-id" : "6a5aa590-501a-0019-2beb-414a0a000000", - "Body" : "51c57c98", - "x-ms-client-request-id" : "9653631f-c1b6-49e7-a363-5521f563852c", - "Date" : "Wed, 05 May 2021 20:19:37 GMT", + "x-ms-request-id" : "e98e164b-401a-003c-1760-cf5546000000", + "Body" : "51c57c98051c57c9813955349f4ed3903d08b40fd8a5Mon, 01 Nov 2021 20:40:43 GMT\"0x8D99D77E0407F2F\"unlockedavailable100SMBPremium500110110110Mon, 01 Nov 2021 20:40:43 GMT$account-encryption-keyfalse51c57c98051c57c98b58523952a5a28bb318b4d429a6Mon, 01 Nov 2021 20:39:44 GMT\"0x8D99D77BCC039DC\"unlockedavailable100SMBPremium500110110110Mon, 01 Nov 2021 20:39:44 GMT$account-encryption-keyfalseshare1Thu, 28 Oct 2021 23:39:25 GMT\"0x8D99A6C2D3F6D3E\"unlockedavailable100SMBPremium500110110110Thu, 28 Oct 2021 05:53:03 GMT$account-encryption-keyfalse", + "x-ms-client-request-id" : "75a7518f-a1c9-45ff-8db9-750941bef32e", + "Date" : "Mon, 01 Nov 2021 20:40:43 GMT", "Content-Type" : "application/xml" }, "Exception" : null } ], - "variables" : [ "51c57c9851c57c98f4f05301e3dec33189894af4b8", "51c57c98051c57c98f4f48896749239c6b8644d4daed" ] + "variables" : [ "51c57c9851c57c981390541673af954817fd4a79a3", "51c57c98051c57c9813955349f4ed3903d08b40fd8a5" ] } \ No newline at end of file diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[0].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[0].json index c8e47ca580c64..ccf12c210348b 100644 --- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[0].json +++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[0].json @@ -1,79 +1,59 @@ { "networkCallRecords" : [ { "Method" : "PUT", - "Uri" : "https://REDACTED.file.core.windows.net/65adf5a8065adf5a8042042158c5650588c444f368ef?restype=share", + "Uri" : "https://REDACTED.file.preprod.core.windows.net/65adf5a8065adf5a893206601729a3981b3974294ad0?restype=share", "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "938baebe-08fd-4fc4-a8dd-6172b796bf9c" + "x-ms-version" : "2021-02-12", + "User-Agent" : "azsdk-java-azure-storage-file-share/12.12.0-beta.1 (11.0.7; Windows 10; 10.0)", + "x-ms-client-request-id" : "f389c665-7f3b-4d84-b13e-3d1d2f81125d" }, "Response" : { "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", + "x-ms-version" : "2021-02-12", "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D9100584381F25", - "Last-Modified" : "Wed, 05 May 2021 20:36:52 GMT", + "eTag" : "0x8D99D8140EF808B", + "Last-Modified" : "Mon, 01 Nov 2021 21:47:51 GMT", "retry-after" : "0", "StatusCode" : "201", - "x-ms-request-id" : "d0ea8e16-401a-006a-4dee-412cd3000000", - "x-ms-client-request-id" : "938baebe-08fd-4fc4-a8dd-6172b796bf9c", - "Date" : "Wed, 05 May 2021 20:36:52 GMT" + "x-ms-request-id" : "64d76275-101a-000e-4d6a-cf5531000000", + "x-ms-client-request-id" : "f389c665-7f3b-4d84-b13e-3d1d2f81125d", + "Date" : "Mon, 01 Nov 2021 21:47:51 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.file.core.windows.net/65adf5a8065adf5a8042042158c5650588c444f368ef?restype=share", + "Uri" : "https://REDACTED.file.preprod.core.windows.net/65adf5a8065adf5a893206601729a3981b3974294ad0?restype=share", "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "363e72d0-49b6-415d-934c-fa08f8d7ff33" + "x-ms-version" : "2021-02-12", + "User-Agent" : "azsdk-java-azure-storage-file-share/12.12.0-beta.1 (11.0.7; Windows 10; 10.0)", + "x-ms-client-request-id" : "f630a96e-e2ba-4913-a296-d22dcdafb293" }, "Response" : { "Transfer-Encoding" : "chunked", "x-ms-share-provisioned-iops" : "500", - "x-ms-version" : "2020-06-12", + "x-ms-version" : "2021-02-12", "x-ms-lease-status" : "unlocked", "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", "x-ms-lease-state" : "available", - "Last-Modified" : "Wed, 05 May 2021 20:36:52 GMT", + "Last-Modified" : "Mon, 01 Nov 2021 21:47:51 GMT", "retry-after" : "0", "StatusCode" : "200", "x-ms-has-legal-hold" : "false", - "Date" : "Wed, 05 May 2021 20:36:52 GMT", - "x-ms-share-provisioned-ingress-mbps" : "44", + "Date" : "Mon, 01 Nov 2021 21:47:51 GMT", + "x-ms-share-provisioned-bandwidth-mibps" : "110", + "x-ms-share-provisioned-ingress-mbps" : "110", "x-ms-share-quota" : "100", "x-ms-access-tier" : "Premium", "x-ms-enabled-protocols" : "SMB", "x-ms-has-immutability-policy" : "false", "x-ms-meta-testmetadata" : "value", - "eTag" : "0x8D9100584381F25", - "x-ms-request-id" : "8caf9808-c01a-0074-1cee-41c00b000000", - "x-ms-client-request-id" : "363e72d0-49b6-415d-934c-fa08f8d7ff33", - "x-ms-share-provisioned-egress-mbps" : "66", - "x-ms-share-next-allowed-quota-downgrade-time" : "Wed, 05 May 2021 20:36:52 GMT" - }, - "Exception" : null - }, { - "Method" : "GET", - "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=65adf5a8&include=", - "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "d11f9c02-a953-471a-b245-dd519bded483" - }, - "Response" : { - "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", - "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", - "retry-after" : "0", - "StatusCode" : "200", - "x-ms-request-id" : "03a9e55b-001a-0004-04ee-4147b6000000", - "Body" : "65adf5a8", - "x-ms-client-request-id" : "d11f9c02-a953-471a-b245-dd519bded483", - "Date" : "Wed, 05 May 2021 20:36:53 GMT", - "Content-Type" : "application/xml" + "eTag" : "0x8D99D8140EF808B", + "x-ms-request-id" : "64d7627d-101a-000e-536a-cf5531000000", + "x-ms-client-request-id" : "f630a96e-e2ba-4913-a296-d22dcdafb293", + "x-ms-share-provisioned-egress-mbps" : "110", + "x-ms-share-next-allowed-quota-downgrade-time" : "Mon, 01 Nov 2021 21:47:51 GMT" }, "Exception" : null } ], - "variables" : [ "65adf5a865adf5a804271878ef8aa1698f41416e92", "65adf5a8065adf5a8042042158c5650588c444f368ef" ] + "variables" : [ "65adf5a865adf5a893258191b5526040c03544b6a4", "65adf5a8065adf5a893206601729a3981b3974294ad0" ] } \ No newline at end of file diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[1].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[1].json index 65678ae1197c4..8b22552fe0bf6 100644 --- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[1].json +++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[1].json @@ -1,80 +1,60 @@ { "networkCallRecords" : [ { "Method" : "PUT", - "Uri" : "https://REDACTED.file.core.windows.net/7cb6c4e907cb6c4e9030323338bcae0842a214e60bbb?restype=share", + "Uri" : "https://REDACTED.file.preprod.core.windows.net/7cb6c4e907cb6c4e914b694160bd758f2b8e54ba2b30?restype=share", "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "6484e9c0-f8ce-4d0d-a6d4-15fd1de74d48" + "x-ms-version" : "2021-02-12", + "User-Agent" : "azsdk-java-azure-storage-file-share/12.12.0-beta.1 (11.0.7; Windows 10; 10.0)", + "x-ms-client-request-id" : "0bb92053-2eee-4512-9ad9-f2d449f8c3ce" }, "Response" : { "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", + "x-ms-version" : "2021-02-12", "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D910058437E71F", - "Last-Modified" : "Wed, 05 May 2021 20:36:52 GMT", + "eTag" : "0x8D99D8140EFDDD4", + "Last-Modified" : "Mon, 01 Nov 2021 21:47:51 GMT", "retry-after" : "0", "StatusCode" : "201", - "x-ms-request-id" : "5632e988-701a-004e-38ee-41da73000000", - "x-ms-client-request-id" : "6484e9c0-f8ce-4d0d-a6d4-15fd1de74d48", - "Date" : "Wed, 05 May 2021 20:36:52 GMT" + "x-ms-request-id" : "baf9139d-401a-0013-356a-cf588d000000", + "x-ms-client-request-id" : "0bb92053-2eee-4512-9ad9-f2d449f8c3ce", + "Date" : "Mon, 01 Nov 2021 21:47:51 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.file.core.windows.net/7cb6c4e907cb6c4e9030323338bcae0842a214e60bbb?restype=share", + "Uri" : "https://REDACTED.file.preprod.core.windows.net/7cb6c4e907cb6c4e914b694160bd758f2b8e54ba2b30?restype=share", "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "5d5b82da-36cf-4bb4-9715-f76a09d8f532" + "x-ms-version" : "2021-02-12", + "User-Agent" : "azsdk-java-azure-storage-file-share/12.12.0-beta.1 (11.0.7; Windows 10; 10.0)", + "x-ms-client-request-id" : "264707db-f8c2-4405-bc67-cf5a318cd241" }, "Response" : { "Transfer-Encoding" : "chunked", "x-ms-share-provisioned-iops" : "500", - "x-ms-version" : "2020-06-12", + "x-ms-version" : "2021-02-12", "x-ms-lease-status" : "unlocked", "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", "x-ms-lease-state" : "available", "x-ms-root-squash" : "AllSquash", - "Last-Modified" : "Wed, 05 May 2021 20:36:52 GMT", + "Last-Modified" : "Mon, 01 Nov 2021 21:47:51 GMT", "retry-after" : "0", "StatusCode" : "200", "x-ms-has-legal-hold" : "false", - "Date" : "Wed, 05 May 2021 20:36:52 GMT", - "x-ms-share-provisioned-ingress-mbps" : "44", + "Date" : "Mon, 01 Nov 2021 21:47:51 GMT", + "x-ms-share-provisioned-bandwidth-mibps" : "110", + "x-ms-share-provisioned-ingress-mbps" : "110", "x-ms-share-quota" : "100", "x-ms-access-tier" : "Premium", "x-ms-enabled-protocols" : "NFS", "x-ms-has-immutability-policy" : "false", "x-ms-meta-testmetadata" : "value", - "eTag" : "0x8D910058437E71F", - "x-ms-request-id" : "4306ec13-b01a-008a-37ee-41af4a000000", - "x-ms-client-request-id" : "5d5b82da-36cf-4bb4-9715-f76a09d8f532", - "x-ms-share-provisioned-egress-mbps" : "66", - "x-ms-share-next-allowed-quota-downgrade-time" : "Wed, 05 May 2021 20:36:52 GMT" - }, - "Exception" : null - }, { - "Method" : "GET", - "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=7cb6c4e9&include=", - "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "bed695bc-0b97-43f1-8ab8-de4b4e675084" - }, - "Response" : { - "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", - "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", - "retry-after" : "0", - "StatusCode" : "200", - "x-ms-request-id" : "efe4c525-201a-0003-5fee-412bd5000000", - "Body" : "7cb6c4e9", - "x-ms-client-request-id" : "bed695bc-0b97-43f1-8ab8-de4b4e675084", - "Date" : "Wed, 05 May 2021 20:36:53 GMT", - "Content-Type" : "application/xml" + "eTag" : "0x8D99D8140EFDDD4", + "x-ms-request-id" : "42385131-d01a-0001-086a-cf235d000000", + "x-ms-client-request-id" : "264707db-f8c2-4405-bc67-cf5a318cd241", + "x-ms-share-provisioned-egress-mbps" : "110", + "x-ms-share-next-allowed-quota-downgrade-time" : "Mon, 01 Nov 2021 21:47:51 GMT" }, "Exception" : null } ], - "variables" : [ "7cb6c4e97cb6c4e903000531c41853d50808442f8e", "7cb6c4e907cb6c4e9030323338bcae0842a214e60bbb" ] + "variables" : [ "7cb6c4e97cb6c4e914b626730c139ea752954738b8", "7cb6c4e907cb6c4e914b694160bd758f2b8e54ba2b30" ] } \ No newline at end of file diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[2].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[2].json index cbd5f409b11d4..528ac78cefb95 100644 --- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[2].json +++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[2].json @@ -1,80 +1,60 @@ { "networkCallRecords" : [ { "Method" : "PUT", - "Uri" : "https://REDACTED.file.core.windows.net/579b972a0579b972a6df78217a97e12abed4b4ec09d1?restype=share", + "Uri" : "https://REDACTED.file.preprod.core.windows.net/579b972a0579b972ad28309564ff82b68cae5454bb08?restype=share", "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "86310bc2-6b70-4eb9-b467-5ea1164fd31b" + "x-ms-version" : "2021-02-12", + "User-Agent" : "azsdk-java-azure-storage-file-share/12.12.0-beta.1 (11.0.7; Windows 10; 10.0)", + "x-ms-client-request-id" : "e3705f0e-09e2-45a5-8a86-c2c30a6715da" }, "Response" : { "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", + "x-ms-version" : "2021-02-12", "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D9100584381CC0", - "Last-Modified" : "Wed, 05 May 2021 20:36:52 GMT", + "eTag" : "0x8D99D8140EF6023", + "Last-Modified" : "Mon, 01 Nov 2021 21:47:51 GMT", "retry-after" : "0", "StatusCode" : "201", - "x-ms-request-id" : "4306ec0d-b01a-008a-36ee-41af4a000000", - "x-ms-client-request-id" : "86310bc2-6b70-4eb9-b467-5ea1164fd31b", - "Date" : "Wed, 05 May 2021 20:36:52 GMT" + "x-ms-request-id" : "049b416d-f01a-0006-6a6a-cf4f3e000000", + "x-ms-client-request-id" : "e3705f0e-09e2-45a5-8a86-c2c30a6715da", + "Date" : "Mon, 01 Nov 2021 21:47:50 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.file.core.windows.net/579b972a0579b972a6df78217a97e12abed4b4ec09d1?restype=share", + "Uri" : "https://REDACTED.file.preprod.core.windows.net/579b972a0579b972ad28309564ff82b68cae5454bb08?restype=share", "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "2cd5f3dd-4e1e-4cf1-b980-2a90df85e002" + "x-ms-version" : "2021-02-12", + "User-Agent" : "azsdk-java-azure-storage-file-share/12.12.0-beta.1 (11.0.7; Windows 10; 10.0)", + "x-ms-client-request-id" : "a44ac9aa-8c7b-4ad8-9a15-75a2dd4a8811" }, "Response" : { "Transfer-Encoding" : "chunked", "x-ms-share-provisioned-iops" : "500", - "x-ms-version" : "2020-06-12", + "x-ms-version" : "2021-02-12", "x-ms-lease-status" : "unlocked", "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", "x-ms-lease-state" : "available", "x-ms-root-squash" : "NoRootSquash", - "Last-Modified" : "Wed, 05 May 2021 20:36:52 GMT", + "Last-Modified" : "Mon, 01 Nov 2021 21:47:51 GMT", "retry-after" : "0", "StatusCode" : "200", "x-ms-has-legal-hold" : "false", - "Date" : "Wed, 05 May 2021 20:36:52 GMT", - "x-ms-share-provisioned-ingress-mbps" : "44", + "Date" : "Mon, 01 Nov 2021 21:47:51 GMT", + "x-ms-share-provisioned-bandwidth-mibps" : "110", + "x-ms-share-provisioned-ingress-mbps" : "110", "x-ms-share-quota" : "100", "x-ms-access-tier" : "Premium", "x-ms-enabled-protocols" : "NFS", "x-ms-has-immutability-policy" : "false", "x-ms-meta-testmetadata" : "value", - "eTag" : "0x8D9100584381CC0", - "x-ms-request-id" : "00f57b33-101a-0048-30ee-41e9cc000000", - "x-ms-client-request-id" : "2cd5f3dd-4e1e-4cf1-b980-2a90df85e002", - "x-ms-share-provisioned-egress-mbps" : "66", - "x-ms-share-next-allowed-quota-downgrade-time" : "Wed, 05 May 2021 20:36:52 GMT" - }, - "Exception" : null - }, { - "Method" : "GET", - "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=579b972a&include=", - "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "fb25fe58-5d44-4d6c-bd40-9ed8adcc812c" - }, - "Response" : { - "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", - "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", - "retry-after" : "0", - "StatusCode" : "200", - "x-ms-request-id" : "53b04876-d01a-0017-70ee-4163ba000000", - "Body" : "579b972a", - "x-ms-client-request-id" : "fb25fe58-5d44-4d6c-bd40-9ed8adcc812c", - "Date" : "Wed, 05 May 2021 20:36:53 GMT", - "Content-Type" : "application/xml" + "eTag" : "0x8D99D8140EF6023", + "x-ms-request-id" : "baf913a2-401a-0013-366a-cf588d000000", + "x-ms-client-request-id" : "a44ac9aa-8c7b-4ad8-9a15-75a2dd4a8811", + "x-ms-share-provisioned-egress-mbps" : "110", + "x-ms-share-next-allowed-quota-downgrade-time" : "Mon, 01 Nov 2021 21:47:51 GMT" }, "Exception" : null } ], - "variables" : [ "579b972a579b972a6df7027230f4089d22994aac82", "579b972a0579b972a6df78217a97e12abed4b4ec09d1" ] + "variables" : [ "579b972a579b972ad2825000a893216c3d1e42da87", "579b972a0579b972ad28309564ff82b68cae5454bb08" ] } \ No newline at end of file diff --git a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[3].json b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[3].json index 2c6c3929d4baa..543653f0bd2e4 100644 --- a/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[3].json +++ b/sdk/storage/azure-storage-file-share/src/test/resources/session-records/ShareAPITestsGetPropertiesPremium[3].json @@ -1,80 +1,60 @@ { "networkCallRecords" : [ { "Method" : "PUT", - "Uri" : "https://REDACTED.file.core.windows.net/4e80a66b04e80a66b18018171ba5d70536eb0419596f?restype=share", + "Uri" : "https://REDACTED.file.preprod.core.windows.net/4e80a66b04e80a66b5696395722fa9555c3dd444e975?restype=share", "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "ccf81a26-14bb-471b-9e80-3fdae5c13d1e" + "x-ms-version" : "2021-02-12", + "User-Agent" : "azsdk-java-azure-storage-file-share/12.12.0-beta.1 (11.0.7; Windows 10; 10.0)", + "x-ms-client-request-id" : "5e7134f7-7db0-470b-9c96-70677392711d" }, "Response" : { "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", + "x-ms-version" : "2021-02-12", "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D910058437F55D", - "Last-Modified" : "Wed, 05 May 2021 20:36:52 GMT", + "eTag" : "0x8D99D8140EF93A8", + "Last-Modified" : "Mon, 01 Nov 2021 21:47:51 GMT", "retry-after" : "0", "StatusCode" : "201", - "x-ms-request-id" : "97223488-201a-000e-0cee-41dd4b000000", - "x-ms-client-request-id" : "ccf81a26-14bb-471b-9e80-3fdae5c13d1e", - "Date" : "Wed, 05 May 2021 20:36:52 GMT" + "x-ms-request-id" : "4238512d-d01a-0001-066a-cf235d000000", + "x-ms-client-request-id" : "5e7134f7-7db0-470b-9c96-70677392711d", + "Date" : "Mon, 01 Nov 2021 21:47:51 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.file.core.windows.net/4e80a66b04e80a66b18018171ba5d70536eb0419596f?restype=share", + "Uri" : "https://REDACTED.file.preprod.core.windows.net/4e80a66b04e80a66b5696395722fa9555c3dd444e975?restype=share", "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "93d9c7da-6723-4577-b91b-b8272af36c04" + "x-ms-version" : "2021-02-12", + "User-Agent" : "azsdk-java-azure-storage-file-share/12.12.0-beta.1 (11.0.7; Windows 10; 10.0)", + "x-ms-client-request-id" : "4db89105-8244-4ce1-9964-054c38dd55d1" }, "Response" : { "Transfer-Encoding" : "chunked", "x-ms-share-provisioned-iops" : "500", - "x-ms-version" : "2020-06-12", + "x-ms-version" : "2021-02-12", "x-ms-lease-status" : "unlocked", "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", "x-ms-lease-state" : "available", "x-ms-root-squash" : "RootSquash", - "Last-Modified" : "Wed, 05 May 2021 20:36:52 GMT", + "Last-Modified" : "Mon, 01 Nov 2021 21:47:51 GMT", "retry-after" : "0", "StatusCode" : "200", "x-ms-has-legal-hold" : "false", - "Date" : "Wed, 05 May 2021 20:36:53 GMT", - "x-ms-share-provisioned-ingress-mbps" : "44", + "Date" : "Mon, 01 Nov 2021 21:47:51 GMT", + "x-ms-share-provisioned-bandwidth-mibps" : "110", + "x-ms-share-provisioned-ingress-mbps" : "110", "x-ms-share-quota" : "100", "x-ms-access-tier" : "Premium", "x-ms-enabled-protocols" : "NFS", "x-ms-has-immutability-policy" : "false", "x-ms-meta-testmetadata" : "value", - "eTag" : "0x8D910058437F55D", - "x-ms-request-id" : "5632e98b-701a-004e-39ee-41da73000000", - "x-ms-client-request-id" : "93d9c7da-6723-4577-b91b-b8272af36c04", - "x-ms-share-provisioned-egress-mbps" : "66", - "x-ms-share-next-allowed-quota-downgrade-time" : "Wed, 05 May 2021 20:36:52 GMT" - }, - "Exception" : null - }, { - "Method" : "GET", - "Uri" : "https://REDACTED.file.core.windows.net?comp=list&prefix=4e80a66b&include=", - "Headers" : { - "x-ms-version" : "2020-06-12", - "User-Agent" : "azsdk-java-azure-storage-file-share/12.10.0-beta.1 (11.0.8; Windows 10; 10.0)", - "x-ms-client-request-id" : "3a2e579e-e2b1-45d4-b037-118df517dd53" - }, - "Response" : { - "Transfer-Encoding" : "chunked", - "x-ms-version" : "2020-06-12", - "Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0", - "retry-after" : "0", - "StatusCode" : "200", - "x-ms-request-id" : "b2ba8cef-001a-002b-02ee-414a7d000000", - "Body" : "4e80a66b", - "x-ms-client-request-id" : "3a2e579e-e2b1-45d4-b037-118df517dd53", - "Date" : "Wed, 05 May 2021 20:36:53 GMT", - "Content-Type" : "application/xml" + "eTag" : "0x8D99D8140EF93A8", + "x-ms-request-id" : "049b4176-f01a-0006-716a-cf4f3e000000", + "x-ms-client-request-id" : "4db89105-8244-4ce1-9964-054c38dd55d1", + "x-ms-share-provisioned-egress-mbps" : "110", + "x-ms-share-next-allowed-quota-downgrade-time" : "Mon, 01 Nov 2021 21:47:51 GMT" }, "Exception" : null } ], - "variables" : [ "4e80a66b4e80a66b18005692baf80931d265463c91", "4e80a66b04e80a66b18018171ba5d70536eb0419596f" ] + "variables" : [ "4e80a66b4e80a66b5691865339d5ca03389e4c55b1", "4e80a66b04e80a66b5696395722fa9555c3dd444e975" ] } \ No newline at end of file diff --git a/sdk/storage/azure-storage-file-share/swagger/README.md b/sdk/storage/azure-storage-file-share/swagger/README.md index 8e1c6a3911348..d3fcf430e8255 100644 --- a/sdk/storage/azure-storage-file-share/swagger/README.md +++ b/sdk/storage/azure-storage-file-share/swagger/README.md @@ -16,7 +16,7 @@ autorest --java --use:@autorest/java@4.0.x ### Code generation settings ``` yaml -input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/storage-dataplane-preview/specification/storage/data-plane/Microsoft.FileStorage/preview/2020-10-02/file.json +input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/storage/data-plane/Microsoft.FileStorage/preview/2021-02-12/file.json java: true output-folder: ../ namespace: com.azure.storage.file.share diff --git a/sdk/storage/azure-storage-file-share/swagger/src/main/java/com/azure/storage/file/share/customization/ShareStorageCustomization.java b/sdk/storage/azure-storage-file-share/swagger/src/main/java/com/azure/storage/file/share/customization/ShareStorageCustomization.java index 1b2067eb26e66..b0f6b773ea609 100644 --- a/sdk/storage/azure-storage-file-share/swagger/src/main/java/com/azure/storage/file/share/customization/ShareStorageCustomization.java +++ b/sdk/storage/azure-storage-file-share/swagger/src/main/java/com/azure/storage/file/share/customization/ShareStorageCustomization.java @@ -77,7 +77,7 @@ public void customize(LibraryCustomization customization, Logger logger) { PackageCustomization implementationModels = customization.getPackage("com.azure.storage.file.share.implementation.models"); implementationModels.getClass("FilesAndDirectoriesListSegment").addAnnotation("@JsonDeserialize(using = com.azure.storage.file.share.implementation.util.FilesAndDirectoriesListSegmentDeserializer.class)"); implementationModels.getClass("CopyFileSmbInfo") - .removeAnnotation("@JacksonXmlRootElement\\(localName = \"CopyFileSmbInfo\"\\)") + .removeAnnotation("@JacksonXmlRootElement(localName = \"CopyFileSmbInfo\")") .addAnnotation("@JacksonXmlRootElement(localName = \"copy-file-smb-info\")"); PackageCustomization models = customization.getPackage("com.azure.storage.file.share.models"); @@ -85,11 +85,11 @@ public void customize(LibraryCustomization customization, Logger logger) { // Replace JacksonXmlRootElement annotations that are causing a semantic breaking change. ClassCustomization shareFileHttpHeaders = models.getClass("ShareFileHttpHeaders"); - shareFileHttpHeaders.removeAnnotation("@JacksonXmlRootElement\\(localName = \"ShareFileHttpHeaders\"\\)") + shareFileHttpHeaders.removeAnnotation("@JacksonXmlRootElement(localName = \"ShareFileHttpHeaders\")") .addAnnotation("@JacksonXmlRootElement(localName = \"share-file-http-headers\")"); ClassCustomization sourceModifiedAccessConditions = models.getClass("SourceModifiedAccessConditions"); - sourceModifiedAccessConditions.removeAnnotation("@JacksonXmlRootElement\\(localName = \"SourceModifiedAccessConditions\"\\)") + sourceModifiedAccessConditions.removeAnnotation("@JacksonXmlRootElement(localName = \"SourceModifiedAccessConditions\")") .addAnnotation("@JacksonXmlRootElement(localName = \"source-modified-access-conditions\")"); // Update incorrect JsonProperty of Metrics