Merge pull request #9667 from gyuho/strings

*: remove "strings.Compare == 0"

auth/simple_token.go

@@ -148,7 +148,7 @@ func (t *tokenSimple) invalidateUser(username string) {
 	}
 	t.simpleTokensMu.Lock()
 	for token, name := range t.simpleTokens {
-		if strings.Compare(name, username) == 0 {
+		if name == username {
 			delete(t.simpleTokens, token)
 			t.simpleTokenKeeper.deleteSimpleToken(token)
 		}

auth/store.go

@@ -412,7 +412,7 @@ func (as *authStore) UserAdd(r *pb.AuthUserAddRequest) (*pb.AuthUserAddResponse,
 }
 
 func (as *authStore) UserDelete(r *pb.AuthUserDeleteRequest) (*pb.AuthUserDeleteResponse, error) {
-	if as.enabled && strings.Compare(r.Name, rootUser) == 0 {
+	if as.enabled && r.Name == rootUser {
 		if as.lg != nil {
 			as.lg.Warn("cannot delete 'root' user", zap.String("user-name", r.Name))
 		} else {
@@ -518,7 +518,7 @@ func (as *authStore) UserGrantRole(r *pb.AuthUserGrantRoleRequest) (*pb.AuthUser
 	}
 
 	idx := sort.SearchStrings(user.Roles, r.Role)
-	if idx < len(user.Roles) && strings.Compare(user.Roles[idx], r.Role) == 0 {
+	if idx < len(user.Roles) && user.Roles[idx] == r.Role {
 		if as.lg != nil {
 			as.lg.Warn(
 				"ignored grant role request to a user",
@@ -583,7 +583,7 @@ func (as *authStore) UserList(r *pb.AuthUserListRequest) (*pb.AuthUserListRespon
 }
 
 func (as *authStore) UserRevokeRole(r *pb.AuthUserRevokeRoleRequest) (*pb.AuthUserRevokeRoleResponse, error) {
-	if as.enabled && strings.Compare(r.Name, rootUser) == 0 && strings.Compare(r.Role, rootRole) == 0 {
+	if as.enabled && r.Name == rootUser && r.Role == rootRole {
 		if as.lg != nil {
 			as.lg.Warn(
 				"'root' user cannot revoke 'root' role",
@@ -611,7 +611,7 @@ func (as *authStore) UserRevokeRole(r *pb.AuthUserRevokeRoleRequest) (*pb.AuthUs
 	}
 
 	for _, role := range user.Roles {
-		if strings.Compare(role, r.Role) != 0 {
+		if role != r.Role {
 			updatedUser.Roles = append(updatedUser.Roles, role)
 		}
 	}
@@ -714,7 +714,7 @@ func (as *authStore) RoleRevokePermission(r *pb.AuthRoleRevokePermissionRequest)
 }
 
 func (as *authStore) RoleDelete(r *pb.AuthRoleDeleteRequest) (*pb.AuthRoleDeleteResponse, error) {
-	if as.enabled && strings.Compare(r.Role, rootRole) == 0 {
+	if as.enabled && r.Role == rootRole {
 		if as.lg != nil {
 			as.lg.Warn("cannot delete 'root' role", zap.String("role-name", r.Role))
 		} else {
@@ -742,7 +742,7 @@ func (as *authStore) RoleDelete(r *pb.AuthRoleDeleteRequest) (*pb.AuthRoleDelete
 		}
 
 		for _, role := range user.Roles {
-			if strings.Compare(role, r.Role) != 0 {
+			if role != r.Role {
 				updatedUser.Roles = append(updatedUser.Roles, role)
 			}
 		}

etcdctl/ctlv3/command/printer_simple.go

@@ -189,12 +189,12 @@ func (s *simplePrinter) RoleGet(role string, r v3.AuthRoleGetResponse) {
 	printRange := func(perm *v3.Permission) {
 		sKey := string(perm.Key)
 		sRangeEnd := string(perm.RangeEnd)
-		if strings.Compare(sRangeEnd, "\x00") != 0 {
+		if sRangeEnd != "\x00" {
 			fmt.Printf("\t[%s, %s)", sKey, sRangeEnd)
 		} else {
 			fmt.Printf("\t[%s, <open ended>", sKey)
 		}
-		if strings.Compare(v3.GetPrefixRangeEnd(sKey), sRangeEnd) == 0 {
+		if v3.GetPrefixRangeEnd(sKey) == sRangeEnd {
 			fmt.Printf(" (prefix %s)", sKey)
 		}
 		fmt.Printf("\n")
@@ -240,7 +240,7 @@ func (s *simplePrinter) RoleRevokePermission(role string, key string, end string
 		fmt.Printf("Permission of key %s is revoked from role %s\n", key, role)
 		return
 	}
-	if strings.Compare(end, "\x00") != 0 {
+	if end != "\x00" {
 		fmt.Printf("Permission of range [%s, %s) is revoked from role %s\n", key, end, role)
 	} else {
 		fmt.Printf("Permission of range [%s, <open ended> is revoked from role %s\n", key, role)

etcdctl/ctlv3/command/user_command.go

@@ -272,7 +272,7 @@ func readPasswordInteractive(name string) string {
 		ExitWithError(ExitBadArgs, fmt.Errorf("failed to ask password: %s.", err2))
 	}
 
-	if strings.Compare(password1, password2) != 0 {
+	if password1 != password2 {
 		ExitWithError(ExitBadArgs, fmt.Errorf("given passwords are different."))
 	}
 

lease/leasehttp/http_test.go

@@ -19,7 +19,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
-	"strings"
 	"testing"
 	"time"
 
@@ -110,7 +109,7 @@ func testApplyTimeout(t *testing.T, f func(*lease.Lease, string) error) {
 	if err == nil {
 		t.Fatalf("expected timeout error, got nil")
 	}
-	if strings.Compare(err.Error(), ErrLeaseHTTPTimeout.Error()) != 0 {
+	if err.Error() != ErrLeaseHTTPTimeout.Error() {
 		t.Fatalf("expected (%v), got (%v)", ErrLeaseHTTPTimeout.Error(), err.Error())
 	}
 }