Skip to content

Commit ef7b33e

Browse files
EmyrkEmyrk
committed
e2e fixes
1 parent 11815cb commit ef7b33e

File tree

6 files changed

+57
-39
lines changed

6 files changed

+57
-39
lines changed

‎site/e2e/helpers.ts‎

Lines changed: 48 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import {
3232
type ApplyComplete,
3333
AppSharingLevel,
3434
type ExternalAuthProviderResource,
35+
type GraphComplete,
3536
type ParseComplete,
3637
type PlanComplete,
3738
type Resource,
@@ -540,12 +541,14 @@ type RecursivePartial<T> = {
540541
};
541542

542543
interface EchoProvisionerResponses {
544+
init?: RecursivePartial<Response>[];
543545
// parse is for observing any Terraform variables
544546
parse?: RecursivePartial<Response>[];
545547
// plan occurs when the template is imported
546548
plan?: RecursivePartial<Response>[];
547549
// apply occurs when the workspace is built
548550
apply?: RecursivePartial<Response>[];
551+
graph?: RecursivePartial<Response>[];
549552
// extraFiles allows the bundling of terraform files in echo provisioner tars
550553
// in order to support dynamic parameters
551554
extraFiles?: Map<string, string>;
@@ -560,6 +563,13 @@ const emptyPlan = new TextEncoder().encode("{}");
560563
const createTemplateVersionTar = async (
561564
responses: EchoProvisionerResponses = {},
562565
): Promise<Buffer> => {
566+
if (!responses.init) {
567+
responses.init = [
568+
{
569+
init: {},
570+
},
571+
];
572+
}
563573
if (!responses.parse) {
564574
responses.parse = [
565575
{
@@ -575,17 +585,24 @@ const createTemplateVersionTar = async (
575585
];
576586
}
577587
if (!responses.plan) {
578-
responses.plan = responses.apply.map((response) => {
588+
responses.plan = [
589+
{
590+
plan: {},
591+
},
592+
];
593+
}
594+
if (!responses.graph) {
595+
responses.graph = responses.apply.map((response) => {
579596
if (response.log) {
580597
return response;
581598
}
582599
return {
583-
plan: {
584-
error: response.apply?.error ?? "",
585-
resources: response.apply?.resources ?? [],
586-
parameters: response.apply?.parameters ?? [],
587-
externalAuthProviders: response.apply?.externalAuthProviders ?? [],
588-
timings: response.apply?.timings ?? [],
600+
graph: {
601+
error: response.graph?.error ?? "",
602+
resources: response.graph?.resources ?? [],
603+
parameters: response.graph?.parameters ?? [],
604+
externalAuthProviders: response.graph?.externalAuthProviders ?? [],
605+
timings: response.graph?.timings ?? [],
589606
presets: [],
590607
resourceReplacements: [],
591608
plan: emptyPlan,
@@ -698,25 +715,25 @@ const createTemplateVersionTar = async (
698715
};
699716

700717
responses.apply.forEach((response, index) => {
701-
response.apply = {
718+
response.graph = {
702719
error: "",
703720
state: new Uint8Array(),
704721
resources: [],
705722
parameters: [],
706723
externalAuthProviders: [],
707724
timings: [],
708725
aiTasks: [],
709-
...response.apply,
726+
...response.graph,
710727
} as ApplyComplete;
711-
response.apply.resources = response.apply.resources?.map(fillResource);
728+
response.graph.resources = response.graph.resources?.map(fillResource);
712729

713730
tar.addFile(
714731
`${index}.apply.protobuf`,
715732
Response.encode(response as Response).finish(),
716733
);
717734
});
718-
responses.plan.forEach((response, index) => {
719-
response.plan = {
735+
responses.graph.forEach((response, index) => {
736+
response.graph = {
720737
error: "",
721738
resources: [],
722739
parameters: [],
@@ -729,9 +746,9 @@ const createTemplateVersionTar = async (
729746
moduleFiles: new Uint8Array(),
730747
moduleFilesHash: new Uint8Array(),
731748
aiTasks: [],
732-
...response.plan,
733-
} as PlanComplete;
734-
response.plan.resources = response.plan.resources?.map(fillResource);
749+
...response.graph,
750+
} as GraphComplete;
751+
response.graph.resources = response.graph.resources?.map(fillResource);
735752

736753
tar.addFile(
737754
`${index}.plan.protobuf`,
@@ -889,21 +906,22 @@ ${options}}
889906
parse: {},
890907
},
891908
],
892-
plan: [
909+
graph: [
893910
{
894-
plan: {
911+
graph: {
895912
parameters: richParameters,
913+
resources: [
914+
{
915+
name: "example",
916+
},
917+
],
896918
},
897919
},
898920
],
899921
apply: [
900922
{
901923
apply: {
902-
resources: [
903-
{
904-
name: "example",
905-
},
906-
],
924+
907925
},
908926
},
909927
],
@@ -920,22 +938,22 @@ export const echoResponsesWithExternalAuth = (
920938
parse: {},
921939
},
922940
],
923-
plan: [
941+
graph: [
924942
{
925-
plan: {
943+
graph: {
926944
externalAuthProviders: providers,
945+
resources: [
946+
{
947+
name: "example",
948+
},
949+
],
927950
},
928951
},
929952
],
930953
apply: [
931954
{
932955
apply: {
933-
externalAuthProviders: providers,
934-
resources: [
935-
{
936-
name: "example",
937-
},
938-
],
956+
939957
},
940958
},
941959
],

‎site/e2e/tests/app.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ test("app", async ({ context, page }) => {
3232
}
3333
const appName = "test-app";
3434
const template = await createTemplate(page, {
35-
apply: [
35+
graph: [
3636
{
37-
apply: {
37+
graph: {
3838
resources: [
3939
{
4040
agents: [

‎site/e2e/tests/outdatedAgent.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ test.skip(`ssh with agent ${agentVersion}`, async ({ page }) => {
2525

2626
const token = randomUUID();
2727
const template = await createTemplate(page, {
28-
apply: [
28+
graph: [
2929
{
30-
apply: {
30+
graph: {
3131
resources: [
3232
{
3333
agents: [

‎site/e2e/tests/outdatedCLI.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ test.beforeEach(async ({ page }) => {
2323
test(`ssh with client ${clientVersion}`, async ({ page }) => {
2424
const token = randomUUID();
2525
const template = await createTemplate(page, {
26-
apply: [
26+
graph: [
2727
{
28-
apply: {
28+
graph: {
2929
resources: [
3030
{
3131
agents: [

‎site/e2e/tests/webTerminal.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ test.beforeEach(async ({ page }) => {
1818
test("web terminal", async ({ context, page }) => {
1919
const token = randomUUID();
2020
const template = await createTemplate(page, {
21-
apply: [
21+
graph: [
2222
{
23-
apply: {
23+
graph: {
2424
resources: [
2525
{
2626
agents: [

‎site/e2e/tests/workspaces/createWorkspace.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ test.beforeEach(async ({ page }) => {
3232
test("create workspace", async ({ page }) => {
3333
await login(page, users.templateAdmin);
3434
const template = await createTemplate(page, {
35-
apply: [{ apply: { resources: [{ name: "example" }] } }],
35+
graph: [{ graph: { resources: [{ name: "example" }] } }],
3636
});
3737

3838
await login(page, users.member);

0 commit comments

Comments
 (0)