feat(core): make a repository dir for each network #239

vincenzopalazzo · 2024-02-07T18:38:56Z

This is the more sane thing to do because each network can have a different repository version.

Fixes: #234
Fixes #233

netlify · 2024-02-07T18:39:00Z

✅ Deploy Preview for coffee-docs canceled.

Name	Link
🔨 Latest commit	`8615159`
🔍 Latest deploy log	https://app.netlify.com/sites/coffee-docs/deploys/66447145c3ccc500087ded41

tareknaser

I also have a concern. The code in this PR handles moving the global repository to be network specific but does it handle the information in coffee configuration as well?

So, if we run coffee nurse and then see coffee remote list for a network. is the output sane?

coffee_core/src/nurse/strategy.rs

git-bugreport-2024-02-07-1353.txt

coffee_lib/src/types/mod.rs

coffee_core/src/coffee.rs

coffee_core/src/nurse/strategy.rs

coffee_cmd/src/coffee_term/command_show.rs

coffee_core/src/coffee.rs

vincenzopalazzo · 2024-02-13T23:24:43Z

ok I pushed the review you suggested @tareknaser tomorrow I will take a look if this PR is completed, but I guess yes?

I m not sure just when run the nurse command

tareknaser · 2024-03-07T15:10:58Z

just a reminder that #239 (review) is still not resolved

vincenzopalazzo · 2024-04-09T10:33:18Z

Ok I think we must complete this, I ran into some issues that are really embracing

So, if we run coffee nurse and then see the coffee remote list for a network. is the output sane?

Yes, why they should not be sane @tareknaser? I am missing something around your point?

vincenzopalazzo · 2024-04-09T14:16:03Z

ok fixed a couple of bugs found with the nurse command.

Now the nurse command will migrate the directory, and then restore the repositories to have a fresh copy of them 😄

Review are welcome

vincenzopalazzo · 2024-04-09T14:46:41Z

With the current code I had to run two times the nurse command to have all fixed

➜  ~ coffee nurse
╭────────────────────────────────────────────────────────────────╮
│ ●   Actions Taken                        Affected repositories │
├────────────────────────────────────────────────────────────────┤
│ ●   Moving Global repository directory   testnet               │
│ ●   Moving Global repository directory   bitcoin               │
╰────────────────────────────────────────────────────────────────╯
➜  ~ coffee remote list
Error: CoffeeError { code: 1, msg: "Coffee found some defects in the configuration. Please run `coffee nurse` to fix them.\n                    If you are want to skip the verification, please add the `--skip-verify ` flag to the command." }
➜  ~ coffee nurse
╭─────────────────────────────────────────────────────╮
│ ●   Actions Taken        Affected repositories      │
├─────────────────────────────────────────────────────┤
│ ●   Restored using Git   summars, teos, folgore-git │
╰─────────────────────────────────────────────────────╯
➜  ~ coffee remote list
● List of repositories
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ●   Repository Alias   URL                                            N. Plugins   Git HEAD   Last Update │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ ●   folgore-git        https://github.com/coffee-tools/folgore        1            aedd703    12/03/2024  │
│ ●   summars            https://github.com/daywalker90/summars         1            c73633a    18/03/2024  │
│ ●   teos               https://github.com/vincenzopalazzo/rust-teos   1            507b8e2    09/04/2024  │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯

Maybe this is a way to do stuff but not sure if it is so good from implementation view point

vincenzopalazzo · 2024-04-09T14:47:47Z

It breaks the upgrade command

➜  ~ coffee upgrade folgore-git -v
HEAD is now at 09189fb deps: changing the git url for esplora
cp: cannot stat '/home/vincent/.coffee/repositories/folgore-git': No such file or directory
✗ Error: code: 2, msg:

tareknaser

Thanks for putting this together. I like coffee nurse --verify output

I think the method to handle this nurse strategy should handle all the related logic so we don't need to modify patch_repository_locally_absent for example

coffee_core/src/coffee.rs

