Merge pull request #229 from jackgr/master

Replace cross package panic with error return.
pull/254/head
vaikas-google 9 years ago
commit 04d8ae4e21

@ -168,6 +168,7 @@ type githubRegistryProvider struct {
// NewGithubRegistryProvider creates a GithubRegistryProvider. // NewGithubRegistryProvider creates a GithubRegistryProvider.
func NewGithubRegistryProvider(cp common.CredentialProvider) GithubRegistryProvider { func NewGithubRegistryProvider(cp common.CredentialProvider) GithubRegistryProvider {
if cp == nil { if cp == nil {
// TODO: replace this panic with an error return.
panic(fmt.Errorf("no credential provider")) panic(fmt.Errorf("no credential provider"))
} }
return &githubRegistryProvider{cp: cp} return &githubRegistryProvider{cp: cp}
@ -239,6 +240,7 @@ type gcsRegistryProvider struct {
// NewGCSRegistryProvider creates a GCSRegistryProvider. // NewGCSRegistryProvider creates a GCSRegistryProvider.
func NewGCSRegistryProvider(cp common.CredentialProvider) GCSRegistryProvider { func NewGCSRegistryProvider(cp common.CredentialProvider) GCSRegistryProvider {
if cp == nil { if cp == nil {
// TODO: replace this panic with an error return.
panic(fmt.Errorf("no credential provider")) panic(fmt.Errorf("no credential provider"))
} }
return &gcsRegistryProvider{cp: cp} return &gcsRegistryProvider{cp: cp}
@ -350,7 +352,7 @@ func ShortTypeToDownloadURLs(rp RegistryProvider, t string) ([]string, Registry,
} }
if r == nil { if r == nil {
panic(fmt.Errorf("cannot get github registry for %s", t)) return nil, nil, fmt.Errorf("cannot get github registry for %s", t)
} }
tt, err := NewType(m[3], m[4], m[5]) tt, err := NewType(m[3], m[4], m[5])

Loading…
Cancel
Save