Revert "Update the efs-utils to use a different Cargo.toml"

This reverts commit 20b88c9

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-environment/files/efs/Cargo.toml

@@ -13,9 +13,10 @@
 # This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-def install_script_code(_efs_utils_tarball, efs_utils_package, efs_utils_version)
+def install_script_code(efs_utils_tarball, efs_utils_package, efs_utils_version)
   <<-EFSUTILSINSTALL
       set -e
+      tar xf #{efs_utils_tarball}
       cd efs-utils-#{efs_utils_version}
       ./build-deb.sh
       apt-get -y install ./build/#{efs_utils_package}*deb

cookbooks/aws-parallelcluster-environment/resources/efs/partial/_debian.rb

@@ -50,22 +50,6 @@
     action :create_if_missing
   end
 
-  bash "Untar the efs-utils" do
-    cwd node['cluster']['sources_dir']
-    code <<-EFSUTILSUNTAR
-      set -e
-      tar xf #{efs_utils_tarball}
-    EFSUTILSUNTAR
-  end
-
-  cookbook_file "#{node['cluster']['sources_dir']}/efs-utils-#{package_version}/src/proxy/Cargo.toml" do
-    source 'efs/Cargo.toml'
-    owner 'root'
-    group 'root'
-    mode '0755'
-    action :create
-  end
-
   # Install EFS Utils following https://docs.aws.amazon.com/efs/latest/ug/installing-amazon-efs-utils.html
   bash "install efs utils" do
     cwd node['cluster']['sources_dir']

cookbooks/aws-parallelcluster-environment/resources/efs/partial/_install_from_tar.rb

@@ -13,9 +13,10 @@
 # This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-def install_script_code(_efs_utils_tarball, efs_utils_package, efs_utils_version)
+def install_script_code(efs_utils_tarball, efs_utils_package, efs_utils_version)
   <<-EFSUTILSINSTALL
       set -e
+      tar xf #{efs_utils_tarball}
       cd efs-utils-#{efs_utils_version}
       make rpm
       yum -y install ./build/#{efs_utils_package}*rpm

cookbooks/aws-parallelcluster-environment/resources/efs/partial/_redhat_based.rb

@@ -88,15 +88,10 @@ def mock_already_installed(package, expected_version, installed)
       cached(:tarball_path) { "#{source_dir}/efs-utils-#{utils_version}.tar.gz" }
       cached(:tarball_url) { "https://#{aws_region}-aws-parallelcluster.s3.#{aws_region}.test_aws_domain/archives/dependencies/efs/v#{utils_version}.tar.gz" }
       cached(:tarball_checksum) { 'TARBALL CHECKSUM' }
-      cached(:bash_untar_code) do
-        <<-EFSUTILSUNTAR
-      set -e
-      tar xf #{tarball_path}
-        EFSUTILSUNTAR
-      end
       cached(:bash_code) do
         <<-EFSUTILSINSTALL
       set -e
+      tar xf #{tarball_path}
       cd efs-utils-#{utils_version}
       ./build-deb.sh
       apt-get -y install ./build/amazon-efs-utils*deb
@@ -132,12 +127,6 @@ def mock_already_installed(package, expected_version, installed)
             .with(checksum: tarball_checksum)
         end
 
-        it 'it untars the downloaded tarball' do
-          is_expected.to run_bash('Untar the efs-utils')
-            .with(cwd: source_dir)
-            .with(code: bash_untar_code)
-        end
-
         it 'installs package from downloaded tarball' do
           is_expected.to run_bash('install efs utils')
             .with(cwd: source_dir)
@@ -179,15 +168,10 @@ def mock_already_installed(package, expected_version, installed)
       cached(:tarball_path) { "#{source_dir}/efs-utils-#{utils_version}.tar.gz" }
       cached(:tarball_url) { "https://#{aws_region}-aws-parallelcluster.s3.#{aws_region}.test_aws_domain/archives/dependencies/efs/v#{utils_version}.tar.gz" }
       cached(:tarball_checksum) { 'TARBALL CHECKSUM' }
-      cached(:bash_untar_code) do
-        <<-EFSUTILSUNTAR
-      set -e
-      tar xf #{tarball_path}
-        EFSUTILSUNTAR
-      end
       cached(:bash_code) do
         <<-EFSUTILSINSTALL
       set -e
+      tar xf #{tarball_path}
       cd efs-utils-#{utils_version}
       make rpm
       yum -y install ./build/amazon-efs-utils*rpm
@@ -234,12 +218,6 @@ def mock_already_installed(package, expected_version, installed)
             .with(checksum: tarball_checksum)
         end
 
-        it 'it untars the downloaded tarball' do
-          is_expected.to run_bash('Untar the efs-utils')
-            .with(cwd: source_dir)
-            .with(code: bash_untar_code)
-        end
-
         it 'installs package from downloaded tarball' do
           is_expected.to run_bash('install efs utils')
             .with(cwd: source_dir)