Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore: Reuse ComputedParmeter, remove duplicated codersdk type #2477

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 3 commits into from
Jun 17, 2022
Merged

chore: Reuse ComputedParmeter, remove duplicated codersdk type #2477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b099fde
chore: Reuse ComputedParmeter instead of custom type
Emyrk Jun 17, 2022
cd87f0c
fixup! chore: Reuse ComputedParmeter instead of custom type
Emyrk Jun 17, 2022
17e5445
Make gen
Emyrk Jun 17, 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
2 changes: 1 addition & 1 deletion cli/templatecreate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVers
}

if provisionerd.IsMissingParameterError(version.Job.Error) {
valuesBySchemaID := map[string]codersdk.TemplateVersionParameter{}
valuesBySchemaID := map[string]codersdk.ComputedParameter{}
for _, parameterValue := range parameterValues {
valuesBySchemaID[parameterValue.SchemaID.String()] = parameterValue
}
Expand Down
7 changes: 7 additions & 0 deletions codersdk/parameters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ const (
ParameterTypeSystemHCL ParameterTypeSystem = "hcl"
)

type ComputedParameter struct {
Parameter
SourceValue string `json:"source_value"`
SchemaID uuid.UUID `json:"schema_id"`
DefaultSourceValue bool `json:"default_source_value"`
}

// Parameter represents a set value for the scope.
type Parameter struct {
ID uuid.UUID `json:"id"`
Expand Down
19 changes: 2 additions & 17 deletions codersdk/templateversions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,6 @@ type TemplateVersion struct {
Readme string `json:"readme"`
}

// TemplateVersionParameter represents a computed parameter value.
type TemplateVersionParameter struct {
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"`
SourceValue string `json:"source_value"`
DestinationScheme ParameterDestinationScheme `json:"destination_scheme"`
SchemaID uuid.UUID `json:"schema_id"`
DefaultSourceValue bool `json:"default_source_value"`
}

// TemplateVersion returns a template version by ID.
func (c *Client) TemplateVersion(ctx context.Context, id uuid.UUID) (TemplateVersion, error) {
res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/templateversions/%s", id), nil)
Expand Down Expand Up @@ -79,7 +64,7 @@ func (c *Client) TemplateVersionSchema(ctx context.Context, version uuid.UUID) (
}

// TemplateVersionParameters returns computed parameters for a template version.
func (c *Client) TemplateVersionParameters(ctx context.Context, version uuid.UUID) ([]TemplateVersionParameter, error) {
func (c *Client) TemplateVersionParameters(ctx context.Context, version uuid.UUID) ([]ComputedParameter, error) {
res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/templateversions/%s/parameters", version), nil)
if err != nil {
return nil, err
Expand All @@ -88,7 +73,7 @@ func (c *Client) TemplateVersionParameters(ctx context.Context, version uuid.UUI
if res.StatusCode != http.StatusOK {
return nil, readBodyAsError(res)
}
var params []TemplateVersionParameter
var params []ComputedParameter
return params, json.NewDecoder(res.Body).Decode(&params)
}

Expand Down
30 changes: 11 additions & 19 deletions site/src/api/typesGenerated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ export interface BuildInfoResponse {
readonly version: string
}

// From codersdk/parameters.go:44:6
export interface ComputedParameter extends Parameter {
readonly source_value: string
readonly schema_id: string
readonly default_source_value: boolean
}

// From codersdk/users.go:42:6
export interface CreateFirstUserRequest {
readonly email: string
Expand All @@ -49,7 +56,7 @@ export interface CreateOrganizationRequest {
readonly name: string
}

// From codersdk/parameters.go:80:6
// From codersdk/parameters.go:87:6
export interface CreateParameterRequest {
readonly copy_from_parameter?: string
readonly name: string
Expand All @@ -68,7 +75,7 @@ export interface CreateTemplateRequest {
readonly min_autostart_interval_ms?: number
}

// From codersdk/templateversions.go:121:6
// From codersdk/templateversions.go:106:6
export interface CreateTemplateVersionDryRunRequest {
readonly WorkspaceName: string
readonly ParameterValues: CreateParameterRequest[]
Expand Down Expand Up @@ -161,7 +168,7 @@ export interface Pagination {
readonly offset?: number
}

// From codersdk/parameters.go:45:6
// From codersdk/parameters.go:52:6
export interface Parameter {
readonly id: string
readonly created_at: string
Expand All @@ -173,7 +180,7 @@ export interface Parameter {
readonly destination_scheme: ParameterDestinationScheme
}

// From codersdk/parameters.go:56:6
// From codersdk/parameters.go:63:6
export interface ParameterSchema {
readonly id: string
readonly created_at: string
Expand Down Expand Up @@ -265,21 +272,6 @@ export interface TemplateVersion {
readonly readme: string
}

// From codersdk/templateversions.go:26:6
export interface TemplateVersionParameter {
readonly id: string
readonly created_at: string
readonly updated_at: string
readonly scope: ParameterScope
readonly scope_id: string
readonly name: string
readonly source_scheme: ParameterSourceScheme
readonly source_value: string
readonly destination_scheme: ParameterDestinationScheme
readonly schema_id: string
readonly default_source_value: boolean
}

// From codersdk/templates.go:100:6
export interface TemplateVersionsByTemplateRequest extends Pagination {
readonly template_id: string
Expand Down