chore: Add hidden options to support v1-to-v2 translation.

Author: hessjcg

cmd/options.go

@@ -76,6 +76,30 @@ func WithAutoIP() Option {
 	}
 }
 
+// WithProxyV1Compatibility enables legacy behavior of v1 and will print
+// out "Ready for new connections" when the proxy starts.
+func WithProxyV1Compatibility() Option {
+	return func(c *Command) {
+		c.conf.ProxyV1Compatibility = true
+	}
+}
+
+// WithProxyV1LogDebugStdout enables legacy behavior of v1 and will print
+// debug/info logs to stdout instead of stderr.
+func WithProxyV1LogDebugStdout() Option {
+	return func(c *Command) {
+		c.conf.LogDebugStdout = true
+	}
+}
+
+// WithProxyV1Verbose enables legacy behavior of v1 and will set
+// the debug-logs flag on the v2 proxy.
+func WithProxyV1Verbose(v bool) Option {
+	return func(c *Command) {
+		c.conf.DebugLogs = v
+	}
+}
+
 // WithQuietLogging configures the Proxy to log error messages only.
 func WithQuietLogging() Option {
 	return func(c *Command) {

cmd/options_test.go

@@ -146,6 +146,36 @@ func TestCommandOptions(t *testing.T) {
 			},
 			option: WithLazyRefresh(),
 		},
+		{
+			desc: "with proxy v1 compatibility",
+			isValid: func(c *Command) error {
+				if !c.conf.ProxyV1Compatibility {
+					return errors.New("compatibility was false, but should be true")
+				}
+				return nil
+			},
+			option: WithProxyV1Compatibility(),
+		},
+		{
+			desc: "with proxy v1 verbose true",
+			isValid: func(c *Command) error {
+				if !c.conf.DebugLogs {
+					return errors.New("DebugLogs was false, but should be true")
+				}
+				return nil
+			},
+			option: WithProxyV1Verbose(true),
+		},
+		{
+			desc: "with proxy v1 verbose false",
+			isValid: func(c *Command) error {
+				if c.conf.DebugLogs {
+					return errors.New("DebugLogs was true, but should be false")
+				}
+				return nil
+			},
+			option: WithProxyV1Verbose(false),
+		},
 	}
 
 	for _, tc := range tcs {

cmd/root.go

@@ -83,6 +83,19 @@ func Execute() {
 	}
 }
 
+// Execute adds all child commands to the root command and sets flags appropriately.
+// This is called by main.main(). It only needs to happen once to the rootCmd.
+func ExecuteCommand(c *Command) {
+	if err := c.Execute(); err != nil {
+		exit := 1
+		var terr *exitError
+		if errors.As(err, &terr) {
+			exit = terr.Code
+		}
+		os.Exit(exit)
+	}
+}
+
 // Command represents an invocation of the Cloud SQL Auth Proxy.
 type Command struct {
 	*cobra.Command
@@ -646,6 +659,8 @@ func loadConfig(c *Command, args []string, opts []Option) error {
 
 	if c.conf.Quiet {
 		c.logger = log.NewStdLogger(io.Discard, os.Stderr)
+	} else if c.conf.LogDebugStdout {
+		c.logger = log.NewStdLogger(os.Stdout, os.Stderr)
 	}
 
 	err = parseConfig(c, c.conf, args)
@@ -1105,6 +1120,9 @@ func runSignalWrapper(cmd *Command) (err error) {
 		return err
 	case p = <-startCh:
 		cmd.logger.Infof("The proxy has started successfully and is ready for new connections!")
+		if cmd.conf.ProxyV1Compatibility {
+			cmd.logger.Infof("Ready for new connections")
+		}
 		// If running under systemd with Type=notify, it will send a message to the
 		// service manager that it is ready to handle connections now.
 		go func() {

internal/proxy/proxy.go

@@ -188,6 +188,14 @@ type Config struct {
 	// endpoint for all instances
 	PSC bool
 
+	// ProxyV1Compatibility supports a legacy behavior where the Proxy will
+	// print out "Ready for new connections" when the proxy starts.
+	ProxyV1Compatibility bool
+
+	// LogDebugStdout supports a legacy behavior where the Proxy will
+	// print debug/info logs to stdout instead of stderr.
+	LogDebugStdout bool
+
 	// AutoIP supports a legacy behavior where the Proxy will connect to
 	// the first IP address returned from the SQL ADmin API response. This
 	// setting should be avoided and used only to support legacy Proxy