Skip to content

Ensure pack reference for solution local pack #2423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brondani merged 2 commits into from
Apr 7, 2026
+59 −5
Merged

Ensure pack reference for solution local pack #2423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
178cf80
Ensure pack reference for solution local pack
edriouk Apr 2, 2026
026c7f4
Address review comments
edriouk Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions tools/projmgr/src/ProjMgrRpcServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class RpcHandler : public RpcMethods {

PackReferenceVector& GetPackReferences(const string& context);
PackReferenceVector CollectPackReferences(const string& context);
PackReferenceVector GetPackReferencesForPack(const string& context, const string& packId);
PackReferenceVector GetPackReferencesForPack(const string& context, const RtePackage* pack);
RpcArgs::PackReference& EnsurePackReferenceForPack(const string& context, const string& packId, const string& origin, bool bVersion);
RpcArgs::PackReference& EnsurePackReference(const string& context, const RpcArgs::PackReference& packRef);

Expand Down Expand Up @@ -411,18 +411,22 @@ PackReferenceVector RpcHandler::CollectPackReferences(const string& context) {
packRef.origin = packItem.origin;
packRef.path = packItem.path;
packRef.selected = true; // initially pack is selected;
if (!contextItem.availablePackVersions[packId].empty()) {
if (packItem.path.empty() && !contextItem.availablePackVersions[packId].empty()) {
packRef.upgrade = contextItem.availablePackVersions[packId];
}
packRefs.push_back(packRef);
}
return packRefs;
}

PackReferenceVector RpcHandler::GetPackReferencesForPack(const string& context, const string& packId) {
PackReferenceVector RpcHandler::GetPackReferencesForPack(const string& context, const RtePackage* pack) {
PackReferenceVector packRefs;
auto& packId = pack->GetID();
auto path = pack->GetRootFilePath(false);

for(auto& ref : GetPackReferences(context)) {
if(ref.resolvedPack.has_value() && ref.resolvedPack == packId) {
if(ref.resolvedPack.has_value() && ref.resolvedPack == packId ||
ref.path.has_value() && RteFsUtils::Equivalent(ref.path.value(), path)) {
packRefs.push_back(ref);
}
}
Expand Down Expand Up @@ -487,7 +491,7 @@ RpcArgs::PacksInfo RpcHandler::GetPacksInfo(const string& context, const bool& a
if(contains_key(usedPacks, p.id)) {
p.used = true;
}
auto packRefs = GetPackReferencesForPack(context, p.id);
auto packRefs = GetPackReferencesForPack(context, rtePackage);

if(!packRefs.empty()) {
p.references = packRefs;
Expand Down
50 changes: 50 additions & 0 deletions tools/projmgr/test/src/ProjMgrRpcTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,6 +1182,56 @@ TEST_F(ProjMgrRpcTests, RpcGetPacksInfoLayer) {
}


TEST_F(ProjMgrRpcTests, RpcGetPacksInfoLocal) {
string context = "incompatible.Debug+CM0";
vector<string> contextList = {
context
};

auto requests = CreateLoadRequests("/TestSolution/PackRequirements/incompatible.csolution.yml", "", contextList);
requests += FormatRequest(3, "GetUsedItems", json({{ "context", context }}));
requests += FormatRequest(4, "GetPacksInfo", json({{ "context", context }, {"all", false}}));

const auto& responses = RunRpcMethods(requests);

EXPECT_TRUE(responses[2]["result"]["success"]);
auto packs = responses[2]["result"]["packs"];
EXPECT_EQ(packs.size(), 2);
EXPECT_EQ(packs[0]["pack"], "ARM::RteTestRequired");
EXPECT_EQ(packs[0]["resolvedPack"], "ARM::RteTestRequired");

string path = packs[0]["path"];
RteUtils::ReplaceAll(path, testinput_folder, "TEST"); ;
EXPECT_EQ(path, "TEST/TestSolution/PackRequirements/packs/required");
EXPECT_EQ(RteUtils::ExtractFileName(packs[0]["origin"]), "incompatible.csolution.yml");

EXPECT_EQ(packs[1]["pack"], "ARM::RteTest_DFP@0.2.0");
EXPECT_EQ(packs[1]["resolvedPack"], "ARM::RteTest_DFP@0.2.0");
EXPECT_EQ(RteUtils::ExtractFileName(packs[1]["origin"]), "incompatible.csolution.yml");

EXPECT_TRUE(responses[3]["result"]["success"]); // get pack infos
auto packInfos = responses[3]["result"]["packs"];
EXPECT_EQ(packInfos.size(), 2);

EXPECT_EQ(packInfos[0]["id"], "ARM::RteTestRequired@1.0.0");
EXPECT_FALSE(packInfos[0].contains("used"));
auto refs = packInfos[0]["references"];
EXPECT_EQ(refs.size(), 1);
EXPECT_TRUE(refs[0].contains("path"));

path = refs[0]["path"];
RteUtils::ReplaceAll(path, testinput_folder, "TEST");

EXPECT_EQ(refs[0]["pack"], "ARM::RteTestRequired");
EXPECT_EQ(refs[0]["resolvedPack"], "ARM::RteTestRequired");
EXPECT_EQ(path, "TEST/TestSolution/PackRequirements/packs/required");

EXPECT_EQ(packInfos[1]["id"], "ARM::RteTest_DFP@0.2.0");
EXPECT_TRUE(packInfos[1].contains("used"));
refs = packInfos[1]["references"];
EXPECT_EQ(refs.size(),1);
EXPECT_FALSE(refs[1].contains("path"));
}

TEST_F(ProjMgrRpcTests, RpcSelectPack) {
string context = "test1.Release+CM0";
Expand Down
Loading