From ca775ee99356793052faf591e5ba3c47d488df61 Mon Sep 17 00:00:00 2001 From: brianheineman Date: Sun, 4 Aug 2024 15:44:15 -0600 Subject: [PATCH] fix: correct extension regex to match file extensions --- .../src/repository/portal_corp/repository.rs | 4 ++-- postgresql_extensions/src/repository/steampipe/repository.rs | 4 ++-- .../src/repository/tensor_chord/repository.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/postgresql_extensions/src/repository/portal_corp/repository.rs b/postgresql_extensions/src/repository/portal_corp/repository.rs index b9a51b8..0cc402d 100644 --- a/postgresql_extensions/src/repository/portal_corp/repository.rs +++ b/postgresql_extensions/src/repository/portal_corp/repository.rs @@ -78,8 +78,8 @@ impl Repository for PortalCorp { archive: &[u8], ) -> Result> { let mut extract_directories = ExtractDirectories::default(); - extract_directories.add_mapping(Regex::new(r"(\.dll|\.dylib|\.so)")?, library_dir); - extract_directories.add_mapping(Regex::new(r"(\.control|\.sql)")?, extension_dir); + extract_directories.add_mapping(Regex::new(r"\.(dll|dylib|so)$")?, library_dir); + extract_directories.add_mapping(Regex::new(r"\.(control|sql)$")?, extension_dir); let bytes = &archive.to_vec(); let files = zip_extract(bytes, extract_directories)?; Ok(files) diff --git a/postgresql_extensions/src/repository/steampipe/repository.rs b/postgresql_extensions/src/repository/steampipe/repository.rs index 718fda9..5ab39eb 100644 --- a/postgresql_extensions/src/repository/steampipe/repository.rs +++ b/postgresql_extensions/src/repository/steampipe/repository.rs @@ -91,8 +91,8 @@ impl Repository for Steampipe { archive: &[u8], ) -> Result> { let mut extract_directories = ExtractDirectories::default(); - extract_directories.add_mapping(Regex::new(r"(\.dll|\.dylib|\.so)")?, library_dir); - extract_directories.add_mapping(Regex::new(r"(\.control|\.sql)")?, extension_dir); + extract_directories.add_mapping(Regex::new(r"\.(dll|dylib|so)$")?, library_dir); + extract_directories.add_mapping(Regex::new(r"\.(control|sql)$")?, extension_dir); let bytes = &archive.to_vec(); let files = tar_gz_extract(bytes, extract_directories)?; Ok(files) diff --git a/postgresql_extensions/src/repository/tensor_chord/repository.rs b/postgresql_extensions/src/repository/tensor_chord/repository.rs index e14040e..2b7d2ab 100644 --- a/postgresql_extensions/src/repository/tensor_chord/repository.rs +++ b/postgresql_extensions/src/repository/tensor_chord/repository.rs @@ -78,8 +78,8 @@ impl Repository for TensorChord { archive: &[u8], ) -> Result> { let mut extract_directories = ExtractDirectories::default(); - extract_directories.add_mapping(Regex::new(r"(\.dll|\.dylib|\.so)")?, library_dir); - extract_directories.add_mapping(Regex::new(r"(\.control|\.sql)")?, extension_dir); + extract_directories.add_mapping(Regex::new(r"\.(dll|dylib|so)$")?, library_dir); + extract_directories.add_mapping(Regex::new(r"\.(control|sql)$")?, extension_dir); let bytes = &archive.to_vec(); let files = zip_extract(bytes, extract_directories)?; Ok(files)