Resolving Misc Pipeline Test Failures (#45352)

* removing management plane interaction and replacing with data plane interaction so it doesnt explode with 429s

* making root tests playback only

* misc timeout adjustments

* removing unused test

* marking httpfaultinjectingtests as isolated and removing redundant helper class

* spotless

Author: ibrandes

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/BlobTestBase.java

@@ -37,7 +37,6 @@
 import com.azure.identity.ChainedTokenCredentialBuilder;
 import com.azure.identity.DefaultAzureCredentialBuilder;
 import com.azure.identity.EnvironmentCredentialBuilder;
-import com.azure.json.JsonProviders;
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonWriter;
 import com.azure.storage.blob.models.BlobContainerItem;
@@ -68,7 +67,6 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -165,6 +163,10 @@ public class BlobTestBase extends TestProxyTestBase {
 
     protected String prefix;
 
+    // used to support cross package tests without taking a dependency on the package
+    protected HttpPipeline dataPlanePipeline;
+    protected HttpHeaders genericHeaders;
+
     // used to build pipeline to management plane
     protected static final String RESOURCE_GROUP_NAME = ENVIRONMENT.getResourceGroupName();
     protected static final String SUBSCRIPTION_ID = ENVIRONMENT.getSubscriptionId();
@@ -875,22 +877,15 @@ protected Mono<?> setAccessPolicySleepAsync(BlobContainerAsyncClient cc, PublicA
         return setPolicyMono;
     }
 
-    protected String generateShareName() {
-        return generateResourceName(entityNo++);
-    }
-
     protected String createFileAndDirectoryWithoutFileShareDependency(byte[] data, String shareName)
         throws IOException {
         String accountName = ENVIRONMENT.getPrimaryAccount().getName();
         //authenticate
         BearerTokenAuthenticationPolicy credentialPolicyDataPlane = new BearerTokenAuthenticationPolicy(
             getTokenCredential(ENVIRONMENT.getTestMode()), Constants.STORAGE_SCOPE);
 
-        //create share through management plane
-        createFileShareWithoutDependency(shareName);
-
         //setup headers that will be used in every request
-        HttpHeaders genericHeaders = new HttpHeaders().set(X_MS_VERSION, "2025-07-05")
+        genericHeaders = new HttpHeaders().set(X_MS_VERSION, "2025-07-05")
             .set(HttpHeaderName.ACCEPT, "application/xml")
             .set(HttpHeaderName.HOST, accountName + ".file.core.windows.net")
             .set(HttpHeaderName.CONTENT_LENGTH, "0")
@@ -904,8 +899,15 @@ protected String createFileAndDirectoryWithoutFileShareDependency(byte[] data, S
         policies.add(new RequestIdPolicy());
 
         // create data plane pipeline
-        HttpPipeline dataPlanePipeline
-            = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])).build();
+        dataPlanePipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0])).build();
+
+        // create share through data plane pipeline
+        String shareUrl = String.format("https://%s.file.core.windows.net/%s?restype=share", accountName, shareName);
+
+        HttpResponse shareCreateResponse
+            = dataPlanePipeline.send(new HttpRequest(HttpMethod.PUT, new URL(shareUrl), genericHeaders)).block();
+        assertNotNull(shareCreateResponse);
+        assertEquals(201, shareCreateResponse.getStatusCode());
 
         // create directory
         String directoryName = generateBlobName();
@@ -945,48 +947,14 @@ protected String createFileAndDirectoryWithoutFileShareDependency(byte[] data, S
         return fileUrl;
     }
 
-    protected void createFileShareWithoutDependency(String shareName) throws IOException {
-        String shareID = getFileShareID(shareName);
-        Body shareBody = new Body();
-        shareBody.setId(shareID);
-        shareBody.setName(shareName);
-        shareBody.setType("Microsoft.Storage/storageAccounts/fileServices/shares");
-
-        ByteArrayOutputStream shareJson = new ByteArrayOutputStream();
-        try (JsonWriter jsonWriter = JsonProviders.createWriter(shareJson)) {
-            shareBody.toJson(jsonWriter);
-        }
-        HttpResponse response
-            = getManagementPlanePipeline().send(new HttpRequest(HttpMethod.PUT, new URL(getFileShareUri(shareID)),
-                new HttpHeaders(), Flux.just(ByteBuffer.wrap(shareJson.toByteArray())))).block();
-        assertNotNull(response);
-        assertEquals(201, response.getStatusCode());
-    }
-
     protected void deleteFileShareWithoutDependency(String shareName) throws IOException {
-        String shareID = getFileShareID(shareName);
-        HttpResponse response = getManagementPlanePipeline()
-            .send(new HttpRequest(HttpMethod.DELETE, new URL(getFileShareUri(shareID)), new HttpHeaders()))
-            .block();
-        assertNotNull(response);
-        assertEquals(200, response.getStatusCode());
-    }
-
-    protected HttpPipeline getManagementPlanePipeline() {
-        BearerTokenAuthenticationPolicy credentialPolicyManagementPlane = new BearerTokenAuthenticationPolicy(
-            getTokenCredential(ENVIRONMENT.getTestMode()), "https://management.azure.com/.default");
-        return new HttpPipelineBuilder().policies(credentialPolicyManagementPlane).build();
-    }
+        String shareUrl = String.format("https://%s.file.core.windows.net/%s?restype=share",
+            ENVIRONMENT.getPrimaryAccount().getName(), shareName);
 
