Add missing optionalities to generated request interfaces

code-asher · code-asher · commit f8f6125122cd · 2022-05-11T17:25:37.000-05:00
diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -31,7 +31,7 @@ type CreateTemplateVersionRequest struct {
 	Provisioner   database.ProvisionerType          `json:"provisioner" validate:"oneof=terraform echo,required"`
 	// ParameterValues allows for additional parameters to be provided
 	// during the dry-run provision stage.
-	ParameterValues []CreateParameterRequest `json:"parameter_values"`
+	ParameterValues []CreateParameterRequest `json:"parameter_values,omitempty"`
 }
 
 // CreateTemplateRequest provides options when creating a template.
@@ -45,7 +45,7 @@ type CreateTemplateRequest struct {
 	// template works. There is no reason the data-model cannot support
 	// empty templates, but it doesn't make sense for users.
 	VersionID       uuid.UUID                `json:"template_version_id" validate:"required"`
-	ParameterValues []CreateParameterRequest `json:"parameter_values"`
+	ParameterValues []CreateParameterRequest `json:"parameter_values,omitempty"`
 }
 
 // CreateWorkspaceRequest provides options for creating a new workspace.
@@ -54,7 +54,7 @@ type CreateWorkspaceRequest struct {
 	Name       string    `json:"name" validate:"username,required"`
 	// ParameterValues allows for additional parameters to be provided
 	// during the initial provision.
-	ParameterValues []CreateParameterRequest `json:"parameter_values"`
+	ParameterValues []CreateParameterRequest `json:"parameter_values,omitempty"`
 }
 
 func (c *Client) Organization(ctx context.Context, id uuid.UUID) (Organization, error) {
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -21,9 +21,9 @@ const (
 )
 
 type UsersRequest struct {
-	Search string `json:"search"`
+	Search string `json:"search,omitempty"`
 	// Filter users by status
-	Status string `json:"status"`
+	Status string `json:"status,omitempty"`
 	Pagination
 }
 
diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -31,9 +31,9 @@ type Workspace struct {
 
 // CreateWorkspaceBuildRequest provides options to update the latest workspace build.
 type CreateWorkspaceBuildRequest struct {
-	TemplateVersionID uuid.UUID                    `json:"template_version_id"`
+	TemplateVersionID uuid.UUID                    `json:"template_version_id,omitempty"`
 	Transition        database.WorkspaceTransition `json:"transition" validate:"oneof=create start stop delete,required"`
-	DryRun            bool                         `json:"dry_run"`
+	DryRun            bool                         `json:"dry_run,omitempty"`
 	ProvisionerState  []byte                       `json:"state,omitempty"`
 }
 
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -63,7 +63,7 @@ export interface CreateParameterRequest {
 export interface CreateTemplateRequest {
   readonly name: string
   readonly template_version_id: string
-  readonly parameter_values: CreateParameterRequest[]
+  readonly parameter_values?: CreateParameterRequest[]
 }
 
 // From codersdk/organizations.go:25:6
@@ -74,7 +74,7 @@ export interface CreateTemplateVersionRequest {
   readonly storage_source: string
   // This is likely an enum in an external package ("github.com/coder/coder/coderd/database.ProvisionerType")
   readonly provisioner: string
-  readonly parameter_values: CreateParameterRequest[]
+  readonly parameter_values?: CreateParameterRequest[]
 }
 
 // From codersdk/users.go:54:6
@@ -87,18 +87,18 @@ export interface CreateUserRequest {
 
 // From codersdk/workspaces.go:33:6
 export interface CreateWorkspaceBuildRequest {
-  readonly template_version_id: string
+  readonly template_version_id?: string
   // This is likely an enum in an external package ("github.com/coder/coder/coderd/database.WorkspaceTransition")
   readonly transition: string
-  readonly dry_run: boolean
+  readonly dry_run?: boolean
   readonly state?: string
 }
 
 // From codersdk/organizations.go:52:6
 export interface CreateWorkspaceRequest {
   readonly template_id: string
   readonly name: string
-  readonly parameter_values: CreateParameterRequest[]
+  readonly parameter_values?: CreateParameterRequest[]
 }
 
 // From codersdk/users.go:91:6
@@ -323,8 +323,8 @@ export interface UserRoles {
 
 // From codersdk/users.go:23:6
 export interface UsersRequest extends Pagination {
-  readonly search: string
-  readonly status: string
+  readonly search?: string
+  readonly status?: string
 }
 
 // From codersdk/workspaces.go:18:6
diff --git a/site/src/forms/CreateTemplateForm.tsx b/site/src/forms/CreateTemplateForm.tsx
@@ -55,7 +55,6 @@ export const CreateTemplateForm: React.FC<CreateTemplateFormProps> = ({
         storage_method: "file",
         storage_source: "hash",
         provisioner: req.provisioner,
-        parameter_values: [],
       })
     },
   })
diff --git a/site/src/forms/CreateWorkspaceForm.tsx b/site/src/forms/CreateWorkspaceForm.tsx
@@ -40,7 +40,6 @@ export const CreateWorkspaceForm: React.FC<CreateWorkspaceForm> = ({
       return onSubmit(organizationId, {
         template_id: template.id,
         name: name,
-        parameter_values: [],
       })
     },
   })

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ const (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`type UsersRequest struct {`
`24`		- Search string `json:"search"`
	`24`	+ Search string `json:"search,omitempty"`
`25`	`25`	`// Filter users by status`
`26`		- Status string `json:"status"`
	`26`	+ Status string `json:"status,omitempty"`
`27`	`27`	`Pagination`
`28`	`28`	`}`
`29`	`29`