Skip to content

chore: Force codersdk to not import anything from database #1576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
May 19, 2022
Merged

chore: Force codersdk to not import anything from database #1576

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8d086e7
chore: Force codersdk to not import anything from database
Emyrk May 18, 2022
c452991
chore: Move all database types in codersdk out
Emyrk May 18, 2022
de0d26a
Merge rules files into 1
Emyrk May 18, 2022
3456244
Move gorules to /script
Emyrk May 18, 2022
e1f7011
Merge remote-tracking branch 'origin/main' into stevenmasley/clean_co…
Emyrk May 18, 2022
8c5d66e
Fix unit test assert types
Emyrk May 18, 2022
db536c0
Make gen
Emyrk May 19, 2022
85aa0fe
Merge remote-tracking branch 'origin/main' into stevenmasley/clean_co…
Emyrk May 19, 2022
7811333
Make gen
Emyrk May 19, 2022
96b4227
Merge remote-tracking branch 'origin/main' into stevenmasley/clean_co…
Emyrk May 19, 2022
d2a7506
Make gen
Emyrk May 19, 2022
ae8014e
Fix type
Emyrk May 19, 2022
34537af
Fix ts mocks
Emyrk May 19, 2022
2cc2ffd
Fix ts issue
Emyrk May 19, 2022
ce24743
Merge remote-tracking branch 'origin/main' into stevenmasley/clean_co…
Emyrk May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into stevenmasley/clean_co… 
…dersdk
  • Loading branch information
