Skip to content

feat!: Validate monotonic numbers for rich parameters #6046

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 10 commits into from
Feb 7, 2023
Merged

feat!: Validate monotonic numbers for rich parameters #6046

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
45d5261
Database changes
mtojek Feb 6, 2023
7d6314e
protobuf
mtojek Feb 6, 2023
88495f2
Fix: docs
mtojek Feb 6, 2023
6715d27
workspaces_test
mtojek Feb 6, 2023
c1097ee
Validation in coderd
mtojek Feb 6, 2023
8426ef2
Fix: resources
mtojek Feb 6, 2023
ef470b2
omitempty
mtojek Feb 6, 2023
2a65b72
UI changes
mtojek Feb 6, 2023
4b34d1e
UI tests
mtojek Feb 6, 2023
0c5e49a
fix
mtojek Feb 6, 2023
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
protobuf
  • Loading branch information
@mtojek
mtojek committed Feb 6, 2023
commit 7d6314e76b591cf69f5a33321ca1618e9051e39c
4 changes: 2 additions & 2 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 12 additions & 11 deletions codersdk/templateversions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,18 @@ type TemplateVersion struct {

// TemplateVersionParameter represents a parameter for a template version.
type TemplateVersionParameter struct {
Name string `json:"name"`
Description string `json:"description"`
Type string `json:"type"`
Mutable bool `json:"mutable"`
DefaultValue string `json:"default_value"`
Icon string `json:"icon"`
Options []TemplateVersionParameterOption `json:"options"`
ValidationError string `json:"validation_error"`
ValidationRegex string `json:"validation_regex"`
ValidationMin int32 `json:"validation_min"`
ValidationMax int32 `json:"validation_max"`
Name string `json:"name"`
Description string `json:"description"`
Type string `json:"type"`
Mutable bool `json:"mutable"`
DefaultValue string `json:"default_value"`
Icon string `json:"icon"`
Options []TemplateVersionParameterOption `json:"options"`
ValidationError string `json:"validation_error"`
ValidationRegex string `json:"validation_regex"`
ValidationMin int32 `json:"validation_min"`
ValidationMax int32 `json:"validation_max"`
ValidationMonotonic string `json:"validation_monotonic"`
}

// TemplateVersionParameterOption represents a selectable option for a template parameter.
Expand Down
475 changes: 243 additions & 232 deletions provisionersdk/proto/provisioner.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions provisionersdk/proto/provisioner.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ message RichParameter {
string validation_error = 9;
int32 validation_min = 10;
int32 validation_max = 11;
string validation_monotonic = 12;
}

// RichParameterValue holds the key/value mapping of a parameter.
Expand Down
1 change: 1 addition & 0 deletions site/src/api/typesGenerated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,7 @@ export interface TemplateVersionParameter {
readonly validation_regex: string
readonly validation_min: number
readonly validation_max: number
readonly validation_monotonic: string
}

// From codersdk/templateversions.go
Expand Down
1 change: 1 addition & 0 deletions site/src/components/RichParameterInput/RichParameterInput.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const createTemplateVersionParameter = (
validation_regex: "",
validation_min: 0,
validation_max: 0,
validation_monotonic: "",

...partial,
}
Expand Down
4 changes: 4 additions & 0 deletions site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,7 @@ export const MockTemplateVersionParameter1: TypesGen.TemplateVersionParameter =
validation_regex: "",
validation_min: 0,
validation_max: 0,
validation_monotonic: "",
}

export const MockTemplateVersionParameter2: TypesGen.TemplateVersionParameter =
Expand All @@ -658,6 +659,7 @@ export const MockTemplateVersionParameter2: TypesGen.TemplateVersionParameter =
validation_regex: "",
validation_min: 1,
validation_max: 3,
validation_monotonic: "",
}

export const MockTemplateVersionParameter3: TypesGen.TemplateVersionParameter =
Expand All @@ -673,6 +675,7 @@ export const MockTemplateVersionParameter3: TypesGen.TemplateVersionParameter =
validation_regex: "^[a-z]{3}$",
validation_min: 0,
validation_max: 0,
validation_monotonic: "",
}

export const MockTemplateVersionParameter4: TypesGen.TemplateVersionParameter =
Expand All @@ -688,6 +691,7 @@ export const MockTemplateVersionParameter4: TypesGen.TemplateVersionParameter =
validation_regex: "",
validation_min: 0,
validation_max: 0,
validation_monotonic: "",
}

// requests the MockWorkspace
Expand Down