From 120ea92816478e3ad8c8842836b336d775577758 Mon Sep 17 00:00:00 2001 From: vaikas-google Date: Wed, 27 Jan 2016 14:54:09 -0800 Subject: [PATCH] address CR comments --- dm/dm.go | 6 +----- manager/deployments.go | 5 ++++- registry/github_package_registry.go | 4 ---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dm/dm.go b/dm/dm.go index 9b77a55d4..1fa9da578 100644 --- a/dm/dm.go +++ b/dm/dm.go @@ -295,11 +295,7 @@ func getDownloadURLs(tName string) []string { if err := json.Unmarshal([]byte(resp), &u); err != nil { panic(fmt.Errorf("Failed to parse JSON response from service: %s", resp)) } - urls := []string{} - for _, url := range u { - urls = append(urls, url) - } - return urls + return u } func loadTemplate(args []string) *common.Template { diff --git a/manager/deployments.go b/manager/deployments.go index 42ee00a22..ff6accb6c 100644 --- a/manager/deployments.go +++ b/manager/deployments.go @@ -80,6 +80,9 @@ func init() { routes = append(routes, deployments...) var credentialProvider common.CredentialProvider if *credentialFile != "" { + if *credentialSecrets { + panic(fmt.Errorf("Both credentialFile and credentialSecrets are set")) + } var err error credentialProvider, err = registry.NewFilebasedCredentialProvider(*credentialFile) if err != nil { @@ -427,7 +430,7 @@ func getDownloadURLsHandlerFunc(w http.ResponseWriter, r *http.Request) { return } - var urls = []string{} + urls := []string{} for _, u := range c { urls = append(urls, u.String()) } diff --git a/registry/github_package_registry.go b/registry/github_package_registry.go index 5d91147ef..7f457021b 100644 --- a/registry/github_package_registry.go +++ b/registry/github_package_registry.go @@ -124,10 +124,6 @@ func (g GithubPackageRegistry) GetDownloadURLs(t Type) ([]*url.URL, error) { } } } - - for _, ll := range downloadURLs { - log.Printf("Found DOWNLOAD URL AS: %#v", ll.String()) - } return downloadURLs, nil }