Skip to content

Commit 2d79a97

Browse files
committed
fix param order
1 parent 43253f7 commit 2d79a97

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Diff for: provider/formtype.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ var formTypeTruthTable = map[string]map[bool][]ParameterFormType{
7878
// | `list(string)` | Y | | `radio` | |
7979
// | `list(string)` | N | | `tag-select` | |
8080
// | `list(string)` | Y | `multi-select` | `multi-select` | Option values will be `string` |
81-
func ValidateFormType(paramType string, optionCount int, specifiedFormType ParameterFormType) (ParameterFormType, string, error) {
81+
func ValidateFormType(paramType string, optionCount int, specifiedFormType ParameterFormType) (string, ParameterFormType, error) {
8282
allowed, ok := formTypeTruthTable[paramType][optionCount > 0]
8383
if !ok || len(allowed) == 0 {
84-
return specifiedFormType, paramType, xerrors.Errorf("value type %q is not supported for 'form_types'", paramType)
84+
return paramType, specifiedFormType, xerrors.Errorf("value type %q is not supported for 'form_types'", paramType)
8585
}
8686

8787
if specifiedFormType == ParameterFormTypeDefault {
@@ -90,15 +90,15 @@ func ValidateFormType(paramType string, optionCount int, specifiedFormType Param
9090
}
9191

9292
if !slices.Contains(allowed, specifiedFormType) {
93-
return specifiedFormType, paramType, xerrors.Errorf("value type %q is not supported for 'form_types'", paramType)
93+
return paramType, specifiedFormType, xerrors.Errorf("value type %q is not supported for 'form_types'", paramType)
9494
}
9595

9696
// Special case
9797
if paramType == "list(string)" && specifiedFormType == ParameterFormTypeMultiSelect {
98-
return ParameterFormTypeMultiSelect, "string", nil
98+
return "string", ParameterFormTypeMultiSelect, nil
9999
}
100100

101-
return specifiedFormType, paramType, nil
101+
return paramType, specifiedFormType, nil
102102
}
103103

104104
func toStrings[A ~string](l []A) []string {

Diff for: provider/parameter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func parameterDataSource() *schema.Resource {
154154

155155
// Validate options
156156
var optionType string
157-
parameter.FormType, optionType, err = ValidateFormType(parameter.Type, len(parameter.Option), parameter.FormType)
157+
optionType, parameter.FormType, err = ValidateFormType(parameter.Type, len(parameter.Option), parameter.FormType)
158158

159159
if len(parameter.Option) > 0 {
160160
names := map[string]interface{}{}

0 commit comments

Comments
 (0)