Merge pull request #12112 from spzala/automated-cherry-pick-of-#12018…

…-upstream-release-3.4 Automated cherry pick of #12018
etcd-io · Jul 7, 2020 · d3a702a · d3a702a
2 parents 2acdf88 + 3193311
commit d3a702a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
@@ -358,16 +358,9 @@ func startProxy(cfg *config) error {
 	}
 
 	cfg.ec.Dir = filepath.Join(cfg.ec.Dir, "proxy")
-	if fileutil.Exist(cfg.ec.Dir) {
-		err = fileutil.CheckDirPermission(cfg.ec.Dir, fileutil.PrivateDirMode)
-		if err != nil {
-			return err
-		}
-	} else {
-		err = os.MkdirAll(cfg.ec.Dir, fileutil.PrivateDirMode)
-		if err != nil {
-			return err
-		}
+	err = fileutil.TouchDirAll(cfg.ec.Dir)
+	if err != nil {
+		return err
 	}
 
 	var peerURLs []string

diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go
@@ -115,17 +115,17 @@ func (info TLSInfo) Empty() bool {
 }
 
 func SelfCert(lg *zap.Logger, dirpath string, hosts []string, additionalUsages ...x509.ExtKeyUsage) (info TLSInfo, err error) {
-	if fileutil.Exist(dirpath) {
-		err = fileutil.CheckDirPermission(dirpath, fileutil.PrivateDirMode)
-		if err != nil {
-			return
-		}
-	} else {
-		if err = os.MkdirAll(dirpath, fileutil.PrivateDirMode); err != nil {
-			return
+	info.Logger = lg
+	err = fileutil.TouchDirAll(dirpath)
+	if err != nil {
+		if info.Logger != nil {
+			info.Logger.Warn(
+				"cannot create cert directory",
+				zap.Error(err),
+			)
 		}
+		return
 	}
-	info.Logger = lg
 
 	certPath := filepath.Join(dirpath, "cert.pem")
 	keyPath := filepath.Join(dirpath, "key.pem")