Skip to content

Commit f9abdf3

Browse files
committed
fix test in 241
1 parent 60a5f37 commit f9abdf3

File tree

2 files changed

+16
-2
lines changed
  • plugins/amazonq/shared/jetbrains-community
    • src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts
    • tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts

2 files changed

+16
-2
lines changed

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/LspUtils.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import com.intellij.openapi.util.SystemInfo
77
import com.intellij.openapi.util.text.StringUtil
88
import com.intellij.util.io.DigestUtil
99
import com.intellij.util.system.CpuArch
10+
import java.nio.file.attribute.PosixFileAttributes
11+
import java.nio.file.attribute.PosixFileAttributeView
1012
import software.aws.toolkits.core.utils.ZIP_PROPERTY_POSIX
1113
import software.aws.toolkits.core.utils.createParentDirectories
1214
import software.aws.toolkits.core.utils.exists
@@ -18,6 +20,7 @@ import java.nio.file.Files
1820
import java.nio.file.Path
1921
import java.nio.file.Paths
2022
import java.nio.file.StandardCopyOption
23+
import java.nio.file.attribute.PosixFilePermissions
2124
import java.security.MessageDigest
2225
import kotlin.io.path.isDirectory
2326
import kotlin.io.path.listDirectoryEntries
@@ -91,7 +94,12 @@ fun extractZipFile(zipFilePath: Path, destDir: Path) {
9194
.forEach { zipEntry ->
9295
val destPath = Paths.get(destDir.toString(), zipEntry.toString())
9396
destPath.createParentDirectories()
94-
Files.copy(zipEntry, destPath, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES)
97+
98+
Files.copy(zipEntry, destPath, StandardCopyOption.REPLACE_EXISTING)
99+
100+
// Explicitly set permissions after copy
101+
val permissions = Files.getPosixFilePermissions(zipEntry)
102+
Files.setPosixFilePermissions(destPath, permissions)
95103
}
96104
}
97105
}

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/LspUtilsTest.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import java.nio.file.attribute.PosixFilePermissions
2222
import java.util.zip.ZipOutputStream
2323
import kotlin.io.path.isRegularFile
2424
import kotlin.io.path.setPosixFilePermissions
25+
import java.nio.file.attribute.PosixFilePermission
2526

2627
class LspUtilsTest {
2728
@Test
@@ -86,7 +87,12 @@ class LspUtilsTest {
8687
paths
8788
.filter { it.isRegularFile() }
8889
.forEach { file ->
89-
Files.copy(file, zipfs.getPath("/").resolve(source.relativize(file).toString()), StandardCopyOption.COPY_ATTRIBUTES)
90+
val targetPath = zipfs.getPath("/").resolve(source.relativize(file).toString())
91+
// First copy the file
92+
Files.copy(file, targetPath)
93+
// Then explicitly set the permissions from the source file
94+
val sourcePerms = Files.getPosixFilePermissions(file)
95+
Files.setPosixFilePermissions(targetPath, sourcePerms)
9096
}
9197
}
9298
}

0 commit comments

Comments
 (0)