fix types

coder · f0ssel · Sep 23, 2022 · Sep 19, 2022 · Sep 19, 2022 · Sep 19, 2022
commit e87b48a4977da0e15068eb7ff042e35d88ebeb5c
diff --git a/codersdk/agentconn.go b/codersdk/agentconn.go
@@ -30,12 +30,14 @@ var (
 
 // ReconnectingPTYRequest is sent from the client to the server
 // to pipe data to a PTY.
+// @typescript-ignore ReconnectingPTYRequest
 type ReconnectingPTYRequest struct {
 	Data   string `json:"data"`
 	Height uint16 `json:"height"`
 	Width  uint16 `json:"width"`
 }
 
+// @typescript-ignore AgentConn
 type AgentConn struct {
 	*tailnet.Conn
 	CloseFunc func()
@@ -70,6 +72,7 @@ func (c *AgentConn) Close() error {
 	return c.Conn.Close()
 }
 
+// @typescript-ignore ReconnectingPTYInit
 type ReconnectingPTYInit struct {
 	ID      string
 	Height  uint16

diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -25,36 +25,43 @@ import (
 	"github.com/coder/retry"
 )
 
+// @typescript-ignore GoogleInstanceIdentityToken
 type GoogleInstanceIdentityToken struct {
 	JSONWebToken string `json:"json_web_token" validate:"required"`
 }
 
+// @typescript-ignore AWSInstanceIdentityToken
 type AWSInstanceIdentityToken struct {
 	Signature string `json:"signature" validate:"required"`
 	Document  string `json:"document" validate:"required"`
 }
 
+// @typescript-ignore ReconnectingPTYRequest
 type AzureInstanceIdentityToken struct {
 	Signature string `json:"signature" validate:"required"`
 	Encoding  string `json:"encoding" validate:"required"`
 }
 
 // WorkspaceAgentAuthenticateResponse is returned when an instance ID
 // has been exchanged for a session token.
+// @typescript-ignore WorkspaceAgentAuthenticateResponse
 type WorkspaceAgentAuthenticateResponse struct {
 	SessionToken string `json:"session_token"`
 }
 
 // WorkspaceAgentConnectionInfo returns required information for establishing
 // a connection with a workspace.
+// @typescript-ignore WorkspaceAgentConnectionInfo
 type WorkspaceAgentConnectionInfo struct {
 	DERPMap *tailcfg.DERPMap `json:"derp_map"`
 }
 
+// @typescript-ignore PostWorkspaceAgentVersionRequest
 type PostWorkspaceAgentVersionRequest struct {
 	Version string `json:"version"`
 }
 
+// @typescript-ignore WorkspaceAgentMetadata
 type WorkspaceAgentMetadata struct {
 	DERPMap              *tailcfg.DERPMap  `json:"derpmap"`
 	EnvironmentVariables map[string]string `json:"environment_variables"`
@@ -427,6 +434,7 @@ func (c *Client) WorkspaceAgentReconnectingPTY(ctx context.Context, agentID, rec
 // Stats records the Agent's network connection statistics for use in
 // user-facing metrics and debugging.
 // Each member value must be written and read with atomic.
+// @typescript-ignore AgentStats
 type AgentStats struct {
 	NumConns int64 `json:"num_comms"`
 	RxBytes  int64 `json:"rx_bytes"`

diff --git a/codersdk/workspaceapps.go b/codersdk/workspaceapps.go
@@ -30,6 +30,7 @@ type WorkspaceApp struct {
 	Health               WorkspaceAppHealth `json:"health"`
 }
 
+// @typescript-ignore PostWorkspaceAppHealthsRequest
 type PostWorkspaceAppHealthsRequest struct {
 	// Healths is a map of the workspace app name and the health of the app.
 	Healths map[string]WorkspaceAppHealth

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -12,12 +12,6 @@ export interface APIKey {
   readonly lifetime_seconds: number
 }
 
-// From codersdk/workspaceagents.go
-export interface AWSInstanceIdentityToken {
-  readonly signature: string
-  readonly document: string
-}
-
 // From codersdk/licenses.go
 export interface AddLicenseRequest {
   readonly license: string
@@ -250,11 +244,6 @@ export interface GitSSHKey {
   readonly public_key: string
 }
 
-// From codersdk/workspaceagents.go
-export interface GoogleInstanceIdentityToken {
-  readonly json_web_token: string
-}
-
 // From codersdk/licenses.go
 export interface License {
   readonly id: number
@@ -331,16 +320,6 @@ export interface ParameterSchema {
   readonly validation_contains?: string[]
 }
 
-// From codersdk/workspaceagents.go
-export interface PostWorkspaceAgentVersionRequest {
-  readonly version: string
-}
-
-// From codersdk/workspaceapps.go
-export interface PostWorkspaceAppHealthsRequest {
-  readonly Healths: Record<string, WorkspaceAppHealth>
-}
-
 // From codersdk/provisionerdaemons.go
 export interface ProvisionerDaemon {
   readonly id: string
@@ -581,18 +560,6 @@ export interface WorkspaceAgent {
   readonly latency?: Record<string, DERPRegion>
 }
 
-// From codersdk/workspaceagents.go
-export interface WorkspaceAgentAuthenticateResponse {
-  readonly session_token: string
-}
-
-// From codersdk/workspaceagents.go
-export interface WorkspaceAgentConnectionInfo {
-  // Named type "tailscale.com/tailcfg.DERPMap" unknown, using "any"
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  readonly derp_map?: any
-}
-
 // From codersdk/workspaceresources.go
 export interface WorkspaceAgentInstanceMetadata {
   readonly jail_orchestrator: string