Skip to content
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.

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

Merge ign-fuel-tools7 ➡️ gz-fuel-tools8 #362

Merged
merged 12 commits into from
Jul 20, 2023

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port ign-fuel-tools7 ➡️ gz-fuel-tools8

Branch comparison: gz-fuel-tools8...ign-fuel-tools7

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

nkoenig and others added 11 commits March 29, 2023 11:11
* Support downloading from a referal link

Signed-off-by: Nate Koenig <[email protected]>

* spelling

Signed-off-by: Nate Koenig <[email protected]>

* Address comments

Signed-off-by: Nate Koenig <[email protected]>

---------

Signed-off-by: Nate Koenig <[email protected]>
* 4.8.3 release

Signed-off-by: Nate Koenig <[email protected]>

* 4.8.3

Signed-off-by: Nate Koenig <[email protected]>

---------

Signed-off-by: Nate Koenig <[email protected]>
The ModelIter iterator was fetching all available pages before making the first model available. This PR makes it so that each page is fetched from Fuel when the iterator is advanced.

This also adds a new member function FuelClient::Models(onst ModelIdentifier &_id, bool _checkCache) that allows bypassing the cache when getting a list of models owned by a user from the server.

---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-fuel-tools4 ➡️  ign-fuel-tools7
Signed-off-by: Addisu Z. Taddese <[email protected]>
Fixes compiler warnings on macOS.

Signed-off-by: Steve Peters <[email protected]>
Merge ign-fuel-tools4 ➡️  ign-fuel-tools7
@scpeters scpeters requested a review from nkoenig as a code owner July 19, 2023 05:36
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Jul 19, 2023
@scpeters
Copy link
Member Author

@azeey I resolved some conflicts from fe66f33; hopefully I got it right

TEST_F(FuelClientTest, ModelsCheckCached)
{
ClientConfig config;
std::string cacheDir = common::joinPaths(PROJECT_BINARY_PATH, "test_cache");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be fixed since PROJECT_BINARY_PATH is no longer in use

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can use common::cwd as other tests have done.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call, I just amended to cfa86f7

TEST_F(FuelClientTest, ModelsCheckCached)
{
ClientConfig config;
std::string cacheDir = common::joinPaths(PROJECT_BINARY_PATH, "test_cache");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can use common::cwd as other tests have done.

@codecov
Copy link

codecov bot commented Jul 20, 2023

Codecov Report

Merging #362 (d7ed0de) into gz-fuel-tools8 (a0ef972) will increase coverage by 0.02%.
The diff coverage is 100.00%.

❗ Current head d7ed0de differs from pull request most recent head cfa86f7. Consider uploading reports for the commit cfa86f7 to get more accurate results

@@                Coverage Diff                 @@
##           gz-fuel-tools8     #362      +/-   ##
==================================================
+ Coverage           75.30%   75.32%   +0.02%     
==================================================
  Files                  20       20              
  Lines                2911     2910       -1     
==================================================
  Hits                 2192     2192              
+ Misses                719      718       -1     
Impacted Files Coverage Δ
src/FuelClient.cc 68.86% <100.00%> (+0.29%) ⬆️
src/ModelIter.cc 100.00% <100.00%> (ø)
src/Zip.cc 71.08% <100.00%> (ø)

@scpeters
Copy link
Member Author

the windows test failures are already present on the gz-fuel-tools8 branch:

@scpeters scpeters merged commit 1d66045 into gz-fuel-tools8 Jul 20, 2023
8 checks passed
@scpeters scpeters deleted the scpeters/merge_7_8 branch July 20, 2023 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants