Fix flag name from 'enableTls' -> 'enableTLS'. Make bool comparisons …

…conform to go best practices.
sigstore · Feb 13, 2024 · 8611688 · 8611688
1 parent 53238d4
commit 8611688
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/cmd/backfill-redis/main.go b/cmd/backfill-redis/main.go
@@ -70,7 +70,7 @@ var (
 	redisPassword      = flag.String("password", "", "Password for Redis authentication")
 	startIndex         = flag.Int("start", -1, "First index to backfill")
 	endIndex           = flag.Int("end", -1, "Last index to backfill")
-	enableTls          = flag.Bool("enable-tls", false, "Enable TLS for Redis client")
+	enableTLS          = flag.Bool("enable-tls", false, "Enable TLS for Redis client")
 	insecureSkipVerify = flag.Bool("insecure-skip-verify", false, "Whether to skip TLS verification for Redis client or not")
 	rekorAddress       = flag.String("rekor-address", "", "Address for Rekor, e.g. https://rekor.sigstore.dev")
 	versionFlag        = flag.Bool("version", false, "Print the current version of Backfill Redis")
@@ -215,22 +215,21 @@ func redisClient() *redis.Client {
 		InsecureSkipVerify: *insecureSkipVerify,
 	}
 
-	if *enableTls == true {
+	if *enableTLS {
 		return redis.NewClient(&redis.Options{
 			Addr:      fmt.Sprintf("%s:%s", *redisHostname, *redisPort),
 			Password:  *redisPassword,
 			Network:   "tcp",
 			TLSConfig: tlsConfig,
 			DB:        0, // default DB
 		})
-	} else {
-		return redis.NewClient(&redis.Options{
-			Addr:     fmt.Sprintf("%s:%s", *redisHostname, *redisPort),
-			Password: *redisPassword,
-			Network:  "tcp",
-			DB:       0, // default DB
-		})
 	}
+	return redis.NewClient(&redis.Options{
+		Addr:     fmt.Sprintf("%s:%s", *redisHostname, *redisPort),
+		Password: *redisPassword,
+		Network:  "tcp",
+		DB:       0, // default DB
+	})
 }
 
 // unmarshalEntryImpl decodes the base64-encoded entry to a specific entry type (types.EntryImpl).

diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -188,7 +188,7 @@ func ConfigureAPI(treeID uint) {
 }
 
 func NewRedisClient() *redis.Client {
-	if viper.GetBool("redis_server.enable-tls") == true {
+	if viper.GetBool("redis_server.enable-tls") {
 		return redis.NewClient(&redis.Options{
 			Addr:     fmt.Sprintf("%v:%v", viper.GetString("redis_server.address"), viper.GetUint64("redis_server.port")),
 			Password: viper.GetString("redis_server.password"),
@@ -199,14 +199,13 @@ func NewRedisClient() *redis.Client {
 			},
 			DB: 0, // default DB
 		})
-	} else {
-		return redis.NewClient(&redis.Options{
-			Addr:     fmt.Sprintf("%v:%v", viper.GetString("redis_server.address"), viper.GetUint64("redis_server.port")),
-			Password: viper.GetString("redis_server.password"),
-			Network:  "tcp",
-			DB:       0, // default DB
-		})
 	}
+	return redis.NewClient(&redis.Options{
+		Addr:     fmt.Sprintf("%v:%v", viper.GetString("redis_server.address"), viper.GetUint64("redis_server.port")),
+		Password: viper.GetString("redis_server.password"),
+		Network:  "tcp",
+		DB:       0, // default DB
+	})
 }
 
 func StopAPI() {