[Isolated] Not using same Subnet again while creating Storage mount t… (#6171)

* [Isolated] Not using same Subnet again while creating Storage mount targets

* [Isolated] Adding Disable Sudo Test in isolated_regions.yaml

---------

Co-authored-by: Himani Deshpande <himanidp@amazon.com>

Author: himani2411

cloudformation/storage/storage-stack.yaml

@@ -118,6 +118,12 @@ Conditions:
   CreateFsxOntap: !Equals [!Ref CreateFsxOntap, 'true']
   CreateFsxOpenZfs: !Equals [!Ref CreateFsxOpenZfs, 'true']
   CreateFileCache: !Equals [!Ref CreateFileCache, 'true']
+  UniqueSubnetThree: !Or
+    - !Equals [!Ref SubnetOne, !Ref SubnetThree]
+    - !Equals [!Ref SubnetTwo, !Ref SubnetThree]
+  CreateMountTargetSubnetThree: !And
+    - !Condition CreateEfs
+    - !Not [!Condition UniqueSubnetThree]
   NoStorage: !And
     - !Not [!Equals [!Ref CreateEbs, 'true']]
     - !Not [!Equals [!Ref CreateEfs, 'true']]
@@ -161,7 +167,7 @@ Resources:
       SubnetId: !Ref SubnetTwo
   MountTargetResourceEfs0SubnetThree:
     Type: 'AWS::EFS::MountTarget'
-    Condition: CreateEfs
+    Condition: CreateMountTargetSubnetThree
     Properties:
       FileSystemId: !Ref EfsFileSystem
       SecurityGroups:
@@ -363,7 +369,7 @@ Resources:
           ToPort: 20003
       VpcId: !Ref Vpc
     Type: 'AWS::EC2::SecurityGroup'
-    
+
   # File Cache
   FileCacheSecurityGroup:
     Type: AWS::EC2::SecurityGroup

tests/integration-tests/configs/isolated_regions.yaml

@@ -104,6 +104,12 @@ test-suites:
           instances: {{ INSTANCES }}
           oss: {{ OSS }}
           schedulers: {{ SCHEDULERS }}
+    test_create.py::test_create_disable_sudo_access_for_default_user:
+      dimensions:
+        - regions: {{ REGIONS }}
+          instances: {{ INSTANCES }}
+          oss: {{ OSS }}
+          schedulers: {{ SCHEDULERS }}
     test_create.py::test_create_imds_secured:
       dimensions:
         - regions: {{ REGIONS }}