diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java index bdfbed88e68e..bfe0d4b5b3e7 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceVersion.java @@ -38,6 +38,6 @@ public String getVersion() { * @return the latest {@link BlobServiceVersion} */ public static BlobServiceVersion getLatest() { - return V2020_08_04; + return V2020_10_02; } } diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAPITest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAPITest.groovy index b17dc53a88ff..82f09422a959 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAPITest.groovy +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAPITest.groovy @@ -926,8 +926,10 @@ class ContainerAPITest extends APISpec { @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02") def "list blobs flat options deleted with versions"() { setup: + def versionedCC = versionedBlobServiceClient.getBlobContainerClient(getContainerName()) + versionedCC.create() def blobName = generateBlobName() - def blob = cc.getBlobClient(blobName).getAppendBlobClient() + def blob = versionedCC.getBlobClient(blobName).getAppendBlobClient() blob.create() def metadata = new HashMap() metadata.put("foo", "bar") @@ -937,13 +939,16 @@ class ContainerAPITest extends APISpec { .setDetails(new BlobListDetails().setRetrieveDeletedBlobsWithVersions(true)) when: - def blobs = cc.listBlobs(options, null).iterator() + def blobs = versionedCC.listBlobs(options, null).iterator() then: def b = blobs.next() !blobs.hasNext() b.getName() == blobName b.hasVersionsOnly() + + cleanup: + versionedCC.delete() } def "List blobs prefix with comma"() { @@ -1331,8 +1336,10 @@ class ContainerAPITest extends APISpec { @RequiredServiceVersion(clazz = BlobServiceVersion.class, min = "V2020_10_02") def "list blobs hier options deleted with versions"() { setup: + def versionedCC = versionedBlobServiceClient.getBlobContainerClient(getContainerName()) + versionedCC.create() def blobName = generateBlobName() - def blob = cc.getBlobClient(blobName).getAppendBlobClient() + def blob = versionedCC.getBlobClient(blobName).getAppendBlobClient() blob.create() def metadata = new HashMap() metadata.put("foo", "bar") @@ -1342,13 +1349,16 @@ class ContainerAPITest extends APISpec { .setDetails(new BlobListDetails().setRetrieveDeletedBlobsWithVersions(true)) when: - def blobs = cc.listBlobsByHierarchy("", options, null).iterator() + def blobs = versionedCC.listBlobsByHierarchy("", options, null).iterator() then: def b = blobs.next() !blobs.hasNext() b.getName() == blobName b.hasVersionsOnly() + + cleanup: + versionedCC.delete() } @Unroll diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy index f7940da5f529..e1a91ecce5a1 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ImmutableStorageWithVersioningTest.groovy @@ -56,10 +56,10 @@ class ImmutableStorageWithVersioningTest extends APISpec { private BlobContainerClient vlwContainer; private BlobClient vlwBlob - private String accountName = env.primaryAccount.name + private String accountName = env.versionedAccount.name private String containerName - private String resourceGroupName = "XClient" - private String subscriptionId = "ba45b233-e2ef-4169-8808-49eb0d8eba0d" + private String resourceGroupName = env.resourceGroupName + private String subscriptionId = env.subscriptionId private String apiVersion = "2021-04-01" private TokenCredential credential = new EnvironmentCredentialBuilder().build() private BearerTokenAuthenticationPolicy credentialPolicy = new BearerTokenAuthenticationPolicy(credential, "https://management.azure.com/.default") @@ -89,12 +89,16 @@ class ImmutableStorageWithVersioningTest extends APISpec { String serializedBody = new ObjectMapper().writeValueAsString(body) - httpPipeline.send(new HttpRequest(HttpMethod.PUT, new URL(url), new HttpHeaders(), + def response = httpPipeline.send(new HttpRequest(HttpMethod.PUT, new URL(url), new HttpHeaders(), Flux.just(ByteBuffer.wrap(serializedBody.getBytes(StandardCharsets.UTF_8))))) .block() + if (response.statusCode != 201) { + println response.getBodyAsString().block() + } + assert response.statusCode == 201 } - vlwContainer = primaryBlobServiceClient.getBlobContainerClient(containerName) + vlwContainer = versionedBlobServiceClient.getBlobContainerClient(containerName) vlwBlob = vlwContainer.getBlobClient(generateBlobName()) vlwBlob.upload(new ByteArrayInputStream(new byte[0]), 0) } @@ -122,8 +126,8 @@ class ImmutableStorageWithVersioningTest extends APISpec { .build() def cleanupClient = new BlobServiceClientBuilder() .httpClient(getHttpClient()) - .credential(env.primaryAccount.credential) - .endpoint(env.primaryAccount.blobEndpoint) + .credential(env.versionedAccount.credential) + .endpoint(env.versionedAccount.blobEndpoint) .buildClient() def options = new ListBlobContainersOptions().setPrefix(namer.getResourcePrefix()) @@ -617,7 +621,7 @@ class ImmutableStorageWithVersioningTest extends APISpec { def immutabilityPolicy = new BlobImmutabilityPolicy() .setExpiryTime(expiryTime) .setPolicyMode(BlobImmutabilityPolicyMode.UNLOCKED) - def sas = primaryBlobServiceClient.generateAccountSas(sasValues) + def sas = versionedBlobServiceClient.generateAccountSas(sasValues) def client = getBlobClient(sas, vlwContainer.getBlobContainerUrl(), vlwBlob.getBlobName()) when: diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsFlatOptionsDeletedWithVersions.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsFlatOptionsDeletedWithVersions.json index ae347ce94d2a..365647447c96 100644 --- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsFlatOptionsDeletedWithVersions.json +++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsFlatOptionsDeletedWithVersions.json @@ -1,78 +1,99 @@ { "networkCallRecords" : [ { "Method" : "PUT", - "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e76780860dbc07e929472486d90d?restype=container", + "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e35586414d243db9c211544dea23?restype=container", "Headers" : { "x-ms-version" : "2020-10-02", - "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)", - "x-ms-client-request-id" : "230a2772-1c69-4408-9f21-2424e9a84d78" + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "307abd84-9a14-40eb-b962-2e369b7ee5cc" }, "Response" : { "content-length" : "0", "x-ms-version" : "2020-10-02", "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D9252E3D6FD9CB", - "Last-Modified" : "Tue, 01 Jun 2021 18:51:17 GMT", + "eTag" : "0x8D94D5D684D8629", + "Last-Modified" : "Thu, 22 Jul 2021 22:09:42 GMT", "retry-after" : "0", "StatusCode" : "201", - "x-ms-request-id" : "6d10ded9-c01e-0014-6917-5792ad000000", - "x-ms-client-request-id" : "230a2772-1c69-4408-9f21-2424e9a84d78", - "Date" : "Tue, 01 Jun 2021 18:51:17 GMT" + "x-ms-request-id" : "0eb1676e-401e-0005-0546-7f186a000000", + "x-ms-client-request-id" : "307abd84-9a14-40eb-b962-2e369b7ee5cc", + "Date" : "Thu, 22 Jul 2021 22:09:41 GMT" }, "Exception" : null }, { "Method" : "PUT", - "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e76780860dbc07e929472486d90d/8295186e18295186e767817414aac029851164b3b9b8", + "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e35586414d243db9c211544dea23?restype=container", "Headers" : { "x-ms-version" : "2020-10-02", - "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)", - "x-ms-client-request-id" : "4c66d24b-834b-4a3f-845f-996c3121ba78" + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "a6edab9a-a23e-4f5d-9e7d-6be8e8db0ae2" }, "Response" : { "content-length" : "0", "x-ms-version" : "2020-10-02", "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D9252E3DB29E26", - "Last-Modified" : "Tue, 01 Jun 2021 18:51:18 GMT", - "x-ms-version-id" : "2021-06-01T18:51:18.3475238Z", + "eTag" : "0x8D94D5D689E677E", + "Last-Modified" : "Thu, 22 Jul 2021 22:09:43 GMT", "retry-after" : "0", "StatusCode" : "201", - "x-ms-request-id" : "6d10dfab-c01e-0014-5c17-5792ad000000", + "x-ms-request-id" : "00e458a6-e01e-003b-7446-7f3a16000000", + "x-ms-client-request-id" : "a6edab9a-a23e-4f5d-9e7d-6be8e8db0ae2", + "Date" : "Thu, 22 Jul 2021 22:09:42 GMT" + }, + "Exception" : null + }, { + "Method" : "PUT", + "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e35586414d243db9c211544dea23/8295186e18295186e35546888feef37328cac4f43b8b", + "Headers" : { + "x-ms-version" : "2020-10-02", + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "4b0c9ed0-9c58-4c12-a3e7-0a9b51d8702c" + }, + "Response" : { + "content-length" : "0", + "x-ms-version" : "2020-10-02", + "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "eTag" : "0x8D94D5D68B90FD3", + "Last-Modified" : "Thu, 22 Jul 2021 22:09:43 GMT", + "x-ms-version-id" : "2021-07-22T22:09:43.3891795Z", + "retry-after" : "0", + "StatusCode" : "201", + "x-ms-request-id" : "00e4590a-e01e-003b-4446-7f3a16000000", "x-ms-request-server-encrypted" : "true", - "x-ms-client-request-id" : "4c66d24b-834b-4a3f-845f-996c3121ba78", - "Date" : "Tue, 01 Jun 2021 18:51:18 GMT" + "x-ms-client-request-id" : "4b0c9ed0-9c58-4c12-a3e7-0a9b51d8702c", + "Date" : "Thu, 22 Jul 2021 22:09:42 GMT" }, "Exception" : null }, { "Method" : "PUT", - "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e76780860dbc07e929472486d90d/8295186e18295186e767817414aac029851164b3b9b8?comp=metadata", + "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e35586414d243db9c211544dea23/8295186e18295186e35546888feef37328cac4f43b8b?comp=metadata", "Headers" : { "x-ms-version" : "2020-10-02", - "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)", - "x-ms-client-request-id" : "eb48934a-df4c-47bf-90c5-945199f73eb1" + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "0cda4997-f75c-425c-8f52-0093f9838e63" }, "Response" : { "content-length" : "0", "x-ms-version" : "2020-10-02", "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D9252E3DCCBA9B", - "Last-Modified" : "Tue, 01 Jun 2021 18:51:18 GMT", - "x-ms-version-id" : "2021-06-01T18:51:18.5196459Z", + "eTag" : "0x8D94D5D68CB3B86", + "Last-Modified" : "Thu, 22 Jul 2021 22:09:43 GMT", + "x-ms-version-id" : "2021-07-22T22:09:43.5102635Z", "retry-after" : "0", "StatusCode" : "200", - "x-ms-request-id" : "6d10dfdc-c01e-0014-7c17-5792ad000000", + "x-ms-request-id" : "00e4594a-e01e-003b-0246-7f3a16000000", "x-ms-request-server-encrypted" : "true", - "x-ms-client-request-id" : "eb48934a-df4c-47bf-90c5-945199f73eb1", - "Date" : "Tue, 01 Jun 2021 18:51:18 GMT" + "x-ms-client-request-id" : "0cda4997-f75c-425c-8f52-0093f9838e63", + "Date" : "Thu, 22 Jul 2021 22:09:43 GMT" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e76780860dbc07e929472486d90d/8295186e18295186e767817414aac029851164b3b9b8", + "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e35586414d243db9c211544dea23/8295186e18295186e35546888feef37328cac4f43b8b", "Headers" : { "x-ms-version" : "2020-10-02", - "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)", - "x-ms-client-request-id" : "6d85a718-b07e-4d6e-ac99-3b622bdf53b3" + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "ef824596-665f-4f34-8cd0-b3986906a74d" }, "Response" : { "content-length" : "0", @@ -81,18 +102,18 @@ "x-ms-delete-type-permanent" : "false", "retry-after" : "0", "StatusCode" : "202", - "x-ms-request-id" : "6d10e00a-c01e-0014-1317-5792ad000000", - "x-ms-client-request-id" : "6d85a718-b07e-4d6e-ac99-3b622bdf53b3", - "Date" : "Tue, 01 Jun 2021 18:51:18 GMT" + "x-ms-request-id" : "00e4597e-e01e-003b-3246-7f3a16000000", + "x-ms-client-request-id" : "ef824596-665f-4f34-8cd0-b3986906a74d", + "Date" : "Thu, 22 Jul 2021 22:09:43 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e76780860dbc07e929472486d90d?restype=container&comp=list&prefix=8295186e18295186e767817414aac029851164b3b9b8&include=deletedwithversions", + "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e35586414d243db9c211544dea23?restype=container&comp=list&prefix=8295186e18295186e35546888feef37328cac4f43b8b&include=deletedwithversions", "Headers" : { "x-ms-version" : "2020-10-02", - "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)", - "x-ms-client-request-id" : "7bf450cd-e0d3-45a1-b672-6e34f25fa9d2" + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "f788ae17-59ad-4a26-a189-8d77482c97e4" }, "Response" : { "Transfer-Encoding" : "chunked", @@ -100,13 +121,32 @@ "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "retry-after" : "0", "StatusCode" : "200", - "x-ms-request-id" : "6d10e03a-c01e-0014-2a17-5792ad000000", - "Body" : "8295186e18295186e767817414aac029851164b3b9b88295186e18295186e767817414aac029851164b3b9b8trueTue, 01 Jun 2021 18:51:18 GMTTue, 01 Jun 2021 18:51:18 GMT0x8D9252E3DCCBA9B0application/octet-streamAppendBlobunlockedavailabletrue", - "x-ms-client-request-id" : "7bf450cd-e0d3-45a1-b672-6e34f25fa9d2", - "Date" : "Tue, 01 Jun 2021 18:51:18 GMT", + "x-ms-request-id" : "00e459b3-e01e-003b-5e46-7f3a16000000", + "Body" : "8295186e18295186e35546888feef37328cac4f43b8b8295186e18295186e35546888feef37328cac4f43b8btrueThu, 22 Jul 2021 22:09:43 GMTThu, 22 Jul 2021 22:09:43 GMT0x8D94D5D68CB3B860application/octet-streamAppendBlobunlockedavailabletrue", + "x-ms-client-request-id" : "f788ae17-59ad-4a26-a189-8d77482c97e4", + "Date" : "Thu, 22 Jul 2021 22:09:43 GMT", "Content-Type" : "application/xml" }, "Exception" : null + }, { + "Method" : "DELETE", + "Uri" : "https://REDACTED.blob.core.windows.net/8295186e08295186e35586414d243db9c211544dea23?restype=container", + "Headers" : { + "x-ms-version" : "2020-10-02", + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "fe5ab77e-199b-4a0f-a70b-e3d11ca67fe4" + }, + "Response" : { + "content-length" : "0", + "x-ms-version" : "2020-10-02", + "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "retry-after" : "0", + "StatusCode" : "202", + "x-ms-request-id" : "00e45a03-e01e-003b-2646-7f3a16000000", + "x-ms-client-request-id" : "fe5ab77e-199b-4a0f-a70b-e3d11ca67fe4", + "Date" : "Thu, 22 Jul 2021 22:09:43 GMT" + }, + "Exception" : null } ], - "variables" : [ "8295186e08295186e76780860dbc07e929472486d90d", "8295186e08295186e76780860dbc07e929472486d111", "8295186e08295186e76780860dbc07e929472486d112", "8295186e18295186e767817414aac029851164b3b9b8" ] + "variables" : [ "8295186e08295186e35586414d243db9c211544dea23", "8295186e66996a11", "8295186e01308ffb", "8295186e18295186e35546888feef37328cac4f43b8b" ] } \ No newline at end of file diff --git a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsHierOptionsDeletedWithVersions.json b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsHierOptionsDeletedWithVersions.json index 2d98504a6186..a4f1b9e29ce1 100644 --- a/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsHierOptionsDeletedWithVersions.json +++ b/sdk/storage/azure-storage-blob/src/test/resources/session-records/ContainerAPITestListBlobsHierOptionsDeletedWithVersions.json @@ -1,78 +1,99 @@ { "networkCallRecords" : [ { "Method" : "PUT", - "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19dd42664791b7d0f52cdc4260b90?restype=container", + "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19d1776261b0727ef5760f47efa40?restype=container", "Headers" : { "x-ms-version" : "2020-10-02", - "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)", - "x-ms-client-request-id" : "13f95fba-b06f-4ac1-8f87-41bbd13d6845" + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "af52d2cd-3d38-4f5f-9dca-5a95e3a9b0c3" }, "Response" : { "content-length" : "0", "x-ms-version" : "2020-10-02", "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D9252E2EEF2C55", - "Last-Modified" : "Tue, 01 Jun 2021 18:50:53 GMT", + "eTag" : "0x8D94D6096D3D651", + "Last-Modified" : "Thu, 22 Jul 2021 22:32:29 GMT", "retry-after" : "0", "StatusCode" : "201", - "x-ms-request-id" : "c1d30bd1-e01e-0013-0717-57fece000000", - "x-ms-client-request-id" : "13f95fba-b06f-4ac1-8f87-41bbd13d6845", - "Date" : "Tue, 01 Jun 2021 18:50:52 GMT" + "x-ms-request-id" : "933eb159-601e-003d-6849-7fbcaa000000", + "x-ms-client-request-id" : "af52d2cd-3d38-4f5f-9dca-5a95e3a9b0c3", + "Date" : "Thu, 22 Jul 2021 22:32:28 GMT" }, "Exception" : null }, { "Method" : "PUT", - "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19dd42664791b7d0f52cdc4260b90/bd465e191bd465e19dd460231e493f5fe94664b838a3", + "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19d1776261b0727ef5760f47efa40?restype=container", "Headers" : { "x-ms-version" : "2020-10-02", - "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)", - "x-ms-client-request-id" : "06615617-d81d-4083-9358-a120d707f7ef" + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "fc52050b-caef-4053-af40-d8a34cd080b2" }, "Response" : { "content-length" : "0", "x-ms-version" : "2020-10-02", "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D9252E2F317F9E", - "Last-Modified" : "Tue, 01 Jun 2021 18:50:54 GMT", - "x-ms-version-id" : "2021-06-01T18:50:54.0132254Z", + "eTag" : "0x8D94D609726DA90", + "Last-Modified" : "Thu, 22 Jul 2021 22:32:29 GMT", "retry-after" : "0", "StatusCode" : "201", - "x-ms-request-id" : "c1d30c55-e01e-0013-7217-57fece000000", + "x-ms-request-id" : "86002b67-a01e-0048-2a49-7f6285000000", + "x-ms-client-request-id" : "fc52050b-caef-4053-af40-d8a34cd080b2", + "Date" : "Thu, 22 Jul 2021 22:32:29 GMT" + }, + "Exception" : null + }, { + "Method" : "PUT", + "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19d1776261b0727ef5760f47efa40/bd465e191bd465e19d17239814fb30d3540244f93bba", + "Headers" : { + "x-ms-version" : "2020-10-02", + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "e40d434c-f9ea-4baf-baca-113951af6320" + }, + "Response" : { + "content-length" : "0", + "x-ms-version" : "2020-10-02", + "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "eTag" : "0x8D94D609747C4D8", + "Last-Modified" : "Thu, 22 Jul 2021 22:32:29 GMT", + "x-ms-version-id" : "2021-07-22T22:32:29.9898072Z", + "retry-after" : "0", + "StatusCode" : "201", + "x-ms-request-id" : "86002c25-a01e-0048-2849-7f6285000000", "x-ms-request-server-encrypted" : "true", - "x-ms-client-request-id" : "06615617-d81d-4083-9358-a120d707f7ef", - "Date" : "Tue, 01 Jun 2021 18:50:53 GMT" + "x-ms-client-request-id" : "e40d434c-f9ea-4baf-baca-113951af6320", + "Date" : "Thu, 22 Jul 2021 22:32:29 GMT" }, "Exception" : null }, { "Method" : "PUT", - "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19dd42664791b7d0f52cdc4260b90/bd465e191bd465e19dd460231e493f5fe94664b838a3?comp=metadata", + "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19d1776261b0727ef5760f47efa40/bd465e191bd465e19d17239814fb30d3540244f93bba?comp=metadata", "Headers" : { "x-ms-version" : "2020-10-02", - "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)", - "x-ms-client-request-id" : "0638132e-5519-4644-96f2-fca545f7f3cf" + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "eb6b1e02-1c7c-49c2-895b-3b5da29395a1" }, "Response" : { "content-length" : "0", "x-ms-version" : "2020-10-02", "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "eTag" : "0x8D9252E2F4112D8", - "Last-Modified" : "Tue, 01 Jun 2021 18:50:54 GMT", - "x-ms-version-id" : "2021-06-01T18:50:54.1172991Z", + "eTag" : "0x8D94D60975B0234", + "Last-Modified" : "Thu, 22 Jul 2021 22:32:30 GMT", + "x-ms-version-id" : "2021-07-22T22:32:30.1178973Z", "retry-after" : "0", "StatusCode" : "200", - "x-ms-request-id" : "c1d30c8d-e01e-0013-2417-57fece000000", + "x-ms-request-id" : "86002c6b-a01e-0048-5949-7f6285000000", "x-ms-request-server-encrypted" : "true", - "x-ms-client-request-id" : "0638132e-5519-4644-96f2-fca545f7f3cf", - "Date" : "Tue, 01 Jun 2021 18:50:53 GMT" + "x-ms-client-request-id" : "eb6b1e02-1c7c-49c2-895b-3b5da29395a1", + "Date" : "Thu, 22 Jul 2021 22:32:29 GMT" }, "Exception" : null }, { "Method" : "DELETE", - "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19dd42664791b7d0f52cdc4260b90/bd465e191bd465e19dd460231e493f5fe94664b838a3", + "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19d1776261b0727ef5760f47efa40/bd465e191bd465e19d17239814fb30d3540244f93bba", "Headers" : { "x-ms-version" : "2020-10-02", - "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)", - "x-ms-client-request-id" : "e8931cba-3b55-40cd-ae18-2f6a0db7f608" + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "1368004f-49a8-4b2e-844d-7d8f4ccf0d6c" }, "Response" : { "content-length" : "0", @@ -81,18 +102,18 @@ "x-ms-delete-type-permanent" : "false", "retry-after" : "0", "StatusCode" : "202", - "x-ms-request-id" : "c1d30cc2-e01e-0013-5417-57fece000000", - "x-ms-client-request-id" : "e8931cba-3b55-40cd-ae18-2f6a0db7f608", - "Date" : "Tue, 01 Jun 2021 18:50:53 GMT" + "x-ms-request-id" : "86002cbb-a01e-0048-0e49-7f6285000000", + "x-ms-client-request-id" : "1368004f-49a8-4b2e-844d-7d8f4ccf0d6c", + "Date" : "Thu, 22 Jul 2021 22:32:30 GMT" }, "Exception" : null }, { "Method" : "GET", - "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19dd42664791b7d0f52cdc4260b90?restype=container&comp=list&prefix=bd465e191bd465e19dd460231e493f5fe94664b838a3&delimiter=&include=deletedwithversions", + "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19d1776261b0727ef5760f47efa40?restype=container&comp=list&prefix=bd465e191bd465e19d17239814fb30d3540244f93bba&delimiter=&include=deletedwithversions", "Headers" : { "x-ms-version" : "2020-10-02", - "User-Agent" : "azsdk-java-azure-storage-blob/12.12.0-beta.2 (11.0.7; Windows 10; 10.0)", - "x-ms-client-request-id" : "d0616405-0176-47cd-9682-76988c45dfdc" + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "9057f97d-f634-40b4-83cb-c34d3ed91f7e" }, "Response" : { "Transfer-Encoding" : "chunked", @@ -100,13 +121,32 @@ "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "retry-after" : "0", "StatusCode" : "200", - "x-ms-request-id" : "c1d30cfd-e01e-0013-0217-57fece000000", - "Body" : "bd465e191bd465e19dd460231e493f5fe94664b838a3bd465e191bd465e19dd460231e493f5fe94664b838a3trueTue, 01 Jun 2021 18:50:54 GMTTue, 01 Jun 2021 18:50:54 GMT0x8D9252E2F4112D80application/octet-streamAppendBlobunlockedavailabletrue", - "x-ms-client-request-id" : "d0616405-0176-47cd-9682-76988c45dfdc", - "Date" : "Tue, 01 Jun 2021 18:50:53 GMT", + "x-ms-request-id" : "86002d0d-a01e-0048-4249-7f6285000000", + "Body" : "bd465e191bd465e19d17239814fb30d3540244f93bbabd465e191bd465e19d17239814fb30d3540244f93bbatrueThu, 22 Jul 2021 22:32:29 GMTThu, 22 Jul 2021 22:32:30 GMT0x8D94D60975B02340application/octet-streamAppendBlobunlockedavailabletrue", + "x-ms-client-request-id" : "9057f97d-f634-40b4-83cb-c34d3ed91f7e", + "Date" : "Thu, 22 Jul 2021 22:32:30 GMT", "Content-Type" : "application/xml" }, "Exception" : null + }, { + "Method" : "DELETE", + "Uri" : "https://REDACTED.blob.core.windows.net/bd465e190bd465e19d1776261b0727ef5760f47efa40?restype=container", + "Headers" : { + "x-ms-version" : "2020-10-02", + "User-Agent" : "azsdk-java-azure-storage-blob/12.13.0-beta.1 (11; Windows 10; 10.0)", + "x-ms-client-request-id" : "43a914df-53ee-4c94-a686-6282f129c750" + }, + "Response" : { + "content-length" : "0", + "x-ms-version" : "2020-10-02", + "Server" : "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "retry-after" : "0", + "StatusCode" : "202", + "x-ms-request-id" : "86002da1-a01e-0048-1f49-7f6285000000", + "x-ms-client-request-id" : "43a914df-53ee-4c94-a686-6282f129c750", + "Date" : "Thu, 22 Jul 2021 22:32:30 GMT" + }, + "Exception" : null } ], - "variables" : [ "bd465e190bd465e19dd42664791b7d0f52cdc4260b90", "bd465e190bd465e19dd42664791b7d0f52cdc4260111", "bd465e190bd465e19dd42664791b7d0f52cdc4260112", "bd465e191bd465e19dd460231e493f5fe94664b838a3" ] + "variables" : [ "bd465e190bd465e19d1776261b0727ef5760f47efa40", "bd465e1973821c28", "bd465e19132607b1", "bd465e191bd465e19d17239814fb30d3540244f93bba" ] } \ No newline at end of file diff --git a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java index 86d75c443ade..2b063267f055 100644 --- a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java +++ b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/implementation/Constants.java @@ -88,7 +88,7 @@ public final class Constants { public static final String PROPERTY_AZURE_STORAGE_SAS_SERVICE_VERSION = "AZURE_STORAGE_SAS_SERVICE_VERSION"; public static final String SAS_SERVICE_VERSION = Configuration.getGlobalConfiguration() - .get(PROPERTY_AZURE_STORAGE_SAS_SERVICE_VERSION, "2020-08-04"); + .get(PROPERTY_AZURE_STORAGE_SAS_SERVICE_VERSION, "2020-10-02"); private Constants() { } diff --git a/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/TestEnvironment.java b/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/TestEnvironment.java index 6a674e2daee6..a1833258db5b 100644 --- a/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/TestEnvironment.java +++ b/sdk/storage/azure-storage-common/src/test-shared/java/com/azure/storage/common/test/shared/TestEnvironment.java @@ -17,6 +17,9 @@ public final class TestEnvironment { private final TestMode testMode; private final String serviceVersion; + private final String resourceGroupName; + private final String subscriptionId; + private final TestAccount primaryAccount; private final TestAccount secondaryAccount; private final TestAccount managedDiskAccount; @@ -30,6 +33,8 @@ public final class TestEnvironment { private TestEnvironment() { this.testMode = readTestModeFromEnvironment(); this.serviceVersion = readServiceVersionFromEnvironment(); + this.resourceGroupName = Configuration.getGlobalConfiguration().get("STORAGE_RESOURCE_GROUP_NAME"); + this.subscriptionId = Configuration.getGlobalConfiguration().get("STORAGE_SUBSCRIPTION_ID"); this.primaryAccount = readTestAccountFromEnvironment("PRIMARY_STORAGE_", this.testMode); this.secondaryAccount = readTestAccountFromEnvironment("SECONDARY_STORAGE_", this.testMode); this.managedDiskAccount = readTestAccountFromEnvironment("MANAGED_DISK_STORAGE_", this.testMode); @@ -143,4 +148,12 @@ public TestAccount getDataLakeSoftDeleteAccount() { public String getServiceVersion() { return serviceVersion; } + + public String getResourceGroupName() { + return resourceGroupName; + } + + public String getSubscriptionId() { + return subscriptionId; + } } diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java index 0f297093d777..4152f1c501c1 100644 --- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java +++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/DataLakeServiceVersion.java @@ -38,6 +38,6 @@ public String getVersion() { * @return the latest {@link DataLakeServiceVersion} */ public static DataLakeServiceVersion getLatest() { - return V2020_08_04; + return V2020_10_02; } } diff --git a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java index 43e485041c71..b383bb3e4a59 100644 --- a/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java +++ b/sdk/storage/azure-storage-file-share/src/main/java/com/azure/storage/file/share/ShareServiceVersion.java @@ -39,6 +39,6 @@ public String getVersion() { * @return the latest {@link ShareServiceVersion} */ public static ShareServiceVersion getLatest() { - return V2020_08_04; + return V2020_10_02; } } diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java index 0ad04bd10a1f..6f6cb7aa4aa0 100644 --- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java +++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/QueueServiceVersion.java @@ -38,6 +38,6 @@ public String getVersion() { * @return the latest {@link QueueServiceVersion} */ public static QueueServiceVersion getLatest() { - return V2020_08_04; + return V2020_10_02; } } diff --git a/sdk/storage/test-resources.json b/sdk/storage/test-resources.json index 42ec9590bd58..7266bd97e664 100644 --- a/sdk/storage/test-resources.json +++ b/sdk/storage/test-resources.json @@ -40,7 +40,9 @@ "premiumFileAccountName": "[concat('premf', parameters('baseName'))]", "keyvaultName": "[concat(parameters('baseName'), 'kvlt')]", "azureKeyVaultUrl": "[format('https://{0}.vault.azure.net', variables('keyvaultName'))]", - "location": "[resourceGroup().location]" + "location": "[resourceGroup().location]", + "resourceGroupName": "[resourceGroup().name]", + "subscriptionId": "[subscription().subscriptionId]" }, "resources": [ { @@ -616,6 +618,14 @@ "KEYVAULT_URL":{ "type": "string", "value": "[variables('azureKeyVaultUrl')]" + }, + "STORAGE_RESOURCE_GROUP_NAME": { + "type": "string", + "value": "[variables('resourceGroupName')]" + }, + "STORAGE_SUBSCRIPTION_ID": { + "type": "string", + "value": "[variables('subscriptionId')]" } } }