Add "--always-prompt" flag and logging info

Emyrk · Emyrk · commit fa9b230f0923 · 2022-06-17T09:55:28.000-05:00
diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -229,15 +229,6 @@ func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVers
 		sort.Slice(parameterSchemas, func(i, j int) bool {
 			return parameterSchemas[i].Name < parameterSchemas[j].Name
 		})
-		missingSchemas := make([]codersdk.ParameterSchema, 0)
-		for _, parameterSchema := range parameterSchemas {
-			_, ok := valuesBySchemaID[parameterSchema.ID.String()]
-			if ok {
-				continue
-			}
-			missingSchemas = append(missingSchemas, parameterSchema)
-		}
-		_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("This template has required variables! They are scoped to the template, and not viewable after being set.")+"\r\n")
 
 		// parameterMapFromFile can be nil if parameter file is not specified
 		var parameterMapFromFile map[string]string
@@ -248,15 +239,39 @@ func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVers
 				return nil, nil, err
 			}
 		}
-		for _, parameterSchema := range missingSchemas {
-			// If the value is in the file, skip trying to reuse the param
+
+		// pulled params come from the last template version
+		pulled := make([]string, 0)
+		missingSchemas := make([]codersdk.ParameterSchema, 0)
+		for _, parameterSchema := range parameterSchemas {
+			_, ok := valuesBySchemaID[parameterSchema.ID.String()]
+			if ok {
+				continue
+			}
+
+			// The file values are handled below. So don't handle them here,
+			// just check if a value is present in the file.
 			_, fileOk := parameterMapFromFile[parameterSchema.Name]
 			if inherit, ok := lastParameterValues[parameterSchema.Name]; ok && !fileOk {
+				// If the value is not in the param file, and can be pulled from the last template version,
+				// then don't mark it as missing.
 				parameters = append(parameters, codersdk.CreateParameterRequest{
 					CopyFromParameter: inherit.ID,
 				})
+				pulled = append(pulled, fmt.Sprintf("%q", parameterSchema.Name))
 				continue
 			}
+
+			missingSchemas = append(missingSchemas, parameterSchema)
+		}
+		_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("This template has required variables! They are scoped to the template, and not viewable after being set."))
+		if len(pulled) > 0 {
+			_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render(fmt.Sprintf("The following parameter values are being pulled from the latest template version: %s.", strings.Join(pulled, ", "))))
+			_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("Use \"--always-prompt\" flag to change the values."))
+		}
+		_, _ = fmt.Fprint(cmd.OutOrStdout(), "\r\n")
+
+		for _, parameterSchema := range missingSchemas {
 			parameterValue, err := getParameterValueFromMapOrInput(cmd, parameterMapFromFile, parameterSchema)
 			if err != nil {
 				return nil, nil, err
diff --git a/cli/templateupdate.go b/cli/templateupdate.go
@@ -20,6 +20,7 @@ func templateUpdate() *cobra.Command {
 		directory     string
 		provisioner   string
 		parameterFile string
+		alwaysPrompt  bool
 	)
 
 	cmd := &cobra.Command{
@@ -73,7 +74,7 @@ func templateUpdate() *cobra.Command {
 				FileHash:        resp.Hash,
 				ParameterFile:   parameterFile,
 				Template:        &template,
-				ReuseParameters: true,
+				ReuseParameters: !alwaysPrompt,
 			})
 			if err != nil {
 				return err
@@ -107,6 +108,7 @@ func templateUpdate() *cobra.Command {
 	cmd.Flags().StringVarP(&directory, "directory", "d", currentDirectory, "Specify the directory to create from")
 	cmd.Flags().StringVarP(&provisioner, "test.provisioner", "", "terraform", "Customize the provisioner backend")
 	cmd.Flags().StringVarP(&parameterFile, "parameter-file", "", "", "Specify a file path with parameter values.")
+	cmd.Flags().BoolVar(&alwaysPrompt, "always-prompt", false, "Always prompt all parameters. Does not pull parameter values from active template version")
 	cliui.AllowSkipPrompt(cmd)
 	// This is for testing!
 	err := cmd.Flags().MarkHidden("test.provisioner")
