synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Disallow using legacy params with rich params (#5974)

Browse Source 
* feat: Disallow using legacy params with rich params

* Fix

* nolint
This commit is contained in:
Marcin Tojek
2023-02-02 16:44:57 +01:00
committed by GitHub
parent 01ebfdc9dd
commit 271d68c862
5 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cli/create.go
View File

@ -194,6 +194,21 @@ type buildParameters struct {
// Any missing params will be prompted to the user. It supports legacy and rich parameters.
func prepWorkspaceBuild(cmd *cobra.Command, client *codersdk.Client, args prepWorkspaceBuildArgs) (*buildParameters, error) {
ctx := cmd.Context()
var useRichParameters bool
if len(args.ExistingRichParams) > 0 && len(args.RichParameterFile) > 0 {
useRichParameters = true
}
var useLegacyParameters bool
if len(args.ExistingParams) > 0 || len(args.ParameterFile) > 0 {
useLegacyParameters = true
}
if useRichParameters && useLegacyParameters {
return nil, xerrors.Errorf("Rich parameters can't be used together with legacy parameters.")
}
templateVersion, err := client.TemplateVersion(ctx, args.Template.ActiveVersionID)
if err != nil {
return nil, err