Skip to content

Commit f20fab3

Browse files
kasobol-msftkasobol-msft
authored
[Storage] Finish Version property deprecation. Make SAS version settable in tests. (Azure#20669)
* finish deprecation. * continue deprecation of Version property. * override sas. * changelog. * one more. * api * recordings 1. * more recordings. * getting there. * ...
1 parent 47ed2b5 commit f20fab3

File tree

76 files changed

+4994
-7238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+4994
-7238
lines changed

‎sdk/storage/Azure.Storage.Blobs.Batch/samples/Azure.Storage.Blobs.Batch.Samples.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<Compile Include="$(AzureStorageSharedTestSources)\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
1414
<Compile Remove="$(AzureStorageSharedTestSources)\AzuriteFixture.cs" />
1515
<Compile Remove="$(AzureStorageSharedTestSources)\AzuriteNUnitFixture.cs" />
16+
<Compile Remove="$(AzureStorageSharedTestSources)\StorageTestBase.SasVersion.cs" />
1617
<None Include="$(AzureStorageSharedTestSources)\*.xml">
1718
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1819
</None>

‎sdk/storage/Azure.Storage.Blobs.Batch/tests/Azure.Storage.Blobs.Batch.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<Compile Include="$(AzureStorageSharedTestSources)\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
1717
<Compile Remove="$(AzureStorageSharedTestSources)\AzuriteFixture.cs" />
1818
<Compile Remove="$(AzureStorageSharedTestSources)\AzuriteNUnitFixture.cs" />
19+
<Compile Remove="$(AzureStorageSharedTestSources)\StorageTestBase.SasVersion.cs" />
1920
<None Include="$(AzureStorageSharedTestSources)\*.xml">
2021
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2122
</None>

‎sdk/storage/Azure.Storage.Blobs.ChangeFeed/samples/Azure.Storage.Blobs.ChangeFeed.Samples.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<Compile Include="$(AzureStorageSharedTestSources)\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
1313
<Compile Remove="$(AzureStorageSharedTestSources)\AzuriteFixture.cs" />
1414
<Compile Remove="$(AzureStorageSharedTestSources)\AzuriteNUnitFixture.cs" />
15+
<Compile Remove="$(AzureStorageSharedTestSources)\StorageTestBase.SasVersion.cs" />
1516
<None Include="$(AzureStorageSharedTestSources)\*.xml">
1617
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1718
</None>

‎sdk/storage/Azure.Storage.Blobs/samples/Azure.Storage.Blobs.Samples.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<Compile Include="$(AzureStorageSharedTestSources)\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
1414
<Compile Remove="$(AzureStorageSharedTestSources)\AzuriteFixture.cs" />
1515
<Compile Remove="$(AzureStorageSharedTestSources)\AzuriteNUnitFixture.cs" />
16+
<Compile Remove="$(AzureStorageSharedTestSources)\StorageTestBase.SasVersion.cs" />
1617
<None Include="$(AzureStorageSharedTestSources)\*.xml">
1718
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1819
</None>

‎sdk/storage/Azure.Storage.Blobs/src/Sas/BlobSasBuilder.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,8 @@ private void EnsureState()
532532
Resource = Constants.Sas.Resource.BlobVersion;
533533
}
534534
}
535-
Version = SasQueryParameters.DefaultSasVersion;
535+
536+
Version = SasQueryParametersInternals.DefaultSasVersionInternal;
536537
}
537538

538539
/// <summary>

‎sdk/storage/Azure.Storage.Blobs/tests/BlobSasBuilderTests.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void ToSasQueryParameters_ContainerTest()
5454
BlobSasQueryParameters sasQueryParameters = blobSasBuilder.ToSasQueryParameters(constants.Sas.SharedKeyCredential);
5555

5656
// Assert
57-
Assert.AreEqual(SasQueryParameters.DefaultSasVersion, sasQueryParameters.Version);
57+
Assert.AreEqual(SasQueryParametersInternals.DefaultSasVersionInternal, sasQueryParameters.Version);
5858
Assert.IsNull(sasQueryParameters.Services);
5959
Assert.IsNull(sasQueryParameters.ResourceTypes);
6060
Assert.AreEqual(constants.Sas.Protocol, sasQueryParameters.Protocol);
@@ -82,7 +82,7 @@ public void ToSasQueryParameters_ContainerIdentityTest()
8282
BlobSasQueryParameters sasQueryParameters = blobSasBuilder.ToSasQueryParameters(GetUserDelegationKey(constants), constants.Sas.Account);
8383

