Merge branch 'main' into update

rivet-gg · Aug 8, 2024 · 99af676 · 99af676
2 parents 2a2dba5 + fdcc94b
commit 99af676
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/generators/typescript/sdk/client-class-generator/src/GeneratedSdkClientClassImpl.ts b/generators/typescript/sdk/client-class-generator/src/GeneratedSdkClientClassImpl.ts
@@ -42,6 +42,7 @@ import { getLiteralValueForHeader, isLiteralHeader } from "./endpoints/utils/isL
 import { REQUEST_OPTIONS_PARAMETER_NAME } from "./endpoints/utils/requestOptionsParameter";
 import { OAuthTokenProviderGenerator } from "./oauth-generator/OAuthTokenProviderGenerator";
 
+
 export declare namespace GeneratedSdkClientClassImpl {
     export interface Init {
         isRoot: boolean;
@@ -865,6 +866,7 @@ export class GeneratedSdkClientClassImpl implements GeneratedSdkClientClass {
             });
         }
 
+
         // headers.push(
         //     {
         //         header: "X-Fern-Runtime",

diff --git a/packages/cli/cli/src/commands/generate/generateAPIWorkspace.ts b/packages/cli/cli/src/commands/generate/generateAPIWorkspace.ts
@@ -80,7 +80,7 @@ export async function generateWorkspace({
         });
     } else {
         if (!token) {
-            return context.failAndThrow("Token is required for remote generation.");
+            return context.failAndThrow("Must provide token if 'useLocalDocker' is false");
         }
         await runRemoteGenerationForAPIWorkspace({
             projectConfig,

diff --git a/packages/cli/cli/src/commands/generate/generateAPIWorkspaces.ts b/packages/cli/cli/src/commands/generate/generateAPIWorkspaces.ts
@@ -1,4 +1,5 @@
 import { createOrganizationIfDoesNotExist, FernToken, FernUserToken } from "@fern-api/auth";
+
 import { Values } from "@fern-api/core-utils";
 import { join, RelativeFilePath } from "@fern-api/fs-utils";
 import { askToLogin } from "@fern-api/login";