Send right variable values

BrunoQuaresma · BrunoQuaresma · commit 772a0aad3f6a · 2023-03-02T18:53:26.000Z
diff --git a/site/src/pages/CreateTemplatePage/VariableInput.tsx b/site/src/pages/CreateTemplatePage/VariableInput.tsx
@@ -18,7 +18,10 @@ const VariableLabel: React.FC<{ variable: TemplateVersionVariable }> = ({
 
   return (
     <label htmlFor={variable.name}>
-      <span className={styles.labelName}>var.{variable.name}</span>
+      <span className={styles.labelName}>
+        var.{variable.name}
+        {!variable.required && " (optional)"}
+      </span>
       <span className={styles.labelDescription}>{variable.description}</span>
     </label>
   )
@@ -91,12 +94,20 @@ const VariableField: React.FC<VariableInputProps> = ({
       size="small"
       disabled={disabled}
       placeholder={variable.sensitive ? "" : variable.default_value}
+      required={variable.required}
       defaultValue={
         variable.sensitive ? "" : defaultValue ?? variable.default_value
       }
       onChange={(event) => {
         onChange(event.target.value)
       }}
+      type={
+        variable.type === "number"
+          ? "number"
+          : variable.sensitive
+          ? "password"
+          : "string"
+      }
     />
   )
 }
diff --git a/site/src/xServices/createTemplate/createTemplateXService.ts b/site/src/xServices/createTemplate/createTemplateXService.ts
@@ -95,7 +95,7 @@ export const createTemplateMachine =
           checkParametersAndVariables: {
             data: {
               parameters?: ParameterSchema[]
-              variables: TemplateVersionVariable[]
+              variables?: TemplateVersionVariable[]
             }
           }
           createTemplate: {
@@ -216,6 +216,7 @@ export const createTemplateMachine =
                   actions: ["assignError"],
                 },
               },
+              tags: ["submitting"],
             },
             promptParametersAndVariables: {
               on: {
@@ -348,6 +349,7 @@ export const createTemplateMachine =
             file_id: version.job.file_id,
             provisioner: "terraform",
             parameter_values: parameterValues,
+            user_variable_values: templateData.user_variable_values,
             tags: {},
           })
         },
@@ -373,18 +375,27 @@ export const createTemplateMachine =
             throw new Error("Version not defined")
           }
 
+          let promiseParameter: Promise<ParameterSchema[]> | undefined =
+            undefined
+          let promiseVariables: Promise<TemplateVersionVariable[]> | undefined =
+            undefined
+
           if (isMissingParameter(version)) {
-            const [parameters, variables] = await Promise.all([
-              getTemplateVersionSchema(version.id),
-              getTemplateVersionVariables(version.id),
-            ])
+            promiseParameter = getTemplateVersionSchema(version.id)
+          }
 
-            return { parameters, variables }
+          if (isMissingVariables(version)) {
+            promiseVariables = getTemplateVersionVariables(version.id)
           }
 
+          const [parameters, variables] = await Promise.all([
+            promiseParameter,
+            promiseVariables,
+          ])
+
           return {
-            parameters: undefined,
-            variables: await getTemplateVersionVariables(version.id),
+            parameters,
+            variables,
           }
         },
         createTemplate: async ({ organizationId, version, templateData }) => {
@@ -445,10 +456,12 @@ export const createTemplateMachine =
         hasFile: ({ file }) => Boolean(file),
         hasFailed: (_, { data }) =>
           Boolean(
-            data.job.status === "failed" && !isMissingParameter(data), // This should not be considered as a "hard" failure
+            data.job.status === "failed" &&
+              !isMissingParameter(data) &&
+              !isMissingVariables(data),
           ),
         hasNoParametersOrVariables: (_, { data }) =>
-          data.parameters === undefined && data.variables.length === 0,
+          data.parameters === undefined && data.variables === undefined,
       },
     },
   )
@@ -458,3 +471,10 @@ const isMissingParameter = (version: TemplateVersion) => {
     version.job.error && version.job.error.includes("missing parameter"),
   )
 }
+
+const isMissingVariables = (version: TemplateVersion) => {
+  return Boolean(
+    version.job.error &&
+      version.job.error.includes("required template variables"),
+  )
+}
