fix(example): improve arg name used for tls skip verify (#2385)

IBM · Dec 13, 2022 · 8828f05 · 8828f05
1 parent 978aadd
commit 8828f05
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/examples/http_server/http_server.go b/examples/http_server/http_server.go
@@ -16,13 +16,13 @@ import (
 )
 
 var (
-	addr      = flag.String("addr", ":8080", "The address to bind to")
-	brokers   = flag.String("brokers", os.Getenv("KAFKA_PEERS"), "The Kafka brokers to connect to, as a comma separated list")
-	verbose   = flag.Bool("verbose", false, "Turn on Sarama logging")
-	certFile  = flag.String("certificate", "", "The optional certificate file for client authentication")
-	keyFile   = flag.String("key", "", "The optional key file for client authentication")
-	caFile    = flag.String("ca", "", "The optional certificate authority file for TLS client authentication")
-	verifySsl = flag.Bool("verify", false, "Optional verify ssl certificates chain")
+	addr          = flag.String("addr", ":8080", "The address to bind to")
+	brokers       = flag.String("brokers", os.Getenv("KAFKA_PEERS"), "The Kafka brokers to connect to, as a comma separated list")
+	verbose       = flag.Bool("verbose", false, "Turn on Sarama logging")
+	certFile      = flag.String("certificate", "", "The optional certificate file for client authentication")
+	keyFile       = flag.String("key", "", "The optional key file for client authentication")
+	caFile        = flag.String("ca", "", "The optional certificate authority file for TLS client authentication")
+	tlsSkipVerify = flag.Bool("tls-skip-verify", false, "Whether to skip TLS server cert verification")
 )
 
 func main() {
@@ -71,7 +71,7 @@ func createTlsConfiguration() (t *tls.Config) {
 		t = &tls.Config{
 			Certificates:       []tls.Certificate{cert},
 			RootCAs:            caCertPool,
-			InsecureSkipVerify: *verifySsl,
+			InsecureSkipVerify: *tlsSkipVerify,
 		}
 	}
 	// will be nil by default if nothing is provided

diff --git a/examples/sasl_scram_client/main.go b/examples/sasl_scram_client/main.go
@@ -17,25 +17,25 @@ func init() {
 }
 
 var (
-	brokers   = flag.String("brokers", os.Getenv("KAFKA_PEERS"), "The Kafka brokers to connect to, as a comma separated list")
-	userName  = flag.String("username", "", "The SASL username")
-	passwd    = flag.String("passwd", "", "The SASL password")
-	algorithm = flag.String("algorithm", "", "The SASL SCRAM SHA algorithm sha256 or sha512 as mechanism")
-	topic     = flag.String("topic", "default_topic", "The Kafka topic to use")
-	certFile  = flag.String("certificate", "", "The optional certificate file for client authentication")
-	keyFile   = flag.String("key", "", "The optional key file for client authentication")
-	caFile    = flag.String("ca", "", "The optional certificate authority file for TLS client authentication")
-	verifySSL = flag.Bool("verify", false, "Optional verify ssl certificates chain")
-	useTLS    = flag.Bool("tls", false, "Use TLS to communicate with the cluster")
-	mode      = flag.String("mode", "produce", "Mode to run in: \"produce\" to produce, \"consume\" to consume")
-	logMsg    = flag.Bool("logmsg", false, "True to log consumed messages to console")
+	brokers       = flag.String("brokers", os.Getenv("KAFKA_PEERS"), "The Kafka brokers to connect to, as a comma separated list")
+	userName      = flag.String("username", "", "The SASL username")
+	passwd        = flag.String("passwd", "", "The SASL password")
+	algorithm     = flag.String("algorithm", "", "The SASL SCRAM SHA algorithm sha256 or sha512 as mechanism")
+	topic         = flag.String("topic", "default_topic", "The Kafka topic to use")
+	certFile      = flag.String("certificate", "", "The optional certificate file for client authentication")
+	keyFile       = flag.String("key", "", "The optional key file for client authentication")
+	caFile        = flag.String("ca", "", "The optional certificate authority file for TLS client authentication")
+	tlsSkipVerify = flag.Bool("tls-skip-verify", false, "Whether to skip TLS server cert verification")
+	useTLS        = flag.Bool("tls", false, "Use TLS to communicate with the cluster")
+	mode          = flag.String("mode", "produce", "Mode to run in: \"produce\" to produce, \"consume\" to consume")
+	logMsg        = flag.Bool("logmsg", false, "True to log consumed messages to console")
 
 	logger = log.New(os.Stdout, "[Producer] ", log.LstdFlags)
 )
 
 func createTLSConfiguration() (t *tls.Config) {
 	t = &tls.Config{
-		InsecureSkipVerify: *verifySSL,
+		InsecureSkipVerify: *tlsSkipVerify,
 	}
 	if *certFile != "" && *keyFile != "" && *caFile != "" {
 		cert, err := tls.LoadX509KeyPair(*certFile, *keyFile)
@@ -54,7 +54,7 @@ func createTLSConfiguration() (t *tls.Config) {
 		t = &tls.Config{
 			Certificates:       []tls.Certificate{cert},
 			RootCAs:            caCertPool,
-			InsecureSkipVerify: *verifySSL,
+			InsecureSkipVerify: *tlsSkipVerify,
 		}
 	}
 	return t