Using single quote style when setting annotations

Annotations must be strings.  Use single-quote style
so tools don't get confused about the type.
This commit is contained in:
Phillip Wittrock
2019-12-16 17:44:45 -08:00
parent 01105af14d
commit eaaefc128f
12 changed files with 127 additions and 118 deletions

View File

@@ -150,7 +150,7 @@ func TestByteReader_Read(t *testing.T) {
c: d
metadata:
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/index: '0'
`,
`# second resource
e: f
@@ -158,12 +158,12 @@ g:
- h
metadata:
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/index: '1'
`,
`i: j
metadata:
annotations:
config.kubernetes.io/index: 2
config.kubernetes.io/index: '2'
`,
}
for i := range nodes {
@@ -230,7 +230,7 @@ func TestByteReader_Read_setAnnotationsOmitReaderAnnotations(t *testing.T) {
c: d
metadata:
annotations:
foo: bar
foo: 'bar'
`,
`# second resource
e: f
@@ -238,12 +238,12 @@ g:
- h
metadata:
annotations:
foo: bar
foo: 'bar'
`,
`i: j
metadata:
annotations:
foo: bar
foo: 'bar'
`,
}
for i := range nodes {
@@ -278,8 +278,8 @@ func TestByteReader_Read_setAnnotations(t *testing.T) {
c: d
metadata:
annotations:
config.kubernetes.io/index: 0
foo: bar
config.kubernetes.io/index: '0'
foo: 'bar'
`,
`# second resource
e: f
@@ -287,14 +287,14 @@ g:
- h
metadata:
annotations:
config.kubernetes.io/index: 1
foo: bar
config.kubernetes.io/index: '1'
foo: 'bar'
`,
`i: j
metadata:
annotations:
config.kubernetes.io/index: 2
foo: bar
config.kubernetes.io/index: '2'
foo: 'bar'
`,
}
for i := range nodes {

View File

@@ -77,7 +77,7 @@ spec:
// labels:
// app: nginx
// annotations:
// foo: bar
// foo: 'bar'
// spec:
// replicas: 3
// selector:
@@ -99,7 +99,7 @@ spec:
// metadata:
// name: nginx
// annotations:
// foo: bar
// foo: 'bar'
// spec:
// selector:
// app: nginx

View File

@@ -177,13 +177,13 @@ items:
metadata:
name: deployment-foo
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/index: '0'
- apiVersion: v1
kind: Service
metadata:
name: service-foo
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/index: '1'
functionConfig: {apiVersion: apps/v1, kind: Deployment, metadata: {name: foo}}
`, s) {
t.FailNow()
@@ -208,14 +208,14 @@ kind: StatefulSet
metadata:
name: deployment-foo
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/index: '0'
---
apiVersion: v1
kind: Service
metadata:
name: service-foo
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/index: '1'
`, b.String())
}
@@ -259,13 +259,13 @@ items:
metadata:
name: deployment-foo
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/index: '0'
- apiVersion: v1
kind: Service
metadata:
name: service-foo
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/index: '1'
functionConfig: {apiversion: apps/v1, kind: Deployment, metadata: {name: foo}}
`, s) {
t.FailNow()
@@ -290,14 +290,14 @@ kind: Deployment
metadata:
name: deployment-foo
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/index: '0'
---
apiVersion: v1
kind: Service
metadata:
name: service-foo
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/index: '1'
`, b.String())
}

View File

@@ -53,21 +53,21 @@ metadata:
name: foo1
namespace: bar
annotations:
config.kubernetes.io/path: foo1_deployment.yaml
config.kubernetes.io/path: 'foo1_deployment.yaml'
---
apiVersion: v1
kind: Service
metadata:
name: foo1
annotations:
config.kubernetes.io/path: foo1_service.yaml
config.kubernetes.io/path: 'foo1_service.yaml'
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: foo2
annotations:
config.kubernetes.io/path: foo2_deployment.yaml
config.kubernetes.io/path: 'foo2_deployment.yaml'
---
apiVersion: v1
kind: Service
@@ -75,7 +75,7 @@ metadata:
name: foo2
namespace: bar
annotations:
config.kubernetes.io/path: foo2_service.yaml
config.kubernetes.io/path: 'foo2_service.yaml'
`, out.String())
}
@@ -97,7 +97,7 @@ kind: Service
metadata:
name: foo1
annotations:
config.kubernetes.io/path: foo1__service.yaml
config.kubernetes.io/path: 'foo1__service.yaml'
---
apiVersion: apps/v1
kind: Deployment
@@ -105,14 +105,14 @@ metadata:
name: foo1
namespace: bar
annotations:
config.kubernetes.io/path: foo1_bar_deployment.yaml
config.kubernetes.io/path: 'foo1_bar_deployment.yaml'
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: foo2
annotations:
config.kubernetes.io/path: foo2__deployment.yaml
config.kubernetes.io/path: 'foo2__deployment.yaml'
---
apiVersion: v1
kind: Service
@@ -120,7 +120,7 @@ metadata:
name: foo2
namespace: bar
annotations:
config.kubernetes.io/path: foo2_bar_service.yaml
config.kubernetes.io/path: 'foo2_bar_service.yaml'
`, out.String())
}
@@ -143,14 +143,14 @@ metadata:
name: foo1
namespace: bar
annotations:
config.kubernetes.io/path: resource.yaml
config.kubernetes.io/path: 'resource.yaml'
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: foo2
annotations:
config.kubernetes.io/path: resource.yaml
config.kubernetes.io/path: 'resource.yaml'
---
apiVersion: v1
kind: Service
@@ -158,13 +158,13 @@ metadata:
name: foo2
namespace: bar
annotations:
config.kubernetes.io/path: resource.yaml
config.kubernetes.io/path: 'resource.yaml'
---
apiVersion: v1
kind: Service
metadata:
name: foo1
annotations:
config.kubernetes.io/path: resource.yaml
config.kubernetes.io/path: 'resource.yaml'
`, out.String())
}

