Skip to content

Commit 2df0228

Browse files
committed
Fix error handling
Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>
1 parent b52d102 commit 2df0228

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

cloudprovider/azure.go

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,24 @@ func (m *CloudProviderAzure) FetchToken() (token *bootstraptoken.BootstrapToken)
7676

7777
log.Infof("fetching newest token from Azure KeyVault \"%s\" secret \"%s\"", vaultName, secretName)
7878
secret, err := m.keyvaultClient.GetSecret(m.ctx, vaultUrl, secretName, "")
79-
switch m.getInnerErrorCodeFromAutorestError(err) {
80-
case "SecretDisabled":
81-
// disabled secret, continue as there would be no token
82-
log.Warn("current secret is disabled, assuming non existing token")
83-
break
84-
case "ForbiddenByPolicy":
85-
// access is forbidden
86-
log.Error("unable to access Azure KeyVault, please check access")
87-
log.Panic(err)
88-
default:
89-
// not handled error
90-
log.Panic(err)
79+
if err != nil {
80+
switch m.getInnerErrorCodeFromAutorestError(err) {
81+
case "SecretNotFound":
82+
// no secret found, need to create new token
83+
log.Warn("no secret found, assuming non existing token")
84+
break
85+
case "SecretDisabled":
86+
// disabled secret, continue as there would be no token
87+
log.Warn("current secret is disabled, assuming non existing token")
88+
break
89+
case "ForbiddenByPolicy":
90+
// access is forbidden
91+
log.Error("unable to access Azure KeyVault, please check access")
92+
log.Panic(err)
93+
default:
94+
// not handled error
95+
log.Panic(err)
96+
}
9197
}
9298

9399
if secret.Value != nil {

0 commit comments

Comments
 (0)