From 4b82745f73a29dc812bf99631d5358d1e6174612 Mon Sep 17 00:00:00 2001 From: Michael Ruoss Date: Sun, 4 Feb 2024 11:42:38 +0100 Subject: [PATCH] Make sure declared fields are set on AWS credentials map (#2472) --- lib/livebook/file_system/s3.ex | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/livebook/file_system/s3.ex b/lib/livebook/file_system/s3.ex index 37677f015..e15aef0aa 100644 --- a/lib/livebook/file_system/s3.ex +++ b/lib/livebook/file_system/s3.ex @@ -109,12 +109,15 @@ defmodule Livebook.FileSystem.S3 do def credentials(%__MODULE__{} = file_system) do case {file_system.access_key_id, file_system.secret_access_key} do {nil, nil} -> + defaults = %{token: nil, access_key_id: nil, secret_access_key: nil} + case get_credentials() do :undefined -> - %{access_key_id: nil, secret_access_key: nil, token: nil} + defaults 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 _ ->