crl provider: Static and FileWatcher provider implementations

security/advancedtls/crl_provider.go

@@ -135,8 +135,7 @@ func (o *FileWatcherOptions) validate() error {
 		return fmt.Errorf("advancedtls: CRLDirectory %v is not readable: %v", o.CRLDirectory, err)
 	}
 	// Checks related to RefreshDuration.
-	if o.RefreshDuration <= 0 {
-		grpclogLogger.Infof("RefreshDuration is not set or negative: provided value %v, default value %v will be used.", o.RefreshDuration, defaultCRLRefreshDuration)
+	if o.RefreshDuration == 0 {
 		o.RefreshDuration = defaultCRLRefreshDuration
 	}
 	if o.RefreshDuration < minCRLRefreshDuration {

security/advancedtls/crl_provider_test.go

@@ -24,6 +24,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"sync"
 	"testing"
 	"time"
 
@@ -137,9 +138,13 @@ func (s) TestFileWatcherCRLProviderConfig(t *testing.T) {
 // that it’s correctly processed. Additionally, we also check if number of
 // invocations of custom callback is correct.
 func (s) TestFileWatcherCRLProvider(t *testing.T) {
+	t.Parallel()
 	const nonCRLFilesUnderCRLDirectory = 5
 	nonCRLFilesSet := make(map[string]struct{})
+	var nonCRLMutex sync.Mutex
 	customCallback := func(err error) {
+		nonCRLMutex.Lock()
+		defer nonCRLMutex.Unlock()
 		nonCRLFilesSet[err.Error()] = struct{}{}
 	}
 	p, err := NewFileWatcherCRLProvider(FileWatcherOptions{
@@ -191,10 +196,11 @@ func (s) TestFileWatcherCRLProvider(t *testing.T) {
 			}
 		})
 	}
+	p.Close()
 	if len(nonCRLFilesSet) < nonCRLFilesUnderCRLDirectory {
 		t.Fatalf("Number of callback executions: got %v, want %v", len(nonCRLFilesSet), nonCRLFilesUnderCRLDirectory)
 	}
-	p.Close()
+
 }
 
 // TestFileWatcherCRLProviderDirectoryScan tests how FileWatcherCRLProvider
@@ -258,6 +264,8 @@ func (s) TestFileWatcherCRLProviderDirectoryScan(t *testing.T) {
 		t.Run(tt.desc, func(t *testing.T) {
 			copyFiles(sourcePath, targetPath, tt.fileNames, t)
 			p.ScanCRLDirectory()
+			p.scanMutex.Lock()
+			defer p.scanMutex.Unlock()
 			if diff := cmp.Diff(len(p.crls), tt.expectedEntries); diff != "" {
 				t.Errorf("Expected number of entries in the map do not match\ndiff (-got +want):\n%s", diff)
 			}