Rearrange comments for yaml/V3 bug fix

kyaml/kio/byteio_writer.go

@@ -45,6 +45,7 @@ type ByteWriter struct {
 var _ Writer = ByteWriter{}
 
 func (w ByteWriter) Write(nodes []*yaml.RNode) error {
+	yaml.DoSerializationHacksOnNodes(nodes)
 	if w.Sort {
 		if err := kioutil.SortNodes(nodes); err != nil {
 			return errors.Wrap(err)
@@ -117,5 +118,7 @@ func (w ByteWriter) Write(nodes []*yaml.RNode) error {
 	for i := range nodes {
 		items.Content = append(items.Content, nodes[i].YNode())
 	}
-	return errors.Wrap(encoder.Encode(doc))
+	err := errors.Wrap(encoder.Encode(doc))
+	yaml.UndoSerializationHacksOnNodes(nodes)
+	return err
 }

kyaml/kio/byteio_writer_test.go

@@ -75,8 +75,10 @@ func TestByteWriter_Write_withoutAnnotations(t *testing.T) {
 	node3, err := yaml.Parse(`e: f
 g:
   h:
-  - i # has a list
-  - j
+  # has a list
+  - i : [i1, i2] # line comment
+  # has a list 2
+  - j : j1
 `)
 	if !assert.NoError(t, err) {
 		return
@@ -93,8 +95,10 @@ g:
 e: f
 g:
   h:
-  - i # has a list
-  - j
+  # has a list
+  - i: [i1, i2] # line comment
+  # has a list 2
+  - j: j1
 ---
 a: b #first
 `, buff.String())

kyaml/kio/filters/fmtr_test.go

@@ -411,8 +411,8 @@ spec:
         app: nginx
     spec:
       containers:
-      - # this is another container
-        name: a-nginx
+      # this is another container
+      - name: a-nginx
         image: nginx:1.7.9
         ports:
         - containerPort: 80