Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Storage STG 97 #46694

Merged
merged 13 commits into from
Dec 5, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ namespace Azure.Storage.Blobs.ChangeFeed.Tests
BlobClientOptions.ServiceVersion.V2024_08_04,
BlobClientOptions.ServiceVersion.V2024_11_04,
BlobClientOptions.ServiceVersion.V2025_01_05,
BlobClientOptions.ServiceVersion.V2025_05_05,
StorageVersionExtensions.LatestVersion,
StorageVersionExtensions.MaxVersion,
RecordingServiceVersion = StorageVersionExtensions.MaxVersion,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public enum ServiceVersion
V2024_08_04 = 23,
V2024_11_04 = 24,
V2025_01_05 = 25,
V2025_05_05 = 26,
}
}
public partial class BlobContainerClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public enum ServiceVersion
V2024_08_04 = 23,
V2024_11_04 = 24,
V2025_01_05 = 25,
V2025_05_05 = 26,
}
}
public partial class BlobContainerClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public enum ServiceVersion
V2024_08_04 = 23,
V2024_11_04 = 24,
V2025_01_05 = 25,
V2025_05_05 = 26,
}
}
public partial class BlobContainerClient
Expand Down
7 changes: 6 additions & 1 deletion sdk/storage/Azure.Storage.Blobs/src/BlobClientOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,12 @@ public enum ServiceVersion
/// <summary>
/// The 2025-01-05 service version.
/// </summary>
V2025_01_05 = 25
V2025_01_05 = 25,

/// <summary>
/// The 2025-05-05 service version.
/// </summary>
V2025_05_05 = 26
#pragma warning restore CA1707 // Identifiers should not contain underscores
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public BlobsClientTestFixtureAttribute(params object[] additionalParameters)
BlobClientOptions.ServiceVersion.V2024_08_04,
BlobClientOptions.ServiceVersion.V2024_11_04,
BlobClientOptions.ServiceVersion.V2025_01_05,
BlobClientOptions.ServiceVersion.V2025_05_05,
StorageVersionExtensions.LatestVersion,
StorageVersionExtensions.MaxVersion
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public enum SasProtocol
}
public partial class SasQueryParameters
{
public const string DefaultSasVersion = "2025-01-05";
public const string DefaultSasVersion = "2025-05-05";
protected SasQueryParameters() { }
protected SasQueryParameters(System.Collections.Generic.IDictionary<string, string> values) { }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public enum SasProtocol
}
public partial class SasQueryParameters
{
public const string DefaultSasVersion = "2025-01-05";
public const string DefaultSasVersion = "2025-05-05";
protected SasQueryParameters() { }
protected SasQueryParameters(System.Collections.Generic.IDictionary<string, string> values) { }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal static class Constants
/// Gets the default service version to use when building shared access
/// signatures.
/// </summary>
public const string DefaultSasVersion = "2025-01-05";
public const string DefaultSasVersion = "2025-05-05";

/// <summary>
/// Max download range size while requesting a transactional hash.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ internal static class StorageVersionExtensions
/// </summary>
internal const ServiceVersion MaxVersion =
#if BlobSDK || QueueSDK || FileSDK || DataLakeSDK || ChangeFeedSDK || DataMovementSDK || BlobDataMovementSDK || ShareDataMovementSDK
ServiceVersion.V2025_01_05;
ServiceVersion.V2025_05_05;
#else
ERROR_STORAGE_SERVICE_NOT_DEFINED;
#endif
Expand Down Expand Up @@ -95,6 +95,7 @@ public static string ToVersionString(this ServiceVersion version) =>
ServiceVersion.V2024_08_04 => "2024-08-04",
ServiceVersion.V2024_11_04 => "2024-11-04",
ServiceVersion.V2025_01_05 => "2025-01-05",
ServiceVersion.V2025_05_05 => "2025-05-05",
#endif
_ => throw Errors.VersionNotSupported(nameof(version))
};
Expand Down Expand Up @@ -158,6 +159,8 @@ public static Azure.Storage.Blobs.BlobClientOptions.ServiceVersion AsBlobsVersio
Azure.Storage.Blobs.BlobClientOptions.ServiceVersion.V2024_11_04,
Azure.Storage.Files.DataLake.DataLakeClientOptions.ServiceVersion.V2025_01_05 =>
Azure.Storage.Blobs.BlobClientOptions.ServiceVersion.V2025_01_05,
Azure.Storage.Files.DataLake.DataLakeClientOptions.ServiceVersion.V2025_05_05 =>
Azure.Storage.Blobs.BlobClientOptions.ServiceVersion.V2025_05_05,
_ => throw Errors.VersionNotSupported(nameof(version))
};
#endif
Expand Down
5 changes: 3 additions & 2 deletions sdk/storage/Azure.Storage.Common/tests/CommonTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ namespace Azure.Storage.Test
BlobClientOptions.ServiceVersion.V2024_08_04,
BlobClientOptions.ServiceVersion.V2024_11_04,
BlobClientOptions.ServiceVersion.V2025_01_05,
RecordingServiceVersion = BlobClientOptions.ServiceVersion.V2025_01_05,
LiveServiceVersions = new object[] { BlobClientOptions.ServiceVersion.V2024_11_04, })]
BlobClientOptions.ServiceVersion.V2025_05_05,
RecordingServiceVersion = BlobClientOptions.ServiceVersion.V2025_05_05,
LiveServiceVersions = new object[] { BlobClientOptions.ServiceVersion.V2025_01_05, })]
public abstract class CommonTestBase : StorageTestBase<StorageTestEnvironment>
{
protected readonly BlobClientOptions.ServiceVersion _serviceVersion;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public enum ServiceVersion
V2024_08_04 = 23,
V2024_11_04 = 24,
V2025_01_05 = 25,
V2025_05_05 = 26,
}
}
public partial class DataLakeDirectoryClient : Azure.Storage.Files.DataLake.DataLakePathClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public enum ServiceVersion
V2024_08_04 = 23,
V2024_11_04 = 24,
V2025_01_05 = 25,
V2025_05_05 = 26,
}
}
public partial class DataLakeDirectoryClient : Azure.Storage.Files.DataLake.DataLakePathClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,12 @@ public enum ServiceVersion
/// <summary>
/// The 2025-01-05 service version.
/// </summary>
V2025_01_05 = 25
V2025_01_05 = 25,

