From e98c0af8cac52c17f18cab576cb553ed32e56d4a Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Mon, 10 Nov 2025 21:04:08 +0100
Subject: [PATCH] feat(repositories): add google cloud storage support

---
 .../app/components/create-repository-form.tsx | 49 +++++++++++++++++++
 .../client/app/components/repository-icon.tsx |  2 +
 .../repositories/routes/repositories.tsx      |  1 +
 .../repositories/repositories.service.ts      |  3 ++
 apps/server/src/utils/restic.ts               | 10 ++++
 packages/schemas/src/restic.ts                | 10 +++-
 6 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/apps/client/app/components/create-repository-form.tsx b/apps/client/app/components/create-repository-form.tsx
index 3153af1..03891b1 100644
--- a/apps/client/app/components/create-repository-form.tsx
+++ b/apps/client/app/components/create-repository-form.tsx
@@ -30,6 +30,7 @@ type Props = {
 const defaultValuesForType = {
 	local: { backend: "local" as const, compressionMode: "auto" as const },
 	s3: { backend: "s3" as const, compressionMode: "auto" as const },
+	gcs: { backend: "gcs" as const, compressionMode: "auto" as const },
 };
 
 export const CreateRepositoryForm = ({
@@ -100,6 +101,7 @@ export const CreateRepositoryForm = ({
 								<SelectContent>
 									<SelectItem value="local">Local</SelectItem>
 									<SelectItem value="s3">S3</SelectItem>
+									<SelectItem value="gcs">Google Cloud Storage</SelectItem>
 								</SelectContent>
 							</Select>
 							<FormDescription>Choose the storage backend for this repository.</FormDescription>
@@ -195,6 +197,53 @@ export const CreateRepositoryForm = ({
 					</>
 				)}
 
+				{watchedBackend === "gcs" && (
+					<>
+						<FormField
+							control={form.control}
+							name="bucket"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Bucket</FormLabel>
+									<FormControl>
+										<Input placeholder="my-backup-bucket" {...field} />
+									</FormControl>
+									<FormDescription>GCS bucket name for storing backups.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="projectId"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Project ID</FormLabel>
+									<FormControl>
+										<Input placeholder="my-gcp-project-123" {...field} />
+									</FormControl>
+									<FormDescription>Google Cloud project ID.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="credentialsJson"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Service Account JSON</FormLabel>
+									<FormControl>
+										<Input type="password" placeholder="Paste service account JSON key..." {...field} />
+									</FormControl>
+									<FormDescription>Service account JSON credentials for authentication.</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+					</>
+				)}
+
 				{mode === "update" && (
 					<Button type="submit" className="w-full" loading={loading}>
 						Save Changes
diff --git a/apps/client/app/components/repository-icon.tsx b/apps/client/app/components/repository-icon.tsx
index a706448..40d4152 100644
--- a/apps/client/app/components/repository-icon.tsx
+++ b/apps/client/app/components/repository-icon.tsx
@@ -12,6 +12,8 @@ export const RepositoryIcon = ({ backend, className = "h-4 w-4" }: Props) => {
 			return <HardDrive className={className} />;
 		case "s3":
 			return <Cloud className={className} />;
+		case "gcs":
+			return <Cloud className={className} />;
 		default:
 			return <Database className={className} />;
 	}
diff --git a/apps/client/app/modules/repositories/routes/repositories.tsx b/apps/client/app/modules/repositories/routes/repositories.tsx
index 79055f2..4a87fd5 100644
--- a/apps/client/app/modules/repositories/routes/repositories.tsx
+++ b/apps/client/app/modules/repositories/routes/repositories.tsx
@@ -102,6 +102,7 @@ export default function Repositories({ loaderData }: Route.ComponentProps) {
 							<SelectItem value="local">Local</SelectItem>
 							<SelectItem value="sftp">SFTP</SelectItem>
 							<SelectItem value="s3">S3</SelectItem>
+							<SelectItem value="gcs">Google Cloud Storage</SelectItem>
 						</SelectContent>
 					</Select>
 					{(searchQuery || statusFilter || backendFilter) && (
diff --git a/apps/server/src/modules/repositories/repositories.service.ts b/apps/server/src/modules/repositories/repositories.service.ts
index 775043e..f645f53 100644
--- a/apps/server/src/modules/repositories/repositories.service.ts
+++ b/apps/server/src/modules/repositories/repositories.service.ts
@@ -22,6 +22,9 @@ const encryptConfig = async (config: RepositoryConfig): Promise<RepositoryConfig
 			encryptedConfig.accessKeyId = await cryptoUtils.encrypt(config.accessKeyId);
 			encryptedConfig.secretAccessKey = await cryptoUtils.encrypt(config.secretAccessKey);
 			break;
+		case "gcs":
+			encryptedConfig.credentialsJson = await cryptoUtils.encrypt(config.credentialsJson);
+			break;
 	}
 
 	return encryptedConfig as RepositoryConfig;
diff --git a/apps/server/src/utils/restic.ts b/apps/server/src/utils/restic.ts
index 175641a..90e6c3d 100644
--- a/apps/server/src/utils/restic.ts
+++ b/apps/server/src/utils/restic.ts
@@ -74,6 +74,8 @@ const buildRepoUrl = (config: RepositoryConfig): string => {
 			return `${REPOSITORY_BASE}/${config.name}`;
 		case "s3":
 			return `s3:${config.endpoint}/${config.bucket}`;
+		case "gcs":
+			return `gs:${config.bucket}:/`;
 		default: {
 			throw new Error(`Unsupported repository backend: ${JSON.stringify(config)}`);
 		}
@@ -91,6 +93,14 @@ const buildEnv = async (config: RepositoryConfig) => {
 			env.AWS_ACCESS_KEY_ID = await cryptoUtils.decrypt(config.accessKeyId);
 			env.AWS_SECRET_ACCESS_KEY = await cryptoUtils.decrypt(config.secretAccessKey);
 			break;
+		case "gcs": {
+			const decryptedCredentials = await cryptoUtils.decrypt(config.credentialsJson);
+			const credentialsPath = path.join("/tmp", `gcs-credentials-${crypto.randomBytes(8).toString("hex")}.json`);
+			await fs.writeFile(credentialsPath, decryptedCredentials, { mode: 0o600 });
+			env.GOOGLE_PROJECT_ID = config.projectId;
+			env.GOOGLE_APPLICATION_CREDENTIALS = credentialsPath;
+			break;
+		}
 	}
 
 	return env;
diff --git a/packages/schemas/src/restic.ts b/packages/schemas/src/restic.ts
index 0d6fb92..c3bb621 100644
--- a/packages/schemas/src/restic.ts
+++ b/packages/schemas/src/restic.ts
@@ -3,6 +3,7 @@ import { type } from "arktype";
 export const REPOSITORY_BACKENDS = {
 	local: "local",
 	s3: "s3",
+	gcs: "gcs",
 } as const;
 
 export type RepositoryBackend = keyof typeof REPOSITORY_BACKENDS;
@@ -20,7 +21,14 @@ export const localRepositoryConfigSchema = type({
 	name: "string",
 });
 
-export const repositoryConfigSchema = s3RepositoryConfigSchema.or(localRepositoryConfigSchema);
+export const gcsRepositoryConfigSchema = type({
+	backend: "'gcs'",
+	bucket: "string",
+	projectId: "string",
+	credentialsJson: "string",
+});
+
+export const repositoryConfigSchema = s3RepositoryConfigSchema.or(localRepositoryConfigSchema).or(gcsRepositoryConfigSchema);
 
 export type RepositoryConfig = typeof repositoryConfigSchema.infer;