瀏覽代碼

Merge pull request #43552 from thaJeztah/remove_redundant_validation

api:  postContainersStop, postContainersRestart  remove redundant validation
Sebastiaan van Stijn 3 年之前
父節點
當前提交
7b08faa089
共有 1 個文件被更改,包括 2 次插入12 次删除
  1. 2 12
      api/server/router/container/container_routes.go

+ 2 - 12
api/server/router/container/container_routes.go

@@ -225,12 +225,7 @@ func (s *containerRouter) postContainersStop(ctx context.Context, w http.Respons
 		version = httputils.VersionFromContext(ctx)
 		version = httputils.VersionFromContext(ctx)
 	)
 	)
 	if versions.GreaterThanOrEqualTo(version, "1.42") {
 	if versions.GreaterThanOrEqualTo(version, "1.42") {
-		if sig := r.Form.Get("signal"); sig != "" {
-			if _, err := signal.ParseSignal(sig); err != nil {
-				return errdefs.InvalidParameter(err)
-			}
-			options.Signal = sig
-		}
+		options.Signal = r.Form.Get("signal")
 	}
 	}
 	if tmpSeconds := r.Form.Get("t"); tmpSeconds != "" {
 	if tmpSeconds := r.Form.Get("t"); tmpSeconds != "" {
 		valSeconds, err := strconv.Atoi(tmpSeconds)
 		valSeconds, err := strconv.Atoi(tmpSeconds)
@@ -283,12 +278,7 @@ func (s *containerRouter) postContainersRestart(ctx context.Context, w http.Resp
 		version = httputils.VersionFromContext(ctx)
 		version = httputils.VersionFromContext(ctx)
 	)
 	)
 	if versions.GreaterThanOrEqualTo(version, "1.42") {
 	if versions.GreaterThanOrEqualTo(version, "1.42") {
-		if sig := r.Form.Get("signal"); sig != "" {
-			if _, err := signal.ParseSignal(sig); err != nil {
-				return errdefs.InvalidParameter(err)
-			}
-			options.Signal = sig
-		}
+		options.Signal = r.Form.Get("signal")
 	}
 	}
 	if tmpSeconds := r.Form.Get("t"); tmpSeconds != "" {
 	if tmpSeconds := r.Form.Get("t"); tmpSeconds != "" {
 		valSeconds, err := strconv.Atoi(tmpSeconds)
 		valSeconds, err := strconv.Atoi(tmpSeconds)