Skip to content

Commit fc81201

Browse files
v-huizhu2CopilotXiaofeiCao
authored
mgmt containerinstance , fix live test failures (#47634)
* test(container): disable failing test due to policy restriction - Added @disabled annotation to testBeginCreateWithFileShareVolume - Included reason for disabling: internal policy denies local auth methods - Preserved existing @DoNotRecord annotation and skipInPlayback setting * feat(test): enable file share volume testing for container groups - Add storage account creation and key retrieval for file share testing - Integrate Azure file share volume configuration with existing storage credentials - Include ShareServiceClientBuilder for file endpoint management - Remove @disabled annotation to activate file share volume tests - Add storage manager initialization in test base class - Update container group volume definition to use existing Azure file share * fix(test): update ContainerGroupTest to clarify Azure Storage limitations with managed identity * test(containerinstance): add tests for container group volume configurations - Added testBeginCreateWithEmptyDirectoryVolume method - Disabled testBeginCreateWithFileShareVolume due to internal policy restrictions - Updated volume configuration logic to use withEmptyDirectoryVolume instead of manual volume definition - Added proper annotations for test recording and policy compliance - Implemented container group creation with virtual network and volume mounting - Added assertions for volume count validation * fix(containerinstance): update test comment and remove outdated reference Removed outdated comment about Azure Storage SMB mounting with managed identity and updated the test documentation to reflect current behavior. The test now properly references the Azure documentation for container instances volume mounting. * chore(containerinstance): update assets tag Update the assets tag from a0e5cc2e29 to bd0493a9b7 in azure-resourcemanager-containerinstance module * refactor(tests): remove unused storage manager from container instance tests - Removed storage account creation logic from ContainerGroupTest - Eliminated unused StorageManager dependency from ContainerInstanceManagementTest - Cleaned up related imports and fields that were no longer needed - Simplified test setup by removing unnecessary storage account initialization * chore(containerinstance): update assets tag Update the assets tag in assets.json from bd0493a9b7 to cade898991 for azure-resourcemanager-containerinstance package. * refactor(ContainerGroupTest): remove unused imports - Removed unused Azure identity imports (AzureAuthorityHosts, ClientSecretCredential, DefaultAzureCredentialBuilder) - Removed unused storage related imports (StorageAccount, StorageAccountKey, ShareServiceAsyncClient, ShareServiceClientBuilder) * Update sdk/containerinstance/azure-resourcemanager-containerinstance/src/test/java/com/azure/resourcemanager/containerinstance/ContainerGroupTest.java Co-authored-by: Copilot <[email protected]> * Update sdk/containerinstance/azure-resourcemanager-containerinstance/src/test/java/com/azure/resourcemanager/containerinstance/ContainerGroupTest.java Co-authored-by: Xiaofei Cao <[email protected]> --------- Co-authored-by: Copilot <[email protected]> Co-authored-by: Xiaofei Cao <[email protected]>
1 parent c4f4b16 commit fc81201

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

sdk/containerinstance/azure-resourcemanager-containerinstance/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "java",
44
"TagPrefix": "java/containerinstance/azure-resourcemanager-containerinstance",
5-
"Tag": "java/containerinstance/azure-resourcemanager-containerinstance_a0e5cc2e29"
5+
"Tag": "java/containerinstance/azure-resourcemanager-containerinstance_cade898991"
66
}

sdk/containerinstance/azure-resourcemanager-containerinstance/src/test/java/com/azure/resourcemanager/containerinstance/ContainerGroupTest.java

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
package com.azure.resourcemanager.containerinstance;
55

6+
import com.azure.core.management.Region;
67
import com.azure.core.test.annotation.DoNotRecord;
78
import com.azure.resourcemanager.containerinstance.models.Container;
89
import com.azure.resourcemanager.containerinstance.models.ContainerAttachResult;
910
import com.azure.resourcemanager.containerinstance.models.ContainerExec;
1011
import com.azure.resourcemanager.containerinstance.models.ContainerGroup;
11-
import com.azure.core.management.Region;
1212
import com.azure.resourcemanager.containerinstance.models.ContainerGroupRestartPolicy;
1313
import com.azure.resourcemanager.containerinstance.models.ContainerHttpGet;
1414
import com.azure.resourcemanager.containerinstance.models.ContainerProbe;
@@ -19,6 +19,7 @@
1919
import com.azure.resourcemanager.resources.fluentcore.model.Accepted;
2020
import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils;
2121
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.Disabled;
2223
import org.junit.jupiter.api.Test;
2324

2425
import java.time.Duration;
@@ -210,8 +211,11 @@ public void testBeginCreate() {
210211
}
211212

212213
// test contains a data-plane call
214+
// Azure Storage doesn't support SMB mounting of file share using managed identity
215+
// https://learn.microsoft.com/azure/container-instances/container-instances-volume-azure-files
213216
@DoNotRecord(skipInPlayback = true)
214217
@Test
218+
@Disabled("This request was denied due to internal policy. Container Group requires that Storage Accounts is authenticated with managed identity, but Azure Storage doesn't support SMB mounting of file share using managed identity. ")
215219
public void testBeginCreateWithFileShareVolume() {
216220
String containerGroupName = generateRandomResourceName("container", 20);
217221
Region region = Region.US_WEST3;
@@ -232,6 +236,27 @@ public void testBeginCreateWithFileShareVolume() {
232236
Assertions.assertEquals(1, containerGroup.volumes().size());
233237
}
234238

239+
@DoNotRecord(skipInPlayback = true)
240+
@Test
241+
public void testBeginCreateWithEmptyDirectoryVolume() {
242+
String containerGroupName = generateRandomResourceName("container", 20);
243+
Region region = Region.US_WEST3;
244+
245+
// create virtual network before creating container group
246+
Accepted<ContainerGroup> acceptedContainerGroup = containerInstanceManager.containerGroups()
247+
.define(containerGroupName)
248+
.withRegion(region)
249+
.withNewResourceGroup(rgName)
250+
.withLinux()
251+
.withPublicImageRegistryOnly()
252+
.withEmptyDirectoryVolume("vol2")
253+
.withContainerInstance("nginx", 80)
254+
.withNewVirtualNetwork("10.0.0.0/24")
255+
.beginCreate();
256+
ContainerGroup containerGroup = acceptedContainerGroup.getSyncPoller().getFinalResult();
257+
Assertions.assertEquals(1, containerGroup.volumes().size());
258+
}
259+
235260
@Test
236261
public void testCreateWithAutoGeneratedDomainNameLabelScope() {
237262
String containerGroupName = generateRandomResourceName("container", 20);

0 commit comments

Comments
 (0)