chore: cherry pick azcli login for azcopy and fix e2e (#7494)

Author: awesomenix

e2e/config/azure.go

@@ -43,7 +43,7 @@ type AzureClient struct {
 	StorageContainers         *armstorage.BlobContainersClient
 	CacheRulesClient          *armcontainerregistry.CacheRulesClient
 	Core                      *azcore.Client
-	Credential                *azidentity.DefaultAzureCredential
+	Credential                *azidentity.AzureCLICredential
 	Maintenance               *armcontainerservice.MaintenanceConfigurationsClient
 	NetworkInterfaces         *armnetwork.InterfacesClient
 	PrivateDNSZoneGroup       *armnetwork.PrivateDNSZoneGroupsClient
@@ -125,9 +125,9 @@ func NewAzureClient() (*AzureClient, error) {
 		},
 	}
 
-	credential, err := azidentity.NewDefaultAzureCredential(nil)
+	credential, err := azidentity.NewAzureCLICredential(nil)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create credential: %w", err)
+		return nil, fmt.Errorf("creating azure cli credential: %w", err)
 	}
 
 	plOpts := runtime.PipelineOptions{}

vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh

@@ -132,8 +132,7 @@ capture_benchmark "${SCRIPT_NAME}_grant_access_to_disk"
 echo "Uploading $disk_resource_id to ${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd"
 
 echo "Setting azcopy environment variables with pool identity: $AZURE_MSI_RESOURCE_STRING"
-export AZCOPY_AUTO_LOGIN_TYPE="MSI"
-export AZCOPY_MSI_RESOURCE_STRING="$AZURE_MSI_RESOURCE_STRING"
+export AZCOPY_AUTO_LOGIN_TYPE="AZCLI"
 export AZCOPY_CONCURRENCY_VALUE="AUTO"
 export AZCOPY_LOG_LOCATION="$(pwd)/azcopy-log-files/"
 export AZCOPY_JOB_PLAN_LOCATION="$(pwd)/azcopy-job-plan-files/"
@@ -176,4 +175,4 @@ fi
 capture_benchmark "${SCRIPT_NAME}_revoke_access_and_delete_disk"
 
 capture_benchmark "${SCRIPT_NAME}_overall" true
-process_benchmarks
+process_benchmarks

vhdbuilder/packer/imagecustomizer/scripts/publish-imagecustomizer-image.sh

@@ -39,8 +39,7 @@ capture_benchmark "${SCRIPT_NAME}_prepare_upload_vhd_to_blob"
 echo "Uploading ${OUT_DIR}/${CONFIG}.vhd to ${CLASSIC_BLOB}/${CAPTURED_SIG_VERSION}.vhd"
 
 echo "Setting azcopy environment variables with pool identity: $AZURE_MSI_RESOURCE_STRING"
-export AZCOPY_AUTO_LOGIN_TYPE="MSI"
-export AZCOPY_MSI_RESOURCE_STRING="$AZURE_MSI_RESOURCE_STRING"
+export AZCOPY_AUTO_LOGIN_TYPE="AZCLI"
 export AZCOPY_CONCURRENCY_VALUE="AUTO"
 
 export AZCOPY_LOG_LOCATION="$(pwd)/azcopy-log-files/"

vhdbuilder/packer/produce-packer-settings-functions.sh

@@ -297,8 +297,7 @@ function prepare_windows_vhd() {
 	windows_sigmode_source_image_version=""
 
 	# default: build VHD images from a marketplace base image
-	export AZCOPY_AUTO_LOGIN_TYPE="MSI" # use Managed Identity for AzCopy authentication
-	export AZCOPY_MSI_RESOURCE_STRING="${AZURE_MSI_RESOURCE_STRING}"
+	export AZCOPY_AUTO_LOGIN_TYPE="AZCLI" # use AZCLI for AzCopy authentication
 	export AZCOPY_LOG_LOCATION="$(pwd)/azcopy-log-files/"
 	export AZCOPY_JOB_PLAN_LOCATION="$(pwd)/azcopy-job-plan-files/"
 	mkdir -p "${AZCOPY_LOG_LOCATION}"

vhdbuilder/prefetch/scripts/optimize.sh

@@ -229,8 +229,7 @@ convert_specialized_sig_version_to_managed_image() {
         return 1
     fi
     echo "setting azcopy environment variables with pool identity: ${IMAGE_BUILDER_IDENTITY_ID}"
-    export AZCOPY_AUTO_LOGIN_TYPE="MSI"
-    export AZCOPY_MSI_RESOURCE_STRING="${IMAGE_BUILDER_IDENTITY_ID}"
+    export AZCOPY_AUTO_LOGIN_TYPE="AZCLI"
     export AZCOPY_CONCURRENCY_VALUE="AUTO"
     echo "uploading $disk_resource_id to ${TEMP_VHD_URI}"
     azcopy copy "${disk_sas_url}" "${TEMP_VHD_URI}" --recursive=true || return $?