Skip bad updates in watchInstancesLoop (GoogleCloudPlatform#311)

bajb · kurtisvg · commit 69852d3cd6a8 · 2019-10-04T12:44:46.000-07:00
diff --git a/cmd/cloud_sql_proxy/proxy.go b/cmd/cloud_sql_proxy/proxy.go
@@ -66,6 +66,8 @@ func watchInstancesLoop(dir string, dst chan<- proxy.Conn, updates <-chan string
 		list, err := parseInstanceConfigs(dir, strings.Split(instances, ","), cl)
 		if err != nil {
 			logging.Errorf("%v", err)
+			// If we do not have a valid list of instances, skip this update
+			continue
 		}
 
 		stillOpen := make(map[string]net.Listener)
@@ -334,6 +336,7 @@ func CreateInstanceConfigs(dir string, useFuse bool, instances []string, instanc
 
 	cfgs, err := parseInstanceConfigs(dir, instances, cl)
 	if err != nil {
+		// Error when unable to correctly parse the instance configuration
 		return nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ func watchInstancesLoop(dir string, dst chan<- proxy.Conn, updates <-chan string`
`66`	`66`	`list, err := parseInstanceConfigs(dir, strings.Split(instances, ","), cl)`
`67`	`67`	`if err != nil {`
`68`	`68`	`logging.Errorf("%v", err)`
	`69`	`+ // If we do not have a valid list of instances, skip this update`
	`70`	`+ continue`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`stillOpen := make(map[string]net.Listener)`
`@@ -334,6 +336,7 @@ func CreateInstanceConfigs(dir string, useFuse bool, instances []string, instanc`
`334`	`336`
`335`	`337`	`cfgs, err := parseInstanceConfigs(dir, instances, cl)`
`336`	`338`	`if err != nil {`
	`339`	`+ // Error when unable to correctly parse the instance configuration`
`337`	`340`	`return nil, err`
`338`	`341`	`}`
`339`	`342`