From 6230d5512e78c9823635461e103ea7ea56367a86 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 27 Jul 2022 16:36:15 -0500 Subject: [PATCH] chore: Remove line numbers from auto-gen typescript (#3258) * chore: Remove line numbers from auto-gen typescript The line numbers are just extra noise that change when things shift around. They are not required and usually make CI fail when you forget to run 'make gen'. --- scripts/apitypings/main.go | 6 +- site/src/api/typesGenerated.ts | 154 ++++++++++++++++----------------- 2 files changed, 78 insertions(+), 82 deletions(-) diff --git a/scripts/apitypings/main.go b/scripts/apitypings/main.go index 88eb51fd63..dcb0b962d1 100644 --- a/scripts/apitypings/main.go +++ b/scripts/apitypings/main.go @@ -248,11 +248,7 @@ func (g *Generator) generateAll() (*TypescriptTypes, error) { func (g *Generator) posLine(obj types.Object) string { file := g.pkg.Fset.File(obj.Pos()) - position := file.Position(obj.Pos()) - position.Filename = filepath.Join("codersdk", filepath.Base(position.Filename)) - return fmt.Sprintf("// From %s\n", - position.String(), - ) + return fmt.Sprintf("// From %s\n", filepath.Join("codersdk", filepath.Base(file.Name()))) } // buildStruct just prints the typescript def for a type. diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 72af42722d..9dfe44998e 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -1,6 +1,6 @@ // Code generated by 'make coder/scripts/apitypings/main.go'. DO NOT EDIT. -// From codersdk/users.go:54:6 +// From codersdk/users.go export interface APIKey { readonly id: string readonly user_id: string @@ -12,44 +12,44 @@ export interface APIKey { readonly lifetime_seconds: number } -// From codersdk/workspaceagents.go:35:6 +// From codersdk/workspaceagents.go export interface AWSInstanceIdentityToken { readonly signature: string readonly document: string } -// From codersdk/gitsshkey.go:21:6 +// From codersdk/gitsshkey.go export interface AgentGitSSHKey { readonly public_key: string readonly private_key: string } -// From codersdk/users.go:174:6 +// From codersdk/users.go export interface AuthMethods { readonly password: boolean readonly github: boolean } -// From codersdk/workspaceagents.go:40:6 +// From codersdk/workspaceagents.go export interface AzureInstanceIdentityToken { readonly signature: string readonly encoding: string } -// From codersdk/buildinfo.go:13:6 +// From codersdk/buildinfo.go export interface BuildInfoResponse { readonly external_url: string readonly version: string } -// From codersdk/parameters.go:44:6 +// From codersdk/parameters.go export interface ComputedParameter extends Parameter { readonly source_value: string readonly schema_id: string readonly default_source_value: boolean } -// From codersdk/users.go:65:6 +// From codersdk/users.go export interface CreateFirstUserRequest { readonly email: string readonly username: string @@ -57,18 +57,18 @@ export interface CreateFirstUserRequest { readonly organization: string } -// From codersdk/users.go:73:6 +// From codersdk/users.go export interface CreateFirstUserResponse { readonly user_id: string readonly organization_id: string } -// From codersdk/users.go:169:6 +// From codersdk/users.go export interface CreateOrganizationRequest { readonly name: string } -// From codersdk/parameters.go:87:6 +// From codersdk/parameters.go export interface CreateParameterRequest { readonly copy_from_parameter?: string readonly name: string @@ -77,7 +77,7 @@ export interface CreateParameterRequest { readonly destination_scheme: ParameterDestinationScheme } -// From codersdk/organizations.go:49:6 +// From codersdk/organizations.go export interface CreateTemplateRequest { readonly name: string readonly description?: string @@ -87,13 +87,13 @@ export interface CreateTemplateRequest { readonly min_autostart_interval_ms?: number } -// From codersdk/templateversions.go:108:6 +// From codersdk/templateversions.go export interface CreateTemplateVersionDryRunRequest { readonly WorkspaceName: string readonly ParameterValues: CreateParameterRequest[] } -// From codersdk/organizations.go:36:6 +// From codersdk/organizations.go export interface CreateTemplateVersionRequest { readonly template_id?: string readonly storage_method: ProvisionerStorageMethod @@ -102,7 +102,7 @@ export interface CreateTemplateVersionRequest { readonly parameter_values?: CreateParameterRequest[] } -// From codersdk/users.go:78:6 +// From codersdk/users.go export interface CreateUserRequest { readonly email: string readonly username: string @@ -110,7 +110,7 @@ export interface CreateUserRequest { readonly organization_id: string } -// From codersdk/workspaces.go:35:6 +// From codersdk/workspaces.go export interface CreateWorkspaceBuildRequest { readonly template_version_id?: string readonly transition: WorkspaceTransition @@ -119,7 +119,7 @@ export interface CreateWorkspaceBuildRequest { readonly parameter_values?: CreateParameterRequest[] } -// From codersdk/organizations.go:76:6 +// From codersdk/organizations.go export interface CreateWorkspaceRequest { readonly template_id: string readonly name: string @@ -128,12 +128,12 @@ export interface CreateWorkspaceRequest { readonly parameter_values?: CreateParameterRequest[] } -// From codersdk/users.go:165:6 +// From codersdk/users.go export interface GenerateAPIKeyResponse { readonly key: string } -// From codersdk/gitsshkey.go:14:6 +// From codersdk/gitsshkey.go export interface GitSSHKey { readonly user_id: string readonly created_at: string @@ -141,23 +141,23 @@ export interface GitSSHKey { readonly public_key: string } -// From codersdk/workspaceagents.go:31:6 +// From codersdk/workspaceagents.go export interface GoogleInstanceIdentityToken { readonly json_web_token: string } -// From codersdk/users.go:154:6 +// From codersdk/users.go export interface LoginWithPasswordRequest { readonly email: string readonly password: string } -// From codersdk/users.go:160:6 +// From codersdk/users.go export interface LoginWithPasswordResponse { readonly session_token: string } -// From codersdk/organizations.go:28:6 +// From codersdk/organizations.go export interface Organization { readonly id: string readonly name: string @@ -165,7 +165,7 @@ export interface Organization { readonly updated_at: string } -// From codersdk/organizationmember.go:9:6 +// From codersdk/organizationmember.go export interface OrganizationMember { readonly user_id: string readonly organization_id: string @@ -174,14 +174,14 @@ export interface OrganizationMember { readonly roles: string[] } -// From codersdk/pagination.go:11:6 +// From codersdk/pagination.go export interface Pagination { readonly after_id?: string readonly limit?: number readonly offset?: number } -// From codersdk/parameters.go:52:6 +// From codersdk/parameters.go export interface Parameter { readonly id: string readonly created_at: string @@ -193,7 +193,7 @@ export interface Parameter { readonly destination_scheme: ParameterDestinationScheme } -// From codersdk/parameters.go:63:6 +// From codersdk/parameters.go export interface ParameterSchema { readonly id: string readonly created_at: string @@ -214,7 +214,7 @@ export interface ParameterSchema { readonly validation_contains?: string[] } -// From codersdk/provisionerdaemons.go:36:6 +// From codersdk/provisionerdaemons.go export interface ProvisionerDaemon { readonly id: string readonly created_at: string @@ -223,7 +223,7 @@ export interface ProvisionerDaemon { readonly provisioners: ProvisionerType[] } -// From codersdk/provisionerdaemons.go:65:6 +// From codersdk/provisionerdaemons.go export interface ProvisionerJob { readonly id: string readonly created_at: string @@ -235,7 +235,7 @@ export interface ProvisionerJob { readonly storage_source: string } -// From codersdk/provisionerdaemons.go:76:6 +// From codersdk/provisionerdaemons.go export interface ProvisionerJobLog { readonly id: string readonly created_at: string @@ -245,25 +245,25 @@ export interface ProvisionerJobLog { readonly output: string } -// From codersdk/workspaces.go:206:6 +// From codersdk/workspaces.go export interface PutExtendWorkspaceRequest { readonly deadline: string } -// From codersdk/error.go:11:6 +// From codersdk/error.go export interface Response { readonly message: string readonly detail?: string readonly validations?: ValidationError[] } -// From codersdk/roles.go:12:6 +// From codersdk/roles.go export interface Role { readonly name: string readonly display_name: string } -// From codersdk/templates.go:16:6 +// From codersdk/templates.go export interface Template { readonly id: string readonly created_at: string @@ -280,7 +280,7 @@ export interface Template { readonly created_by_name: string } -// From codersdk/templateversions.go:14:6 +// From codersdk/templateversions.go export interface TemplateVersion { readonly id: string readonly template_id?: string @@ -294,55 +294,55 @@ export interface TemplateVersion { readonly created_by_name: string } -// From codersdk/templates.go:100:6 +// From codersdk/templates.go export interface TemplateVersionsByTemplateRequest extends Pagination { readonly template_id: string } -// From codersdk/templates.go:32:6 +// From codersdk/templates.go export interface UpdateActiveTemplateVersion { readonly id: string } -// From codersdk/users.go:94:6 +// From codersdk/users.go export interface UpdateRoles { readonly roles: string[] } -// From codersdk/templates.go:36:6 +// From codersdk/templates.go export interface UpdateTemplateMeta { readonly description?: string readonly max_ttl_ms?: number readonly min_autostart_interval_ms?: number } -// From codersdk/users.go:89:6 +// From codersdk/users.go export interface UpdateUserPasswordRequest { readonly old_password: string readonly password: string } -// From codersdk/users.go:85:6 +// From codersdk/users.go export interface UpdateUserProfileRequest { readonly username: string } -// From codersdk/workspaces.go:165:6 +// From codersdk/workspaces.go export interface UpdateWorkspaceAutostartRequest { readonly schedule?: string } -// From codersdk/workspaces.go:185:6 +// From codersdk/workspaces.go export interface UpdateWorkspaceTTLRequest { readonly ttl_ms?: number } -// From codersdk/files.go:16:6 +// From codersdk/files.go export interface UploadResponse { readonly hash: string } -// From codersdk/users.go:44:6 +// From codersdk/users.go export interface User { readonly id: string readonly email: string @@ -353,13 +353,13 @@ export interface User { readonly roles: Role[] } -// From codersdk/users.go:119:6 +// From codersdk/users.go export interface UserAuthorization { readonly object: UserAuthorizationObject readonly action: string } -// From codersdk/users.go:135:6 +// From codersdk/users.go export interface UserAuthorizationObject { readonly resource_type: string readonly owner_id?: string @@ -367,32 +367,32 @@ export interface UserAuthorizationObject { readonly resource_id?: string } -// From codersdk/users.go:108:6 +// From codersdk/users.go export interface UserAuthorizationRequest { readonly checks: Record } -// From codersdk/users.go:103:6 +// From codersdk/users.go export type UserAuthorizationResponse = Record -// From codersdk/users.go:98:6 +// From codersdk/users.go export interface UserRoles { readonly roles: string[] readonly organization_roles: Record } -// From codersdk/users.go:32:6 +// From codersdk/users.go export interface UsersRequest extends Pagination { readonly q?: string } -// From codersdk/error.go:31:6 +// From codersdk/error.go export interface ValidationError { readonly field: string readonly detail: string } -// From codersdk/workspaces.go:19:6 +// From codersdk/workspaces.go export interface Workspace { readonly id: string readonly created_at: string @@ -408,7 +408,7 @@ export interface Workspace { readonly ttl_ms?: number } -// From codersdk/workspaceresources.go:33:6 +// From codersdk/workspaceresources.go export interface WorkspaceAgent { readonly id: string readonly created_at: string @@ -437,12 +437,12 @@ export interface WorkspaceAgent { readonly ipv6: any } -// From codersdk/workspaceagents.go:47:6 +// From codersdk/workspaceagents.go export interface WorkspaceAgentAuthenticateResponse { readonly session_token: string } -// From codersdk/workspaceresources.go:63:6 +// From codersdk/workspaceresources.go export interface WorkspaceAgentInstanceMetadata { readonly jail_orchestrator: string readonly operating_system: string @@ -455,7 +455,7 @@ export interface WorkspaceAgentInstanceMetadata { readonly vnc: boolean } -// From codersdk/workspaceresources.go:55:6 +// From codersdk/workspaceresources.go export interface WorkspaceAgentResourceMetadata { readonly memory_total: number readonly disk_total: number @@ -464,7 +464,7 @@ export interface WorkspaceAgentResourceMetadata { readonly cpu_mhz: number } -// From codersdk/workspaceapps.go:7:6 +// From codersdk/workspaceapps.go export interface WorkspaceApp { readonly id: string readonly name: string @@ -472,7 +472,7 @@ export interface WorkspaceApp { readonly icon?: string } -// From codersdk/workspacebuilds.go:38:6 +// From codersdk/workspacebuilds.go export interface WorkspaceBuild { readonly id: string readonly created_at: string @@ -492,22 +492,22 @@ export interface WorkspaceBuild { readonly reason: BuildReason } -// From codersdk/workspaces.go:88:6 +// From codersdk/workspaces.go export interface WorkspaceBuildsRequest extends Pagination { readonly WorkspaceID: string } -// From codersdk/workspaces.go:224:6 +// From codersdk/workspaces.go export interface WorkspaceFilter { readonly q?: string } -// From codersdk/workspaces.go:46:6 +// From codersdk/workspaces.go export interface WorkspaceOptions { readonly include_deleted?: boolean } -// From codersdk/workspaceresources.go:23:6 +// From codersdk/workspaceresources.go export interface WorkspaceResource { readonly id: string readonly created_at: string @@ -518,31 +518,31 @@ export interface WorkspaceResource { readonly agents?: WorkspaceAgent[] } -// From codersdk/workspacebuilds.go:22:6 +// From codersdk/workspacebuilds.go export type BuildReason = "autostart" | "autostop" | "initiator" -// From codersdk/provisionerdaemons.go:26:6 +// From codersdk/provisionerdaemons.go export type LogLevel = "debug" | "error" | "info" | "trace" | "warn" -// From codersdk/provisionerdaemons.go:19:6 +// From codersdk/provisionerdaemons.go export type LogSource = "provisioner" | "provisioner_daemon" -// From codersdk/users.go:25:6 +// From codersdk/users.go export type LoginType = "github" | "password" -// From codersdk/parameters.go:29:6 +// From codersdk/parameters.go export type ParameterDestinationScheme = "environment_variable" | "none" | "provisioner_variable" -// From codersdk/parameters.go:14:6 +// From codersdk/parameters.go export type ParameterScope = "import_job" | "template" | "workspace" -// From codersdk/parameters.go:22:6 +// From codersdk/parameters.go export type ParameterSourceScheme = "data" | "none" -// From codersdk/parameters.go:37:6 +// From codersdk/parameters.go export type ParameterTypeSystem = "hcl" | "none" -// From codersdk/provisionerdaemons.go:45:6 +// From codersdk/provisionerdaemons.go export type ProvisionerJobStatus = | "canceled" | "canceling" @@ -551,17 +551,17 @@ export type ProvisionerJobStatus = | "running" | "succeeded" -// From codersdk/organizations.go:14:6 +// From codersdk/organizations.go export type ProvisionerStorageMethod = "file" -// From codersdk/organizations.go:20:6 +// From codersdk/organizations.go export type ProvisionerType = "echo" | "terraform" -// From codersdk/users.go:18:6 +// From codersdk/users.go export type UserStatus = "active" | "suspended" -// From codersdk/workspaceresources.go:15:6 +// From codersdk/workspaceresources.go export type WorkspaceAgentStatus = "connected" | "connecting" | "disconnected" -// From codersdk/workspacebuilds.go:14:6 +// From codersdk/workspacebuilds.go export type WorkspaceTransition = "delete" | "start" | "stop"