Addressing some comments

Signed-off-by: David Pratt <[email protected]>

Author: davprat

attributes/default.rb

@@ -26,6 +26,10 @@
 # AWS domain
 default['cluster']['aws_domain'] = aws_domain
 
+# URL for ParallelCluster Artifacts stored in public S3 buckets
+# ['cluster']['region'] will need to be defined by image_dna.json during AMI build.
+default['cluster']['artifacts_s3_url'] = "https://#{node['cluster']['region']}-aws-parallelcluster.s3.#{node['cluster']['region']}.#{node['cluster']['aws_domain']}/archives"
+
 # Cluster config
 default['cluster']['cluster_s3_bucket'] = nil
 default['cluster']['cluster_config_s3_key'] = nil
@@ -243,7 +247,7 @@
 )
 
 # MySQL Packages
-default['cluster']['mysql']['package']['root'] = "https://#{node['cluster']['region']}-aws-parallelcluster.s3.#{node['cluster']['region']}.#{node['cluster']['aws_domain']}/archives/mysql"
+default['cluster']['mysql']['package']['root'] = "#{node['cluster']['artifacts_s3_url']}/mysql"
 default['cluster']['mysql']['package']['version'] = "8.0.31-1"
 default['cluster']['mysql']['package']['source-version'] = "8.0.31"
 default['cluster']['mysql']['package']['platform'] = if arm_instance?
@@ -261,7 +265,7 @@
                                                      end
 default['cluster']['mysql']['package']['file-name'] = "mysql-community-client-#{node['cluster']['mysql']['package']['version']}.tar.gz"
 default['cluster']['mysql']['package']['archive'] = "#{node['cluster']['mysql']['package']['root']}/#{node['cluster']['mysql']['package']['platform']}/#{node['cluster']['mysql']['package']['file-name']}"
-default['cluster']['mysql']['package']['source'] = "#{node['cluster']['mysql']['package']['root']}/source/mysql-#{node['cluster']['mysql']['package']['source-version']}.tar.gz"
+default['cluster']['mysql']['package']['source'] = "#{node['cluster']['artifacts_s3_url']}/source/mysql-#{node['cluster']['mysql']['package']['source-version']}.tar.gz"
 
 # MySQL Validation
 if arm_instance?
@@ -631,7 +635,6 @@
 default['cluster']['slurm_node_reg_mem_percent'] = 75
 default['cluster']['slurmdbd_response_retries'] = 30
 
-
 # Official ami build
 default['cluster']['is_official_ami_build'] = false
 

cookbooks/aws-parallelcluster-install/libraries/helpers.rb

@@ -34,3 +34,60 @@ def get_package_version(package_name)
   end
   version
 end
+
+def validate_file_hash(file_path, expected_hash)
+  hash_function = yield
+  checksum = hash_function.file(file_path).hexdigest
+  if checksum != expected_hash
+    raise "Downloaded file #{file_path} checksum #{checksum} does not match expected checksum #{expected_hash}"
+  end
+end
+
+def validate_file_md5_hash(file_path, expected_hash)
+  validate_file_hash(file_path, expected_hash) do
+    require 'digest'
+    Digest::MD5
+  end
+end
+
+def validate_file_sha256_hash(file_path, expected_hash)
+  validate_file_hash(file_path, expected_hash) do
+    require 'digest'
+    Digest::SHA2.new(256)
+  end
+end
+
+def install_repository_definition(repository_name, definition_source, local_file, md5_hash = nil)
+  remote_file local_file do
+    source definition_source
+    mode '0644'
+    retries 3
+    retry_delay 5
+    not_if { ::File.exist?(local_file) }
+  end
+
+  ruby_block "Validate Repository Definition Checksum" do
+    block do
+      validate_file_md5_hash(local_file, md5_hash = nil)
+    end
+    not_if { md5_hash.nil? }
+  end
+
+  if platform?('ubuntu')
+    # dpkg_package is used here because 'package' seems to default to using apt_package
+    # which fails on the MySQL package.
+    dpkg_package repository_name do
+      source local_file
+    end
+
+    apt_update 'update' do
+      action :update
+      retries 3
+      retry_delay 5
+    end
+  else
+    package repository_name do
+      source local_file
+    end
+  end
+end

cookbooks/aws-parallelcluster-install/recipes/install_mysql_client.rb

@@ -2,7 +2,7 @@
 
 #
 # Cookbook:: aws-parallelcluster
-# Recipe:: mysql
+# Recipe:: install_mysql_client
 #
 # Copyright:: 2013-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
@@ -24,7 +24,7 @@
 
   package_installer = value_for_platform(
     'default' => "yum install -y",
-    'ubuntu' => { 'default' => "apt install" }
+    'ubuntu' => { 'default' => "apt install -y" }
   )
 
   mysql_archive_url = node['cluster']['mysql']['package']['archive']
@@ -55,7 +55,7 @@
 
 # Add MySQL source file
 template "#{node['cluster']['sources_dir']}/mysql_source_code.txt" do
-  source 'mysql/mysql_source_code.erb'
+  source 'mysql/mysql_source_code.txt.erb'
   owner 'root'
   group 'root'
   mode '0644'

cookbooks/aws-parallelcluster-install/recipes/install_mysql_repository.rb

@@ -2,7 +2,7 @@
 
 #
 # Cookbook:: aws-parallelcluster
-# Recipe:: mysql
+# Recipe:: install_mysql_repository
 #
 # Copyright:: 2013-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
@@ -15,47 +15,8 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-def install_repository_configuration_package(repository_name, definition_source, local_file, md5_hash)
-  remote_file local_file do
-    source definition_source
-    mode '0644'
-    retries 3
-    retry_delay 5
-    not_if { ::File.exist?(local_file) }
-  end
-
-  ruby_block "Validate Repository Definition Checksum" do
-    block do
-      require 'digest'
-      checksum = Digest::MD5.file(local_file).hexdigest
-
-      if checksum != md5_hash
-        raise "Downloaded file #{local_file} checksum #{checksum} does not match expected checksum #{md5_hash}"
-      end
-    end
-  end
-
-  if platform?('ubuntu')
-    # dpkg_package is used here because 'package' seems to default to using apt_package
-    # which fails on the MySQL package.
-    dpkg_package repository_name do
-      source local_file
-    end
-
-    apt_update 'update' do
-      action :update
-      retries 3
-      retry_delay 5
-    end
-  else
-    package repository_name do
-      source local_file
-    end
-  end
-end
-
 unless platform?('ubuntu') && arm_instance?
-  install_repository_configuration_package(
+  install_repository_definition(
     "MySQL Repository",
     node['cluster']['mysql']['repository']['definition']['url'],
     "/tmp/#{node['cluster']['mysql']['repository']['definition']['file-name']}",