mirror of
https://github.com/coder/coder.git
synced 2025-07-13 21:36:50 +00:00
feat: support partial parameter files (#5392)
Fixes https://github.com/coder/coder/issues/5390
This commit is contained in:
@ -232,13 +232,16 @@ func TestCreate(t *testing.T) {
|
|||||||
ProvisionApply: echo.ProvisionComplete,
|
ProvisionApply: echo.ProvisionComplete,
|
||||||
ProvisionPlan: echo.ProvisionComplete,
|
ProvisionPlan: echo.ProvisionComplete,
|
||||||
})
|
})
|
||||||
|
|
||||||
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
|
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
|
||||||
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
|
_ = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
|
||||||
|
|
||||||
tempDir := t.TempDir()
|
tempDir := t.TempDir()
|
||||||
removeTmpDirUntilSuccessAfterTest(t, tempDir)
|
removeTmpDirUntilSuccessAfterTest(t, tempDir)
|
||||||
parameterFile, _ := os.CreateTemp(tempDir, "testParameterFile*.yaml")
|
parameterFile, _ := os.CreateTemp(tempDir, "testParameterFile*.yaml")
|
||||||
_, _ = parameterFile.WriteString("zone: \"bananas\"")
|
_, _ = parameterFile.WriteString("username: \"boingo\"")
|
||||||
cmd, root := clitest.New(t, "create", "my-workspace", "--template", template.Name, "--parameter-file", parameterFile.Name())
|
|
||||||
|
cmd, root := clitest.New(t, "create", "", "--parameter-file", parameterFile.Name())
|
||||||
clitest.SetupConfig(t, client, root)
|
clitest.SetupConfig(t, client, root)
|
||||||
doneChan := make(chan struct{})
|
doneChan := make(chan struct{})
|
||||||
pty := ptytest.New(t)
|
pty := ptytest.New(t)
|
||||||
@ -247,11 +250,32 @@ func TestCreate(t *testing.T) {
|
|||||||
go func() {
|
go func() {
|
||||||
defer close(doneChan)
|
defer close(doneChan)
|
||||||
err := cmd.Execute()
|
err := cmd.Execute()
|
||||||
assert.EqualError(t, err, "Parameter value absent in parameter file for \"region\"!")
|
assert.NoError(t, err)
|
||||||
}()
|
}()
|
||||||
|
matches := []struct {
|
||||||
|
match string
|
||||||
|
write string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
match: "Specify a name",
|
||||||
|
write: "my-workspace",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
match: fmt.Sprintf("Enter a value (default: %q):", defaultValue),
|
||||||
|
write: "bingo",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
match: "Confirm create?",
|
||||||
|
write: "yes",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, m := range matches {
|
||||||
|
pty.ExpectMatch(m.match)
|
||||||
|
pty.WriteLine(m.write)
|
||||||
|
}
|
||||||
<-doneChan
|
<-doneChan
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("FailedDryRun", func(t *testing.T) {
|
t.Run("FailedDryRun", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
|
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
|
||||||
|
@ -36,18 +36,21 @@ func createParameterMapFromFile(parameterFile string) (map[string]string, error)
|
|||||||
return nil, xerrors.Errorf("Parameter file name is not specified")
|
return nil, xerrors.Errorf("Parameter file name is not specified")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns a parameter value from a given map, if the map exists, else takes input from the user.
|
// Returns a parameter value from a given map, if the map does not exist or does not contain the item, it takes input from the user.
|
||||||
// Throws an error if the map exists but does not include a value for the parameter.
|
// Throws an error if there are any errors with the users input.
|
||||||
func getParameterValueFromMapOrInput(cmd *cobra.Command, parameterMap map[string]string, parameterSchema codersdk.ParameterSchema) (string, error) {
|
func getParameterValueFromMapOrInput(cmd *cobra.Command, parameterMap map[string]string, parameterSchema codersdk.ParameterSchema) (string, error) {
|
||||||
var parameterValue string
|
var parameterValue string
|
||||||
|
var err error
|
||||||
if parameterMap != nil {
|
if parameterMap != nil {
|
||||||
var ok bool
|
var ok bool
|
||||||
parameterValue, ok = parameterMap[parameterSchema.Name]
|
parameterValue, ok = parameterMap[parameterSchema.Name]
|
||||||
if !ok {
|
if !ok {
|
||||||
return "", xerrors.Errorf("Parameter value absent in parameter file for %q!", parameterSchema.Name)
|
parameterValue, err = cliui.ParameterSchema(cmd, parameterSchema)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
var err error
|
|
||||||
parameterValue, err = cliui.ParameterSchema(cmd, parameterSchema)
|
parameterValue, err = cliui.ParameterSchema(cmd, parameterSchema)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
|
@ -187,14 +187,25 @@ func TestTemplateCreate(t *testing.T) {
|
|||||||
match string
|
match string
|
||||||
write string
|
write string
|
||||||
}{
|
}{
|
||||||
{match: "Create and upload", write: "yes"},
|
{
|
||||||
|
match: "Create and upload",
|
||||||
|
write: "yes",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
match: "Enter a value:",
|
||||||
|
write: "bingo",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
match: "Confirm create?",
|
||||||
|
write: "yes",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
for _, m := range matches {
|
for _, m := range matches {
|
||||||
pty.ExpectMatch(m.match)
|
pty.ExpectMatch(m.match)
|
||||||
pty.WriteLine(m.write)
|
pty.WriteLine(m.write)
|
||||||
}
|
}
|
||||||
|
|
||||||
require.EqualError(t, <-execDone, "Parameter value absent in parameter file for \"region\"!")
|
require.NoError(t, <-execDone)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Recreate template with same name (create, delete, create)", func(t *testing.T) {
|
t.Run("Recreate template with same name (create, delete, create)", func(t *testing.T) {
|
||||||
|
Reference in New Issue
Block a user