livebook-dev/livebook
1
1
Fork 0
mirror of https://github.com/livebook-dev/livebook.git synced 2025-09-14 17:04:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

Make sure declared fields are set on AWS credentials map (#2472)

Browse source
This commit is contained in:
Michael Ruoss 2024-02-04 11:42:38 +01:00 • committed by GitHub
parent 82dc0d432c
commit 4b82745f73
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/livebook/file_system/s3.ex
View file

@ -109,12 +109,15 @@ defmodule Livebook.FileSystem.S3 do
def credentials(%__MODULE__{} = file_system) do def credentials(%__MODULE__{} = file_system) do
case {file_system.access_key_id, file_system.secret_access_key} do case {file_system.access_key_id, file_system.secret_access_key} do
{nil, nil} -> {nil, nil} ->
defaults = %{token: nil, access_key_id: nil, secret_access_key: nil}
case get_credentials() do case get_credentials() do
:undefined -> :undefined ->
%{access_key_id: nil, secret_access_key: nil, token: nil} defaults
credentials -> credentials ->
Map.take(credentials, [:access_key_id, :secret_access_key, :token]) credentials = Map.take(credentials, [:access_key_id, :secret_access_key, :token])
Map.merge(defaults, credentials)
end end
_ -> _ ->