removed unnecessary variable declaration

updated comments
This commit is contained in:
Bhaskar Brahma 2019-07-26 13:19:12 -07:00
Родитель b574909d10
Коммит 2e2d012c2c
2 изменённых файлов: 8 добавлений и 7 удалений

Просмотреть файл

@ -14,7 +14,7 @@ RedHat RHEL 6.9|![badge](https://dcrbadges.blob.core.windows.net/scenarios/RedHa
RedHat RHEL 7-RAW|![badge](https://dcrbadges.blob.core.windows.net/scenarios/RedHat_RHEL_7-RAW__ext--custom--script.svg)
SUSE SLES 12-SP2|![badge](https://dcrbadges.blob.core.windows.net/scenarios/SUSE_SLES_12-SP2__ext--custom--script.svg)
This documentation is current for version 2.0.8 and above.
This documentation is current for version 2.0.6 and above.
CustomScript extensions runs scripts on VMs. These scripts can be
used to bootstrap/install software, run administrative tasks, or run

Просмотреть файл

@ -29,9 +29,7 @@ func downloadAndProcessURL(ctx *log.Context, url, downloadDir string, cfg *handl
return fmt.Errorf("[REDACTED] is not a valid url")
}
var dl []download.Downloader
dl, err = getDownloaders(url, cfg.StorageAccountName, cfg.StorageAccountKey, cfg.ManagedIdentity)
dl, err := getDownloaders(url, cfg.StorageAccountName, cfg.StorageAccountKey, cfg.ManagedIdentity)
if err != nil {
return err
}
@ -53,8 +51,11 @@ func downloadAndProcessURL(ctx *log.Context, url, downloadDir string, cfg *handl
func getDownloaders(fileURL string, storageAccountName, storageAccountKey string, managedIdentity *clientOrObjectId) (
[]download.Downloader, error) {
if storageAccountName == "" || storageAccountKey == "" {
// storage account name and key cannot be specified with managed identity, handler settings validation won't allow that
// handler settings validation will also not allow storageAccountName XOR storageAccountKey == 1
// in this case, we can be sure that storage account name and key was not specified
if download.IsAzureStorageBlobUri(fileURL) && managedIdentity != nil {
// If managed identity was specified in the configuration, try to use it to download the files
// if managed identity was specified in the configuration, try to use it to download the files
var msiProvider download.MsiProvider
switch {
case managedIdentity.ClientId == "" && managedIdentity.ObjectId == "":
@ -77,8 +78,8 @@ func getDownloaders(fileURL string, storageAccountName, storageAccountKey string
return []download.Downloader{download.NewURLDownload(fileURL)}, nil
}
} else {
// If storage name account and key are specified, use that for all files
// This preserves old behavior
// if storage name account and key are specified, use that for all files
// this preserves old behavior
blob, err := blobutil.ParseBlobURL(fileURL)
if err != nil {
return nil, err