coffee_core/src/nurse/strategy.rs

coffee_lib/src/types/mod.rs

coffee_core/src/nurse/strategy.rs

coffee_lib/src/types/mod.rs

coffee_cmd/src/coffee_term/command_show.rs

coffee_core/src/coffee.rs

tareknaser

Thanks. This resolves the initial problem, but I believe there might still be a lurking bug.

coffee_cmd/src/coffee_term/command_show.rs

coffee_core/src/nurse/strategy.rs

tareknaser · 2024-04-12T21:49:27Z

Currently, remote repositories are still global in the coffee configuration, not specific to individual networks. To reproduce:

coffee remote add lightningd https://github.com/lightningd/plugins.git

coffee -n testnet remote add folgore https://github.com/coffee-tools/folgore.git

coffee remote list

coffee -n testnet remote list

coffee install folgore # Shouldn't work

coffee remote rm folgore

coffee -n testnet remote list

Expected

Output for coffee remote list: lightningd
Output for coffee -n testnet remote list: folgore

Output

tareknasser@Tareks-MacBook ~ % coffee remote add lightningd https://github.com/lightningd/plugins.git
✓ Remote added!
tareknasser@Tareks-MacBook ~ % coffee -n testnet remote add folgore https://github.com/coffee-tools/folgore.git 
✓ Remote added!
tareknasser@Tareks-MacBook ~ % coffee remote list
● List of repositories
╭──────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ●   Repository Alias   URL                                       N. Plugins   Git HEAD   Last Update │
├──────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ ●   folgore            https://github.com/coffee-tools/folgore   1            09189fb    20/03/2024  │
│ ●   lightningd         https://github.com/lightningd/plugins     19           fef7ded    12/04/2024  │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────╯
tareknasser@Tareks-MacBook ~ % coffee -n testnet remote list
● List of repositories
╭──────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ●   Repository Alias   URL                                       N. Plugins   Git HEAD   Last Update │
├──────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ ●   lightningd         https://github.com/lightningd/plugins     19           fef7ded    12/04/2024  │
│ ●   folgore            https://github.com/coffee-tools/folgore   1            09189fb    20/03/2024  │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────╯
tareknasser@Tareks-MacBook ~ % coffee install folgore                 
✓ Compiling and installing
✓ Plugin folgore Compiled and Installed
tareknasser@Tareks-MacBook ~ % coffee remote rm folgore
✓ Remote removed!
tareknasser@Tareks-MacBook ~ % coffee -n testnet remote list
● List of repositories
╭────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ●   Repository Alias   URL                                     N. Plugins   Git HEAD   Last Update │
├────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ ●   lightningd         https://github.com/lightningd/plugins   19           fef7ded    12/04/2024  │
╰────────────────────────────────────────────────────────────────────────────────────────────────────╯

vincenzopalazzo · 2024-04-13T11:19:24Z

I think your case can be written in some integration testing that we have, so looking in doing it

This is the more sane thing to do because each network can have a different repository version. Link: #234 Signed-off-by: Vincenzo Palazzo <[email protected]>

vincenzopalazzo · 2024-04-14T21:56:46Z

Thanks for this amazing catch @tareknaser

I decided to fix our tests and write your example case in our test suite, to run it, run just make integration ARGS="-- --test-threads=4 test_migrated_repository_to_local_one"

P.S: pushed the test in a single single commit, and I find also a bug inside the nurse strategy that was not checking if there was the root repositories dir.

So now we should be ok

tareknaser

Thanks! Everything works as expected
I really like test_migrated_repository_to_local_one as well

Glad to see this one through

coffee_core/src/coffee.rs

coffee_cmd/src/coffee_term/command_show.rs

tareknaser · 2024-04-15T13:03:53Z

coffee_core/src/nurse/strategy.rs

