Rest source addition #765
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| #include "SourceFactory.h" | ||
| #include "Microsoft/PredefinedInstalledSourceFactory.h" | ||
| #include "Microsoft/PreIndexedPackageSourceFactory.h" | ||
| #include "Rest/RestSourceFactory.h" | ||
|
|
||
| namespace AppInstaller::Repository | ||
| { | ||
|
|
@@ -206,9 +207,10 @@ namespace AppInstaller::Repository | |
| result.emplace_back(std::move(storeDetails)); | ||
| } | ||
| } | ||
| break; | ||
| case SourceOrigin::User: | ||
| { | ||
| std::vector<SourceDetailsInternal> userSources = GetSourcesFromSetting( | ||
| Settings::Streams::UserSources, | ||
| s_SourcesYaml_Sources, | ||
| [&](SourceDetailsInternal& details, const std::string& settingValue, const YAML::Node& source) | ||
|
|
@@ -222,7 +224,19 @@ namespace AppInstaller::Repository | |
| TryReadScalar(name, settingValue, source, s_SourcesYaml_Source_Identifier, details.Identifier); | ||
| return true; | ||
| }); | ||
|
|
||
| for (auto& source : userSources) | ||
| { | ||
| if (Utility::CaseInsensitiveEquals(Rest::RestSourceFactory::Type(), source.Type) | ||
| && !Settings::ExperimentalFeature::IsEnabled(Settings::ExperimentalFeature::Feature::ExperimentalRestSource)) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| result.emplace_back(std::move(source)); | ||
| } | ||
| } | ||
| break; | ||
| default: | ||
| THROW_HR(E_UNEXPECTED); | ||
| } | ||
|
|
@@ -327,6 +341,11 @@ namespace AppInstaller::Repository | |
| { | ||
| return Microsoft::PredefinedInstalledSourceFactory::Create(); | ||
| } | ||
| else if (Utility::CaseInsensitiveEquals(Rest::RestSourceFactory::Type(), type) | ||
|
Contributor
There was a problem hiding this comment.
From the comment above "Should always come from code, so no need for case insensitivity"
Member
There was a problem hiding this comment. That comment is because those are specifically internal sources. A REST source may be configured externally, so yes, we should do case insensitive. In reply to: 594688379 [](ancestors = 594688379)
Contributor
Author
There was a problem hiding this comment. So, we need case insensitivity check because the Rest source type doesnt come from code. I also realized that I missed adding case-insensitivity check in the rest factory. I will add it there as well. #Resolved |
||
| && Settings::ExperimentalFeature::IsEnabled(Settings::ExperimentalFeature::Feature::ExperimentalRestSource)) | ||
| { | ||
| return Rest::RestSourceFactory::Create(); | ||
| } | ||
|
|
||
| THROW_HR(APPINSTALLER_CLI_ERROR_INVALID_SOURCE_TYPE); | ||
| } | ||
|
|
@@ -607,6 +626,15 @@ namespace AppInstaller::Repository | |
| details.LastUpdateTime = Utility::ConvertUnixEpochToSystemClock(0); | ||
| details.Origin = SourceOrigin::User; | ||
|
|
||
| // Check feature flag enablement for rest source. | ||
| if (Utility::CaseInsensitiveEquals(Rest::RestSourceFactory::Type(), type) | ||
| && !Settings::ExperimentalFeature::IsEnabled(Settings::ExperimentalFeature::Feature::ExperimentalRestSource)) | ||
| { | ||
| AICLI_LOG(Repo, Error, << Settings::ExperimentalFeature::GetFeature(Settings::ExperimentalFeature::Feature::ExperimentalRestSource).Name() | ||
| << " feature is disabled. Execution cancelled."); | ||
| THROW_HR(APPINSTALLER_CLI_ERROR_EXPERIMENTAL_FEATURE_DISABLED); | ||
| } | ||
|
|
||
| AddSourceFromDetails(details, progress); | ||
|
|
||
| AICLI_LOG(Repo, Info, << "Source created with extra data: " << details.Data); | ||
|
|
@@ -627,7 +655,7 @@ namespace AppInstaller::Repository | |
| AICLI_LOG(Repo, Info, << "Default source requested, but no sources configured"); | ||
| return {}; | ||
| } | ||
| else if (currentSources.size() == 1) | ||
| { | ||
| AICLI_LOG(Repo, Info, << "Default source requested, only 1 source available, using the only source: " << currentSources[0].get().Name); | ||
| return OpenSource(currentSources[0].get().Name, progress); | ||
|
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.