Make sure the efs access point id array is set properly and the unit …

…tests cover the dna.json values (#2792)
aws · Aug 20, 2024 · d39131d · d39131d
1 parent b39929f
commit d39131d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/cookbooks/aws-parallelcluster-environment/recipes/config/mount_home.rb b/cookbooks/aws-parallelcluster-environment/recipes/config/mount_home.rb
@@ -61,7 +61,7 @@
         efs_encryption_in_transit_array [node['cluster']['efs_encryption_in_transits'].split(',')[index]]
         efs_iam_authorization_array [node['cluster']['efs_iam_authorizations'].split(',')[index]]
         efs_mount_point_array ['/home']
-        efs_access_point_id [node['cluster']['efs_access_point_ids'].split(',')[index]]
+        efs_access_point_id_array [node['cluster']['efs_access_point_ids'].split(',')[index]]
         action :mount
       end
       break
@@ -74,7 +74,7 @@
         efs_fs_id_array [node['cluster']['efs_fs_ids'].split(',')[index]]
         efs_encryption_in_transit_array [node['cluster']['efs_encryption_in_transits'].split(',')[index]]
         efs_iam_authorization_array [node['cluster']['efs_iam_authorizations'].split(',')[index]]
-        efs_access_point_id [node['cluster']['efs_access_point_ids'].split(',')[index]]
+        efs_access_point_id_array [node['cluster']['efs_access_point_ids'].split(',')[index]]
         action :mount
       end
       break

diff --git a/cookbooks/aws-parallelcluster-environment/resources/efs/partial/_mount_umount.rb b/cookbooks/aws-parallelcluster-environment/resources/efs/partial/_mount_umount.rb
@@ -50,7 +50,7 @@
         mount_options += ",iam"
       end
       # accesspoint requires tls
-      if efs_access_point_id && efs_access_point_id != ''
+      if efs_access_point_id != 'none'
         mount_options += ",accesspoint=#{efs_access_point_id}"
       end
     end

diff --git a/cookbooks/aws-parallelcluster-environment/spec/unit/resources/efs_spec.rb b/cookbooks/aws-parallelcluster-environment/spec/unit/resources/efs_spec.rb
@@ -257,10 +257,11 @@ def mock_already_installed(package, expected_version, installed)
           end
           runner.converge_dsl do
             efs 'mount' do
-              efs_fs_id_array %w(id_1 id_2 id_3)
-              shared_dir_array %w(shared_dir_1 /shared_dir_2 /shared_dir_3)
-              efs_encryption_in_transit_array %w(true true not_true)
-              efs_iam_authorization_array %w(not_true true true)
+              efs_fs_id_array %w(id_1 id_2 id_3 id_4)
+              shared_dir_array %w(shared_dir_1 /shared_dir_2 /shared_dir_3 /shared_dir_4)
+              efs_encryption_in_transit_array %w(true true not_true true)
+              efs_iam_authorization_array %w(not_true true true true)
+              efs_access_point_id_array %w(none none none ap)
               action :mount
             end
           end
@@ -270,14 +271,15 @@ def mock_already_installed(package, expected_version, installed)
           stub_command("mount | grep ' /shared_dir_1 '").and_return(false)
           stub_command("mount | grep ' /shared_dir_2 '").and_return(true)
           stub_command("mount | grep ' /shared_dir_3 '").and_return(true)
+          stub_command("mount | grep ' /shared_dir_4 '").and_return(false)
         end
 
         it 'mounts efs' do
           is_expected.to mount_efs('mount')
         end
 
         it 'creates shared directory' do
-          %w(/shared_dir_1 /shared_dir_2 /shared_dir_3).each do |shared_dir|
+          %w(/shared_dir_1 /shared_dir_2 /shared_dir_3 /shared_dir_4).each do |shared_dir|
             is_expected.to create_directory(shared_dir)
               .with(owner: 'root')
               .with(group: 'root')
@@ -295,6 +297,15 @@ def mock_already_installed(package, expected_version, installed)
             .with(options: %w(_netdev noresvport tls))
             .with(retries: 10)
             .with(retry_delay: 60)
+
+          is_expected.to mount_mount('/shared_dir_4')
+            .with(device: 'id_4:/')
+            .with(fstype: 'efs')
+            .with(dump: 0)
+            .with(pass: 0)
+            .with(options: %w(_netdev noresvport tls iam accesspoint=ap))
+            .with(retries: 10)
+            .with(retry_delay: 60)
         end
 
         it 'enables shared dir mount if already mounted' do

diff --git a/...ks/aws-parallelcluster-platform/resources/install_packages/install_packages_alinux2023.rb b/...ks/aws-parallelcluster-platform/resources/install_packages/install_packages_alinux2023.rb
@@ -41,7 +41,7 @@ def default_packages
      blas-devel libffi-devel dkms libedit-devel jq
      libical-devel sendmail libxml2-devel libglvnd-devel
      libgcrypt-devel libevent-devel glibc-static bind-utils
-     iproute python3 python3-pip libcurl-devel
+     iproute python3 python3-pip libcurl-devel git
      coreutils environment-modules gcc gcc-c++ bzip2 iptables vim yum-plugin-versionlock)
 end