salesforce: Move oauthAddr to salesforceAddr for fake server

Author: beautifulentropy

test/config-next/salesforce-test-srv.json

@@ -1,5 +1,5 @@
 {
-	"oauthAddr": ":9601",
+	"salesforceAddr": ":9601",
 	"pardotAddr": ":9602",
 	"expectedClientId": "test-client-id",
 	"expectedClientSecret": "you-shall-not-pass"

test/config/salesforce-test-srv.json

@@ -1,5 +1,5 @@
 {
-	"oauthAddr": ":9601",
+	"salesforceAddr": ":9601",
 	"pardotAddr": ":9602",
 	"expectedClientId": "test-client-id",
 	"expectedClientSecret": "you-shall-not-pass"

test/salesforce-test-srv/main.go

@@ -19,13 +19,6 @@ import (
 var contactsCap = 20
 
 type config struct {
-	// OAuthAddr is the address (e.g. IP:port) on which the Salesforce REST API
-	// and OAuth API server will listen.
-	//
-	// Deprecated: Use SalesforceAddr instead.
-	// TODO(#8410): Remove this field.
-	OAuthAddr string
-
 	// SalesforceAddr is the address (e.g. IP:port) on which the Salesforce REST
 	// API and OAuth API server will listen.
 	SalesforceAddr string
@@ -209,8 +202,6 @@ func (ts *testServer) queryCasesHandler(w http.ResponseWriter, r *http.Request)
 }
 
 func main() {
-	// TODO(#8410): Remove the oauthAddr flag.
-	oauthAddr := flag.String("oauth-addr", "", "Salesforce REST API and OAuth server listen address override (deprecated: use --salesforce-addr instead)")
 	salesforceAddr := flag.String("salesforce-addr", "", "Salesforce REST API and OAuth server listen address override")
 	pardotAddr := flag.String("pardot-addr", "", "Pardot server listen address override")
 	configFile := flag.String("config", "", "Path to configuration file")
@@ -225,29 +216,24 @@ func main() {
 	err := cmd.ReadConfigFile(*configFile, &c)
 	cmd.FailOnError(err, "Reading JSON config file into config structure")
 
-	// TODO(#8410): Reduce this logic down to just using salesforceAddr once
-	// oauthAddr is removed.
-	firstNonEmpty := func(vals ...string) string {
-		for _, v := range vals {
-			if v != "" {
-				return v
-			}
-		}
-		return ""
+	if *salesforceAddr != "" {
+		c.SalesforceAddr = *salesforceAddr
 	}
-	c.SalesforceAddr = firstNonEmpty(*salesforceAddr, c.SalesforceAddr, *oauthAddr, c.OAuthAddr)
 	if c.SalesforceAddr == "" {
-		log.Fatal("--salesforce-addr or JSON salesforceAddr must be set (or use deprecated --oauth-addr or JSON oauthAddr until removed)")
+		cmd.Fail("SalesforceAddr must be specified in config or via -salesforce-addr flag")
 	}
 
 	if *pardotAddr != "" {
 		c.PardotAddr = *pardotAddr
 	}
+	if c.PardotAddr == "" {
+		cmd.Fail("PardotAddr must be specified in config or via -pardot-addr flag")
+	}
 
 	tokenBytes := make([]byte, 32)
 	_, err = rand.Read(tokenBytes)
 	if err != nil {
-		log.Fatalf("Failed to generate token: %v", err)
+		cmd.Fail("Failed to generate token")
 	}
 
 	ts := &testServer{