Merge pull request #39 from docker/cm/remove-credcheck

Remove credential check & pat
docker · Sep 30, 2024 · f9247c6 · f9247c6
2 parents 306d049 + 888dd56
commit f9247c6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 72 deletions.
diff --git a/src/commands/runPrompt.ts b/src/commands/runPrompt.ts
@@ -6,7 +6,6 @@ import { showPromptPicker } from "../utils/promptPicker";
 import { createOutputBuffer } from "../utils/promptFilename";
 import { spawnPromptImage, writeKeyToVolume } from "../utils/promptRunner";
 import { verifyHasOpenAIKey } from "./setOpenAIKey";
-import { getCredential } from "../utils/credential";
 import { setProjectDir } from "./setProjectDir";
 import { postToBackendSocket } from "../utils/ddSocket";
 import { ctx } from "../extension";
@@ -162,15 +161,13 @@ export const runPrompt: (secrets: vscode.SecretStorage, mode: PromptOption) => v
 
     progress.report({ increment: 5, message: "Detecting docker desktop token" });
 
-    const { Username, Password } = await getCredential("docker");
-
     try {
         progress.report({ increment: 5, message: "Mounting secrets..." });
         await writeKeyToVolume(apiKey!);
         progress.report({ increment: 5, message: "Running..." });
         const ranges: Record<string, vscode.Range> = {};
         const getBaseFunctionRange = () => new vscode.Range(doc.lineCount, 0, doc.lineCount, 0);
-        await spawnPromptImage(promptOption.id, runningLocal ? inputWorkspace! : workspaceFolder!.uri.fsPath, Username, process.platform, Password, async (json) => {
+        await spawnPromptImage(promptOption.id, runningLocal ? inputWorkspace! : workspaceFolder!.uri.fsPath, 'vscode-user', process.platform, async (json) => {
             if (json.method === 'functions') {
                 const functions = json.params;
                 for (const func of functions) {

diff --git a/src/utils/credential.ts b/src/utils/credential.ts
diff --git a/src/utils/ddSocket.ts b/src/utils/ddSocket.ts
@@ -1,43 +1,10 @@
 import os from 'os';
-import path from 'path';
 import http from 'http';
-import { ctx } from '../extension';
 import { ExtensionContext } from 'vscode';
-const getDevhomePrefix = () => {
-    return process.env['DEVHOME'] ? path.basename(process.env['DEVHOME']) : '';
-}
 
 const getDevhome = (): string => {
     return process.env['DEVHOME'] ?? os.homedir();
 }
-const getUserDataDirectory = (
-    /** This distinction is only currently meaningful on Windows */
-    type: 'local' | 'roaming' = 'local',
-): string => {
-    const devhome = getDevhome();
-    if (os.platform() === 'win32') {
-        return path.join(
-            devhome,
-            'AppData',
-            type === 'local' ? 'Local' : 'Roaming',
-            'Docker',
-        );
-    }
-    if (os.platform() === 'linux') {
-        return path.join(devhome, '.docker', 'desktop');
-    }
-    if (os.platform() === 'darwin') {
-        return path.join(
-            devhome,
-            'Library',
-            'Containers',
-            'com.docker.docker',
-            'Data',
-        );
-    }
-
-    throw new Error('Unrecognized platform');
-}
 
 export function getBackendSocketByPlatform(): string {
     switch (os.platform()) {

diff --git a/src/utils/promptRunner.ts b/src/utils/promptRunner.ts
@@ -3,7 +3,7 @@ import { CancellationToken, commands, window, workspace } from "vscode";
 import { setThreadId } from "../commands/setThreadId";
 const output = window.createOutputChannel("Docker Labs: AI Tools");
 
-export const getRunArgs = async (promptRef: string, projectDir: string, username: string, platform: string, pat: string, render = false) => {
+export const getRunArgs = async (promptRef: string, projectDir: string, username: string, platform: string, render = false) => {
     const isLocal = promptRef.startsWith('local://');
     const isMarkdown = promptRef.toLowerCase().endsWith('.md');
     const threadId = await commands.executeCommand<ReturnType<typeof setThreadId>>('docker.labs-ai-tools-vscode.thread-id', false)
@@ -35,7 +35,6 @@ export const getRunArgs = async (promptRef: string, projectDir: string, username
         "--platform", platform,
         ...promptArgs,
         '--jsonrpc',
-        ...(pat ? ['--pat', pat] : []),
         ...(threadId ? ['--thread-id', threadId] : []),
     ];
 
@@ -119,8 +118,8 @@ const runAndStream = async (command: string, args: string[], callback: (json: an
     });
 };
 
-export const spawnPromptImage = async (promptArg: string, projectDir: string, username: string, platform: string, pat: string, callback: (json: any) => Promise<void>, token: CancellationToken) => {
-    const args = await getRunArgs(promptArg!, projectDir!, username, platform, pat);
+export const spawnPromptImage = async (promptArg: string, projectDir: string, username: string, platform: string, callback: (json: any) => Promise<void>, token: CancellationToken) => {
+    const args = await getRunArgs(promptArg!, projectDir!, username, platform);
     callback({ method: 'message', params: { debug: `Running ${args.join(' ')}` } });
     return runAndStream("docker", args, callback, token);
 };