-    protected String getFileShareID(String shareName) {
-        return String.format(
-            "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Storage/storageAccounts/"
-                + "%s/fileServices/default/shares/%s",
-            SUBSCRIPTION_ID, RESOURCE_GROUP_NAME, ENVIRONMENT.getPrimaryAccount().getName(), shareName);
-    }
-
-    protected String getFileShareUri(String fileShareID) {
-        return "https://management.azure.com" + fileShareID + "?api-version=2024-01-01";
+        HttpResponse shareDeleteResponse
+            = dataPlanePipeline.send(new HttpRequest(HttpMethod.DELETE, new URL(shareUrl), genericHeaders)).block();
+        assertNotNull(shareDeleteResponse);
+        assertEquals(202, shareDeleteResponse.getStatusCode());
     }
 
     public static final class Body implements JsonSerializable<Body> {
@@ -1058,10 +1026,6 @@ public static final class ImmutableStorageWithVersioning
         implements JsonSerializable<ImmutableStorageWithVersioning> {
         private boolean enabled;
 
-        public boolean isEnabled() {
-            return enabled;
-        }
-
         public void setEnabled(boolean enabled) {
             this.enabled = enabled;
         }
@@ -1073,7 +1037,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         }
     }
 
-    //todo: change the copy of this method in StorageCommonTestUtils to take in TestMode instead of interception manager
+    //todo isbr: change the copy of this method in StorageCommonTestUtils to take in TestMode instead of interception manager
     protected static TokenCredential getTokenCredential(TestMode testMode) {
         if (testMode == TestMode.RECORD) {
             return new DefaultAzureCredentialBuilder().build();

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerApiTests.java

@@ -1760,6 +1760,7 @@ public void createURLSpecialCharsDecoded(String name) {
     }
 
     @Test
+    @PlaybackOnly
     public void rootExplicit() {
         cc = primaryBlobServiceClient.getBlobContainerClient(BlobContainerClient.ROOT_CONTAINER_NAME);
         // create root container if not exist.
@@ -1771,6 +1772,7 @@ public void rootExplicit() {
     }
 
     @Test
+    @PlaybackOnly
     public void rootExplicitInEndpoint() {
         cc = primaryBlobServiceClient.getBlobContainerClient(BlobContainerClient.ROOT_CONTAINER_NAME);
         // create root container if not exist.
@@ -1788,6 +1790,7 @@ public void rootExplicitInEndpoint() {
     }
 
     @Test
+    @PlaybackOnly
     public void blobClientBuilderRootImplicit() {
         cc = primaryBlobServiceClient.getBlobContainerClient(BlobContainerClient.ROOT_CONTAINER_NAME);
         // createroot container if not exist.
@@ -1810,6 +1813,7 @@ public void blobClientBuilderRootImplicit() {
     }
 
     @Test
+    @PlaybackOnly
     public void containerClientBuilderRootImplicit() {
         cc = primaryBlobServiceClient.getBlobContainerClient(BlobContainerClient.ROOT_CONTAINER_NAME);
         // create root container if not exist.

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ContainerAsyncApiTests.java

@@ -1859,6 +1859,7 @@ public void createURLSpecialCharsEncoded(String name) {
     }
 
     @Test
+    @PlaybackOnly
     public void rootExplicit() {
         ccAsync = primaryBlobServiceAsyncClient.getBlobContainerAsyncClient(BlobContainerClient.ROOT_CONTAINER_NAME);
         // create root container if not exist.
@@ -1874,6 +1875,7 @@ public void rootExplicit() {
     }
 
     @Test
+    @PlaybackOnly
     public void rootExplicitInEndpoint() {
         ccAsync = primaryBlobServiceAsyncClient.getBlobContainerAsyncClient(BlobContainerClient.ROOT_CONTAINER_NAME);
         // create root container if not exist.
@@ -1893,6 +1895,7 @@ public void rootExplicitInEndpoint() {
     }
 
     @Test
+    @PlaybackOnly
     public void blobClientBuilderRootImplicit() {
         ccAsync = primaryBlobServiceAsyncClient.getBlobContainerAsyncClient(BlobContainerClient.ROOT_CONTAINER_NAME);
         // createroot container if not exist.
@@ -1917,6 +1920,7 @@ public void blobClientBuilderRootImplicit() {
     }
 
     @Test
+    @PlaybackOnly
     public void containerClientBuilderRootImplicit() {
         ccAsync = primaryBlobServiceAsyncClient.getBlobContainerAsyncClient(BlobContainerClient.ROOT_CONTAINER_NAME);
         // create root container if not exist.

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/ServiceApiTests.java

@@ -1021,8 +1021,8 @@ public void restoreContainerWithResponse() {
         sleepIfRunningAgainstService(30000);
 
         Response<BlobContainerClient> response = primaryBlobServiceClient.undeleteBlobContainerWithResponse(
-            new UndeleteBlobContainerOptions(blobContainerItem.getName(), blobContainerItem.getVersion()),
-            Duration.ofMinutes(1), Context.NONE);
+            new UndeleteBlobContainerOptions(blobContainerItem.getName(), blobContainerItem.getVersion()), null,
+            Context.NONE);
         BlobContainerClient restoredContainerClient = response.getValue();
 
         assertNotNull(response);

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlockBlobApiTests.java

@@ -1306,42 +1306,6 @@ private static Stream<Arguments> bufferedUploadSyncHandlePathingWithTransientFai
         return Stream.of(Arguments.of(11110, 0), Arguments.of(2 * Constants.MB + 11, 2));
     }
 
-    /*
-    def "Upload NRF progress"() {
-        setup:
-        def data = getRandomData(BlockBlobURL.MAX_UPLOAD_BLOB_BYTES + 1)
-        def numBlocks = data.remaining() / BlockBlobURL.MAX_STAGE_BLOCK_BYTES
-        long prevCount = 0
-        def mockReceiver = Mock(IProgressReceiver)
-    
-    
-        when:
-        TransferManager.uploadFromNonReplayableFlowable(Flowable.just(data), bu, BlockBlobURL.MAX_STAGE_BLOCK_BYTES, 10,
-            new TransferManagerUploadToBlockBlobOptions(mockReceiver, null, null, null, 20)).blockingGet()
-        data.position(0)
-    
-        then:
-        // We should receive exactly one notification of the completed progress.
-        1 * mockReceiver.reportProgress(data.remaining()) */
-
-    /*
-    We should receive at least one notification reporting an intermediary value per block, but possibly more
-    notifications will be received depending on the implementation. We specify numBlocks - 1 because the last block
-    will be the total size as above. Finally, we assert that the number reported monotonically increases.
-     */
-    /*(numBlocks - 1.._) * mockReceiver.reportProgress(!data.remaining()) >> { long bytesTransferred ->
-        if (!(bytesTransferred > prevCount)) {
-            throw new IllegalArgumentException("Reported progress should monotonically increase")
-        } else {
-            prevCount = bytesTransferred
-        }
-    }
-    
-    // We should receive no notifications that report more progress than the size of the file.
-    0 * mockReceiver.reportProgress({ it > data.remaining() })
-    notThrown(IllegalArgumentException)
-    }*/
-
     @LiveOnly
     @Test
     public void bufferedUploadOverwrite() throws IOException {
@@ -1581,7 +1545,7 @@ public void uploadFromUrlSourceRequestConditions(BlobRequestConditions requestCo
     private static Stream<Arguments> uploadFromUrlSourceRequestConditionsSupplier() {
         return Stream.of(
             Arguments.of(new BlobRequestConditions().setIfMatch("dummy"), BlobErrorCode.SOURCE_CONDITION_NOT_MET),
-            Arguments.of(new BlobRequestConditions().setIfModifiedSince(OffsetDateTime.now().plusSeconds(20)),
+            Arguments.of(new BlobRequestConditions().setIfModifiedSince(OffsetDateTime.now().plusDays(10)),
                 BlobErrorCode.CANNOT_VERIFY_COPY_SOURCE),
             Arguments.of(new BlobRequestConditions().setIfUnmodifiedSince(OffsetDateTime.now().minusDays(1)),
                 BlobErrorCode.CANNOT_VERIFY_COPY_SOURCE));

sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/BlockBlobAsyncApiTests.java

@@ -2546,7 +2546,7 @@ public void uploadFromUrlSourceRequestConditions(BlobRequestConditions requestCo
     private static Stream<Arguments> uploadFromUrlSourceRequestConditionsSupplier() {
         return Stream.of(
             Arguments.of(new BlobRequestConditions().setIfMatch("dummy"), BlobErrorCode.SOURCE_CONDITION_NOT_MET),
-            Arguments.of(new BlobRequestConditions().setIfModifiedSince(OffsetDateTime.now().plusSeconds(10)),
+            Arguments.of(new BlobRequestConditions().setIfModifiedSince(OffsetDateTime.now().plusDays(10)),
                 BlobErrorCode.CANNOT_VERIFY_COPY_SOURCE),
             Arguments.of(new BlobRequestConditions().setIfUnmodifiedSince(OffsetDateTime.now().minusDays(1)),
                 BlobErrorCode.CANNOT_VERIFY_COPY_SOURCE));