add gocritic/ruleguard checks back again, cleanup code. (#13665)

- remove some duplicated code
- reported a bug, separately fixed in #13664
- using strings.ReplaceAll() when needed
- using filepath.ToSlash() use when needed
- remove all non-Go style comments from the codebase

Co-authored-by: Aditya Manthramurthy <donatello@users.noreply.github.com>

internal/config/certs.go

@@ -117,9 +117,9 @@ func LoadX509KeyPair(certFile, keyFile string) (tls.Certificate, error) {
 }
 
 // EnsureCertAndKey checks if both client certificate and key paths are provided
-func EnsureCertAndKey(ClientCert, ClientKey string) error {
-	if (ClientCert != "" && ClientKey == "") ||
-		(ClientCert == "" && ClientKey != "") {
+func EnsureCertAndKey(clientCert, clientKey string) error {
+	if (clientCert != "" && clientKey == "") ||
+		(clientCert == "" && clientKey != "") {
 		return errors.New("cert and key must be specified as a pair")
 	}
 	return nil

internal/config/certsinfo.go

@@ -38,6 +38,7 @@ func printName(names []pkix.AttributeTypeAndValue, buf *strings.Builder) []strin
 	values := []string{}
 	for _, name := range names {
 		oid := name.Type
+		//nolint:gocritic
 		if len(oid) == 4 && oid[0] == 2 && oid[1] == 5 && oid[2] == 4 {
 			switch oid[3] {
 			case 3:

internal/config/dns/operator_dns.go

@@ -201,9 +201,9 @@ func Authentication(username, password string) OperatorOption {
 }
 
 // RootCAs - add custom trust certs pool
-func RootCAs(CAs *x509.CertPool) OperatorOption {
+func RootCAs(certPool *x509.CertPool) OperatorOption {
 	return func(args *OperatorDNS) {
-		args.rootCAs = CAs
+		args.rootCAs = certPool
 	}
 }
 

internal/config/heal/heal.go

@@ -86,7 +86,7 @@ func (opts Config) Wait(currentIO func() int, systemIO func() int) {
 				} else {
 					time.Sleep(waitTick)
 				}
-				tmpMaxWait = tmpMaxWait - waitTick
+				tmpMaxWait -= waitTick
 			}
 			if tmpMaxWait <= 0 {
 				return

internal/config/identity/ldap/config.go

@@ -186,7 +186,7 @@ func (l *Config) lookupBind(conn *ldap.Conn) error {
 // assumed to be using the lookup bind service account. It is required that the
 // search result in at most one result.
 func (l *Config) lookupUserDN(conn *ldap.Conn, username string) (string, error) {
-	filter := strings.Replace(l.UserDNSearchFilter, "%s", ldap.EscapeFilter(username), -1)
+	filter := strings.ReplaceAll(l.UserDNSearchFilter, "%s", ldap.EscapeFilter(username))
 	searchRequest := ldap.NewSearchRequest(
 		l.UserDNSearchBaseDN,
 		ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
@@ -213,8 +213,8 @@ func (l *Config) searchForUserGroups(conn *ldap.Conn, username, bindDN string) (
 	var groups []string
 	if l.GroupSearchFilter != "" {
 		for _, groupSearchBase := range l.GroupSearchBaseDistNames {
-			filter := strings.Replace(l.GroupSearchFilter, "%s", ldap.EscapeFilter(username), -1)
-			filter = strings.Replace(filter, "%d", ldap.EscapeFilter(bindDN), -1)
+			filter := strings.ReplaceAll(l.GroupSearchFilter, "%s", ldap.EscapeFilter(username))
+			filter = strings.ReplaceAll(filter, "%d", ldap.EscapeFilter(bindDN))
 			searchRequest := ldap.NewSearchRequest(
 				groupSearchBase,
 				ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
@@ -393,7 +393,7 @@ func (l *Config) GetNonEligibleUserDistNames(userDistNames []string) ([]string,
 	}
 
 	// Evaluate the filter again with generic wildcard instead of  specific values
-	filter := strings.Replace(l.UserDNSearchFilter, "%s", "*", -1)
+	filter := strings.ReplaceAll(l.UserDNSearchFilter, "%s", "*")
 
 	nonExistentUsers := []string{}
 	for _, dn := range userDistNames {

internal/config/identity/openid/jwks_test.go

@@ -85,6 +85,7 @@ func TestPublicKey(t *testing.T) {
 		}
 	}
 
+	//nolint:gocritic
 	if key0, ok := keys[0].(*ecdsa.PublicKey); !ok {
 		t.Fatalf("Expected ECDSA key[0], got %T", keys[0])
 	} else if key1, ok := keys[1].(*rsa.PublicKey); !ok {

internal/config/legacy.go

@@ -19,7 +19,7 @@ package config
 
 import "github.com/minio/minio/internal/auth"
 
-//// One time migration code section
+// One time migration code section
 
 // SetCredentials - One time migration code needed, for migrating from older config to new for server credentials.
 func SetCredentials(c Config, cred auth.Credentials) {