Fix edge case for delete humanitec secret and improvements on docs

backend/src/services/app-connection/humanitec/humanitec-connection-fns.ts

@@ -2,7 +2,6 @@ import { AxiosError, AxiosResponse } from "axios";
 
 import { request } from "@app/lib/config/request";
 import { BadRequestError, InternalServerError } from "@app/lib/errors";
-import { logger } from "@app/lib/logger";
 import { AppConnection } from "@app/services/app-connection/app-connection-enums";
 import { IntegrationUrls } from "@app/services/integration-auth/integration-list";
 
@@ -73,30 +72,23 @@ export const listOrganizations = async (appConnection: THumanitecConnection): Pr
   const orgsWithApps: HumanitecOrgWithApps[] = [];
 
   for (const org of orgs) {
-    try {
-      // eslint-disable-next-line no-await-in-loop
-      const appsResponse = await request.get<HumanitecApp[]>(
-        `${IntegrationUrls.HUMANITEC_API_URL}/orgs/${org.id}/apps`,
-        {
-          headers: {
-            Authorization: `Bearer ${apiToken}`
-          }
-        }
-      );
-
-      if (appsResponse.data) {
-        const apps = appsResponse.data;
-        orgsWithApps.push({
-          ...org,
-          apps: apps.map((app) => ({
-            name: app.name,
-            id: app.id,
-            envs: app.envs
-          }))
-        });
+    // eslint-disable-next-line no-await-in-loop
+    const appsResponse = await request.get<HumanitecApp[]>(`${IntegrationUrls.HUMANITEC_API_URL}/orgs/${org.id}/apps`, {
+      headers: {
+        Authorization: `Bearer ${apiToken}`
       }
-    } catch (error) {
-      logger.error(error, `Failed to get apps for organization ${org.name}`);
+    });
+
+    if (appsResponse.data) {
+      const apps = appsResponse.data;
+      orgsWithApps.push({
+        ...org,
+        apps: apps.map((app) => ({
+          name: app.name,
+          id: app.id,
+          envs: app.envs
+        }))
+      });
     }
   }
   return orgsWithApps;

backend/src/services/secret-sync/humanitec/humanitec-sync-fns.ts

@@ -1,4 +1,5 @@
 import { request } from "@app/lib/config/request";
+import { logger } from "@app/lib/logger";
 import { IntegrationUrls } from "@app/services/integration-auth/integration-list";
 import { SecretSyncError } from "@app/services/secret-sync/secret-sync-errors";
 import { SECRET_SYNC_NAME_MAP } from "@app/services/secret-sync/secret-sync-maps";
@@ -39,6 +40,13 @@ const deleteSecret = async (secretSync: THumanitecSyncWithCredentials, encrypted
     }
   } = secretSync;
 
+  if (destinationConfig.scope === HumanitecSyncScope.Environment && encryptedSecret.source === "app") {
+    logger.info(
+      `Humanitec secret ${encryptedSecret.key} on app ${destinationConfig.app} has no environment override, not deleted as it is an app-level secret`
+    );
+    return;
+  }
+
   try {
     let url = `${IntegrationUrls.HUMANITEC_API_URL}/orgs/${destinationConfig.org}/apps/${destinationConfig.app}`;
     if (destinationConfig.scope === HumanitecSyncScope.Environment) {
@@ -69,11 +77,12 @@ const createSecret = async (secretSync: THumanitecSyncWithCredentials, secretMap
       }
     } = secretSync;
 
+    const appLevelSecret = destinationConfig.scope === HumanitecSyncScope.Application ? secretMap[key].value : "";
     await request.post(
       `${IntegrationUrls.HUMANITEC_API_URL}/orgs/${destinationConfig.org}/apps/${destinationConfig.app}/values`,
       {
         key,
-        value: "",
+        value: appLevelSecret,
         description: secretMap[key].comment || "",
         is_secret: true
       },