Skip to content

Fix validation bug on Piped config #2219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pipecd-bot merged 2 commits into from
Jul 12, 2021
Merged

Fix validation bug on Piped config #2219

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
464fdfd
Fix validation bug on Piped config
nghialv Jul 12, 2021
a10044f
Update pkg/config/piped.go
nghialv Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/config/piped.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,11 @@ func (s *PipedSpec) Validate() error {
if s.PipedID == "" {
return errors.New("pipedID must be set")
}
if s.PipedKeyFile == "" {
return errors.New("pipedKeyFile must be set")
if s.PipedKeyData == "" && s.PipedKeyFile == "" {
return errors.New("either pipedKeyFile or pipedKeyData must be set")
}
if s.PipedKeyData != "" && s.PipedKeyFile != "" {
return errors.New("only pipedKeyFile or pipedKeyData can be set")
}
if s.APIAddress == "" {
return errors.New("apiAddress must be set")
Expand Down Expand Up @@ -194,9 +197,6 @@ func (s *PipedSpec) GetSecretManagement() *SecretManagement {
}

func (s *PipedSpec) LoadPipedKey() ([]byte, error) {
if s.PipedKeyData != "" && s.PipedKeyFile != "" {
Copy link
Member

@nakabonne nakabonne Jul 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right

return nil, errors.New("only either pipedKeyFile or pipedKeyData can be set")
}
if s.PipedKeyData != "" {
return base64.StdEncoding.DecodeString(s.PipedKeyData)
}
Expand Down