kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Remove leading/trailing newlines following whitespace linter recommendation

Browse Source
This commit is contained in:
Arthur Mello
2019-12-05 23:27:01 -03:00
parent a077482e99
commit d4fa006ccb
10 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kyaml/copyutil/copyutil_test.go
View File

@@ -79,7 +79,6 @@ func TestDiff_additionalDestFiles(t *testing.T) {
diff, err := Diff(s, d) diff, err := Diff(s, d)
assert.NoError(t, err) assert.NoError(t, err)
assert.ElementsMatch(t, diff.List(), []string{"a2"}) assert.ElementsMatch(t, diff.List(), []string{"a2"})
} }
// TestDiff_srcDestContentsDiffer verifies if the file contents // TestDiff_srcDestContentsDiffer verifies if the file contents

2
kyaml/kio/byteio_reader.go
View File

@@ -138,7 +138,6 @@ func (r *ByteReader) Read() ([]*yaml.RNode, error) {
len(values) == 1 && // Only unwrap if there is only 1 value len(values) == 1 && // Only unwrap if there is only 1 value
(meta.Kind == ResourceListKind || meta.Kind == "List") && (meta.Kind == ResourceListKind || meta.Kind == "List") &&
node.Field("items") != nil { node.Field("items") != nil {
r.WrappingKind = meta.Kind r.WrappingKind = meta.Kind
r.WrappingAPIVersion = meta.APIVersion r.WrappingAPIVersion = meta.APIVersion
@@ -154,7 +153,6 @@ func (r *ByteReader) Read() ([]*yaml.RNode, error) {
// add items // add items
output = append(output, yaml.NewRNode(items.Value.Content()[i])) output = append(output, yaml.NewRNode(items.Value.Content()[i]))
} }
} }
continue continue
} }

1
kyaml/kio/byteio_reader_test.go
View File

@@ -87,7 +87,6 @@ elems:
assert.Equal(t, ResourceListKind, r.WrappingKind) assert.Equal(t, ResourceListKind, r.WrappingKind)
assert.Equal(t, ResourceListAPIVersion, r.WrappingAPIVersion) assert.Equal(t, ResourceListAPIVersion, r.WrappingAPIVersion)
} }
func TestByteReader_Read_wrappedList(t *testing.T) { func TestByteReader_Read_wrappedList(t *testing.T) {

1
kyaml/kio/byteio_writer.go
View File

@@ -54,7 +54,6 @@ func (w ByteWriter) Write(nodes []*yaml.RNode) error {
encoder := yaml.NewEncoder(w.Writer) encoder := yaml.NewEncoder(w.Writer)
defer encoder.Close() defer encoder.Close()
for i := range nodes { for i := range nodes {
// clean resources by removing annotations set by the Reader // clean resources by removing annotations set by the Reader
if !w.KeepReaderAnnotations { if !w.KeepReaderAnnotations {
_, err := nodes[i].Pipe(yaml.ClearAnnotation(kioutil.IndexAnnotation)) _, err := nodes[i].Pipe(yaml.ClearAnnotation(kioutil.IndexAnnotation))

2
kyaml/kio/filters/fmtr_test.go
View File

@@ -145,7 +145,6 @@ spec:
// TestFormatInput_service verifies a Service yaml is formatted correctly // TestFormatInput_service verifies a Service yaml is formatted correctly
func TestFormatInput_service(t *testing.T) { func TestFormatInput_service(t *testing.T) {
y := ` y := `
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
@@ -178,7 +177,6 @@ spec:
// TestFormatInput_service verifies a Service yaml is formatted correctly // TestFormatInput_service verifies a Service yaml is formatted correctly
func TestFormatInput_validatingWebhookConfiguration(t *testing.T) { func TestFormatInput_validatingWebhookConfiguration(t *testing.T) {
y := ` y := `
apiVersion: admissionregistration.k8s.io/v1beta1 apiVersion: admissionregistration.k8s.io/v1beta1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration

2
kyaml/kio/pkgio_reader_test.go
View File

@@ -79,7 +79,6 @@ func TestLocalPackageReader_Read_empty(t *testing.T) {
assert.Contains(t, err.Error(), "must specify package path") assert.Contains(t, err.Error(), "must specify package path")
} }
assert.Nil(t, nodes) assert.Nil(t, nodes)
} }
func TestLocalPackageReader_Read_pkg(t *testing.T) { func TestLocalPackageReader_Read_pkg(t *testing.T) {
@@ -207,7 +206,6 @@ func TestLocalPackageReader_Read_pkgOmitAnnotations(t *testing.T) {
{path: s.root}, {path: s.root},
} }
for _, p := range paths { for _, p := range paths {
// empty path // empty path
rfr := LocalPackageReader{PackagePath: p.path, OmitReaderAnnotations: true} rfr := LocalPackageReader{PackagePath: p.path, OmitReaderAnnotations: true}
nodes, err := rfr.Read() nodes, err := rfr.Read()

1
kyaml/yaml/example_test.go
View File

@@ -872,7 +872,6 @@ func ExampleRNode_Elements() {
// Element: 2 // Element: 2
// name: baz // name: baz
// args: ['run.sh'] // args: ['run.sh']
} }
func ExampleRNode_ElementValues() { func ExampleRNode_ElementValues() {

1
kyaml/yaml/fns.go
View File

@@ -129,7 +129,6 @@ func (c FieldClearer) Filter(rn *RNode) (*RNode, error) {
} }
for i := 0; i < len(rn.Content()); i += 2 { for i := 0; i < len(rn.Content()); i += 2 {
// if name matches, remove these 2 elements from the list because // if name matches, remove these 2 elements from the list because
// they are treated as a fieldName/fieldValue pair. // they are treated as a fieldName/fieldValue pair.
if rn.Content()[i].Value == c.Name { if rn.Content()[i].Value == c.Name {

1
kyaml/yaml/match.go
View File

@@ -104,7 +104,6 @@ func (p *PathMatcher) doField(rn *RNode) (*RNode, error) {
// doSeq iterates over a sequence and appends elements matching the path regex to p.Val // doSeq iterates over a sequence and appends elements matching the path regex to p.Val
func (p *PathMatcher) doSeq(rn *RNode) (*RNode, error) { func (p *PathMatcher) doSeq(rn *RNode) (*RNode, error) {
// parse the field + match pair // parse the field + match pair
var err error var err error
p.field, p.matchRegex, err = SplitIndexNameValue(p.Path[0]) p.field, p.matchRegex, err = SplitIndexNameValue(p.Path[0])

1
kyaml/yaml/merge3/visitor.go
View File

@@ -135,7 +135,6 @@ func (m Visitor) getStrValues(nodes walk.Sources) (strValues, error) {
if err != nil { if err != nil {
return strValues{}, err return strValues{}, err
} }
} }
if nodes.Dest() != nil && nodes.Dest().YNode() != nil { if nodes.Dest() != nil && nodes.Dest().YNode() != nil {
s := nodes.Dest().YNode().Style s := nodes.Dest().YNode().Style