Skip to content

Commit d268b05

Browse files
committed
chore(webapp): Logging cleanup
1 parent 4537cac commit d268b05

File tree

3 files changed

+5
-84
lines changed

3 files changed

+5
-84
lines changed

apps/webapp/app/models/vercelIntegration.server.ts

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -511,14 +511,6 @@ export class VercelIntegrationRepository {
511511
}
512512

513513
try {
514-
logger.debug("Fetching decrypted value for shared env var", {
515-
teamId,
516-
envId: env.id,
517-
envKey: env.key,
518-
envType: env.type,
519-
envTarget: env.target,
520-
});
521-
522514
// Get the decrypted value for this shared env var
523515
const getResponse = await client.environment.getSharedEnvVar({
524516
id: env.id as string,
@@ -655,12 +647,6 @@ export class VercelIntegrationRepository {
655647
raw: params.raw,
656648
};
657649

658-
logger.debug("Updating Vercel secret", {
659-
integrationId: params.integrationId,
660-
teamId: params.teamId,
661-
installationId: params.installationId,
662-
});
663-
664650
await secretStore.setSecret(integration.tokenReference.key, secretValue);
665651

666652
await tx.organizationIntegration.update({
@@ -702,11 +688,6 @@ export class VercelIntegrationRepository {
702688
raw: params.raw,
703689
};
704690

705-
logger.debug("Storing Vercel secret", {
706-
teamId: params.teamId,
707-
installationId: params.installationId,
708-
});
709-
710691
await secretStore.setSecret(integrationFriendlyId, secretValue);
711692

712693
const reference = await tx.secretReference.create({
@@ -852,10 +833,6 @@ export class VercelIntegrationRepository {
852833
}
853834

854835
if (envVarsToSync.length === 0) {
855-
logger.debug("No API keys to sync to Vercel", {
856-
projectId: params.projectId,
857-
vercelProjectId: params.vercelProjectId,
858-
});
859836
return { success: true, errors: [] };
860837
}
861838

@@ -1022,15 +999,6 @@ export class VercelIntegrationRepository {
1022999
});
10231000
}
10241001

1025-
logger.info("Vercel pullEnvVarsFromVercel: environment mapping", {
1026-
projectId: params.projectId,
1027-
vercelProjectId: params.vercelProjectId,
1028-
envMappingCount: envMapping.length,
1029-
envMapping: envMapping.map(m => ({ type: m.triggerEnvType, target: m.vercelTarget })),
1030-
runtimeEnvironmentsCount: runtimeEnvironments.length,
1031-
runtimeEnvironments: runtimeEnvironments.map(e => e.type),
1032-
});
1033-
10341002
if (envMapping.length === 0) {
10351003
logger.warn("No environments to sync for Vercel integration", {
10361004
projectId: params.projectId,
@@ -1089,16 +1057,6 @@ export class VercelIntegrationRepository {
10891057
continue;
10901058
}
10911059

1092-
logger.info("Vercel pullEnvVarsFromVercel: fetched env vars for target", {
1093-
projectId: params.projectId,
1094-
vercelTarget: mapping.vercelTarget,
1095-
triggerEnvType: mapping.triggerEnvType,
1096-
projectEnvVarsCount: projectEnvVars.length,
1097-
sharedEnvVarsCount: filteredSharedEnvVars.length,
1098-
mergedEnvVarsCount: mergedEnvVars.length,
1099-
mergedEnvVarKeys: mergedEnvVars.map(v => v.key),
1100-
});
1101-
11021060
const varsToSync = mergedEnvVars.filter((envVar) => {
11031061
if (envVar.isSecret) {
11041062
return false;
@@ -1113,14 +1071,6 @@ export class VercelIntegrationRepository {
11131071
);
11141072
});
11151073

1116-
logger.info("Vercel pullEnvVarsFromVercel: filtered vars to sync", {
1117-
projectId: params.projectId,
1118-
vercelTarget: mapping.vercelTarget,
1119-
triggerEnvType: mapping.triggerEnvType,
1120-
varsToSyncCount: varsToSync.length,
1121-
varsToSyncKeys: varsToSync.map(v => v.key),
1122-
});
1123-
11241074
if (varsToSync.length === 0) {
11251075
continue;
11261076
}
@@ -1181,24 +1131,9 @@ export class VercelIntegrationRepository {
11811131
});
11821132

11831133
if (changedVars.length === 0) {
1184-
logger.info("Vercel pullEnvVarsFromVercel: no changes detected, skipping", {
1185-
projectId: params.projectId,
1186-
vercelTarget: mapping.vercelTarget,
1187-
triggerEnvType: mapping.triggerEnvType,
1188-
skippedCount: varsToSync.length,
1189-
});
11901134
continue;
11911135
}
11921136

1193-
logger.info("Vercel pullEnvVarsFromVercel: updating changed vars", {
1194-
projectId: params.projectId,
1195-
vercelTarget: mapping.vercelTarget,
1196-
triggerEnvType: mapping.triggerEnvType,
1197-
changedCount: changedVars.length,
1198-
unchangedCount: varsToSync.length - changedVars.length,
1199-
changedKeys: changedVars.map((v) => v.key),
1200-
});
1201-
12021137
const secretVars = changedVars.filter((v) => existingSecretKeys.has(v.key));
12031138
const nonSecretVars = changedVars.filter((v) => !existingSecretKeys.has(v.key));
12041139

@@ -1520,11 +1455,6 @@ export class VercelIntegrationRepository {
15201455
},
15211456
});
15221457

1523-
logger.info("Disabled autoAssignCustomDomains on Vercel project", {
1524-
vercelProjectId,
1525-
teamId,
1526-
});
1527-
15281458
return { success: true };
15291459
} catch (error) {
15301460
const errorMessage = `Failed to disable autoAssignCustomDomains: ${error instanceof Error ? error.message : "Unknown error"}`;

apps/webapp/app/presenters/v3/VercelSettingsPresenter.server.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { type PrismaClient } from "@trigger.dev/database";
22
import { fromPromise, ok, ResultAsync } from "neverthrow";
33
import { env } from "~/env.server";
4+
import { logger } from "~/services/logger.server";
45
import { OrgIntegrationRepository } from "~/models/orgIntegration.server";
56
import {
67
VercelIntegrationRepository,
@@ -280,12 +281,12 @@ export class VercelSettingsPresenter extends BasePresenter {
280281
} as VercelSettingsResult));
281282
}).mapErr((error) => {
282283
// Log the error and return a safe fallback
283-
console.error("Error in VercelSettingsPresenter.call:", error);
284+
logger.error("Error in VercelSettingsPresenter.call", { error });
284285
return error;
285286
});
286287
} catch (syncError) {
287288
// Handle any synchronous errors that might occur
288-
console.error("Synchronous error in VercelSettingsPresenter.call:", syncError);
289+
logger.error("Synchronous error in VercelSettingsPresenter.call", { error: syncError });
289290
return ok({
290291
enabled: true,
291292
hasOrgIntegration: false,
@@ -299,7 +300,7 @@ export class VercelSettingsPresenter extends BasePresenter {
299300
}
300301
} catch (error) {
301302
// If there's an unexpected error, log it and return a safe error result
302-
console.error("Unexpected error in VercelSettingsPresenter.call:", error);
303+
logger.error("Unexpected error in VercelSettingsPresenter.call", { error });
303304
return ok({
304305
enabled: true,
305306
hasOrgIntegration: false,
@@ -566,7 +567,7 @@ export class VercelSettingsPresenter extends BasePresenter {
566567
isGitHubConnected,
567568
};
568569
} catch (error) {
569-
console.error("Error in getOnboardingData:", error);
570+
logger.error("Error in getOnboardingData", { error });
570571
return null;
571572
}
572573
}

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -287,16 +287,6 @@ export async function action({ request, params }: ActionFunctionArgs) {
287287
}
288288
}
289289

290-
logger.info("Vercel complete-onboarding action: received params", {
291-
projectId: project.id,
292-
vercelStagingEnvironment,
293-
pullEnvVarsBeforeBuild,
294-
atomicBuilds,
295-
discoverEnvVars,
296-
syncEnvVarsMappingRaw: syncEnvVarsMapping,
297-
parsedMappingKeys: Object.keys(parsedMapping),
298-
});
299-
300290
const parsedStagingEnv = parseVercelStagingEnvironment(vercelStagingEnvironment);
301291

302292
const result = await vercelService.completeOnboarding(project.id, {

0 commit comments

Comments
 (0)