ran go fmt

Author: lychung83

cmd/cloud_sql_proxy/cloud_sql_proxy.go

@@ -81,10 +81,9 @@ can be removed automatically by this program.`)
 	token     = flag.String("token", "", "When set, the proxy uses this Bearer token for authorization.")
 	tokenFile = flag.String("credential_file", "", `If provided, this json file will be used to retrieve Service Account credentials.
 You may set the GOOGLE_APPLICATION_CREDENTIALS environment variable for the same effect.`)
-	
-        // Set when gcloud execution failed.
-        gcloudErrStr string
 
+	// Set when gcloud execution failed.
+	gcloudErrStr string
 )
 
 const (
@@ -332,36 +331,36 @@ func listInstances(ctx context.Context, cl *http.Client, projects []string) ([]s
 }
 
 func gcloudProject() []string {
-        const gcloudResultErrStr = "gcloud failed to get project list. See log for detail."
-        buf := new(bytes.Buffer)
-        cmd := exec.Command("gcloud", "--format", "json", "config", "list", "core/project")
-        cmd.Stdout = buf
-
-        if err := cmd.Run(); err != nil {
-                if strings.Contains(err.Error(), "executable file not found") {
-                        gcloudErrStr = "gcloud could not be found in the system path"
-                        return nil
-                }
-                gcloudErrStr = gcloudResultErrStr
-                logging.Errorf("Error detecting gcloud project: %v", err)
-                return nil
-        }
-
-        var data struct {
-                Core struct {
-                        Project string
-                }
-        }
-
-        if err := json.Unmarshal(buf.Bytes(), &data); err != nil {
-                gcloudErrStr = gcloudResultErrStr
-                logging.Errorf("Failed to unmarshal bytes from gcloud: %v", err)
-                logging.Errorf("   gcloud returned:\n%s", buf)
-                return nil
-        }
-
-        logging.Infof("Using gcloud's active project: %v", data.Core.Project)
-        return []string{data.Core.Project}
+	const gcloudResultErrStr = "gcloud failed to get project list. See log for detail."
+	buf := new(bytes.Buffer)
+	cmd := exec.Command("gcloud", "--format", "json", "config", "list", "core/project")
+	cmd.Stdout = buf
+
+	if err := cmd.Run(); err != nil {
+		if strings.Contains(err.Error(), "executable file not found") {
+			gcloudErrStr = "gcloud could not be found in the system path"
+			return nil
+		}
+		gcloudErrStr = gcloudResultErrStr
+		logging.Errorf("Error detecting gcloud project: %v", err)
+		return nil
+	}
+
+	var data struct {
+		Core struct {
+			Project string
+		}
+	}
+
+	if err := json.Unmarshal(buf.Bytes(), &data); err != nil {
+		gcloudErrStr = gcloudResultErrStr
+		logging.Errorf("Failed to unmarshal bytes from gcloud: %v", err)
+		logging.Errorf("   gcloud returned:\n%s", buf)
+		return nil
+	}
+
+	logging.Infof("Using gcloud's active project: %v", data.Core.Project)
+	return []string{data.Core.Project}
 }
 
 // Main executes the main function of the proxy, allowing it to be called from tests.

cmd/cloud_sql_proxy/proxy.go

@@ -337,19 +337,19 @@ func CreateInstanceConfigs(dir string, useFuse bool, instances []string, instanc
 		return nil, nil
 	}
 	// FUSE disabled.
-        if len(instances) == 0 && instancesSrc == "" { 
-                var flags string 
-                if fuse.Supported() { 
-                        flags = "-projects, -fuse, or -instances" 
-                } else { 
-                        flags = "-projects or -instances" 
-                } 
- 
-                errStr := fmt.Sprintf("no instance selected because none of %s is specified", flags)
-                if gcloudErrStr != "" { 
-                        errStr = fmt.Sprintf("%s and %s", errStr, gcloudErrStr) 
-                } 
-                return nil, errors.New(errStr) 
-        }
+	if len(instances) == 0 && instancesSrc == "" {
+		var flags string
+		if fuse.Supported() {
+			flags = "-projects, -fuse, or -instances"
+		} else {
+			flags = "-projects or -instances"
+		}
+
+		errStr := fmt.Sprintf("no instance selected because none of %s is specified", flags)
+		if gcloudErrStr != "" {
+			errStr = fmt.Sprintf("%s and %s", errStr, gcloudErrStr)
+		}
+		return nil, errors.New(errStr)
+	}
 	return cfgs, nil
 }