@Emyrk
Emyrk committed May 19, 2022
commit 85aa0fe4db50fcd0a1c8896e03330e39a9ba398a
4 changes: 2 additions & 2 deletions coderd/parameters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ func convertParameterSchema(parameterSchema database.ParameterSchema) (codersdk.
JobID: parameterSchema.JobID,
Name: parameterSchema.Name,
Description: parameterSchema.Description,
DefaultSourceScheme: string(parameterSchema.DefaultSourceScheme),
DefaultSourceScheme: codersdk.ParameterSourceScheme(parameterSchema.DefaultSourceScheme),
DefaultSourceValue: parameterSchema.DefaultSourceValue,
AllowOverrideSource: parameterSchema.AllowOverrideSource,
DefaultDestinationScheme: string(parameterSchema.DefaultDestinationScheme),
DefaultDestinationScheme: codersdk.ParameterDestinationScheme(parameterSchema.DefaultDestinationScheme),
AllowOverrideDestination: parameterSchema.AllowOverrideDestination,
DefaultRefresh: parameterSchema.DefaultRefresh,
RedisplayValue: parameterSchema.RedisplayValue,
Expand Down
4 changes: 2 additions & 2 deletions coderd/workspacebuilds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@ func (api *api) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
// Rbac action depends on the transition
var action rbac.Action
switch createBuild.Transition {
case database.WorkspaceTransitionDelete:
case codersdk.WorkspaceTransitionDelete:
action = rbac.ActionDelete
case database.WorkspaceTransitionStart, database.WorkspaceTransitionStop:
case codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop:
action = rbac.ActionUpdate
default:
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Expand Down
39 changes: 31 additions & 8 deletions codersdk/parameters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,37 @@ const (

// Parameter represents a set value for the scope.
type Parameter struct {
ID uuid.UUID `db:"id" json:"id"`
CreatedAt time.Time `db:"created_at" json:"created_at"`
UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
Scope ParameterScope `db:"scope" json:"scope"`
ScopeID uuid.UUID `db:"scope_id" json:"scope_id"`
Name string `db:"name" json:"name"`
SourceScheme ParameterSourceScheme `db:"source_scheme" json:"source_scheme"`
DestinationScheme ParameterDestinationScheme `db:"destination_scheme" json:"destination_scheme"`
ID uuid.UUID `json:"id"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
Scope ParameterScope `json:"scope"`
ScopeID uuid.UUID `json:"scope_id"`
Name string `json:"name"`
SourceScheme ParameterSourceScheme `json:"source_scheme"`
DestinationScheme ParameterDestinationScheme `json:"destination_scheme"`
}

type ParameterSchema struct {
ID uuid.UUID `json:"id"`
CreatedAt time.Time `json:"created_at"`
JobID uuid.UUID `json:"job_id"`
Name string `json:"name"`
Description string `json:"description"`
DefaultSourceScheme ParameterSourceScheme `json:"default_source_scheme"`
DefaultSourceValue string `json:"default_source_value"`
AllowOverrideSource bool `json:"allow_override_source"`
DefaultDestinationScheme ParameterDestinationScheme `json:"default_destination_scheme"`
AllowOverrideDestination bool `json:"allow_override_destination"`
DefaultRefresh string `json:"default_refresh"`
RedisplayValue bool `json:"redisplay_value"`
ValidationError string `json:"validation_error"`
ValidationCondition string `json:"validation_condition"`
ValidationTypeSystem string `json:"validation_type_system"`
ValidationValueType string `json:"validation_value_type"`

// This is a special array of items provided if the validation condition
// explicitly states the value must be one of a set.
ValidationContains []string `json:"validation_contains"`
}

// CreateParameterRequest is used to create a new parameter value for a scope.
Expand Down
20 changes: 0 additions & 20 deletions codersdk/templateversions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,6 @@ type TemplateVersion struct {
Readme string `json:"readme"`
}

// TemplateVersionParameterSchema represents a parameter parsed from template version source.
type TemplateVersionParameterSchema struct {
ID uuid.UUID `json:"id"`
CreatedAt time.Time `json:"created_at"`
JobID uuid.UUID `json:"job_id"`
Name string `json:"name"`
Description string `json:"description"`
DefaultSourceScheme ParameterSourceScheme `json:"default_source_scheme"`
DefaultSourceValue string `json:"default_source_value"`
AllowOverrideSource bool `json:"allow_override_source"`
DefaultDestinationScheme ParameterDestinationScheme `json:"default_destination_scheme"`
AllowOverrideDestination bool `json:"allow_override_destination"`
DefaultRefresh string `json:"default_refresh"`
RedisplayValue bool `json:"redisplay_value"`
ValidationError string `json:"validation_error"`
ValidationCondition string `json:"validation_condition"`
ValidationTypeSystem ParameterTypeSystem `json:"validation_type_system"`
ValidationValueType string `json:"validation_value_type"`
}

// TemplateVersionParameter represents a computed parameter value.
type TemplateVersionParameter struct {
ID uuid.UUID `json:"id"`
Expand Down
54 changes: 16 additions & 38 deletions site/src/api/typesGenerated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export interface CreateUserRequest {
readonly organization_id: string
}

// From codersdk/workspaces.go:36:6
// From codersdk/workspaces.go:34:6
export interface CreateWorkspaceBuildRequest {
readonly template_version_id?: string
readonly transition: WorkspaceTransition
Expand Down Expand Up @@ -344,7 +344,7 @@ export interface UsersRequest extends Pagination {
readonly status?: string
}

// From codersdk/workspaces.go:20:6
// From codersdk/workspaces.go:18:6
export interface Workspace {
readonly id: string
readonly created_at: string
Expand All @@ -360,7 +360,7 @@ export interface Workspace {
readonly autostop_schedule: string
}

// From codersdk/workspaceresources.go:31:6
// From codersdk/workspaceresources.go:33:6
export interface WorkspaceAgent {
readonly id: string
readonly created_at: string
Expand All @@ -384,7 +384,7 @@ export interface WorkspaceAgentAuthenticateResponse {
readonly session_token: string
}

// From codersdk/workspaceresources.go:57:6
// From codersdk/workspaceresources.go:59:6
export interface WorkspaceAgentInstanceMetadata {
readonly jail_orchestrator: string
readonly operating_system: string
Expand All @@ -397,7 +397,7 @@ export interface WorkspaceAgentInstanceMetadata {
readonly vnc: boolean
}

// From codersdk/workspaceresources.go:49:6
// From codersdk/workspaceresources.go:51:6
export interface WorkspaceAgentResourceMetadata {
readonly memory_total: number
readonly disk_total: number
Expand All @@ -406,7 +406,7 @@ export interface WorkspaceAgentResourceMetadata {
readonly cpu_mhz: number
}

// From codersdk/workspacebuilds.go:24:6
// From codersdk/workspacebuilds.go:18:6
export interface WorkspaceBuild {
readonly id: string
readonly created_at: string
Expand All @@ -415,65 +415,43 @@ export interface WorkspaceBuild {
readonly template_version_id: string
readonly build_number: number
readonly name: string
readonly transition: WorkspaceTransition
// This is likely an enum in an external package ("github.com/coder/coder/coderd/database.WorkspaceTransition")
readonly transition: string
readonly initiator_id: string
readonly job: ProvisionerJob
}

// From codersdk/workspaces.go:57:6
// From codersdk/workspaces.go:55:6
export interface WorkspaceBuildsRequest extends Pagination {
readonly WorkspaceID: string
}

// From codersdk/workspaces.go:171:6
// From codersdk/workspaces.go:141:6
export interface WorkspaceFilter {
readonly OrganizationID: string
readonly Owner: string
}

// From codersdk/workspaceresources.go:21:6
// From codersdk/workspaceresources.go:23:6
export interface WorkspaceResource {
readonly id: string
readonly created_at: string
readonly job_id: string
readonly workspace_transition: WorkspaceTransition
// This is likely an enum in an external package ("github.com/coder/coder/coderd/database.WorkspaceTransition")
readonly workspace_transition: string
readonly type: string
readonly name: string
readonly agents?: WorkspaceAgent[]
}

// From codersdk/provisionerdaemons.go:30:6
export type LogLevel = "debug" | "error" | "info" | "trace" | "warn"

// From codersdk/provisionerdaemons.go:23:6
export type LogSource = "provisioner" | "provisioner_daemon"

// From codersdk/parameters.go:30:6
export type ParameterDestinationScheme = "environment_variable" | "none" | "provisioner_variable"

// From codersdk/parameters.go:14:6
// From codersdk/parameters.go:16:6
export type ParameterScope = "organization" | "template" | "user" | "workspace"

// From codersdk/parameters.go:23:6
export type ParameterSourceScheme = "data" | "none"

// From codersdk/parameters.go:38:6
export type ParameterTypeSystem = "hcl" | "none"

// From codersdk/provisionerdaemons.go:50:6
// From codersdk/provisionerdaemons.go:26:6
export type ProvisionerJobStatus = "canceled" | "canceling" | "failed" | "pending" | "running" | "succeeded"

// From codersdk/organizations.go:14:6
export type ProvisionerStorageMethod = "file"

// From codersdk/organizations.go:20:6
export type ProvisionerType = "echo" | "terraform"

// From codersdk/users.go:17:6
export type UserStatus = "active" | "suspended"

// From codersdk/workspaceresources.go:13:6
// From codersdk/workspaceresources.go:15:6
export type WorkspaceAgentStatus = "connected" | "connecting" | "disconnected"

// From codersdk/workspacebuilds.go:14:6
export type WorkspaceTransition = "delete" | "start" | "stop"
You are viewing a condensed version of this merge commit. You can view the full changes here.