Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
71 changes: 67 additions & 4 deletions src/deploy/functions/release/fabricator.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@
it("handles topics that already exist", async () => {
pubsub.createTopic.callsFake(() => {
const err = new Error("Already exists");
(err as any).status = 409;

Check warning on line 454 in src/deploy/functions/release/fabricator.spec.ts

View workflow job for this annotation

GitHub Actions / lint (24)

Unexpected any. Specify a different type

Check warning on line 454 in src/deploy/functions/release/fabricator.spec.ts

View workflow job for this annotation

GitHub Actions / lint (24)

Unsafe member access .status on an `any` value
return Promise.reject(err);
});
gcfv2.createFunction.resolves({ name: "op", done: false });
Expand Down Expand Up @@ -526,7 +526,7 @@
eventarc.createChannel.callsFake(({ name }) => {
expect(name).to.equal("channel");
const err = new Error("Already exists");
(err as any).status = 409;

Check warning on line 529 in src/deploy/functions/release/fabricator.spec.ts

View workflow job for this annotation

GitHub Actions / lint (24)

Unexpected any. Specify a different type

Check warning on line 529 in src/deploy/functions/release/fabricator.spec.ts

View workflow job for this annotation

GitHub Actions / lint (24)

Unsafe member access .status on an `any` value
return Promise.reject(err);
});
gcfv2.createFunction.resolves({ name: "op", done: false });
Expand Down Expand Up @@ -592,7 +592,7 @@
eventarc.getChannel.resolves(undefined);
eventarc.createChannel.callsFake(() => {
const err = new Error("🤷‍♂️");
(err as any).status = 400;

Check warning on line 595 in src/deploy/functions/release/fabricator.spec.ts

View workflow job for this annotation

GitHub Actions / lint (24)

Unexpected any. Specify a different type

Check warning on line 595 in src/deploy/functions/release/fabricator.spec.ts

View workflow job for this annotation

GitHub Actions / lint (24)

Unsafe member access .status on an `any` value
return Promise.reject(err);
});

Expand Down Expand Up @@ -1333,7 +1333,13 @@
upsertScheduleV2.resolves();

await fab.setTrigger(ep);
expect(upsertScheduleV2).to.have.been.called;
expect(upsertScheduleV2).to.have.been.calledOnce;
upsertScheduleV2.resetHistory();

ep.platform = "run";
await fab.setTrigger(ep);
expect(upsertScheduleV2).to.have.been.calledOnce;
upsertScheduleV2.restore();
});

it("sets task queue triggers", async () => {
Expand All @@ -1344,7 +1350,32 @@
upsertTaskQueue.resolves();

await fab.setTrigger(ep);
expect(upsertTaskQueue).to.have.been.called;
expect(upsertTaskQueue).to.have.been.calledOnce;
upsertTaskQueue.resetHistory();

ep.platform = "run";
await fab.setTrigger(ep);
expect(upsertTaskQueue).to.have.been.calledOnce;
upsertTaskQueue.restore();
});

it("sets blocking triggers", async () => {
const ep = endpoint({
blockingTrigger: {
eventType: "beforeCreate",
},
});
const registerBlockingTrigger = sinon.stub(fab, "registerBlockingTrigger");
registerBlockingTrigger.resolves();

await fab.setTrigger(ep);
expect(registerBlockingTrigger).to.have.been.calledOnce;
registerBlockingTrigger.resetHistory();

ep.platform = "run";
await fab.setTrigger(ep);
expect(registerBlockingTrigger).to.have.been.calledOnce;
registerBlockingTrigger.restore();
});
});

Expand Down Expand Up @@ -1384,17 +1415,49 @@
deleteScheduleV2.resolves();

await fab.deleteTrigger(ep);
expect(deleteScheduleV2).to.have.been.called;
expect(deleteScheduleV2).to.have.been.calledOnce;
deleteScheduleV2.resetHistory();

ep.platform = "run";
await fab.deleteTrigger(ep);
expect(deleteScheduleV2).to.have.been.calledOnce;
deleteScheduleV2.restore();
});

it("deletes task queue triggers", async () => {
const ep = endpoint({
taskQueueTrigger: {},
});
const disableTaskQueue = sinon.stub(fab, "disableTaskQueue");
disableTaskQueue.resolves();

await fab.deleteTrigger(ep);
expect(disableTaskQueue).to.have.been.calledOnce;
disableTaskQueue.resetHistory();

ep.platform = "run";
await fab.deleteTrigger(ep);
expect(disableTaskQueue).to.have.been.calledOnce;
disableTaskQueue.restore();
});

