From 5714ac74815fba2ab173479e637c1b48b3ec574e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 1 Sep 2026 18:13:31 +0100 Subject: [PATCH] Use archive_file to unpack sst --- .rubocop_todo.yml | 1 - cookbooks/hardware/recipes/default.rb | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8f86d9309..520a3b909 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -12,7 +12,6 @@ Chef/Modernize/ExecuteArchiveExtract: - '**/metadata.rb' - '**/attributes/*.rb' - '**/Berksfile' - - 'cookbooks/hardware/recipes/default.rb' - 'cookbooks/overpass/recipes/default.rb' - 'cookbooks/tile/recipes/default.rb' diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index 511c94f78..ee1d0834c 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -347,15 +347,15 @@ if !intel_ssds.empty? || !intel_nvmes.empty? sst_package_version = "3.1.346-0" remote_file "#{Chef::Config[:file_cache_path]}/sst-cli-linux-deb--#{sst_tool_version}.zip" do - source "https://sdmsdfwdriver.blob.core.windows.net/files/kba-gcc/drivers-downloads/ka-00085/sst--3-1/sst-cli-linux-deb--3-1.zip" + source "https://sdmsdfwdriver.blob.core.windows.net/files/kba-gcc/drivers-downloads/ka-00085/sst--#{sst_tool_version}/sst-cli-linux-deb--#{sst_tool_version}.zip" end - execute "#{Chef::Config[:file_cache_path]}/sst-cli-linux-deb--#{sst_tool_version}.zip" do - command "unzip sst-cli-linux-deb--#{sst_tool_version}.zip sst-cli-linux-deb--#{sst_tool_version}/sst_#{sst_package_version}_amd64.deb" - cwd Chef::Config[:file_cache_path] - user "root" + archive_file "#{Chef::Config[:file_cache_path]}/sst-cli-linux-deb--#{sst_tool_version}.zip" do + destination Chef::Config[:file_cache_path] + owner "root" group "root" - not_if { ::File.exist?("#{Chef::Config[:file_cache_path]}/sst-cli-linux-deb--#{sst_tool_version}/sst_#{sst_package_version}_amd64.deb") } + overwrite true + subscribes :create, "remote_file[#{Chef::Config[:file_cache_path]}/sst-cli-linux-deb--#{sst_tool_version}.zip]" end dpkg_package "sst" do -- 2.47.3