toolshed/abra
4
4
Fork 23
Code Issues 82 Pull Requests 11 Packages Releases 45 Activity

abra cp enhancements #390

Merged
3wordchant merged 1 commits from (deleted):cp-enhancements into main 2023-12-02 15:39:28 +00:00
Conversation 9 Commits 1 Files Changed 5
+609 -113
p4u1 commented 2023-11-14 18:09:35 +00:00
Owner
Copy Link
Copy Source

Working on coop-cloud/organising#534

TODO:

  • local to server
    • file to dir
    • file to file (create)
    • file to file (override)
    • file to file (rename)
    • dir to dir
    • files to dir
  • server to local
    • file to dir
    • file to file (create)
    • file to file (override)
    • file to file (rename)
    • dir to dir
    • files to dir
Working on https://git.coopcloud.tech/coop-cloud/organising/issues/534 TODO: - [x] local to server - [x] file to dir - [x] file to file (create) - [x] file to file (override) - [x] file to file (rename) - [x] dir to dir - [x] files to dir - [x] server to local - [x] file to dir - [x] file to file (create) - [x] file to file (override) - [x] file to file (rename) - [x] dir to dir - [x] files to dir
3wordchant commented 2023-11-16 14:27:30 +00:00
Owner
Copy Link
Copy Source

omg amazing @p4u1 😍

omg amazing @p4u1 😍
p4u1 commented 2023-11-16 20:39:56 +00:00
Author
Owner
Copy Link
Copy Source

Thanks :) I got the local to server side done. It feels a bit hacky, but I think its worth it, since this is a nice usability upgrade.
Next up is the server to local side, but this should be easier, since I can reuse a lot of the code.
I'm also thinking about include and exclude flags, since it is already supported by the docker library.

Thanks :) I got the local to server side done. It feels a bit hacky, but I think its worth it, since this is a nice usability upgrade. Next up is the server to local side, but this should be easier, since I can reuse a lot of the code. I'm also thinking about include and exclude flags, since it is already supported by the docker library.
p4u1 reviewed 2023-11-20 20:34:51 +00:00
tests/integration/app_cp.bats Outdated
@@ -5,9 +5,11 @@ setup_file(){
_common_setup
_add_server
_new_app
_deploy_app
p4u1 commented 2023-11-20 20:34:51 +00:00
Author
Owner
Copy Link
Copy Source

@decentral1se I changed this test file, so that the app only gets deployed once for this file. This increases the time needed to rune the whole test file by a lot. Is this change ok? Otherwise I can change it back to how it was before.

@decentral1se I changed this test file, so that the app only gets deployed once for this file. This increases the time needed to rune the whole test file by a lot. Is this change ok? Otherwise I can change it back to how it was before.
👍 1
decentral1se marked this conversation as resolved
p4u1 commented 2023-11-20 20:36:25 +00:00
Author
Owner
Copy Link
Copy Source

@3wordchant This is ready for review now :)

@3wordchant This is ready for review now :)
p4u1 marked the pull request as ready for review 2023-11-20 21:48:05 +00:00
3wordchant commented 2023-11-23 11:19:51 +00:00
Owner
Copy Link
Copy Source

Will aim to review today, thanks so much @p4u1! 🙏

Will aim to review today, thanks so much @p4u1! 🙏
decentral1se reviewed 2023-11-27 09:55:32 +00:00
decentral1se left a comment
Owner
Copy Link
Copy Source

Solid stuff, some minor comments! Don't have time atm to run the test suite and such but when you're happy with it @p4u1, please do merge it. Thanks for working on this. I've added you to the org team, you have read/write permissions.

