Avoid attempting to download from exteranl URIs in Product Source Build mode #17237
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ld mode When in product source build mode, there is no need to attempt to download from dotnetbuilds/*. The generated URI will be incorrect (missing a version number) anwyay.
mthalman
reviewed
Aug 22, 2023
Comment on lines
376
to
396
| <UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.BaseUrl)').Replace($(PublicBaseURL), 'https://dotnetbuilds.blob.core.windows.net/public/'))/%(ComponentToDownload.DownloadFileName)" Condition="'%(ComponentToDownload.ShouldDownload)' == 'true'"> | ||
| <!-- If building in product source build mode, there is no need to attempt the external URIs. These are not desired, | ||
| and won't work anyway because the source build file URI doesn't use the same structure as the storage accounts. | ||
| For example, the dotnetbuilds uri for 'file:///vmr/dotnet2/artifacts/obj/x64/Release/blob-feed/assets//aspnetcore_base_runtime.version' | ||
| would end up 'https://dotnetbuilds.blob.core.windows.net/public//dotnet-runtime-8.0.0-rc.1.23381.3-centos.8-x64.tar.gz'. This is | ||
| missing the runtime version number directory. --> | ||
| <UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.BaseUrl)').Replace($(PublicBaseURL), 'https://dotnetbuilds.blob.core.windows.net/public/'))/%(ComponentToDownload.DownloadFileName)" | ||
| Condition="'%(ComponentToDownload.ShouldDownload)' == 'true' AND '$(DotNetBuildFromSourceFlavor)' != 'Product'"> | ||
| <ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload> | ||
| <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination> | ||
| </UrisToDownload> | ||
| <UrisToDownload Include="%(ComponentToDownload.PrivateBaseUrl)/%(ComponentToDownload.DownloadFileName)" Condition="'%(ComponentToDownload.ShouldDownload)' == 'true' and '$(DotNetRuntimeSourceFeedKey)' != ''"> | ||
| <UrisToDownload Include="%(ComponentToDownload.PrivateBaseUrl)/%(ComponentToDownload.DownloadFileName)" | ||
| Condition="'%(ComponentToDownload.ShouldDownload)' == 'true' and '$(DotNetRuntimeSourceFeedKey)' != '' and '$(DotNetBuildFromSourceFlavor)' != 'Product'"> | ||
| <ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload> | ||
| <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination> | ||
| <token>$(DotNetRuntimeSourceFeedKey)</token> | ||
| </UrisToDownload> | ||
| <UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.PrivateBaseUrl)').Replace($(InternalBaseURL), 'https://dotnetbuilds.blob.core.windows.net/internal/'))/%(ComponentToDownload.DownloadFileName)" Condition="'%(ComponentToDownload.ShouldDownload)' == 'true' and '$(DotNetRuntimeSourceFeedKey)' != ''"> | ||
| <UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.PrivateBaseUrl)').Replace($(InternalBaseURL), 'https://dotnetbuilds.blob.core.windows.net/internal/'))/%(ComponentToDownload.DownloadFileName)" | ||
| Condition="'%(ComponentToDownload.ShouldDownload)' == 'true' and '$(DotNetRuntimeSourceFeedKey)' != '' and '$(DotNetBuildFromSourceFlavor)' != 'Product'"> | ||
| <ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload> | ||
| <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination> | ||
| <token>$(dotnetbuilds-internal-container-read-token-base64)</token> |
There was a problem hiding this comment.
What about grouping all of these into a separate ItemGroup that has the $(DotNetBuildFromSourceFlavor)' != 'Product' condition applied at the ItemGroup level?
mthalman
approved these changes
Aug 22, 2023
|
There was also a redundant download uri there in non-SB mode. I've removed it, but want to verify on an internal PR first before merging |
|
lookin good |
mmitche
added a commit
to mmitche/installer
that referenced
this pull request
Aug 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When in product source build mode, there is no need to attempt to download from dotnetbuilds/*. The generated URI will be incorrect (missing a version number) anyway.