Skip to content

Commit 3aa3b0c

Browse files
borsehuss
authored andcommitted
Auto merge of #12985 - Turbo87:fix-1password-account-usage, r=ehuss
cargo-credential-1password: Add missing `--account` argument to `op signin` command ### What does this PR try to resolve? Without this the account chooser is shown by the `op signin` command, even though the user has already specified an account via the `--account` command line argument to the `cargo-credential-1password` CLI. Note that the `--vault` in this case does not need to be forwarded to `op`, since it is irrelevant for the `op signin` command. ### How should we test and review this PR? - Have a 1password installation with multiple accounts - Use `global-credential-providers = ["cargo-credential-1password --account my.1password.com"]` in the cargo config file - Run e.g. `cargo publish` - Notice how you are seeing an account switcher even though `--account` was used - Apply this patch and notice that the account switcher is no longer there and the correct account is selected automatically ### Additional information see https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/1password.20credentials.20provider
1 parent 6790a51 commit 3aa3b0c

File tree

1 file changed

+4
-0
lines changed
  • credential/cargo-credential-1password/src

1 file changed

+4
-0
lines changed

credential/cargo-credential-1password/src/main.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ impl OnePasswordKeychain {
7979
}
8080
let mut cmd = Command::new("op");
8181
cmd.args(["signin", "--raw"]);
82+
if let Some(account) = &self.account {
83+
cmd.arg("--account");
84+
cmd.arg(account);
85+
}
8286
cmd.stdout(Stdio::piped());
8387
let mut child = cmd
8488
.spawn()

0 commit comments

Comments
 (0)