Skip to content

Commit 520ebd8

Browse files
MarfuenMarfuen
authored
Merge pull request #882 from trycompai/mariano/comp-166-osquery-agent-integration
[dev] [Marfuen] mariano/comp-166-osquery-agent-integration
2 parents 76cd975 + cfd8dfc commit 520ebd8

2 files changed

Lines changed: 84 additions & 83 deletions

File tree

‎apps/app/src/env.mjs‎

Lines changed: 81 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -2,84 +2,88 @@ import { createEnv } from "@t3-oss/env-nextjs";
22
import { z } from "zod";
33

44
export const env = createEnv({
5-
server: {
6-
AUTH_GOOGLE_ID: z.string().optional(),
7-
AUTH_GOOGLE_SECRET: z.string().optional(),
8-
AUTH_GITHUB_ID: z.string().optional(),
9-
AUTH_GITHUB_SECRET: z.string().optional(),
10-
AUTH_SECRET: z.string(),
11-
DATABASE_URL: z.string().min(1),
12-
OPENAI_API_KEY: z.string().optional(),
13-
RESEND_API_KEY: z.string(),
14-
UPSTASH_REDIS_REST_URL: z.string().optional(),
15-
UPSTASH_REDIS_REST_TOKEN: z.string().optional(),
16-
STRIPE_SECRET_KEY: z.string().optional(),
17-
STRIPE_WEBHOOK_SECRET: z.string().optional(),
18-
DISCORD_WEBHOOK_URL: z.string().optional(),
19-
TRIGGER_SECRET_KEY: z.string().optional(),
20-
TRIGGER_API_KEY: z.string().optional(),
21-
TRIGGER_API_URL: z.string().optional(),
22-
REVALIDATION_SECRET: z.string(),
23-
VERCEL_ACCESS_TOKEN: z.string().optional(),
24-
VERCEL_TEAM_ID: z.string().optional(),
25-
VERCEL_PROJECT_ID: z.string().optional(),
26-
TRUST_PORTAL_PROJECT_ID: z.string().optional(),
27-
NODE_ENV: z.string().optional(),
28-
AWS_ACCESS_KEY_ID: z.string().optional(),
29-
AWS_SECRET_ACCESS_KEY: z.string().optional(),
30-
AWS_REGION: z.string().optional(),
31-
AWS_BUCKET_NAME: z.string().optional(),
32-
GROQ_API_KEY: z.string().optional(),
33-
NEXT_PUBLIC_PORTAL_URL: z.string(),
34-
RESEND_AUDIENCE_ID: z.string().optional(),
35-
FIRECRAWL_API_KEY: z.string().optional(),
36-
ZAPIER_HUBSPOT_WEBHOOK_URL: z.string().optional(),
37-
},
5+
server: {
6+
AUTH_GOOGLE_ID: z.string().optional(),
7+
AUTH_GOOGLE_SECRET: z.string().optional(),
8+
AUTH_GITHUB_ID: z.string().optional(),
9+
AUTH_GITHUB_SECRET: z.string().optional(),
10+
AUTH_SECRET: z.string(),
11+
DATABASE_URL: z.string().min(1),
12+
OPENAI_API_KEY: z.string().optional(),
13+
RESEND_API_KEY: z.string(),
14+
UPSTASH_REDIS_REST_URL: z.string().optional(),
15+
UPSTASH_REDIS_REST_TOKEN: z.string().optional(),
16+
STRIPE_SECRET_KEY: z.string().optional(),
17+
STRIPE_WEBHOOK_SECRET: z.string().optional(),
18+
DISCORD_WEBHOOK_URL: z.string().optional(),
19+
TRIGGER_SECRET_KEY: z.string().optional(),
20+
TRIGGER_API_KEY: z.string().optional(),
21+
TRIGGER_API_URL: z.string().optional(),
22+
REVALIDATION_SECRET: z.string(),
23+
VERCEL_ACCESS_TOKEN: z.string().optional(),
24+
VERCEL_TEAM_ID: z.string().optional(),
25+
VERCEL_PROJECT_ID: z.string().optional(),
26+
TRUST_PORTAL_PROJECT_ID: z.string().optional(),
27+
NODE_ENV: z.string().optional(),
28+
AWS_ACCESS_KEY_ID: z.string().optional(),
29+
AWS_SECRET_ACCESS_KEY: z.string().optional(),
30+
AWS_REGION: z.string().optional(),
31+
AWS_BUCKET_NAME: z.string().optional(),
32+
GROQ_API_KEY: z.string().optional(),
33+
NEXT_PUBLIC_PORTAL_URL: z.string(),
34+
RESEND_AUDIENCE_ID: z.string().optional(),
35+
FIRECRAWL_API_KEY: z.string().optional(),
36+
ZAPIER_HUBSPOT_WEBHOOK_URL: z.string().optional(),
37+
FLEET_URL: z.string().optional(),
38+
FLEET_TOKEN: z.string().optional(),
39+
},
3840

39-
client: {
40-
NEXT_PUBLIC_POSTHOG_KEY: z.string().optional(),
41-
NEXT_PUBLIC_POSTHOG_HOST: z.string().optional(),
42-
NEXT_PUBLIC_VERCEL_URL: z.string().optional(),
43-
NEXT_PUBLIC_NOVU_IDENTIFIER: z.string().optional(),
44-
},
41+
client: {
42+
NEXT_PUBLIC_POSTHOG_KEY: z.string().optional(),
43+
NEXT_PUBLIC_POSTHOG_HOST: z.string().optional(),
44+
NEXT_PUBLIC_VERCEL_URL: z.string().optional(),
45+
NEXT_PUBLIC_NOVU_IDENTIFIER: z.string().optional(),
46+
},
4547

46-
runtimeEnv: {
47-
AUTH_GOOGLE_ID: process.env.AUTH_GOOGLE_ID,
48-
AUTH_GOOGLE_SECRET: process.env.AUTH_GOOGLE_SECRET,
49-
AUTH_GITHUB_ID: process.env.AUTH_GITHUB_ID,
50-
AUTH_GITHUB_SECRET: process.env.AUTH_GITHUB_SECRET,
51-
AUTH_SECRET: process.env.AUTH_SECRET,
52-
DATABASE_URL: process.env.DATABASE_URL,
53-
OPENAI_API_KEY: process.env.OPENAI_API_KEY,
54-
RESEND_API_KEY: process.env.RESEND_API_KEY,
55-
UPSTASH_REDIS_REST_URL: process.env.UPSTASH_REDIS_REST_URL,
56-
UPSTASH_REDIS_REST_TOKEN: process.env.UPSTASH_REDIS_REST_TOKEN,
57-
STRIPE_SECRET_KEY: process.env.STRIPE_SECRET_KEY,
58-
STRIPE_WEBHOOK_SECRET: process.env.STRIPE_WEBHOOK_SECRET,
59-
DISCORD_WEBHOOK_URL: process.env.DISCORD_WEBHOOK_URL,
60-
TRIGGER_SECRET_KEY: process.env.TRIGGER_SECRET_KEY,
61-
TRIGGER_API_KEY: process.env.TRIGGER_API_KEY,
62-
TRIGGER_API_URL: process.env.TRIGGER_API_URL,
63-
REVALIDATION_SECRET: process.env.REVALIDATION_SECRET,
64-
NEXT_PUBLIC_POSTHOG_KEY: process.env.NEXT_PUBLIC_POSTHOG_KEY,
65-
NEXT_PUBLIC_POSTHOG_HOST: process.env.NEXT_PUBLIC_POSTHOG_HOST,
66-
VERCEL_ACCESS_TOKEN: process.env.VERCEL_ACCESS_TOKEN,
67-
VERCEL_TEAM_ID: process.env.VERCEL_TEAM_ID,
68-
VERCEL_PROJECT_ID: process.env.VERCEL_PROJECT_ID,
69-
TRUST_PORTAL_PROJECT_ID: process.env.TRUST_PORTAL_PROJECT_ID,
70-
NEXT_PUBLIC_VERCEL_URL: process.env.NEXT_PUBLIC_VERCEL_URL,
71-
NEXT_PUBLIC_NOVU_IDENTIFIER: process.env.NEXT_PUBLIC_NOVU_IDENTIFIER,
72-
NODE_ENV: process.env.NODE_ENV,
73-
AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID,
74-
AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY,
75-
AWS_REGION: process.env.AWS_REGION,
76-
AWS_BUCKET_NAME: process.env.AWS_BUCKET_NAME,
77-
GROQ_API_KEY: process.env.GROQ_API_KEY,
78-
NEXT_PUBLIC_PORTAL_URL: process.env.NEXT_PUBLIC_PORTAL_URL,
79-
RESEND_AUDIENCE_ID: process.env.RESEND_AUDIENCE_ID,
80-
FIRECRAWL_API_KEY: process.env.FIRECRAWL_API_KEY,
81-
ZAPIER_HUBSPOT_WEBHOOK_URL: process.env.ZAPIER_HUBSPOT_WEBHOOK_URL,
82-
},
48+
runtimeEnv: {
49+
AUTH_GOOGLE_ID: process.env.AUTH_GOOGLE_ID,
50+
AUTH_GOOGLE_SECRET: process.env.AUTH_GOOGLE_SECRET,
51+
AUTH_GITHUB_ID: process.env.AUTH_GITHUB_ID,
52+
AUTH_GITHUB_SECRET: process.env.AUTH_GITHUB_SECRET,
53+
AUTH_SECRET: process.env.AUTH_SECRET,
54+
DATABASE_URL: process.env.DATABASE_URL,
55+
OPENAI_API_KEY: process.env.OPENAI_API_KEY,
56+
RESEND_API_KEY: process.env.RESEND_API_KEY,
57+
UPSTASH_REDIS_REST_URL: process.env.UPSTASH_REDIS_REST_URL,
58+
UPSTASH_REDIS_REST_TOKEN: process.env.UPSTASH_REDIS_REST_TOKEN,
59+
STRIPE_SECRET_KEY: process.env.STRIPE_SECRET_KEY,
60+
STRIPE_WEBHOOK_SECRET: process.env.STRIPE_WEBHOOK_SECRET,
61+
DISCORD_WEBHOOK_URL: process.env.DISCORD_WEBHOOK_URL,
62+
TRIGGER_SECRET_KEY: process.env.TRIGGER_SECRET_KEY,
63+
TRIGGER_API_KEY: process.env.TRIGGER_API_KEY,
64+
TRIGGER_API_URL: process.env.TRIGGER_API_URL,
65+
REVALIDATION_SECRET: process.env.REVALIDATION_SECRET,
66+
NEXT_PUBLIC_POSTHOG_KEY: process.env.NEXT_PUBLIC_POSTHOG_KEY,
67+
NEXT_PUBLIC_POSTHOG_HOST: process.env.NEXT_PUBLIC_POSTHOG_HOST,
68+
VERCEL_ACCESS_TOKEN: process.env.VERCEL_ACCESS_TOKEN,
69+
VERCEL_TEAM_ID: process.env.VERCEL_TEAM_ID,
70+
VERCEL_PROJECT_ID: process.env.VERCEL_PROJECT_ID,
71+
TRUST_PORTAL_PROJECT_ID: process.env.TRUST_PORTAL_PROJECT_ID,
72+
NEXT_PUBLIC_VERCEL_URL: process.env.NEXT_PUBLIC_VERCEL_URL,
73+
NEXT_PUBLIC_NOVU_IDENTIFIER: process.env.NEXT_PUBLIC_NOVU_IDENTIFIER,
74+
NODE_ENV: process.env.NODE_ENV,
75+
AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID,
76+
AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY,
77+
AWS_REGION: process.env.AWS_REGION,
78+
AWS_BUCKET_NAME: process.env.AWS_BUCKET_NAME,
79+
GROQ_API_KEY: process.env.GROQ_API_KEY,
80+
NEXT_PUBLIC_PORTAL_URL: process.env.NEXT_PUBLIC_PORTAL_URL,
81+
RESEND_AUDIENCE_ID: process.env.RESEND_AUDIENCE_ID,
82+
FIRECRAWL_API_KEY: process.env.FIRECRAWL_API_KEY,
83+
ZAPIER_HUBSPOT_WEBHOOK_URL: process.env.ZAPIER_HUBSPOT_WEBHOOK_URL,
84+
FLEET_URL: process.env.FLEET_URL,
85+
FLEET_TOKEN: process.env.FLEET_TOKEN,
86+
},
8387

84-
skipValidation: !!process.env.CI || !!process.env.SKIP_ENV_VALIDATION,
88+
skipValidation: !!process.env.CI || !!process.env.SKIP_ENV_VALIDATION,
8589
});

‎apps/app/src/lib/fleet.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1+
import { env } from "@/env.mjs";
12
import axios from "axios";
23

3-
if (!process.env.FLEET_URL || !process.env.FLEET_TOKEN) {
4-
throw new Error("FLEET_URL or FLEET_TOKEN not found");
5-
}
6-
74
export const fleet = axios.create({
8-
baseURL: `${process.env.FLEET_URL}/api/v1/fleet`,
9-
headers: { Authorization: `Bearer ${process.env.FLEET_TOKEN}` },
5+
baseURL: `${env.FLEET_URL}/api/v1/fleet`,
6+
headers: { Authorization: `Bearer ${env.FLEET_TOKEN}` },
107
});

0 commit comments

Comments
 (0)