Check for error before accessing field on sql

kirbyquerby · hfwang · commit b9c6045e2e80 · 2018-06-22T17:38:25.000-07:00
diff --git a/cmd/cloud_sql_proxy/proxy.go b/cmd/cloud_sql_proxy/proxy.go
@@ -238,11 +238,10 @@ func parseInstanceConfig(dir, instance string, cl *http.Client) (instanceConfig,
 		}
 	} else {
 		sql, err := sqladmin.New(cl)
-		sql.BasePath = *host
 		if err != nil {
 			return instanceConfig{}, err
 		}
-
+		sql.BasePath = *host
 		ret.Instance = instance
 		// Default to unix socket.
 		ret.Network = "unix"

Original file line number	Diff line number	Diff line change
`@@ -238,11 +238,10 @@ func parseInstanceConfig(dir, instance string, cl *http.Client) (instanceConfig,`
`238`	`238`	`}`
`239`	`239`	`} else {`
`240`	`240`	`sql, err := sqladmin.New(cl)`
`241`		`- sql.BasePath = *host`
`242`	`241`	`if err != nil {`
`243`	`242`	`return instanceConfig{}, err`
`244`	`243`	`}`
`245`		`-`
	`244`	`+ sql.BasePath = *host`
`246`	`245`	`ret.Instance = instance`
`247`	`246`	`// Default to unix socket.`
`248`	`247`	`ret.Network = "unix"`