Add support for ~ in age and GCP key/cred paths in sopsrc

signageos · Dec 19, 2023 · 4046d61 · 4046d61
1 parent f18721b
commit 4046d61
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -531,6 +531,10 @@ async function getSopsGeneralOptions() {
 	}
 
 	if (gcpCredentialsPath) {
+		if (gcpCredentialsPath.startsWith('~')) {
+			gcpCredentialsPath = path.join(os.homedir(), gcpCredentialsPath.substring(1));
+		}
+
 		if (!path.isAbsolute(gcpCredentialsPath) && vscode.workspace.workspaceFolders) {
 			for (const workspaceFolder of vscode.workspace.workspaceFolders) {
 				const gcpCredentialsAbsPath = path.join(workspaceFolder.uri.path, gcpCredentialsPath);
@@ -545,6 +549,10 @@ async function getSopsGeneralOptions() {
 	}
 
 	if (ageKeyFile) {
+		if (ageKeyFile.startsWith('~')) {
+			ageKeyFile = path.join(os.homedir(), ageKeyFile.substring(1));
+		}
+
 		if (!path.isAbsolute(ageKeyFile) && vscode.workspace.workspaceFolders) {
 			for (const workspaceFolder of vscode.workspace.workspaceFolders) {
 				const ageKeyFileAbsPath = path.join(workspaceFolder.uri.path, ageKeyFile);