Solid stuff, some minor comments! Don't have time atm to run the test suite and such but when you're happy with it @p4u1, please do merge it. Thanks for working on this. I've added you to the org team, you have read/write permissions.
❤️ 1
cli/app/cp.go Outdated
@@ -91,1 +63,3 @@
}
srcPath, dstPath, service, toContainer, err := parseSrcAndDst(src, dst)
if err != nil {
log.Fatal(err)
decentral1se commented 2023-11-27 09:48:28 +00:00
Owner
Copy Link
Copy Source

logrus.Fatal(err)

`logrus.Fatal(err)`
👍 1
p4u1 marked this conversation as resolved
cli/app/cp.go Outdated
@@ -150,0 +292,4 @@
ErrDstDirNotExist = fmt.Errorf("destination directory does not exist")
)
func copyMode(srcPath, dstPath string, srcMode os.FileMode, dstMode os.FileMode, dstExists bool) (CopyMode, error) {
decentral1se commented 2023-11-27 09:51:09 +00:00
Owner
Copy Link
Copy Source

Missing docs string?

Missing docs string?
p4u1 commented 2023-11-27 14:41:45 +00:00
Author
Owner
Copy Link
Copy Source

I added documentation to all copy modes and add a reference in here. See bd32d20a2b

I added documentation to all copy modes and add a reference in here. See https://git.coopcloud.tech/coop-cloud/abra/commit/bd32d20a2bbe96778d38bd90d9695f980c975b12
p4u1 marked this conversation as resolved
pkg/container/container.go Outdated
@@ -69,2 +69,4 @@
return containers[0], nil
}
// Retrieves the container for the given stack and service.
decentral1se commented 2023-11-27 09:52:03 +00:00
Owner
Copy Link
Copy Source
// GetContainerFromStackAndService retrieves the container for the given stack and service.
```go // GetContainerFromStackAndService retrieves the container for the given stack and service. ```
👍 1
p4u1 marked this conversation as resolved
p4u1 force-pushed cp-enhancements from a94dc125f4 to bd32d20a2b 2023-11-27 14:40:03 +00:00 Compare
p4u1 commented 2023-11-27 14:44:45 +00:00
Author
Owner
Copy Link
Copy Source

@decentral1se Thanks for the review :) I added a new commit with the changes you suggested.

@3wordchant Do you want still want to review this? (Don't worry, if you need a few more days. I'm in no rush to merge this and would prefer a review from you before merging, since you authored the issue)

@decentral1se Thanks for the review :) I added a new commit with the changes you suggested. @3wordchant Do you want still want to review this? (Don't worry, if you need a few more days. I'm in no rush to merge this and would prefer a review from you before merging, since you authored the issue)
🎉 1
p4u1 force-pushed cp-enhancements from bd32d20a2b to 45d7e5f1fc 2023-12-01 11:26:11 +00:00 Compare
decentral1se reviewed 2023-12-02 11:44:39 +00:00
decentral1se left a comment
Owner
Copy Link
Copy Source

@p4u1 Oh, one other thing: could you change the commit to follow https://www.conventionalcommits.org/en/v1.0.0/ e.g. feat: abra cp enhancements because then it is less work to generate the change log when making releases. Thanks!

@p4u1 Oh, one other thing: could you change the commit to follow https://www.conventionalcommits.org/en/v1.0.0/ e.g. `feat: abra cp enhancements` because then it is less work to generate the change log when making releases. Thanks!
👍 1
p4u1 force-pushed cp-enhancements from 45d7e5f1fc to 296b2e0312 2023-12-02 12:25:44 +00:00 Compare
3wordchant merged commit 2de6934322 into main 2023-12-02 15:39:28 +00:00
3wordchant commented 2023-12-02 15:40:03 +00:00
Owner
Copy Link
Copy Source

11/10, tested all the scenarios listen in #534 and they all work perfectly, huge congratulations and thanks @p4u1 ! 🎉

11/10, tested all the scenarios listen in #534 and they all work perfectly, huge congratulations and thanks @p4u1 ! 🎉
❤️ 2
Sign in to join this conversation.
Reviewers
No Reviewers
p4u1
decentral1se
Labels
Clear labels
bug
Something is not working
 build
go build related issues
 ci/cd
Building things with CI/CD
 critical fix
https://docs.coopcloud.tech/federation/resolutions/passed/010/
 design
UI/UX
 documentation
Documenting all the things
 duplicate
This issue or pull request already exists
 easy-first-issue
Something for new people to get stuck into. We hope it's easy!
 enhancement
New feature
 help wanted
Need some help
 i10n
Everything to do with localisation
 i18n
Everything to do with internationalisation
 installer
Everything to do with the install script.
 invalid
Something is wrong
 question
More information is needed
 release
Release management
 release-candidate
Related to the new release candidate
 security
Security related
 tech-debt
test
Unit/integration testing
 wontfix
This won't be fixed
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
3wordchant aadil (Aadil Ayub) abra-bot (Abra Bot) ammaratef45 amras (Sarma) Apfelwurm BornDeleuze Brooke carla cas (Cassowary) coopcloud cyrnel decentral1se (d1) dede devydave fauno (fauno) iexos jade (Jade Ambrose) jjsfunhouse jmakdah2 (Jackie Makdah) joe-irving (Joe Irving) kawaiipunk (KawaiiPunk) knoflook kolaente lambdabundesverband linnealovespie (April) moosemower moritz notplants oxaliq (sorrel) p4u1 pharaohgraphy (Andrew 🐦‍🔥❤️‍🔥✴️) renovate-bot (Comrade Renovate Bot) ripclap simon sixsmith (Sixsmith) stevensting trav (Trav Fryer) val (val (he/him)) yksflip
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: toolshed/abra#390