mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 14:21:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7443 from ywk253100/240219_credential

Browse Source 
Don't return error when no credential file found
This commit is contained in:
Wenkai Yin(尹文开)
2024-02-21 16:03:55 +08:00
committed by GitHub
parent 2a1ae0ec0a f6383916a2
commit 74bf4c3d80
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/util/azure/util.go
View File

@@ -62,6 +62,10 @@ func LoadCredentials(config map[string]string) (map[string]string, error) {
credFile = config[credentialFile]
}
if len(credFile) == 0 {
return map[string]string{}, nil
}
// put the credential file content into a map
creds, err := godotenv.Read(credFile)
if err != nil {

7
pkg/util/azure/util_test.go
View File

@@ -28,8 +28,9 @@ import (
func TestLoadCredentials(t *testing.T) {
// no credential file
_, err := LoadCredentials(nil)
require.NotNil(t, err)
credentials, err := LoadCredentials(nil)
require.Nil(t, err)
assert.NotNil(t, credentials)
// specified credential file in the config
name := filepath.Join(os.TempDir(), "credential")
@@ -43,7 +44,7 @@ func TestLoadCredentials(t *testing.T) {
config := map[string]string{
"credentialsFile": name,
}
credentials, err := LoadCredentials(config)
credentials, err = LoadCredentials(config)
require.Nil(t, err)
assert.Equal(t, "value", credentials["key"])