incorporated iza's feedback

candysmurf · candysmurf · commit b0dd0d758fb5 · 2017-08-08T13:14:48.000-07:00
diff --git a/mgmt/rest/v2/plugin.go b/mgmt/rest/v2/plugin.go
@@ -284,7 +284,7 @@ func (s *apiV2) loadPlugin(w http.ResponseWriter, r *http.Request, _ httprouter.
 			Write(ec, rb, w)
 			return
 		}
-		cleanUpTempFiles(rp)
+		defer cleanUpTempFiles(rp)
 		Write(201, catalogedPluginBody(r.Host, pl), w)
 	}
 }
@@ -309,9 +309,9 @@ func createTempFile(b []byte, fn string) (string, error) {
 }
 
 func cleanUpTempFiles(rp *core.RequestedPlugin) {
-	defer os.Remove(rp.CACertPaths())
-	defer os.Remove(rp.CertPath())
-	defer os.Remove(rp.KeyPath())
+	os.Remove(rp.CACertPaths())
+	os.Remove(rp.CertPath())
+	os.Remove(rp.KeyPath())
 }
 
 func pluginParameters(p httprouter.Params) (string, string, int, map[string]interface{}, serror.SnapError) {

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ func (s apiV2) loadPlugin(w http.ResponseWriter, r http.Request, _ httprouter.`
`284`	`284`	`Write(ec, rb, w)`
`285`	`285`	`return`
`286`	`286`	`}`
`287`		`- cleanUpTempFiles(rp)`
	`287`	`+ defer cleanUpTempFiles(rp)`
`288`	`288`	`Write(201, catalogedPluginBody(r.Host, pl), w)`
`289`	`289`	`}`
`290`	`290`	`}`
`@@ -309,9 +309,9 @@ func createTempFile(b []byte, fn string) (string, error) {`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`func cleanUpTempFiles(rp *core.RequestedPlugin) {`
`312`		`- defer os.Remove(rp.CACertPaths())`
`313`		`- defer os.Remove(rp.CertPath())`
`314`		`- defer os.Remove(rp.KeyPath())`
	`312`	`+ os.Remove(rp.CACertPaths())`
	`313`	`+ os.Remove(rp.CertPath())`
	`314`	`+ os.Remove(rp.KeyPath())`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`func pluginParameters(p httprouter.Params) (string, string, int, map[string]interface{}, serror.SnapError) {`