Skip to content

chore: enable terraform provisioners in e2e by default #13134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
May 8, 2024
Merged

chore: enable terraform provisioners in e2e by default #13134

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c810759
make gen
Emyrk May 1, 2024
5294740
add icon to health provisioner page for prov type
Emyrk May 1, 2024
ae89373
update golden files
Emyrk May 1, 2024
e12e721
update golden files
Emyrk May 1, 2024
f4dbfb5
make gen
Emyrk May 2, 2024
2a09af3
update golden files
Emyrk May 2, 2024
736df67
remove ui pills for provisioners on health page
Emyrk May 2, 2024
f104148
remove unused import
Emyrk May 2, 2024
e82b2c3
chore: terraform provisioners enabled in e2e by default
Emyrk May 2, 2024
de3f81d
fixup config
Emyrk May 2, 2024
8fdaf2c
begin work on terraform e2e test
Emyrk May 2, 2024
f4d7c0d
update import order
Emyrk May 2, 2024
50501e8
create e2e terraform test with docker template
Emyrk May 3, 2024
c25f6c4
Run docker e2e in CI once
Emyrk May 3, 2024
604227e
disable leaky test
Emyrk May 3, 2024
f5e09cd
fixup hidden input field
Emyrk May 3, 2024
3862311
remove comments
Emyrk May 3, 2024
3173a5e
switch to query params
Emyrk May 5, 2024
fca5946
imports
Emyrk May 5, 2024
d9a8dc7
remove diff
Emyrk May 5, 2024
e34546f
PR suggestions, using web terminal helper
Emyrk May 7, 2024
ab2c29f
PR feedback on executable errors
Emyrk May 7, 2024
c521532
rename require
Emyrk May 8, 2024
2b77082
skip docker test, it leaks containers
Emyrk May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove diff
  • Loading branch information
