Merge pull request #26411 from zefciu/b17542

Automatic merge from submit-queue Validation logic applied to edited file The file that is submitted via ``edit`` is now subject to validation logic as any other file. The validation flags were added to the ``edit`` command. Fixes: #17542

Merge pull request #26411 from zefciu/b17542
c29f3238 · k8s-merge-robot · GitHub · 4fdde68f · b87ee3df · c29f3238
Commit c29f3238 authored Jul 25, 2016 by k8s-merge-robot Committed by GitHub Jul 25, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

edit.go pkg/kubectl/cmd/edit.go +11 -0

No files found.
--- a/pkg/kubectl/cmd/edit.go
+++ b/pkg/kubectl/cmd/edit.go
@@ -120,6 +120,7 @@ func NewCmdEdit(f *cmdutil.Factory, out, errOut io.Writer) *cobra.Command {
 	usage := "Filename, directory, or URL to file to use to edit the resource"
 	kubectl.AddJsonFilenameFlag(cmd, &options.Filenames, usage)
 	cmdutil.AddRecursiveFlag(cmd, &options.Recursive)
+	cmdutil.AddValidateFlags(cmd)
 	cmd.Flags().StringP("output", "o", "yaml", "Output format. One of: yaml|json.")
 	cmd.Flags().String("output-version", "", "Output the formatted object with the given group version (for ex: 'extensions/v1beta1').")
 	cmd.Flags().Bool("windows-line-endings", gruntime.GOOS == "windows", "Use Windows line-endings (default Unix line-endings)")
@@ -253,6 +254,16 @@ func RunEdit(f *cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args
 			}
 			glog.V(4).Infof("User edited:\n%s", string(edited))

+			// Apply validation
+			schema, err := f.Validator(cmdutil.GetFlagBool(cmd, "validate"), cmdutil.GetFlagString(cmd, "schema-cache-dir"))
+			if err != nil {
+				return preservedFile(err, file, errOut)
+			}
+			err = schema.ValidateBytes(stripComments(edited))
+			if err != nil {
+				return preservedFile(err, file, errOut)
+			}
+
 			// Compare content without comments
 			if bytes.Equal(stripComments(original), stripComments(edited)) {
 				os.Remove(file)