Skip to content

Commit 3ef6725

Browse files
Use shared env object in backend
1 parent b1ddb7d commit 3ef6725

15 files changed

Lines changed: 280 additions & 123 deletions

docs/snippets/schemas/v3/index.schema.mdx

Lines changed: 244 additions & 22 deletions
Large diffs are not rendered by default.

packages/backend/src/connectionManager.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ import * as Sentry from "@sentry/node";
22
import { Connection, ConnectionSyncJobStatus, PrismaClient } from "@sourcebot/db";
33
import { createLogger } from "@sourcebot/logger";
44
import { ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
5-
import { loadConfig } from "@sourcebot/shared";
5+
import { loadConfig, env } from "@sourcebot/shared";
66
import { Job, Queue, ReservedJob, Worker } from "groupmq";
77
import { Redis } from 'ioredis';
8-
import { env } from "./env.js";
98
import { compileAzureDevOpsConfig, compileBitbucketConfig, compileGenericGitHostConfig, compileGerritConfig, compileGiteaConfig, compileGithubConfig, compileGitlabConfig } from "./repoCompileUtils.js";
109
import { Settings } from "./types.js";
1110
import { groupmqLifecycleExceptionWrapper } from "./utils.js";

packages/backend/src/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { CodeHostType } from "@sourcebot/db";
2-
import { env } from "./env.js";
2+
import { env } from "@sourcebot/shared";
33
import path from "path";
44

55
export const SINGLE_TENANT_ORG_ID = 1;

packages/backend/src/ee/githubAppManager.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import { loadConfig } from "@sourcebot/shared";
2-
import { env } from "../env.js";
3-
import { createLogger } from "@sourcebot/logger";
1+
import { App } from "@octokit/app";
42
import { getTokenFromConfig } from "@sourcebot/crypto";
53
import { PrismaClient } from "@sourcebot/db";
6-
import { App } from "@octokit/app";
4+
import { createLogger } from "@sourcebot/logger";
75
import { GitHubAppConfig } from "@sourcebot/schemas/v3/index.type";
6+
import { env, loadConfig } from "@sourcebot/shared";
87

98
const logger = createLogger('githubAppManager');
109
const GITHUB_DEFAULT_DEPLOYMENT_HOSTNAME = 'github.com';
@@ -45,7 +44,7 @@ export class GithubAppManager {
4544

4645
public async init(db: PrismaClient) {
4746
this.db = db;
48-
const config = await loadConfig(env.CONFIG_PATH!);
47+
const config = await loadConfig(env.CONFIG_PATH);
4948
if (!config.apps) {
5049
return;
5150
}

packages/backend/src/ee/repoPermissionSyncer.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import * as Sentry from "@sentry/node";
22
import { PrismaClient, Repo, RepoPermissionSyncJobStatus } from "@sourcebot/db";
33
import { createLogger } from "@sourcebot/logger";
4-
import { hasEntitlement } from "@sourcebot/shared";
4+
import { env, hasEntitlement } from "@sourcebot/shared";
55
import { Job, Queue, Worker } from 'bullmq';
66
import { Redis } from 'ioredis';
77
import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
8-
import { env } from "../env.js";
98
import { createOctokitFromToken, getRepoCollaborators, GITHUB_CLOUD_HOSTNAME } from "../github.js";
109
import { createGitLabFromPersonalAccessToken, getProjectMembers } from "../gitlab.js";
1110
import { Settings } from "../types.js";

packages/backend/src/ee/userPermissionSyncer.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import * as Sentry from "@sentry/node";
22
import { PrismaClient, User, UserPermissionSyncJobStatus } from "@sourcebot/db";
33
import { createLogger } from "@sourcebot/logger";
4+
import { env, hasEntitlement } from "@sourcebot/shared";
45
import { Job, Queue, Worker } from "bullmq";
56
import { Redis } from "ioredis";
67
import { PERMISSION_SYNC_SUPPORTED_CODE_HOST_TYPES } from "../constants.js";
7-
import { env } from "../env.js";
88
import { createOctokitFromToken, getReposForAuthenticatedUser } from "../github.js";
99
import { createGitLabFromOAuthToken, getProjectsForAuthenticatedUser } from "../gitlab.js";
10-
import { hasEntitlement } from "@sourcebot/shared";
1110
import { Settings } from "../types.js";
1211

1312
const LOG_TAG = 'user-permission-syncer';

packages/backend/src/env.ts

Lines changed: 0 additions & 64 deletions
This file was deleted.

packages/backend/src/git.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { CheckRepoActions, GitConfigScope, simpleGit, SimpleGitProgressEvent } from 'simple-git';
1+
import { env } from "@sourcebot/shared";
2+
import { existsSync } from 'node:fs';
23
import { mkdir } from 'node:fs/promises';
3-
import { env } from './env.js';
44
import { dirname, resolve } from 'node:path';
5-
import { existsSync } from 'node:fs';
5+
import { CheckRepoActions, GitConfigScope, simpleGit, SimpleGitProgressEvent } from 'simple-git';
66

77
type onProgressFn = (event: SimpleGitProgressEvent) => void;
88

packages/backend/src/gitea.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { Api, giteaApi, HttpResponse, Repository as GiteaRepository } from 'gitea-js';
1+
import * as Sentry from "@sentry/node";
2+
import { getTokenFromConfig } from "@sourcebot/crypto";
3+
import { createLogger } from '@sourcebot/logger';
24
import { GiteaConnectionConfig } from '@sourcebot/schemas/v3/gitea.type';
3-
import { measure } from './utils.js';
5+
import { env } from "@sourcebot/shared";
46
import fetch from 'cross-fetch';
5-
import { createLogger } from '@sourcebot/logger';
7+
import { Api, giteaApi, Repository as GiteaRepository, HttpResponse } from 'gitea-js';
68
import micromatch from 'micromatch';
79
import { processPromiseResults, throwIfAnyFailed } from './connectionUtils.js';
8-
import * as Sentry from "@sentry/node";
9-
import { env } from './env.js';
10-
import { getTokenFromConfig } from "@sourcebot/crypto";
10+
import { measure } from './utils.js';
1111

1212
const logger = createLogger('gitea');
1313
const GITEA_CLOUD_HOSTNAME = "gitea.com";

packages/backend/src/github.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import { Octokit } from "@octokit/rest";
22
import * as Sentry from "@sentry/node";
3+
import { getTokenFromConfig } from "@sourcebot/crypto";
34
import { createLogger } from "@sourcebot/logger";
45
import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
5-
import { hasEntitlement } from "@sourcebot/shared";
6+
import { env, hasEntitlement } from "@sourcebot/shared";
67
import micromatch from "micromatch";
78
import pLimit from "p-limit";
89
import { processPromiseResults, throwIfAnyFailed } from "./connectionUtils.js";
910
import { GithubAppManager } from "./ee/githubAppManager.js";
10-
import { env } from "./env.js";
1111
import { fetchWithRetry, measure } from "./utils.js";
12-
import { getTokenFromConfig } from "@sourcebot/crypto";
1312

1413
export const GITHUB_CLOUD_HOSTNAME = "github.com";
1514

0 commit comments

Comments
 (0)