FAB-17752: return errors when creating keystore

Signed-off-by: Shitaibin <hz_stb@163.com>
Change-Id: I9e68f2c79eb38e7c38e5903080309c762f6cb6bf

bccsp/sw/fileks.go

@@ -398,11 +398,7 @@ func (ks *fileBasedKeyStore) createKeyStoreIfNotExists() error {
 	if missing {
 		logger.Debugf("KeyStore path [%s] missing [%t]: [%s]", ksPath, missing, utils.ErrToString(err))
 
-		err := ks.createKeyStore()
-		if err != nil {
-			logger.Errorf("Failed creating KeyStore At [%s]: [%s]", ksPath, err.Error())
-			return nil
-		}
+		return ks.createKeyStore()
 	}
 
 	return nil
@@ -411,20 +407,24 @@ func (ks *fileBasedKeyStore) createKeyStoreIfNotExists() error {
 func (ks *fileBasedKeyStore) createKeyStore() error {
 	// Create keystore directory root if it doesn't exist yet
 	ksPath := ks.path
-	logger.Debugf("Creating KeyStore at [%s]...", ksPath)
+	logger.Debugf("Creating KeyStore at [%s]", ksPath)
 
-	os.MkdirAll(ksPath, 0755)
+	err := os.MkdirAll(ksPath, 0755)
+	if err == nil {
+		logger.Debugf("KeyStore created at [%s]", ksPath)
+	} else {
+		logger.Errorf("Failed creating KeyStore at [%s]: [%s]", ksPath, err.Error())
+	}
 
-	logger.Debugf("KeyStore created at [%s].", ksPath)
-	return nil
+	return err
 }
 
 func (ks *fileBasedKeyStore) openKeyStore() error {
 	if ks.isOpen {
 		return nil
 	}
 	ks.isOpen = true
-	logger.Debugf("KeyStore opened at [%s]...done", ks.path)
+	logger.Debugf("KeyStore opened at [%s]", ks.path)
 
 	return nil
 }