+
+#[async_trait]
+impl Handler for CoffeeRepositoryDirCleanUpStrategy {
+    async fn can_be_applied(


Currently running coffee nurse only detects that bitcoin network has the defect.
Same goes for coffee -n testnet nurse, it only detects that testnet has the the defect.
This is an issue because nurse removes the global repositories folder so running it the second time for another network won't find the global repositories folder.

The handler for CoffeeRepositoryDirCleanUpStrategy should look for all networks directories and fix them all at once.

You are right!

coffee_core/src/nurse/strategy.rs

coffee_core/src/coffee.rs

tests/src/coffee_integration_tests.rs

Adding a new case for the coffe nurse command to clean up the global repository directory and move it insied the network subdirectory. Signed-off-by: Vincenzo Palazzo <[email protected]>

Signed-off-by: Vincenzo Palazzo <[email protected]>

vincenzopalazzo · 2024-04-15T22:26:46Z

Find a bug when I try to add two times the same repo but in different network

➜  ~ coffee remote list
● List of repositories
╭──────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ●   Repository Alias   URL                                       N. Plugins   Git HEAD   Last Update │
├──────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ ●   folgore-git        https://github.com/coffee-tools/folgore   1            09189fb    20/03/2024  │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────╯
➜  ~ coffee remote add folgore-git https://github.com/coffee-tools/folgore.git
✗ Fetch remote from https://github.com/coffee-tools/folgore.git error: Error while add remote: code: 1, msg: repository with name: folgore-git already exists
✗ Error: code: 1, msg: repository with name: folgore-git already exists

tareknaser · 2024-04-17T18:47:05Z

Find a bug when I try to add two times the same repo but in different network

Good point. We need to modify coffee.add_remote() so it checks against remotes specific to the network instead of global repositories

vincenzopalazzo · 2024-04-17T22:18:07Z

Good point. We need to modify coffee.add_remote() so it checks against remotes specific to the network instead of global repositories

Thanks for suggesting the fix, I will try to look at this tomorrow :)

…ies to Action

vincenzopalazzo · 2024-06-01T07:50:35Z

MH we should push this forward!

vincenzopalazzo requested a review from tareknaser February 7, 2024 19:12

vincenzopalazzo added this to the 0.1-rc1 milestone Feb 7, 2024

vincenzopalazzo force-pushed the macros/moving-repository-dir branch from 7bace56 to f145b1f Compare February 7, 2024 19:38

vincenzopalazzo mentioned this pull request Feb 12, 2024

nurse command is not working as should #233

Open

tareknaser suggested changes Feb 12, 2024

View reviewed changes

vincenzopalazzo force-pushed the macros/moving-repository-dir branch from f145b1f to 1272fa5 Compare February 13, 2024 23:23

vincenzopalazzo marked this pull request as ready for review February 13, 2024 23:23

vincenzopalazzo force-pushed the macros/moving-repository-dir branch from 1272fa5 to b1d3a6a Compare April 9, 2024 10:31

tareknaser reviewed Apr 9, 2024

View reviewed changes

tareknaser mentioned this pull request Apr 9, 2024

nurse: if the is no repository, unistall all the plugin #258

Open

vincenzopalazzo mentioned this pull request Apr 12, 2024

core: remove repo path from url #265

Closed

vincenzopalazzo force-pushed the macros/moving-repository-dir branch 2 times, most recently from 3eabfdf to 1cc6eb5 Compare April 12, 2024 13:50

tareknaser reviewed Apr 12, 2024

View reviewed changes

coffee_cmd/src/coffee_term/command_show.rs Outdated Show resolved Hide resolved

coffee_core/src/nurse/strategy.rs Outdated Show resolved Hide resolved

feat(core): make a repository dir for each network

94b697e

This is the more sane thing to do because each network can have a different repository version. Link: #234 Signed-off-by: Vincenzo Palazzo <[email protected]>

vincenzopalazzo force-pushed the macros/moving-repository-dir branch from 1cc6eb5 to 99633ee Compare April 14, 2024 16:56

vincenzopalazzo mentioned this pull request Apr 14, 2024

Rename the table name this label to action, what do you think? #268

Open

vincenzopalazzo force-pushed the macros/moving-repository-dir branch from a592812 to 4e838c0 Compare April 14, 2024 22:11

tareknaser approved these changes Apr 15, 2024

View reviewed changes

feat(core): nurse clean up the global repository

a5fc3da

Adding a new case for the coffe nurse command to clean up the global repository directory and move it insied the network subdirectory. Signed-off-by: Vincenzo Palazzo <[email protected]>

vincenzopalazzo added 3 commits April 15, 2024 20:54

core: fixing the nurse run command

87b29fe

Signed-off-by: Vincenzo Palazzo <[email protected]>

core: migrating the database

83d65f4

Signed-off-by: Vincenzo Palazzo <[email protected]>

tests: write test to making sure that we use local repo everywhere

4528011

Signed-off-by: Vincenzo Palazzo <[email protected]>

vincenzopalazzo force-pushed the macros/moving-repository-dir branch from 99e6ad2 to 4528011 Compare April 15, 2024 18:55

Anyitechs mentioned this pull request Apr 17, 2024

chore(cmd): change table label #272

Merged

Ifeanyichukwu added 2 commits May 15, 2024 10:24

chore(change-table-label): change table label from Affected repositor…

8f36fe5

…ies to Action

chore(cmd): change table label

8615159

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(core): make a repository dir for each network #239

feat(core): make a repository dir for each network #239

vincenzopalazzo commented Feb 7, 2024 •

edited

Loading

netlify bot commented Feb 7, 2024 •

edited

Loading

tareknaser left a comment

vincenzopalazzo commented Feb 13, 2024

tareknaser commented Mar 7, 2024

vincenzopalazzo commented Apr 9, 2024

vincenzopalazzo commented Apr 9, 2024

vincenzopalazzo commented Apr 9, 2024

vincenzopalazzo commented Apr 9, 2024

tareknaser left a comment

tareknaser left a comment

tareknaser commented Apr 12, 2024

vincenzopalazzo commented Apr 13, 2024

vincenzopalazzo commented Apr 14, 2024

tareknaser left a comment

tareknaser Apr 15, 2024

vincenzopalazzo Apr 15, 2024

vincenzopalazzo commented Apr 15, 2024

tareknaser commented Apr 17, 2024

vincenzopalazzo commented Apr 17, 2024

vincenzopalazzo commented Jun 1, 2024

feat(core): make a repository dir for each network #239

Are you sure you want to change the base?

feat(core): make a repository dir for each network #239

Conversation

vincenzopalazzo commented Feb 7, 2024 • edited Loading

netlify bot commented Feb 7, 2024 • edited Loading

✅ Deploy Preview for coffee-docs canceled.

tareknaser left a comment

Choose a reason for hiding this comment

vincenzopalazzo commented Feb 13, 2024

tareknaser commented Mar 7, 2024

vincenzopalazzo commented Apr 9, 2024

vincenzopalazzo commented Apr 9, 2024

vincenzopalazzo commented Apr 9, 2024

vincenzopalazzo commented Apr 9, 2024

tareknaser left a comment

Choose a reason for hiding this comment

tareknaser left a comment

Choose a reason for hiding this comment

tareknaser commented Apr 12, 2024

Expected

Output

vincenzopalazzo commented Apr 13, 2024

vincenzopalazzo commented Apr 14, 2024

tareknaser left a comment

Choose a reason for hiding this comment

tareknaser Apr 15, 2024

Choose a reason for hiding this comment

vincenzopalazzo Apr 15, 2024

Choose a reason for hiding this comment

vincenzopalazzo commented Apr 15, 2024

tareknaser commented Apr 17, 2024

vincenzopalazzo commented Apr 17, 2024

vincenzopalazzo commented Jun 1, 2024

vincenzopalazzo commented Feb 7, 2024 •

edited

Loading

netlify bot commented Feb 7, 2024 •

edited

Loading