- Notifications
You must be signed in to change notification settings - Fork909
fix: use minDisabled, maxDisabled for parameter validation#7755
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
10 commits Select commitHold shift + click to select a range
ff552ba fix: use MinDisabled, MaxDisabled for parameter validation
mtojek2059dd3 Merge branch 'main' into 7582-validation-min-max-fix
mtojekbded329 WIP
mtojekc7ab830 WIP
mtojek38b5d92 WIP
mtojek6d24ad6 Unit tests done
mtojek85a7bd3 make fmt
mtojek8cc120d Merge branch 'main' into 7582-validation-min-max-fix
mtojek3dc0474 Refactor the min-max condition
mtojek0976148 Merge branch 'main' into 7582-validation-min-max-fix
mtojekFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
28 changes: 15 additions & 13 deletionscodersdk/richparameters.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletionscodersdk/richparameters_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletiongo.mod
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletionsgo.sum
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
39 changes: 31 additions & 8 deletionsprovisioner/terraform/resources.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -483,8 +483,35 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string, rawParameterNa | ||
| if len(param.Validation) == 1 { | ||
| protoParam.ValidationRegex = param.Validation[0].Regex | ||
| protoParam.ValidationError = param.Validation[0].Error | ||
| validationAttributeValues, ok := resource.AttributeValues["validation"] | ||
| if ok { | ||
| validationAttributeValuesArr, ok := validationAttributeValues.([]interface{}) | ||
| if ok { | ||
| validationAttributeValuesMapStr, ok := validationAttributeValuesArr[0].(map[string]interface{}) | ||
| if ok { | ||
| // Backward compatibility with terraform-coder-plugin < v0.8.2: | ||
| // * "min_disabled" and "max_disabled" are not available yet | ||
| // * "min" and "max" are required to be specified together | ||
| if _, ok = validationAttributeValuesMapStr["min_disabled"]; !ok { | ||
| if param.Validation[0].Min != 0 || param.Validation[0].Max != 0 { | ||
| param.Validation[0].MinDisabled = false | ||
| param.Validation[0].MaxDisabled = false | ||
| } else { | ||
| param.Validation[0].MinDisabled = true | ||
| param.Validation[0].MaxDisabled = true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
mtojek marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| if !param.Validation[0].MaxDisabled { | ||
| protoParam.ValidationMax = PtrInt32(param.Validation[0].Max) | ||
| } | ||
| if !param.Validation[0].MinDisabled { | ||
| protoParam.ValidationMin = PtrInt32(param.Validation[0].Min) | ||
| } | ||
| protoParam.ValidationMonotonic = param.Validation[0].Monotonic | ||
| } | ||
| if len(param.Option) > 0 { | ||
| @@ -527,12 +554,8 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string, rawParameterNa | ||
| }, nil | ||
| } | ||
| func PtrInt32(number int) *int32 { | ||
| n := int32(number) | ||
| return &n | ||
| } | ||
77 changes: 77 additions & 0 deletionsprovisioner/terraform/resources_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletionsprovisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| terraform { | ||
| required_providers { | ||
| coder = { | ||
| source = "coder/coder" | ||
| version = "0.8.2" | ||
| } | ||
| } | ||
| } | ||
| data "coder_parameter" "number_example_min_max" { | ||
| name = "number_example_min_max" | ||
| type = "number" | ||
| default = 4 | ||
| validation { | ||
| min = 3 | ||
| max = 6 | ||
| } | ||
| } | ||
| data "coder_parameter" "number_example_min" { | ||
| name = "number_example_min" | ||
| type = "number" | ||
| default = 4 | ||
| validation { | ||
| min = 3 | ||
| } | ||
| } | ||
| data "coder_parameter" "number_example_min_zero" { | ||
| name = "number_example_min_zero" | ||
| type = "number" | ||
| default = 4 | ||
| validation { | ||
| min = 0 | ||
| } | ||
| } | ||
| data "coder_parameter" "number_example_max" { | ||
| name = "number_example_max" | ||
| type = "number" | ||
| default = 4 | ||
| validation { | ||
| max = 6 | ||
mtojek marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| } | ||
| } | ||
| data "coder_parameter" "number_example_max_zero" { | ||
| name = "number_example_max_zero" | ||
| type = "number" | ||
| default = -3 | ||
| validation { | ||
| max = 0 | ||
| } | ||
| } | ||
| data "coder_parameter" "number_example" { | ||
| name = "number_example" | ||
| type = "number" | ||
| default = 4 | ||
| } | ||
| resource "coder_agent" "dev" { | ||
| os = "windows" | ||
| arch = "arm64" | ||
| } | ||
| resource "null_resource" "dev" { | ||
| depends_on = [coder_agent.dev] | ||
| } | ||
36 changes: 36 additions & 0 deletions...ioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.dot
Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.