Partially revert "Removes deployment group deletion (#2479)" (#2480)

* Revert "Removes deployment group deletion (#2479)
This commit is contained in:
Cristine Guadelupe 2024-02-09 20:08:33 +07:00 committed by GitHub
parent 98ad12ed6c
commit 579415fea4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 27 additions and 5 deletions

View file

@ -11,6 +11,7 @@ defmodule LivebookProto do
SecretDeleted, SecretDeleted,
SecretUpdated, SecretUpdated,
DeploymentGroupCreated, DeploymentGroupCreated,
DeploymentGroupDeleted,
DeploymentGroupUpdated, DeploymentGroupUpdated,
UserConnected UserConnected
} }
@ -31,6 +32,7 @@ defmodule LivebookProto do
| SecretDeleted.t() | SecretDeleted.t()
| SecretUpdated.t() | SecretUpdated.t()
| DeploymentGroupCreated.t() | DeploymentGroupCreated.t()
| DeploymentGroupDeleted.t()
| DeploymentGroupUpdated.t() | DeploymentGroupUpdated.t()
| UserConnected.t() | UserConnected.t()

View file

@ -0,0 +1,5 @@
defmodule LivebookProto.DeploymentGroupDeleted do
use Protobuf, syntax: :proto3, protoc_gen_elixir_version: "0.12.0"
field :id, 1, type: :string
end

View file

@ -48,17 +48,22 @@ defmodule LivebookProto.Event do
json_name: "deploymentGroupUpdated", json_name: "deploymentGroupUpdated",
oneof: 0 oneof: 0
field :agent_connected, 10, field :deployment_group_deleted, 10,
type: LivebookProto.DeploymentGroupDeleted,
json_name: "deploymentGroupDeleted",
oneof: 0
field :agent_connected, 11,
type: LivebookProto.AgentConnected, type: LivebookProto.AgentConnected,
json_name: "agentConnected", json_name: "agentConnected",
oneof: 0 oneof: 0
field :agent_key_created, 11, field :agent_key_created, 12,
type: LivebookProto.AgentKeyCreated, type: LivebookProto.AgentKeyCreated,
json_name: "agentKeyCreated", json_name: "agentKeyCreated",
oneof: 0 oneof: 0
field :agent_key_deleted, 12, field :agent_key_deleted, 13,
type: LivebookProto.AgentKeyDeleted, type: LivebookProto.AgentKeyDeleted,
json_name: "agentKeyDeleted", json_name: "agentKeyDeleted",
oneof: 0 oneof: 0

View file

@ -112,7 +112,7 @@ defmodule LivebookWeb.Integration.Hub.DeploymentGroupLiveTest do
assert_receive {:deployment_group_updated, ^updated_deployment_group} assert_receive {:deployment_group_updated, ^updated_deployment_group}
assert_patch(view, "/hub/#{hub.id}/deployment-groups/edit/#{deployment_group.id}") assert_patch(view, "/hub/#{hub.id}/deployment-groups/edit/#{deployment_group.id}")
assert render(view) =~ "Deployment group FOO updated successfully" assert render(view) =~ "Deployment group #{new_name} updated successfully"
assert updated_deployment_group in Livebook.Teams.get_deployment_groups(hub) assert updated_deployment_group in Livebook.Teams.get_deployment_groups(hub)
end end

View file

@ -407,7 +407,7 @@ defmodule LivebookWeb.Integration.Hub.EditLiveTest do
assert_receive {:deployment_group_updated, ^updated_deployment_group} assert_receive {:deployment_group_updated, ^updated_deployment_group}
assert_patch(view, "/hub/#{hub.id}/deployment-groups/edit/#{deployment_group.id}") assert_patch(view, "/hub/#{hub.id}/deployment-groups/edit/#{deployment_group.id}")
assert render(view) =~ "Deployment group FOO updated successfully" assert render(view) =~ "Deployment group #{new_name} updated successfully"
assert updated_deployment_group in Livebook.Teams.get_deployment_groups(hub) assert updated_deployment_group in Livebook.Teams.get_deployment_groups(hub)
end end

View file

@ -188,6 +188,16 @@ defmodule Livebook.HubHelpers do
send(pid, {:event, :deployment_group_created, deployment_group_created}) send(pid, {:event, :deployment_group_created, deployment_group_created})
end end
def remove_offline_hub_deployment_group(deployment_group) do
hub = offline_hub()
{:ok, pid} = hub_pid(hub)
deployment_group_deleted =
%LivebookProto.DeploymentGroupDeleted{id: deployment_group.id}
send(pid, {:event, :deployment_group_deleted, deployment_group_deleted})
end
def put_offline_hub_file_system(file_system) do def put_offline_hub_file_system(file_system) do
hub = offline_hub() hub = offline_hub()
{:ok, pid} = hub_pid(hub) {:ok, pid} = hub_pid(hub)