opensource/flux2
1
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2025-11-02 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use proper GPG terminology

Browse Source 
Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
Hidde Beydals
2021-10-08 19:34:39 +02:00
parent 25283d357e
commit 5249d17a95
7 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/bootstrap/git/commit_options.go
View File

@ -13,9 +13,9 @@ type CommitOptions struct {
// GPGSigningInfo contains information for signing a commit.
type GPGSigningInfo struct {
PrivateKeyPath string
Passphrase string
KeyID string
KeyRingPath string
Passphrase string
KeyID string
}
type GpgSigningOption struct {
@ -27,16 +27,16 @@ func (w GpgSigningOption) ApplyToCommit(in *CommitOptions) {
}
func WithGpgSigningOption(path, passphrase, keyID string) Option {
// return nil info if no path is set
// Return nil if no path is set, even if other options are configured.
if path == "" {
return GpgSigningOption{}
}
return GpgSigningOption{
GPGSigningInfo: &GPGSigningInfo{
PrivateKeyPath: path,
Passphrase: passphrase,
KeyID: keyID,
KeyRingPath: path,
Passphrase: passphrase,
KeyID: keyID,
},
}
}