Skip to content

Commit 4616499

Browse files
EmyrkEmyrk
authored
chore: Reuse ComputedParmeter, remove duplicated codersdk type (#2477)
* chore: Reuse ComputedParmeter instead of custom type
1 parent 0b6efce commit 4616499

File tree

4 files changed

+21
-37
lines changed

4 files changed

+21
-37
lines changed

‎cli/templatecreate.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVers
221221
}
222222

223223
if provisionerd.IsMissingParameterError(version.Job.Error) {
224-
valuesBySchemaID := map[string]codersdk.TemplateVersionParameter{}
224+
valuesBySchemaID := map[string]codersdk.ComputedParameter{}
225225
for _, parameterValue := range parameterValues {
226226
valuesBySchemaID[parameterValue.SchemaID.String()] = parameterValue
227227
}

‎codersdk/parameters.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ const (
4141
ParameterTypeSystemHCL ParameterTypeSystem = "hcl"
4242
)
4343

44+
type ComputedParameter struct {
45+
Parameter
46+
SourceValue string `json:"source_value"`
47+
SchemaID uuid.UUID `json:"schema_id"`
48+
DefaultSourceValue bool `json:"default_source_value"`
49+
}
50+
4451
// Parameter represents a set value for the scope.
4552
type Parameter struct {
4653
ID uuid.UUID `json:"id"`

‎codersdk/templateversions.go‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,6 @@ type TemplateVersion struct {
2222
Readme string `json:"readme"`
2323
}
2424

25-
// TemplateVersionParameter represents a computed parameter value.
26-
type TemplateVersionParameter struct {
27-
ID uuid.UUID `json:"id"`
28-
CreatedAt time.Time `json:"created_at"`
29-
UpdatedAt time.Time `json:"updated_at"`
30-
Scope ParameterScope `json:"scope"`
31-
ScopeID uuid.UUID `json:"scope_id"`
32-
Name string `json:"name"`
33-
SourceScheme ParameterSourceScheme `json:"source_scheme"`
34-
SourceValue string `json:"source_value"`
35-
DestinationScheme ParameterDestinationScheme `json:"destination_scheme"`
36-
SchemaID uuid.UUID `json:"schema_id"`
37-
DefaultSourceValue bool `json:"default_source_value"`
38-
}
39-
4025
// TemplateVersion returns a template version by ID.
4126
func (c *Client) TemplateVersion(ctx context.Context, id uuid.UUID) (TemplateVersion, error) {
4227
res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/templateversions/%s", id), nil)
@@ -79,7 +64,7 @@ func (c *Client) TemplateVersionSchema(ctx context.Context, version uuid.UUID) (
7964
}
8065

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

‎site/src/api/typesGenerated.ts‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ export interface BuildInfoResponse {
3030
readonly version: string
3131
}
3232

33+
// From codersdk/parameters.go:44:6
34+
export interface ComputedParameter extends Parameter {
35+
readonly source_value: string
36+
readonly schema_id: string
37+
readonly default_source_value: boolean
38+
}
39+
3340
// From codersdk/users.go:42:6
3441
export interface CreateFirstUserRequest {
3542
readonly email: string
@@ -49,7 +56,7 @@ export interface CreateOrganizationRequest {
4956
readonly name: string
5057
}
5158

52-
// From codersdk/parameters.go:80:6
59+
// From codersdk/parameters.go:87:6
5360
export interface CreateParameterRequest {
5461
readonly copy_from_parameter?: string
5562
readonly name: string
@@ -68,7 +75,7 @@ export interface CreateTemplateRequest {
6875
readonly min_autostart_interval_ms?: number
6976
}
7077

71-
// From codersdk/templateversions.go:121:6
78+
// From codersdk/templateversions.go:106:6
7279
export interface CreateTemplateVersionDryRunRequest {
7380
readonly WorkspaceName: string
7481
readonly ParameterValues: CreateParameterRequest[]
@@ -161,7 +168,7 @@ export interface Pagination {
161168
readonly offset?: number
162169
}
163170

164-
// From codersdk/parameters.go:45:6
171+
// From codersdk/parameters.go:52:6
165172
export interface Parameter {
166173
readonly id: string
167174
readonly created_at: string
@@ -173,7 +180,7 @@ export interface Parameter {
173180
readonly destination_scheme: ParameterDestinationScheme
174181
}
175182

176-
// From codersdk/parameters.go:56:6
183+
// From codersdk/parameters.go:63:6
177184
export interface ParameterSchema {
178185
readonly id: string
179186
readonly created_at: string
@@ -265,21 +272,6 @@ export interface TemplateVersion {
265272
readonly readme: string
266273
}
267274

268-
// From codersdk/templateversions.go:26:6
269-
export interface TemplateVersionParameter {
270-
readonly id: string
271-
readonly created_at: string
272-
readonly updated_at: string
273-
readonly scope: ParameterScope
274-
readonly scope_id: string
275-
readonly name: string
276-
readonly source_scheme: ParameterSourceScheme
277-
readonly source_value: string
278-
readonly destination_scheme: ParameterDestinationScheme
279-
readonly schema_id: string
280-
readonly default_source_value: boolean
281-
}
282-
283275
// From codersdk/templates.go:100:6
284276
export interface TemplateVersionsByTemplateRequest extends Pagination {
285277
readonly template_id: string

0 commit comments

Comments
 (0)