update a few cleanups

Signed-off-by: Wiard van Rij <[email protected]>

Author: wiardvanrij

pkg/objstore/azure/azure.go

@@ -147,7 +147,7 @@ func parseConfig(conf []byte) (Config, error) {
 	}
 
 	// If we don't have config specific retry values but we do have the generic MaxRetries.
-	// This is part backwards compatibility but also ease of configuration
+	// This is for backwards compatibility but also ease of configuration.
 	if config.MaxRetries > 0 {
 		if config.PipelineConfig.MaxTries == 0 {
 			config.PipelineConfig.MaxTries = int32(config.MaxRetries)

pkg/objstore/azure/helpers.go

@@ -35,9 +35,7 @@ func init() {
 }
 
 func getAzureStorageCredentials(conf Config) (blob.Credential, error) {
-
 	if conf.MSIResource != "" {
-
 		msiConfig := auth.NewMSIConfig()
 		msiConfig.Resource = conf.MSIResource
 
@@ -46,23 +44,21 @@ func getAzureStorageCredentials(conf Config) (blob.Credential, error) {
 			return nil, err
 		}
 
-		// Get a new token
+		// Get a new token.
 		err = azureServicePrincipalToken.Refresh()
 		if err != nil {
 			return nil, err
 		}
 		token := azureServicePrincipalToken.Token()
 
 		return blob.NewTokenCredential(token.AccessToken, nil), nil
-
-	} else {
-		credential, err := blob.NewSharedKeyCredential(conf.StorageAccountName, conf.StorageAccountKey)
-		if err != nil {
-			return nil, err
-		}
-		return credential, nil
 	}
 
+	credential, err := blob.NewSharedKeyCredential(conf.StorageAccountName, conf.StorageAccountKey)
+	if err != nil {
+		return nil, err
+	}
+	return credential, nil
 }
 
 func getContainerURL(ctx context.Context, conf Config) (blob.ContainerURL, error) {