8484
// Assert
85-
Assert.AreEqual(SasQueryParameters.DefaultSasVersion, sasQueryParameters.Version);
85+
Assert.AreEqual(SasQueryParametersInternals.DefaultSasVersionInternal, sasQueryParameters.Version);
8686
Assert.IsNull(sasQueryParameters.Services);
8787
Assert.IsNull(sasQueryParameters.ResourceTypes);
8888
Assert.AreEqual(constants.Sas.Protocol, sasQueryParameters.Protocol);
@@ -116,7 +116,7 @@ public void ToSasQueryParameters_BlobTest()
116116
BlobSasQueryParameters sasQueryParameters = blobSasBuilder.ToSasQueryParameters(constants.Sas.SharedKeyCredential);
117117

118118
// Assert
119-
Assert.AreEqual(SasQueryParameters.DefaultSasVersion, sasQueryParameters.Version);
119+
Assert.AreEqual(SasQueryParametersInternals.DefaultSasVersionInternal, sasQueryParameters.Version);
120120
Assert.IsNull(sasQueryParameters.Services);
121121
Assert.IsNull(sasQueryParameters.ResourceTypes);
122122
Assert.AreEqual(constants.Sas.Protocol, sasQueryParameters.Protocol);
@@ -144,7 +144,7 @@ public void ToSasQueryParameters_BlobIdentityTest()
144144
BlobSasQueryParameters sasQueryParameters = blobSasBuilder.ToSasQueryParameters(GetUserDelegationKey(constants), constants.Sas.Account);
145145

146146
// Assert
147-
Assert.AreEqual(SasQueryParameters.DefaultSasVersion, sasQueryParameters.Version);
147+
Assert.AreEqual(SasQueryParametersInternals.DefaultSasVersionInternal, sasQueryParameters.Version);
148148
Assert.IsNull(sasQueryParameters.Services);
149149
Assert.IsNull(sasQueryParameters.ResourceTypes);
150150
Assert.AreEqual(constants.Sas.Protocol, sasQueryParameters.Protocol);
@@ -178,7 +178,7 @@ public void ToSasQueryParameters_SnapshotTest()
178178
BlobSasQueryParameters sasQueryParameters = blobSasBuilder.ToSasQueryParameters(constants.Sas.SharedKeyCredential);
179179

180180
// Assert
181-
Assert.AreEqual(SasQueryParameters.DefaultSasVersion, sasQueryParameters.Version);
181+
Assert.AreEqual(SasQueryParametersInternals.DefaultSasVersionInternal, sasQueryParameters.Version);
182182
Assert.IsNull(sasQueryParameters.Services);
183183
Assert.IsNull(sasQueryParameters.ResourceTypes);
184184
Assert.AreEqual(constants.Sas.Protocol, sasQueryParameters.Protocol);
@@ -206,7 +206,7 @@ public void ToSasQueryParameters_SnapshotIdentityTest()
206206
BlobSasQueryParameters sasQueryParameters = blobSasBuilder.ToSasQueryParameters(GetUserDelegationKey(constants), constants.Sas.Account);
207207

208208
// Assert
209-
Assert.AreEqual(SasQueryParameters.DefaultSasVersion, sasQueryParameters.Version);
209+
Assert.AreEqual(SasQueryParametersInternals.DefaultSasVersionInternal, sasQueryParameters.Version);
210210
Assert.IsNull(sasQueryParameters.Services);
211211
Assert.IsNull(sasQueryParameters.ResourceTypes);
212212
Assert.AreEqual(constants.Sas.Protocol, sasQueryParameters.Protocol);
@@ -252,7 +252,6 @@ public void ToSasQueryParameters_IdentifierTest()
252252
BlobContainerName = containerName,
253253
Protocol = SasProtocol.Https,
254254
Resource = resource,
255-
Version = constants.Sas.Version
256255
};
257256

258257
// Act
@@ -563,7 +562,7 @@ private string BuildSignature(bool includeBlob, bool includeSnapshot, string con
563562
constants.Sas.Identifier,
564563
constants.Sas.IPRange.ToString(),
565564
SasExtensions.ToProtocolString(constants.Sas.Protocol),
566-
SasQueryParameters.DefaultSasVersion,
565+
SasQueryParametersInternals.DefaultSasVersionInternal,
567566
resource,
568567
includeSnapshot ? Snapshot : null,
569568
constants.Sas.CacheControl,
@@ -607,7 +606,7 @@ private string BuildIdentitySignature(bool includeBlob, bool includeSnapshot, st
607606
null,
608607
constants.Sas.IPRange.ToString(),
609608
SasExtensions.ToProtocolString(constants.Sas.Protocol),
610-
SasQueryParameters.DefaultSasVersion,
609+
SasQueryParametersInternals.DefaultSasVersionInternal,
611610
resource,
612611
includeSnapshot ? Snapshot : null,
613612
constants.Sas.CacheControl,

0 commit comments

Comments
 (0)