From 1178fa51c7f73c858b054ebeaea1060d4f85a0a3 Mon Sep 17 00:00:00 2001 From: Isabelle Date: Tue, 9 Jan 2024 09:29:56 -0800 Subject: [PATCH 1/4] file changes --- .../java/com/azure/storage/blob/BlobServiceVersion.java | 9 +++++++-- sdk/storage/azure-storage-common/ci.system.properties | 4 ++-- .../azure/storage/common/implementation/Constants.java | 4 ++-- .../storage/file/datalake/DataLakeServiceVersion.java | 9 +++++++-- .../datalake/implementation/util/TransformUtils.java | 2 ++ .../azure/storage/file/share/ShareServiceVersion.java | 9 +++++++-- .../com/azure/storage/queue/QueueServiceVersion.java | 9 +++++++-- 7 files changed, 34 insertions(+), 12 deletions(-) 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 22ea7fce137c0..5ae87c86d2dab 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 @@ -112,7 +112,12 @@ public enum BlobServiceVersion implements ServiceVersion { /** * Service version {@code 2024-02-04}. */ - V2024_02_04("2024-02-04"); + V2024_02_04("2024-02-04"), + + /** + * Service version {@code 2024-05-04}. + */ + V2024_05_04("2024-05-04"); private final String version; @@ -134,6 +139,6 @@ public String getVersion() { * @return the latest {@link BlobServiceVersion} */ public static BlobServiceVersion getLatest() { - return V2024_02_04; + return V2024_05_04; } } diff --git a/sdk/storage/azure-storage-common/ci.system.properties b/sdk/storage/azure-storage-common/ci.system.properties index 9aec697607e5c..c582bac08ccce 100644 --- a/sdk/storage/azure-storage-common/ci.system.properties +++ b/sdk/storage/azure-storage-common/ci.system.properties @@ -1,2 +1,2 @@ -AZURE_LIVE_TEST_SERVICE_VERSION=V2024_02_04 -AZURE_STORAGE_SAS_SERVICE_VERSION=2024-02-04 +AZURE_LIVE_TEST_SERVICE_VERSION=V2024_05_04 +AZURE_STORAGE_SAS_SERVICE_VERSION=2024-05-04 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 efe82dde90075..24c7bd9f17bad 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, "2024-02-04"); + .get(PROPERTY_AZURE_STORAGE_SAS_SERVICE_VERSION, "2024-05-04"); private Constants() { } @@ -216,7 +216,7 @@ public static final class HeaderConstants { * @deprecated For SAS Service Version use {@link Constants#SAS_SERVICE_VERSION}. */ @Deprecated - public static final String TARGET_STORAGE_VERSION = "2024-02-04"; + public static final String TARGET_STORAGE_VERSION = "2024-05-04"; /** * Error code returned from the service. 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 c59c1b53cb64f..1965e090323d9 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 @@ -112,7 +112,12 @@ public enum DataLakeServiceVersion implements ServiceVersion { /** * Service version {@code 2024-02-04}. */ - V2024_02_04("2024-02-04"); + V2024_02_04("2024-02-04"), + + /** + * Service version {@code 2024-05-04}. + */ + V2024_05_04("2024-05-04"); private final String version; @@ -134,6 +139,6 @@ public String getVersion() { * @return the latest {@link DataLakeServiceVersion} */ public static DataLakeServiceVersion getLatest() { - return V2024_02_04; + return V2024_05_04; } } diff --git a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/implementation/util/TransformUtils.java b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/implementation/util/TransformUtils.java index 1949fc9574c88..fca9b07818bfd 100644 --- a/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/implementation/util/TransformUtils.java +++ b/sdk/storage/azure-storage-file-datalake/src/main/java/com/azure/storage/file/datalake/implementation/util/TransformUtils.java @@ -54,6 +54,8 @@ public static BlobServiceVersion toBlobServiceVersion(DataLakeServiceVersion ver return BlobServiceVersion.V2023_11_03; } else if (DataLakeServiceVersion.V2024_02_04.ordinal() == version.ordinal()) { return BlobServiceVersion.V2024_02_04; + } else if (DataLakeServiceVersion.V2024_05_04.ordinal() == version.ordinal()) { + return BlobServiceVersion.V2024_05_04; } return null; 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 719bccf5836ab..23f6261bc44fb 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 @@ -113,7 +113,12 @@ public enum ShareServiceVersion implements ServiceVersion { /** * Service version {@code 2024-02-04}. */ - V2024_02_04("2024-02-04"); + V2024_02_04("2024-02-04"), + + /** + * Service version {@code 2024-05-04}. + */ + V2024_05_04("2024-05-04"); private final String version; @@ -135,6 +140,6 @@ public String getVersion() { * @return the latest {@link ShareServiceVersion} */ public static ShareServiceVersion getLatest() { - return V2024_02_04; + return V2024_05_04; } } 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 cc8cd201dfbef..af7b97f964b16 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 @@ -112,7 +112,12 @@ public enum QueueServiceVersion implements ServiceVersion { /** * Service version {@code 2024-02-04}. */ - V2024_02_04("2024-02-04"); + V2024_02_04("2024-02-04"), + + /** + * Service version {@code 2024-05-04}. + */ + V2024_05_04("2024-05-04"); private final String version; @@ -134,6 +139,6 @@ public String getVersion() { * @return the latest {@link QueueServiceVersion} */ public static QueueServiceVersion getLatest() { - return V2024_02_04; + return V2024_05_04; } } From 6291046f2974fb99b64eb5f8377880bb3b1123d1 Mon Sep 17 00:00:00 2001 From: Isabelle Date: Tue, 9 Jan 2024 10:00:20 -0800 Subject: [PATCH 2/4] asset files --- sdk/storage/azure-storage-blob/assets.json | 2 +- sdk/storage/azure-storage-file-datalake/assets.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index 39ea111f64f46..d52f1a12fa84a 100644 --- a/sdk/storage/azure-storage-blob/assets.json +++ b/sdk/storage/azure-storage-blob/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "java", "TagPrefix": "java/storage/azure-storage-blob", - "Tag": "java/storage/azure-storage-blob_622f991d7c" + "Tag": "java/storage/azure-storage-blob_c8d13d7f48" } diff --git a/sdk/storage/azure-storage-file-datalake/assets.json b/sdk/storage/azure-storage-file-datalake/assets.json index 5668b463a9ff8..e0986824a3342 100644 --- a/sdk/storage/azure-storage-file-datalake/assets.json +++ b/sdk/storage/azure-storage-file-datalake/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "java", "TagPrefix": "java/storage/azure-storage-file-datalake", - "Tag": "java/storage/azure-storage-file-datalake_cfa1594c39" + "Tag": "java/storage/azure-storage-file-datalake_454e33b26b" } From d9bddb01048ca96010d7aef6cd64b69696170a1d Mon Sep 17 00:00:00 2001 From: Isabelle Date: Tue, 9 Jan 2024 13:24:50 -0800 Subject: [PATCH 3/4] fixing audience error test without instrument --- sdk/storage/azure-storage-blob/assets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index d52f1a12fa84a..e63a1b194f4c9 100644 --- a/sdk/storage/azure-storage-blob/assets.json +++ b/sdk/storage/azure-storage-blob/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "java", "TagPrefix": "java/storage/azure-storage-blob", - "Tag": "java/storage/azure-storage-blob_c8d13d7f48" + "Tag": "java/storage/azure-storage-blob_e8d223adb0" } From 5c52bcf0c00b54473fec40a537ee22fde7b85218 Mon Sep 17 00:00:00 2001 From: Isabelle Date: Tue, 9 Jan 2024 13:30:49 -0800 Subject: [PATCH 4/4] accidentally did not commit the change lol --- .../storage/blob/specialized/AppendBlobAsyncApiTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/AppendBlobAsyncApiTests.java b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/AppendBlobAsyncApiTests.java index 85b3327f379bf..e612940a2d55a 100644 --- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/AppendBlobAsyncApiTests.java +++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/AppendBlobAsyncApiTests.java @@ -892,10 +892,10 @@ public void storageAccountAudience() { @Test public void audienceError() { - AppendBlobAsyncClient aadBlob = new SpecializedBlobClientBuilder() + AppendBlobAsyncClient aadBlob = instrument(new SpecializedBlobClientBuilder() .endpoint(bc.getBlobUrl()) .credential(new MockTokenCredential()) - .audience(BlobAudience.createBlobServiceAccountAudience("badAudience")) + .audience(BlobAudience.createBlobServiceAccountAudience("badAudience"))) .buildAppendBlobAsyncClient(); StepVerifier.create(aadBlob.exists())