it("deletes blocking triggers", async () => {
const ep = endpoint({
blockingTrigger: {
eventType: "beforeCreate",
},
});
const unregisterBlockingTrigger = sinon.stub(fab, "unregisterBlockingTrigger");
unregisterBlockingTrigger.resolves();

await fab.deleteTrigger(ep);
expect(unregisterBlockingTrigger).to.have.been.calledOnce;
unregisterBlockingTrigger.resetHistory();

ep.platform = "run";
await fab.deleteTrigger(ep);
expect(disableTaskQueue).to.have.been.called;
expect(unregisterBlockingTrigger).to.have.been.calledOnce;
unregisterBlockingTrigger.restore();
});
});

Expand Down Expand Up @@ -1798,7 +1861,7 @@
expect(deleteEndpoint).to.not.have.been.called;

// Resolve the create operation
resolveCreate!();

Check warning on line 1864 in src/deploy/functions/release/fabricator.spec.ts

View workflow job for this annotation

GitHub Actions / lint (24)

Forbidden non-null assertion

await applyPlanPromise;

Expand Down Expand Up @@ -1844,7 +1907,7 @@

describe("createRunFunction", () => {
it("creates a Cloud Run service with correct configuration", async () => {
runv2.createService.resolves({ uri: "https://service", name: "service" } as any);

Check warning on line 1910 in src/deploy/functions/release/fabricator.spec.ts

View workflow job for this annotation

GitHub Actions / lint (24)

Unexpected any. Specify a different type

Check warning on line 1910 in src/deploy/functions/release/fabricator.spec.ts

View workflow job for this annotation

GitHub Actions / lint (24)

Unsafe argument of type `any` assigned to a parameter of type `Service | undefined`
run.setInvokerCreate.resolves();

const ep = endpoint(
Expand Down Expand Up @@ -1885,7 +1948,7 @@
});

it("always sets callable triggers to public on creation", async () => {
runv2.createService.resolves({ uri: "https://service", name: "service" } as any);

Check warning on line 1951 in src/deploy/functions/release/fabricator.spec.ts

View workflow job for this annotation

GitHub Actions / lint (24)

Unsafe argument of type `any` assigned to a parameter of type `Service | undefined`
run.setInvokerCreate.resolves();

const ep = endpoint(
Expand Down
4 changes: 2 additions & 2 deletions src/deploy/functions/release/fabricator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -927,10 +927,10 @@
if (endpoint.platform === "gcfv1") {
await this.upsertScheduleV1(endpoint);
return;
} else if (endpoint.platform === "gcfv2") {
} else if (endpoint.platform === "gcfv2" || endpoint.platform === "run") {
await this.upsertScheduleV2(endpoint);
return;
} else if (endpoint.platform === "run") {

Check failure on line 933 in src/deploy/functions/release/fabricator.ts

View workflow job for this annotation

GitHub Actions / lint (24)

This branch can never execute. Its condition is a duplicate or covered by previous conditions in the if-else-if chain

Check failure on line 933 in src/deploy/functions/release/fabricator.ts

View workflow job for this annotation

GitHub Actions / unit (24)

This branch can never execute. Its condition is a duplicate or covered by previous conditions in the if-else-if chain

Check failure on line 933 in src/deploy/functions/release/fabricator.ts

View workflow job for this annotation

GitHub Actions / unit (24)

This branch can never execute. Its condition is a duplicate or covered by previous conditions in the if-else-if chain
throw new FirebaseError("Schedule triggers for Cloud Run functions are not supported yet.");
}
assertExhaustive(endpoint.platform);
Expand All @@ -954,10 +954,10 @@
if (endpoint.platform === "gcfv1") {
await this.deleteScheduleV1(endpoint);
return;
} else if (endpoint.platform === "gcfv2") {
} else if (endpoint.platform === "gcfv2" || endpoint.platform === "run") {
await this.deleteScheduleV2(endpoint);
return;
} else if (endpoint.platform === "run") {

Check failure on line 960 in src/deploy/functions/release/fabricator.ts

View workflow job for this annotation

GitHub Actions / lint (24)

This branch can never execute. Its condition is a duplicate or covered by previous conditions in the if-else-if chain

Check failure on line 960 in src/deploy/functions/release/fabricator.ts

View workflow job for this annotation

GitHub Actions / unit (24)

This branch can never execute. Its condition is a duplicate or covered by previous conditions in the if-else-if chain

Check failure on line 960 in src/deploy/functions/release/fabricator.ts

View workflow job for this annotation

GitHub Actions / unit (24)

This branch can never execute. Its condition is a duplicate or covered by previous conditions in the if-else-if chain
throw new FirebaseError("Schedule triggers for Cloud Run functions are not supported yet.");
}
assertExhaustive(endpoint.platform);
Expand Down
Loading