Rename variable

AbhineetJain · AbhineetJain · commit 8a075f45fa07 · 2022-05-20T03:47:44.000Z
diff --git a/cli/create.go b/cli/create.go
@@ -117,11 +117,11 @@ func create() *cobra.Command {
 				return err
 			}
 
-			// parameterMap can be nil if the file is not specified or invalid
-			var parameterMap map[string]string
+			// parameterMapFromFile can be nil if the file is not specified or invalid
+			var parameterMapFromFile map[string]string
 			if parameterFile != "" {
 				_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("Attempting to read the variables from the parameter file.")+"\r\n")
-				parameterMap, err = createParameterMapFromFile(parameterFile)
+				parameterMapFromFile, err = createParameterMapFromFile(parameterFile)
 				if err != nil {
 					return err
 				}
@@ -137,7 +137,7 @@ func create() *cobra.Command {
 					_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("This template has customizable parameters. Values can be changed after create, but may have unintended side effects (like data loss).")+"\r\n")
 					disclaimerPrinted = true
 				}
-				parameterValue, err := getParameterValueFromMapOrInput(cmd, parameterMap, parameterSchema)
+				parameterValue, err := getParameterValueFromMapOrInput(cmd, parameterMapFromFile, parameterSchema)
 				if err != nil {
 					return err
 				}
diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -187,17 +187,17 @@ func createValidTemplateVersion(cmd *cobra.Command, client *codersdk.Client, org
 		}
 		_, _ = 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")
 
-		// parameterMap can be nil if the file is not specified or invalid
-		var parameterMap map[string]string
+		// parameterMapFromFile can be nil if the file is not specified or invalid
+		var parameterMapFromFile map[string]string
 		if parameterFile != "" {
 			_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("Attempting to read the variables from the parameter file.")+"\r\n")
-			parameterMap, err = createParameterMapFromFile(parameterFile)
+			parameterMapFromFile, err = createParameterMapFromFile(parameterFile)
 			if err != nil {
 				return nil, nil, err
 			}
 		}
 		for _, parameterSchema := range missingSchemas {
-			parameterValue, err := getParameterValueFromMapOrInput(cmd, parameterMap, parameterSchema)
+			parameterValue, err := getParameterValueFromMapOrInput(cmd, parameterMapFromFile, parameterSchema)
 			if err != nil {
 				return nil, nil, err
 			}

Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,11 @@ func create() *cobra.Command {`
`117`	`117`	`return err`
`118`	`118`	`}`
`119`	`119`
`120`		`- // parameterMap can be nil if the file is not specified or invalid`
`121`		`- var parameterMap map[string]string`
	`120`	`+ // parameterMapFromFile can be nil if the file is not specified or invalid`
	`121`	`+ var parameterMapFromFile map[string]string`
`122`	`122`	`if parameterFile != "" {`
`123`	`123`	`_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("Attempting to read the variables from the parameter file.")+"\r\n")`
`124`		`- parameterMap, err = createParameterMapFromFile(parameterFile)`
	`124`	`+ parameterMapFromFile, err = createParameterMapFromFile(parameterFile)`
`125`	`125`	`if err != nil {`
`126`	`126`	`return err`
`127`	`127`	`}`
`@@ -137,7 +137,7 @@ func create() *cobra.Command {`
`137`	`137`	`_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("This template has customizable parameters. Values can be changed after create, but may have unintended side effects (like data loss).")+"\r\n")`
`138`	`138`	`disclaimerPrinted = true`
`139`	`139`	`}`
`140`		`- parameterValue, err := getParameterValueFromMapOrInput(cmd, parameterMap, parameterSchema)`
	`140`	`+ parameterValue, err := getParameterValueFromMapOrInput(cmd, parameterMapFromFile, parameterSchema)`
`141`	`141`	`if err != nil {`
`142`	`142`	`return err`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,17 +187,17 @@ func createValidTemplateVersion(cmd cobra.Command, client codersdk.Client, org`
`187`	`187`	`}`
`188`	`188`	`_, _ = 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")`
`189`	`189`
`190`		`- // parameterMap can be nil if the file is not specified or invalid`
`191`		`- var parameterMap map[string]string`
	`190`	`+ // parameterMapFromFile can be nil if the file is not specified or invalid`
	`191`	`+ var parameterMapFromFile map[string]string`
`192`	`192`	`if parameterFile != "" {`
`193`	`193`	`_, _ = fmt.Fprintln(cmd.OutOrStdout(), cliui.Styles.Paragraph.Render("Attempting to read the variables from the parameter file.")+"\r\n")`
`194`		`- parameterMap, err = createParameterMapFromFile(parameterFile)`
	`194`	`+ parameterMapFromFile, err = createParameterMapFromFile(parameterFile)`
`195`	`195`	`if err != nil {`
`196`	`196`	`return nil, nil, err`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`	`for _, parameterSchema := range missingSchemas {`
`200`		`- parameterValue, err := getParameterValueFromMapOrInput(cmd, parameterMap, parameterSchema)`
	`200`	`+ parameterValue, err := getParameterValueFromMapOrInput(cmd, parameterMapFromFile, parameterSchema)`
`201`	`201`	`if err != nil {`
`202`	`202`	`return nil, nil, err`
`203`	`203`	`}`