@Emyrk
Emyrk committed May 5, 2024
commit d9a8dc7c3229c3ba0fa015acea592aff5d1705b6
240 changes: 119 additions & 121 deletions site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import TextField from "@mui/material/TextField";
import { FormikProvider, useFormik } from "formik";
import { useFormik } from "formik";
import camelCase from "lodash/camelCase";
import capitalize from "lodash/capitalize";
import type { FC } from "react";
Expand Down Expand Up @@ -204,135 +204,133 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = (props) => {
const getFieldHelpers = getFormHelpers<CreateTemplateData>(form, error);

return (
<FormikProvider value={form}>
<HorizontalForm onSubmit={form.handleSubmit}>
{/* General info */}
<FormSection
title="General"
description="The name is used to identify the template in URLs and the API."
>
<FormFields>
{"starterTemplate" in props && (
<SelectedTemplate template={props.starterTemplate} />
)}
{"copiedTemplate" in props && (
<SelectedTemplate template={props.copiedTemplate} />
)}
{"upload" in props && (
<TemplateUpload
{...props.upload}
onUpload={async (file) => {
await fillNameAndDisplayWithFilename(file.name, form);
props.upload.onUpload(file);
}}
/>
)}

<TextField
{...getFieldHelpers("name")}
disabled={isSubmitting}
onChange={onChangeTrimmed(form)}
autoFocus
fullWidth
required
label="Name"
<HorizontalForm onSubmit={form.handleSubmit}>
{/* General info */}
<FormSection
title="General"
description="The name is used to identify the template in URLs and the API."
>
<FormFields>
{"starterTemplate" in props && (
<SelectedTemplate template={props.starterTemplate} />
)}
{"copiedTemplate" in props && (
<SelectedTemplate template={props.copiedTemplate} />
)}
{"upload" in props && (
<TemplateUpload
{...props.upload}
onUpload={async (file) => {
await fillNameAndDisplayWithFilename(file.name, form);
props.upload.onUpload(file);
}}
/>
</FormFields>
</FormSection>
)}

<TextField
{...getFieldHelpers("name")}
disabled={isSubmitting}
onChange={onChangeTrimmed(form)}
autoFocus
fullWidth
required
label="Name"
/>
</FormFields>
</FormSection>

{/* Display info */}
{/* Display info */}
<FormSection
title="Display"
description="A friendly name, description, and icon to help developers identify your template."
>
<FormFields>
<TextField
{...getFieldHelpers("display_name")}
disabled={isSubmitting}
fullWidth
label="Display name"
/>

<TextField
{...getFieldHelpers("description", {
maxLength: MAX_DESCRIPTION_CHAR_LIMIT,
})}
disabled={isSubmitting}
rows={5}
multiline
fullWidth
label="Description"
/>

<IconField
{...getFieldHelpers("icon")}
disabled={isSubmitting}
onChange={onChangeTrimmed(form)}
fullWidth
onPickEmoji={(value) => form.setFieldValue("icon", value)}
/>
</FormFields>
</FormSection>

{/* Variables */}
{variables && variables.length > 0 && (
<FormSection
title="Display"
description="A friendly name, description, and icon to help developers identify your template."
ref={variablesSectionRef}
title="Variables"
description="Input variables allow you to customize templates without altering their source code."
>
<FormFields>
<TextField
{...getFieldHelpers("display_name")}
disabled={isSubmitting}
fullWidth
label="Display name"
/>

<TextField
{...getFieldHelpers("description", {
maxLength: MAX_DESCRIPTION_CHAR_LIMIT,
})}
disabled={isSubmitting}
rows={5}
multiline
fullWidth
label="Description"
/>

<IconField
{...getFieldHelpers("icon")}
disabled={isSubmitting}
onChange={onChangeTrimmed(form)}
fullWidth
onPickEmoji={(value) => form.setFieldValue("icon", value)}
/>
{variables.map((variable, index) => (
<VariableInput
defaultValue={variable.value}
variable={variable}
disabled={isSubmitting}
key={variable.name}
onChange={async (value) => {
await form.setFieldValue("user_variable_values." + index, {
name: variable.name,
value,
});
}}
/>
))}
</FormFields>
</FormSection>
)}

{/* Variables */}
{variables && variables.length > 0 && (
<FormSection
ref={variablesSectionRef}
title="Variables"
description="Input variables allow you to customize templates without altering their source code."
>
<FormFields>
{variables.map((variable, index) => (
<VariableInput
defaultValue={variable.value}
variable={variable}
disabled={isSubmitting}
key={variable.name}
onChange={async (value) => {
await form.setFieldValue("user_variable_values." + index, {
name: variable.name,
value,
});
}}
/>
))}
</FormFields>
</FormSection>
)}

<div className="flex items-center">
<FormFooter
extraActions={
logs && (
<button
type="button"
onClick={onOpenBuildLogsDrawer}
css={(theme) => ({
backgroundColor: "transparent",
border: 0,
fontWeight: 500,
fontSize: 14,
cursor: "pointer",
color: theme.palette.text.secondary,
<div className="flex items-center">
<FormFooter
extraActions={
logs && (
<button
type="button"
onClick={onOpenBuildLogsDrawer}
css={(theme) => ({
backgroundColor: "transparent",
border: 0,
fontWeight: 500,
fontSize: 14,
cursor: "pointer",
color: theme.palette.text.secondary,

"&:hover": {
textDecoration: "underline",
textUnderlineOffset: 4,
color: theme.palette.text.primary,
},
})}
>
Show build logs
</button>
)
}
onCancel={onCancel}
isLoading={isSubmitting}
submitLabel={jobError ? "Retry" : "Create template"}
/>
</div>
</HorizontalForm>
</FormikProvider>
"&:hover": {
textDecoration: "underline",
textUnderlineOffset: 4,
color: theme.palette.text.primary,
},
})}
>
Show build logs
</button>
)
}
onCancel={onCancel}
isLoading={isSubmitting}
submitLabel={jobError ? "Retry" : "Create template"}
/>
</div>
</HorizontalForm>
);
};

Expand Down