/// <summary>
/// The 2025-05-05 service version.
/// </summary>
V2025_05_05 = 26
#pragma warning restore CA1707 // Identifiers should not contain underscores
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public DataLakeClientTestFixtureAttribute()
DataLakeClientOptions.ServiceVersion.V2024_08_04,
DataLakeClientOptions.ServiceVersion.V2024_11_04,
DataLakeClientOptions.ServiceVersion.V2025_01_05,
DataLakeClientOptions.ServiceVersion.V2025_05_05,
StorageVersionExtensions.LatestVersion,
StorageVersionExtensions.MaxVersion)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public enum ServiceVersion
V2024_08_04 = 23,
V2024_11_04 = 24,
V2025_01_05 = 25,
V2025_05_05 = 26,
}
}
public partial class ShareDirectoryClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public enum ServiceVersion
V2024_08_04 = 23,
V2024_11_04 = 24,
V2025_01_05 = 25,
V2025_05_05 = 26,
}
}
public partial class ShareDirectoryClient
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,12 @@ public enum ServiceVersion
/// <summary>
/// The 2025-01-05 service version.
/// </summary>
V2025_01_05 = 25
V2025_01_05 = 25,

/// <summary>
/// The 2025-05-05 service version.
/// </summary>
V2025_05_05 = 26
#pragma warning restore CA1707 // Identifiers should not contain underscores
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public ShareClientTestFixtureAttribute(params object[] additionalParameters)
ShareClientOptions.ServiceVersion.V2024_08_04,
ShareClientOptions.ServiceVersion.V2024_11_04,
ShareClientOptions.ServiceVersion.V2025_01_05,
ShareClientOptions.ServiceVersion.V2025_05_05,
StorageVersionExtensions.LatestVersion,
StorageVersionExtensions.MaxVersion
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public enum ServiceVersion
V2024_08_04 = 23,
V2024_11_04 = 24,
V2025_01_05 = 25,
V2025_05_05 = 26,
}
}
public partial class QueueMessageDecodingFailedEventArgs : Azure.SyncAsyncEventArgs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public enum ServiceVersion
V2024_08_04 = 23,
V2024_11_04 = 24,
V2025_01_05 = 25,
V2025_05_05 = 26,
}
}
public partial class QueueMessageDecodingFailedEventArgs : Azure.SyncAsyncEventArgs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public enum ServiceVersion
V2024_08_04 = 23,
V2024_11_04 = 24,
V2025_01_05 = 25,
V2025_05_05 = 26,
}
}
public partial class QueueMessageDecodingFailedEventArgs : Azure.SyncAsyncEventArgs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,12 @@ public enum ServiceVersion
/// <summary>
/// The 2025-01-05 service version.
/// </summary>
V2025_01_05 = 25
V2025_01_05 = 25,

/// <summary>
/// The 2025-05-05 service version.
/// </summary>
V2025_05_05 = 26
#pragma warning restore CA1707 // Identifiers should not contain underscores
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public QueueClientTestFixtureAttribute(params object[] additionalParameters)
QueueClientOptions.ServiceVersion.V2024_08_04,
QueueClientOptions.ServiceVersion.V2024_11_04,
QueueClientOptions.ServiceVersion.V2025_01_05,
QueueClientOptions.ServiceVersion.V2025_05_05,
StorageVersionExtensions.LatestVersion,
StorageVersionExtensions.MaxVersion
},
Expand Down