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

Prompt for secrets if not provided on CLI #616

Merged
3wordchant merged 3 commits from calix/646 into main 2025-08-26 17:15:48 +00:00
Conversation 6 Commits 3 Files Changed 2
+38 -7
3wordchant commented 2025-08-25 21:18:41 +00:00
Owner
Copy Link
Copy Source

Re #646

NB I added an integration test to check for the expected failure if the user provides --no-input, but I didn't add a test for the new interactive prompt behaviour because I couldn't find an existing example, and adding expect seemed to be a Big Change Probably Requiring Some Discussion.

Re #646 NB I added an integration test to check for the expected failure if the user provides `--no-input`, but I didn't add a test for the new interactive prompt behaviour because I couldn't find an existing example, and adding `expect` seemed to be a Big Change Probably Requiring Some Discussion.
🎉 1
3wordchant added 1 commit 2025-08-25 21:18:41 +00:00
Prompt for secrets if not provided on CLI
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
238647a987 
Re #646
3wordchant requested review from decentral1se 2025-08-25 21:18:41 +00:00
decentral1se reviewed 2025-08-25 21:35:06 +00:00
decentral1se left a comment
Owner
Copy Link
Copy Source

Radical ☀️ I would also just do a bunch of manual testing for this and call it a day. I don't think we test interactive output anywhere in any part of our testing infra. So yeh, fuck it.

Radical ☀️ I would also just do a bunch of manual testing for this and call it a day. I don't think we test interactive output anywhere in any part of our testing infra. So yeh, fuck it.
❤️ 1
cli/app/secret.go Outdated
@@ -192,0 +196,4 @@
if len(args) > 3 {
data = args[3]
} else if internal.NoInput {
log.Fatal("Must provide <data> argument if --no-input is passed")
decentral1se commented 2025-08-25 21:34:01 +00:00
Owner
Copy Link
Copy Source

Gotta do the i18n.G(...) string wrapping translation dance 🙃

Also, convention for logging is usually no capitalisation / lower-case 🤷

Gotta do the `i18n.G(...)` string wrapping translation dance 🙃 Also, convention for logging is usually no capitalisation / lower-case 🤷
3wordchant marked this conversation as resolved
cli/app/secret.go Outdated
@@ -213,0 +225,4 @@
if insertFromFile {
message = "Specify secret file"
}
prompt := &survey.Input{
decentral1se commented 2025-08-25 21:32:52 +00:00
Owner
Copy Link
Copy Source

survey.Password

[`survey.Password`](https://github.com/AlecAivazis/survey?tab=readme-ov-file#password)
3wordchant marked this conversation as resolved
p4u1 commented 2025-08-25 21:36:45 +00:00
Owner
Copy Link
Copy Source

Nice! It will conflict with my changes though #614
I can update my PR to include your commit and make it work with the stdin reading

Nice! It will conflict with my changes though https://git.coopcloud.tech/toolshed/abra/pulls/614 I can update my PR to include your commit and make it work with the stdin reading
👀 1
decentral1se added this to the Abra v0.11.x project 2025-08-25 21:39:02 +00:00
3wordchant added 1 commit 2025-08-25 22:12:27 +00:00
Implement PR feedback
continuous-integration/drone/push Build is passing
Details
7b7477062f
3wordchant commented 2025-08-25 22:13:35 +00:00
Author
Owner
Copy Link
Copy Source

Ty for the review @decentral1se ! Made those changes

Nice! It will conflict with my changes though #614

Argh sorry @p4u1, let me know if I can help.

Ty for the review @decentral1se ! Made those changes > Nice! It will conflict with my changes though #614 Argh sorry @p4u1, let me know if I can help.
👍 1
decentral1se reviewed 2025-08-26 06:11:20 +00:00
cli/app/secret.go Outdated
@@ -211,2 +220,4 @@
}
if data == "" && !internal.NoInput {
log.Debug("Secret data not provided on command-line, prompting")
decentral1se commented 2025-08-26 06:11:02 +00:00
Owner
Copy Link
Copy Source

i18n.G / capitalisaion 👁‍🗨

`i18n.G` / capitalisaion 👁‍🗨
3wordchant marked this conversation as resolved
cli/app/secret.go Outdated
@@ -213,0 +224,4 @@
var prompt survey.Prompt
if !insertFromFile {
prompt = &survey.Password{
Message: i18n.G("Specify secret value"),
decentral1se commented 2025-08-26 06:11:06 +00:00
Owner
Copy Link
Copy Source

i18n.G / capitalisaion 👁‍🗨

`i18n.G` / capitalisaion 👁‍🗨
3wordchant marked this conversation as resolved
cli/app/secret.go Outdated
@@ -213,0 +228,4 @@
}
} else {
prompt = &survey.Input{
Message: i18n.G("Specify secret file"),
decentral1se commented 2025-08-26 06:11:12 +00:00
Owner
Copy Link
Copy Source

i18n.G / capitalisaion 👁‍🗨

`i18n.G` / capitalisaion 👁‍🗨
3wordchant marked this conversation as resolved
decentral1se commented 2025-08-26 06:13:10 +00:00
Owner
Copy Link
Copy Source

We probably do need that fix suggested in #614 (comment) to wrap the i18n.G call inside the logging functions. If someone is keen to pick it up 🙏 Feel free to merge anyway and come back on it. Happy merge conflict resolving 🤸

We probably do need that fix suggested in https://git.coopcloud.tech/toolshed/abra/pulls/614#issuecomment-26246 to wrap the `i18n.G` call inside the logging functions. If someone is keen to pick it up 🙏 Feel free to merge anyway and come back on it. Happy merge conflict resolving 🤸
3wordchant added 1 commit 2025-08-26 17:15:15 +00:00
Moar PR feedback
continuous-integration/drone/push Build is passing
Details
7dd7f763f4
3wordchant commented 2025-08-26 17:15:44 +00:00
Author
Owner
Copy Link
Copy Source

OK additional tweaks made, mergin'

OK additional tweaks made, mergin'
🚀 1
3wordchant merged commit 7dd7f763f4 into main 2025-08-26 17:15:48 +00:00
3wordchant deleted branch calix/646 2025-08-26 17:15:49 +00:00
decentral1se moved this to Done in Abra v0.11.x on 2025-08-27 14:00:39 +00:00
decentral1se removed this from the Abra v0.11.x project 2025-08-30 10:14:56 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
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#616