feat(sdk): migrate toolbox calls from API to proxy (#2406)

Signed-off-by: MDzaja <[email protected]>

Author: MDzaja

.gitattributes

@@ -4,4 +4,6 @@ libs/api-client-go/** linguist-generated=true
 libs/api-client-python/** linguist-generated=true
 libs/api-client-python-async/** linguist-generated=true
 libs/runner-api-client/** linguist-generated=true
-apps/runner/pkg/api/docs/** linguist-generated=true
+apps/runner/pkg/api/docs/** linguist-generated=true
+libs/toolbox-api-client-python/** linguist-generated=true
+libs/toolbox-api-client-python-async/** linguist-generated=true

.licenserc-clients.yaml

@@ -22,5 +22,8 @@ header:
     - 'apps/docs/**'
     - 'libs/computer-use/**'
     - 'hack/**'
+    - 'libs/toolbox-api-client/**'
+    - 'libs/toolbox-api-client-python/**'
+    - 'libs/toolbox-api-client-python-async/**'
 
   comment: on-failure

.licenserc.yaml

@@ -21,5 +21,6 @@ header:
     - 'examples/**'
     - 'apps/docs/**'
     - 'hack/**'
+    - 'apps/daemon/pkg/toolbox/docs/docs.go'
 
   comment: on-failure

apps/api/.env

@@ -76,6 +76,7 @@ SSH_GATEWAY_COMMAND="ssh -p 2222 {{TOKEN}}@localhost"
 SSH_GATEWAY_PUBLIC_KEY="c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCZ1FEZUtocFdOYVhVNkpSMnJXekc1NlZJeksrcmsrdForcCtVUmwyeWF5cWRnZGg2bnVOL1NtVnJsYmV4MGlrRVZZemdRWUIwWno5M2dqOVhxSkd4WjJiMHVoSDFzNkp2bnhKZVdIK05rbjBNMzRiRjZkeVloZ3o4M0JaTitWcElJdnVDT1pxYWE4VnlRWjhPdjVLMU00enlmQnFCMld3ejcwZEVWUnFaMnVZckd5U0RqUUIrU3hRQ3phY0djb2JRQTFUd2QxdEJvSk5BaVpPWXFSU3d6TmNoTk5hZHlxSHRGdkZRQ0hhNjZWaVBmQ0FVUGt2cEN6ZGh3TmJGdVhGVWkxbnZOWkx4M056RU41M05LWUhZcWU3Y3dXZkI4QjBoRDhDd3hmSDd6T0o1b1RCMnBMVVlsUWpZRDNsN3k4SkFTbDZpYkpuR1A1SWczVXpZWlRIdUdkNzVXWktnNTRJTVROQlFPMWpJdE9HL0orUm1XbzB0YTdpRkF6ZExyL1BmbDdXTVMwbEZhSm9scTdUVmJLUG1JODFTOU04VEgrbXhLbGZ5b2NqZzhwSUdlQUllcEo3dXl1Vk1xT2wxeVVuSFNycDRlVEVlR0k3NlpCOFRoUzhkYnBLUTIvb2RYMHkwc3FSZDI0Y2lGdnM0dnZVaW80NFdYNlNWRG54dXpWRHc1Rzg9IGRheXRvbmFAMDQwNjZiZDIwY2Vi"
 
 PROXY_TEMPLATE_URL=http://{{PORT}}-{{sandboxId}}.proxy.localhost:4000
+PROXY_TOOLBOX_BASE_URL=http://proxy.localhost:4000
 
 PYLON_APP_ID=
 

apps/api/src/config/configuration.ts

@@ -89,6 +89,9 @@ const configuration = {
     protocol: process.env.PROXY_PROTOCOL,
     apiKey: process.env.PROXY_API_KEY,
     templateUrl: process.env.PROXY_TEMPLATE_URL,
+    toolboxUrl:
+      (process.env.PROXY_TOOLBOX_BASE_URL || `${process.env.PROXY_PROTOCOL}://${process.env.PROXY_DOMAIN}`) +
+      '/toolbox',
   },
   audit: {
     toolboxRequestsEnabled: process.env.AUDIT_TOOLBOX_REQUESTS_ENABLED === 'true',

apps/api/src/config/dto/configuration.dto.ts

@@ -118,6 +118,13 @@ export class ConfigurationDto {
   @IsString()
   proxyTemplateUrl: string
 
+  @ApiProperty({
+    description: 'Toolbox template URL',
+    example: 'https://proxy.example.com/toolbox',
+  })
+  @IsString()
+  proxyToolboxUrl: string
+
   @ApiProperty({
     description: 'Default snapshot for sandboxes',
     example: 'ubuntu:22.04',
@@ -187,6 +194,7 @@ export class ConfigurationDto {
     }
     this.linkedAccountsEnabled = configService.get('oidc.managementApi.enabled')
     this.proxyTemplateUrl = configService.getOrThrow('proxy.templateUrl')
+    this.proxyToolboxUrl = configService.getOrThrow('proxy.toolboxUrl')
     this.defaultSnapshot = configService.getOrThrow('defaultSnapshot')
     this.dashboardUrl = configService.getOrThrow('dashboardUrl')
     this.maxAutoArchiveInterval = configService.getOrThrow('maxAutoArchiveInterval')
@@ -210,6 +218,6 @@ export class ConfigurationDto {
       this.pylonAppId = configService.get('pylonAppId')
     }
     // TODO: announcements
-    // this.announcements = configService.get('announcements')
+    this.announcements = {}
   }
 }

apps/api/src/sandbox/controllers/preview.controller.ts

@@ -119,6 +119,11 @@ export class PreviewController {
     summary: 'Check if user has access to the sandbox',
     operationId: 'hasSandboxAccess',
   })
+  @ApiResponse({
+    status: 200,
+    description: 'User access status to the sandbox',
+    type: Boolean,
+  })
   @UseGuards(CombinedAuthGuard)
   @ApiOAuth2(['openid', 'profile', 'email'])
   @ApiBearerAuth()