fix: redis provider variables

Author: omermecitoglu

README.md

@@ -39,7 +39,7 @@ Buttler automates CI/CD workflows using Docker and GitHub webhooks
     - [PostgreSQL](https://www.postgresql.org)
     - [MySQL](https://www.mysql.com) *(not implemented yet)*
     - [MongoDB](https://www.mongodb.com) *(not implemented yet)*
-    - [Redis](https://redis.io) *(not implemented yet)*
+    - [Redis](https://redis.io)
   - can be linked to other services ([see screenshots](#linking-services))
 - Services dashboard ([see screenshots](#list-of-services))
 - Edit service page ([see screenshots](#edit-service-page))

src/actions/service.ts

@@ -123,7 +123,7 @@ export async function start(serviceId: string, _: FormData) {
 
   const image = await getServiceImage();
   const providerVariables = service.providers
-    .map(provider => getProviderVariables(service.name, provider.name, provider.variables))
+    .map(provider => getProviderVariables(service.name, provider.name, provider.repo, provider.variables))
     .reduce((bundle, current) => Object.assign(bundle, current), {});
   const containerId = await createContainer(
     kebabCase(service.name),

src/app/services/[id]/edit/page.tsx

@@ -26,7 +26,7 @@ const EditServicePage = async ({
   if (!service) notFound();
 
   const providerVariables = service.providers
-    .map(provider => getProviderVariables(service.name, provider.name, provider.variables))
+    .map(provider => getProviderVariables(service.name, provider.name, provider.repo, provider.variables))
     .reduce((bundle, current) => {
       Object.assign(bundle, current);
       return bundle;

src/core/build.ts

@@ -25,7 +25,7 @@ export async function startBuilding(service: ServiceDTO) {
         await removeContainer(service.containerId);
         await updateService(db, service.id, { status: "idle", containerId: null, imageId: null });
         const providerVariables = service.providers
-          .map(provider => getProviderVariables(service.name, provider.name, provider.variables))
+          .map(provider => getProviderVariables(service.name, provider.name, provider.repo, provider.variables))
           .reduce((bundle, current) => Object.assign(bundle, current), {});
         const containerId = await createContainer(
           kebabCase(service.name),

src/core/provider.ts

@@ -1,11 +1,26 @@
 import { kebabCase, snakeCase } from "change-case";
 
-export function getProviderVariables(serviceName: string, providerName: string, providerVariables: Record<string, string>) {
-  return {
-    POSTGRES_HOST: kebabCase(providerName),
-    POSTGRES_PORT: "5432",
-    POSTGRES_USER: "postgres",
-    POSTGRES_PASSWORD: providerVariables.POSTGRES_PASSWORD,
-    POSTGRES_DATABASE: snakeCase(serviceName),
-  } as Record<string, string>;
+export function getProviderVariables(
+  serviceName: string,
+  providerName: string,
+  providerType: string,
+  providerVariables: Record<string, string>,
+): Record<string, string> {
+  switch (providerType) {
+    case "postgres":
+      return {
+        POSTGRES_HOST: kebabCase(providerName),
+        POSTGRES_PORT: "5432",
+        POSTGRES_USER: "postgres",
+        POSTGRES_PASSWORD: providerVariables.POSTGRES_PASSWORD,
+        POSTGRES_DATABASE: snakeCase(serviceName),
+      };
+    case "redis":
+      return {
+        REDIS_HOST: kebabCase(providerName),
+        REDIS_PORT: "6379",
+      };
+    default:
+      return {};
+  }
 }

src/models/service.ts

@@ -15,6 +15,7 @@ const baseSchema = createInsertSchema(services, {
   providers: z.object({
     id: z.string(),
     name: z.string(),
+    repo: z.string(),
     networkIds: z.string().array(),
     variables: z.record(z.string(), z.string()),
   }).array(),

src/operations/getService.ts

@@ -35,6 +35,7 @@ export default async function getService(db: typeof database, serviceId: string)
             columns: {
               id: true,
               name: true,
+              repo: true,
             },
             with: {
               networks: {