Merge branch 'main' into v3/machine-config

Author: nicktrn

apps/webapp/app/components/navigation/SideMenu.tsx

@@ -556,7 +556,7 @@ function V3ProjectSideMenu({
         data-action="test"
       />
       <SideMenuItem
-        name="API Keys"
+        name="API keys"
         icon={KeyIcon}
         iconColor="text-amber-500"
         to={v3ApiKeysPath(organization, project)}

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.apikeys/route.tsx

@@ -19,6 +19,7 @@ import {
   TableHeaderCell,
   TableRow,
 } from "~/components/primitives/Table";
+import { TextLink } from "~/components/primitives/TextLink";
 import { useProject } from "~/hooks/useProject";
 import { ApiKeysPresenter } from "~/presenters/v3/ApiKeysPresenter.server";
 import { requireUserId } from "~/services/session.server";
@@ -55,22 +56,23 @@ export default function Page() {
   return (
     <PageContainer>
       <NavBar>
-        <PageTitle title="API Keys" />
+        <PageTitle title="API keys" />
         <PageAccessories>
           <LinkButton
             variant={"minimal/small"}
             LeadingIcon={BookOpenIcon}
-            to={docsPath("/documentation/concepts/environments-endpoints#environments")}
+            to={docsPath("/v3/apikeys")}
           >
             API keys docs
           </LinkButton>
         </PageAccessories>
       </NavBar>
       <PageBody>
         <div className={cn("h-full")}>
-          <Header3 spacing>Server API keys</Header3>
+          <Header3 spacing>Secret keys</Header3>
           <Paragraph variant="small" spacing>
-            Server API keys should be used on your server – they give full API access.
+            Secret keys should be used on your server – they give full API access and allow you to{" "}
+            <TextLink to={docsPath("v3/triggering")}>trigger tasks</TextLink> from your backend.
           </Paragraph>
           <Header3 spacing>Public API keys</Header3>
           <Paragraph variant="small" spacing>
@@ -81,7 +83,7 @@ export default function Page() {
               <TableHeader>
                 <TableRow>
                   <TableHeaderCell>Environment</TableHeaderCell>
-                  <TableHeaderCell>Server API key</TableHeaderCell>
+                  <TableHeaderCell>Secret key</TableHeaderCell>
                   <TableHeaderCell>Public API key</TableHeaderCell>
                   <TableHeaderCell>Keys generated</TableHeaderCell>
                   <TableHeaderCell>Latest version</TableHeaderCell>

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.environment-variables/route.tsx

@@ -167,7 +167,7 @@ export default function Page() {
         <PageAccessories>
           <LinkButton
             LeadingIcon={BookOpenIcon}
-            to={docsPath("/documentation/concepts/environments-endpoints#environments")}
+            to={docsPath("v3/deploy-environment-variables")}
             variant="minimal/small"
           >
             Environment variables docs

docs/images/v3/api-keys.png

@@ -452,6 +452,7 @@
         "v3/trigger-folder",
         "v3/tasks-overview",
         "v3/triggering",
+        "v3/apikeys",
         {
           "group": "Task types",
           "pages": ["v3/tasks-regular", "v3/tasks-scheduled", "v3/tasks-zod", "v3/tasks-webhooks"]

docs/mint.json

@@ -0,0 +1,12 @@
+---
+title: "API keys"
+description: "How to authenticate with Trigger.dev so you can trigger tasks."
+---
+
+### Authentication and your secret keys
+
+When you [trigger a task](/v3/triggering) from your backend code, you need to set the `TRIGGER_SECRET_KEY` environment variable.
+
+Each environment has its own secret key. You can find the value on the API keys page in the Trigger.dev dashboard:
+
+![How to find your secret key](/images/v3/api-keys.png)

docs/v3/apikeys.mdx

@@ -18,7 +18,7 @@ We deploy your tasks and scale them up and down when they are triggered. So any
 
 <Step title="Add your environment variables">
   You can add values for your local dev environment, staging and prod. ![Environment variables
-  page](/images/v3/environment-variables-page.jpg){" "}
+  page](/images/v3/environment-variables-panel.jpg)
 </Step>
 
 </Steps>

docs/v3/deploy-environment-variables.mdx

@@ -23,6 +23,10 @@ You can trigger any task from your backend code, using either `trigger()` or `ba
   Trigger.dev API key to the world.
 </Note>
 
+### Authentication
+
+When you trigger a task from your backend code, you need to set the `TRIGGER_SECRET_KEY` environment variable. You can find the value on the API keys page in the Trigger.dev dashboard. [More info on API keys](/v3/apikeys).
+
 ### trigger()
 
 Triggers a single run of a task with the payload you pass in, and any options you specify. It does NOT wait for the result, you cannot do that from outside a task.