chore: resolve merge conflicts

backend/src/integrations/sync.ts

@@ -28,6 +28,8 @@ import {
   INTEGRATION_HASHICORP_VAULT,
   INTEGRATION_HEROKU,
   INTEGRATION_HEROKU_API_URL,
+  INTEGRATION_LARAVELFORGE,
+  INTEGRATION_LARAVELFORGE_API_URL,
   INTEGRATION_NETLIFY,
   INTEGRATION_NETLIFY_API_URL,
   INTEGRATION_NORTHFLANK,
@@ -156,6 +158,14 @@ const syncSecrets = async ({
         accessToken,
       });
       break;
+    case INTEGRATION_LARAVELFORGE:
+      await syncSecretsLaravelForge({
+        integration,
+        secrets,
+        accessId,
+        accessToken,
+      });
+      break;
     case INTEGRATION_TRAVISCI:
       await syncSecretsTravisCI({
         integration,
@@ -170,37 +180,37 @@ const syncSecrets = async ({
           accessToken,
         });
         break;
-      case INTEGRATION_CHECKLY:
-        await syncSecretsCheckly({
+    case INTEGRATION_CHECKLY:
+      await syncSecretsCheckly({
+        integration,
+        secrets,
+        accessToken,
+      });
+      break;
+    case INTEGRATION_HASHICORP_VAULT:
+      await syncSecretsHashiCorpVault({
+        integration,
+        integrationAuth,
+        secrets,
+        accessId,
+        accessToken,
+      });
+      break;
+    case INTEGRATION_CLOUDFLARE_PAGES:
+      await syncSecretsCloudflarePages({
           integration,
           secrets,
-          accessToken,
-        });
-        break;
-      case INTEGRATION_HASHICORP_VAULT:
-        await syncSecretsHashiCorpVault({
-          integration,
-          integrationAuth,
-          secrets,
           accessId,
-          accessToken,
-        });
-        break;
-      case INTEGRATION_CLOUDFLARE_PAGES:
-        await syncSecretsCloudflarePages({
-            integration,
-            secrets,
-            accessId,
-            accessToken
-        });
-        break;
-      case INTEGRATION_NORTHFLANK:
-        await syncSecretsNorthflank({
-          integration,
-          secrets,
           accessToken
-        });
-        break;
+      });
+      break;
+    case INTEGRATION_NORTHFLANK:
+      await syncSecretsNorthflank({
+        integration,
+        secrets,
+        accessToken
+      });
+      break;
     }
 };
 
@@ -1148,6 +1158,48 @@ const syncSecretsRender = async ({
   );
 };
 
+/**
+ * Sync/push [secrets] to Laravel Forge sites with id [integration.appId]
+ * @param {Object} obj
+ * @param {IIntegration} obj.integration - integration details
+ * @param {Object} obj.secrets - secrets to push to integration (object where keys are secret keys and values are secret values)
+ * @param {String} obj.accessToken - access token for Laravel Forge integration
+ */
+const syncSecretsLaravelForge = async ({
+  integration,
+  secrets,
+  accessId,
+  accessToken,
+}: {
+  integration: IIntegration;
+  secrets: any;
+  accessId: string | null;
+  accessToken: string;
+}) => {
+
+  function transformObjectToString(obj: any) {
+    let result = "";
+    for (const key in obj) {
+      result += `${key}=${obj[key]}\n`;
+    }
+    return result;
+  }
+  
+  await standardRequest.put(
+    `${INTEGRATION_LARAVELFORGE_API_URL}/api/v1/servers/${accessId}/sites/${integration.appId}/env`,
+    {
+      content: transformObjectToString(secrets),
+    },
+    {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        Accept: "application/json",
+        "Content-Type": "application/json",
+      },
+    }
+  );
+};
+
 /**
  * Sync/push [secrets] to Railway project with id [integration.appId]
  * @param {Object} obj