Skip to content

Commit

Permalink
fix: now we can list/create/delete
Browse files Browse the repository at this point in the history
Still have an issue with the update
And the delete show an error but work and delete the key.

Signed-off-by: shiipou <[email protected]>
  • Loading branch information
shiipou committed Feb 23, 2024
1 parent 0ba030b commit ad3b028
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
1 change: 0 additions & 1 deletion apps/lenra/lib/lenra/apps.ex
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ defmodule Lenra.Apps do
Build,
Deployment,
Environment,
EnvSecret,
Image,
Logo,
MainEnv,
Expand Down
26 changes: 13 additions & 13 deletions apps/lenra/lib/lenra/kubernetes/api_services.ex
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ defmodule Lenra.Kubernetes.ApiServices do

defp response({:ok, %Finch.Response{status: status_code, body: body}}, :secret)
when status_code in [404] do
{:error, :secret_not_exist, Jason.decode!(body)}
{:error, :secret_not_found, Jason.decode!(body)}
end

defp response({:ok, %Finch.Response{status: status_code, body: body}}, :build)
Expand Down Expand Up @@ -224,7 +224,7 @@ defmodule Lenra.Kubernetes.ApiServices do
{:ok, body} ->
%{"data" => secret_data} = body
{:ok, Enum.into(Enum.map(secret_data, fn ({key, value}) -> {key, Base.decode64(value)} end), %{})}
{:error, error} -> { :error, error |> IO.inspect(label: "Fetch error") }
{:error, error, _} -> { :error, error |> IO.inspect(label: "Fetch error") }
end
end

Expand Down Expand Up @@ -322,7 +322,7 @@ defmodule Lenra.Kubernetes.ApiServices do
kubernetes_apps_namespace = Application.fetch_env!(:lenra, :kubernetes_apps_namespace)
case get_k8s_secret(secret_name, kubernetes_apps_namespace) do
{:ok, secrets} -> {:ok, Enum.map(secrets, fn ({key, _value}) -> key end)}
{:error, :secret_not_exist} -> {:error, :secret_not_found}
{:error, :secret_not_found} -> {:error, :secret_not_found}
{:error, error} -> {:error, error}
end
end
Expand All @@ -331,9 +331,9 @@ defmodule Lenra.Kubernetes.ApiServices do
kubernetes_apps_namespace = Application.fetch_env!(:lenra, :kubernetes_apps_namespace)
case create_k8s_secret(secret_name, kubernetes_apps_namespace, secrets) do
{:ok, secrets} ->
env = Apps.fetch_env(env_id)
|> Repo.preload(deployment: [:build])
build_number = env.deployment.build.build_number
{:ok, partial_env} = Apps.fetch_env(env_id)
env = Repo.preload(partial_env, deployment: [:build])
build_number = env.deployment.build.build_number
Lenra.OpenfaasServices.update_secrets(service_name, build_number, [])
{:ok, Enum.map(secrets, fn ({key, value}) -> key end)}
{:secret_exist} -> {:error, :secret_exist}
Expand Down Expand Up @@ -361,13 +361,13 @@ defmodule Lenra.Kubernetes.ApiServices do
{:ok, current_secrets} ->
case length(Map.keys(current_secrets)) do
len when len <= 1 ->
case Apps.fetch_env(env_id)
|> Repo.preload(deployment: [:build]) do
%{ deployment: %{ build: build_number }} when not is_nil(build_number) ->
Lenra.OpenfaasServices.update_secrets(service_name, build_number, [secret_name])
{:ok, []} # TODO: Return all other secrets
_ -> {:error, :build_not_exist}
end
{:ok, partial_env} = Apps.fetch_env(env_id)
case Repo.preload(partial_env, deployment: [:build]) do
%{ deployment: %{ build: build }} when not is_nil(build) ->
Lenra.OpenfaasServices.update_secrets(service_name, build.build_number, [])
{:ok, []} # TODO: Return all other secrets
_ -> {:error, :build_not_exist}
end
case delete_k8s_secret(secret_name, kubernetes_apps_namespace) do
{:ok, _} -> {:ok, []}
{:secret_not_found} -> {:error, :secret_not_found}
Expand Down

0 comments on commit ad3b028

Please sign in to comment.