Fix for localization errors and library versioning #6936
Conversation
| @@ -43,12 +43,12 @@ async function getJava(versionSpec: string) { | |||
| if (version) { //This version of Java JDK is already in the cache. Use it instead of downloading again. | |||
| console.log(taskLib.loc('Info_ResolvedToolFromCache', version)); | |||
| } else if (fromAzure) { //Download JDK from an Azure blob storage location and extract. | |||
| console.log(taskLib.loc('RetrievingJdkFromAzure', version)); | |||
There was a problem hiding this comment.
This was an unused variable being passed into the localization message so I removed it.
| compressedFileExtension = getFileEnding(taskLib.getInput('azureCommonVirtualFile', true)); | ||
|
|
||
| const azureDownloader = new AzureStorageArtifactDownloader(taskLib.getInput('azureResourceManagerEndpoint', true), | ||
| taskLib.getInput('azureStorageAccountName', true), taskLib.getInput('azureContainerName', true), taskLib.getInput('azureCommonVirtualFile', false)); | ||
| await azureDownloader.downloadArtifacts(extractLocation, '*' + compressedFileExtension); | ||
| taskLib.getInput('azureStorageAccountName', true), taskLib.getInput('azureContainerName', true), ""); |
There was a problem hiding this comment.
The download artifacts method now treats the path as being a folder and adds a '/' on the end. The work around is to pass the filename in as the itemPattern.
| @@ -24,7 +24,7 @@ | |||
| "dependencies": { | |||
| "azure-arm-rest": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz", | |||
| "azure-blobstorage-artifactProvider": "file:../../_build/Tasks/Common/azure-blobstorage-artifactProvider-1.0.0.tgz", | |||
| "vsts-task-lib": "2.1.0", | |||
| "vsts-task-tool-lib": "^0.4.1" | |||
| "vsts-task-lib": "2.4.0", | |||
There was a problem hiding this comment.
Updating these libraries to include the fixes for localization bugs.
| @@ -43,12 +43,12 @@ async function getJava(versionSpec: string) { | |||
| if (version) { //This version of Java JDK is already in the cache. Use it instead of downloading again. | |||
| console.log(taskLib.loc('Info_ResolvedToolFromCache', version)); | |||
| } else if (fromAzure) { //Download JDK from an Azure blob storage location and extract. | |||
| console.log(taskLib.loc('RetrievingJdkFromAzure', version)); | |||
| console.log(taskLib.loc('RetrievingJdkFromAzure')); | |||
| compressedFileExtension = getFileEnding(taskLib.getInput('azureCommonVirtualFile', true)); | |||
There was a problem hiding this comment.
Probably a good idea to get this input taskLib.getInput('azureCommonVirtualFile', true) only once, save it in a variable, and use it again.
There was a problem hiding this comment.
Good point. I missed that I was using it twice when I rearranged the code. I'll fix this.
| taskLib.getInput('azureStorageAccountName', true), taskLib.getInput('azureContainerName', true), taskLib.getInput('azureCommonVirtualFile', false)); | ||
| await azureDownloader.downloadArtifacts(extractLocation, '*' + compressedFileExtension); | ||
| taskLib.getInput('azureStorageAccountName', true), taskLib.getInput('azureContainerName', true), ""); | ||
| await azureDownloader.downloadArtifacts(extractLocation, '*' + taskLib.getInput('azureCommonVirtualFile', false)); |
There was a problem hiding this comment.
Is the '*' + needed? ('*.zip' makes sense to me; '*javatool.zip' seems a bit odd.)
There was a problem hiding this comment.
The Azure library team who owns the downloadArtifacts functionality had suggested using the * in case the entire path was not entered. I can remove it if there are strong feelings against it.
There was a problem hiding this comment.
Either way is fine by me. It looks odd to me, but it doesn't look wrong.
Updating the vsts-task-tool-lib and vsts-task-lib library versions to pull down a fix for a localization bug.
Updating the javaToolInstaller's usage of the azure blob storage downloadArtifacts method due to changes in the methods functionality.
Fixing an error in the datasource bindings that was causing the pick lists to not be properly filled in.