airship/airshipctl
Code Issues Proposed changes

Merge "[#58] Update receivers for golint"

Browse Source
This commit is contained in:
Zuul 2020-03-02 20:32:29 +00:00 committed by Gerrit Code Review
commit 46d5563fae
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/config/repo.go
View File

@ -32,8 +32,8 @@ func (c *RepoCheckout) Equal(s *RepoCheckout) bool {
c.RemoteRef == s.RemoteRef c.RemoteRef == s.RemoteRef
} }
func (r *RepoCheckout) String() string { func (c *RepoCheckout) String() string {
yaml, err := yaml.Marshal(&r) yaml, err := yaml.Marshal(&c)
if err != nil { if err != nil {
return "" return ""
} }
@ -73,8 +73,8 @@ func (auth *RepoAuth) Equal(s *RepoAuth) bool {
auth.Username == s.Username auth.Username == s.Username
} }
func (r *RepoAuth) String() string { func (auth *RepoAuth) String() string {
yaml, err := yaml.Marshal(&r) yaml, err := yaml.Marshal(&auth)
if err != nil { if err != nil {
return "" return ""
} }
@ -124,28 +124,28 @@ func (repo *Repository) Equal(s *Repository) bool {
reflect.DeepEqual(s.CheckoutOptions, repo.CheckoutOptions) reflect.DeepEqual(s.CheckoutOptions, repo.CheckoutOptions)
} }
func (r *Repository) String() string { func (repo *Repository) String() string {
yaml, err := yaml.Marshal(&r) yaml, err := yaml.Marshal(&repo)
if err != nil { if err != nil {
return "" return ""
} }
return string(yaml) return string(yaml)
} }
func (spec *Repository) Validate() error { func (repo *Repository) Validate() error {
if spec.URLString == "" { if repo.URLString == "" {
return ErrRepoSpecRequiresURL{} return ErrRepoSpecRequiresURL{}
} }
if spec.Auth != nil { if repo.Auth != nil {
err := spec.Auth.Validate() err := repo.Auth.Validate()
if err != nil { if err != nil {
return err return err
} }
} }
if spec.CheckoutOptions != nil { if repo.CheckoutOptions != nil {
err := spec.CheckoutOptions.Validate() err := repo.CheckoutOptions.Validate()
if err != nil { if err != nil {
return err return err
} }