View File

@@ -107,16 +107,16 @@ func TestLocalPackageReader_Read_pkg(t *testing.T) {
`a: b #first
metadata:
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/package: .
config.kubernetes.io/path: a_test.yaml
config.kubernetes.io/index: '0'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'a_test.yaml'
`,
`c: d # second
metadata:
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/package: .
config.kubernetes.io/path: a_test.yaml
config.kubernetes.io/index: '1'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'a_test.yaml'
`,
`# second thing
e: f
@@ -126,9 +126,9 @@ g:
- j
metadata:
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/package: .
config.kubernetes.io/path: b_test.yaml
config.kubernetes.io/index: '0'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'b_test.yaml'
`,
}
for i := range nodes {
@@ -169,16 +169,16 @@ func TestLocalPackageReader_Read_file(t *testing.T) {
`a: b #first
metadata:
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/package: .
config.kubernetes.io/path: a_test.yaml
config.kubernetes.io/index: '0'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'a_test.yaml'
`,
`c: d # second
metadata:
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/package: .
config.kubernetes.io/path: a_test.yaml
config.kubernetes.io/index: '1'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'a_test.yaml'
`,
}
for i := range nodes {
@@ -268,16 +268,16 @@ func TestLocalPackageReader_Read_nestedDirs(t *testing.T) {
`a: b #first
metadata:
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/package: a/b
config.kubernetes.io/path: a/b/a_test.yaml
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/b'
config.kubernetes.io/path: 'a/b/a_test.yaml'
`,
`c: d # second
metadata:
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/package: a/b
config.kubernetes.io/path: a/b/a_test.yaml
config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a/b'
config.kubernetes.io/path: 'a/b/a_test.yaml'
`,
`# second thing
e: f
@@ -287,9 +287,9 @@ g:
- j
metadata:
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/package: a/b
config.kubernetes.io/path: a/b/b_test.yaml
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/b'
config.kubernetes.io/path: 'a/b/b_test.yaml'
`,
}
for i := range nodes {
@@ -326,9 +326,9 @@ func TestLocalPackageReader_Read_matchRegex(t *testing.T) {
assert.Equal(t, `a: b #first
metadata:
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/package: a/b
config.kubernetes.io/path: a/b/a_test.yaml
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/b'
config.kubernetes.io/path: 'a/b/a_test.yaml'
`, val)
val, err = nodes[1].String()
@@ -336,9 +336,9 @@ metadata:
assert.Equal(t, `c: d # second
metadata:
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/package: a/b
config.kubernetes.io/path: a/b/a_test.yaml
config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a/b'
config.kubernetes.io/path: 'a/b/a_test.yaml'
`, val)
}
@@ -365,9 +365,9 @@ func TestLocalPackageReader_Read_skipSubpackage(t *testing.T) {
assert.Equal(t, `a: b #first
metadata:
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/package: a/b
config.kubernetes.io/path: a/b/a_test.yaml
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/b'
config.kubernetes.io/path: 'a/b/a_test.yaml'
`, val)
val, err = nodes[1].String()
@@ -375,9 +375,9 @@ metadata:
assert.Equal(t, `c: d # second
metadata:
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/package: a/b
config.kubernetes.io/path: a/b/a_test.yaml
config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a/b'
config.kubernetes.io/path: 'a/b/a_test.yaml'
`, val)
}
@@ -403,9 +403,9 @@ func TestLocalPackageReader_Read_includeSubpackage(t *testing.T) {
assert.Equal(t, `a: b #first
metadata:
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/package: a/b
config.kubernetes.io/path: a/b/a_test.yaml
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/b'
config.kubernetes.io/path: 'a/b/a_test.yaml'
`, val)
val, err = nodes[1].String()
@@ -413,9 +413,9 @@ metadata:
assert.Equal(t, `c: d # second
metadata:
annotations:
config.kubernetes.io/index: 1
config.kubernetes.io/package: a/b
config.kubernetes.io/path: a/b/a_test.yaml
config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a/b'
config.kubernetes.io/path: 'a/b/a_test.yaml'
`, val)
val, err = nodes[2].String()
@@ -428,9 +428,9 @@ g:
- j
metadata:
annotations:
config.kubernetes.io/index: 0
config.kubernetes.io/package: a/c
config.kubernetes.io/path: a/c/c_test.yaml
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/c'
config.kubernetes.io/path: 'a/c/c_test.yaml'
`, val)
}