be build fail when parse failed to FunctionSpec

This commit is contained in:
yugo kobayashi
2022-08-19 00:58:22 +00:00
parent e2e9181bed
commit f086269d6e
6 changed files with 79 additions and 47 deletions

View File

@@ -201,50 +201,51 @@ func (s *StorageMount) String() string {
//
// The FunctionSpec is read from the resource metadata.annotation
// "config.kubernetes.io/function"
func GetFunctionSpec(n *yaml.RNode) *FunctionSpec {
func GetFunctionSpec(n *yaml.RNode) (*FunctionSpec, error) {
meta, err := n.GetMeta()
if err != nil {
return nil
return nil, nil
}
if fn := getFunctionSpecFromAnnotation(n, meta); fn != nil {
return fn
if fn, err := getFunctionSpecFromAnnotation(n, meta); err != nil {
return nil, err
} else if fn != nil {
return fn, nil
}
// legacy function specification for backwards compatibility
container := meta.Annotations["config.kubernetes.io/container"]
if container != "" {
return &FunctionSpec{Container: ContainerSpec{Image: container}}
return &FunctionSpec{Container: ContainerSpec{Image: container}}, nil
}
return nil
return nil, nil
}
// getFunctionSpecFromAnnotation parses the config function from an annotation
// if it is found
func getFunctionSpecFromAnnotation(n *yaml.RNode, meta yaml.ResourceMeta) *FunctionSpec {
func getFunctionSpecFromAnnotation(n *yaml.RNode, meta yaml.ResourceMeta) (*FunctionSpec, error) {
var fs FunctionSpec
for _, s := range functionAnnotationKeys {
fn := meta.Annotations[s]
if fn != "" {
err := k8syaml.UnmarshalStrict([]byte(fn), &fs)
if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
if err := k8syaml.UnmarshalStrict([]byte(fn), &fs); err != nil {
return nil, fmt.Errorf("%s unmarshal error: %w", s, err)
}
return &fs
return &fs, nil
}
}
n, err := n.Pipe(yaml.Lookup("metadata", "configFn"))
if err != nil || yaml.IsMissingOrNull(n) {
return nil
return nil, nil
}
s, err := n.String()
if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
fmt.Fprintf(os.Stderr, "configFn parse error: %v\n", err)
return nil, fmt.Errorf("configFn parse error: %w", err)
}
err = k8syaml.UnmarshalStrict([]byte(s), &fs)
if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
if err := k8syaml.UnmarshalStrict([]byte(s), &fs); err != nil {
return nil, fmt.Errorf("%s unmarshal error: %w", "configFn", err)
}
return &fs
return &fs, nil
}
func StringToStorageMount(s string) StorageMount {
@@ -289,7 +290,11 @@ type IsReconcilerFilter struct {
func (c *IsReconcilerFilter) Filter(inputs []*yaml.RNode) ([]*yaml.RNode, error) {
var out []*yaml.RNode
for i := range inputs {
isFnResource := GetFunctionSpec(inputs[i]) != nil
functionSpec, err := GetFunctionSpec(inputs[i])
if err != nil {
return nil, err
}
isFnResource := functionSpec != nil
if isFnResource && !c.ExcludeReconcilers {
out = append(out, inputs[i])
}

View File

@@ -1242,7 +1242,7 @@ container:
},
{
name: "path",
name: "path_with_uncorrect_position",
resource: `
apiVersion: v1beta1
kind: Example
@@ -1253,15 +1253,11 @@ metadata:
container:
image: foo:v1.0.0
`,
// path should be erased
expectedFn: `
container:
image: foo:v1.0.0
`,
missingFn: true,
},
{
name: "network",
name: "network_with_uncorrect_position",
resource: `
apiVersion: v1beta1
kind: Example
@@ -1272,11 +1268,7 @@ metadata:
container:
image: foo:v1.0.0
`,
// network should be erased
expectedFn: `
container:
image: foo:v1.0.0
`,
missingFn: true,
},
{
name: "fn missing spell",
@@ -1289,7 +1281,7 @@ metadata:
containeer:
image: foo:v1.0.0
`,
expectedFn: `{}`,
missingFn: true,
},
// legacy fn style
@@ -1310,7 +1302,8 @@ container:
},
// no fn
{name: "no fn",
{
name: "no fn",
resource: `
apiVersion: v1beta1
kind: Example
@@ -1327,7 +1320,7 @@ metadata:
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
resource := yaml.MustParse(tt.resource)
fn := GetFunctionSpec(resource)
fn, _ := GetFunctionSpec(resource)
if tt.missingFn {
if !assert.Nil(t, fn) {
t.FailNow()
@@ -1408,7 +1401,7 @@ metadata:
if !assert.NoError(t, err) {
return
}
fn := GetFunctionSpec(cfg)
fn, _ := GetFunctionSpec(cfg)
assert.Equal(t, tc.required, fn.Container.Network)
}
}
@@ -1546,7 +1539,7 @@ metadata:
if !assert.NoError(t, err) {
return
}
fn := GetFunctionSpec(cfg)
fn, _ := GetFunctionSpec(cfg)
assert.Equal(t, tc.expected, *NewContainerEnvFromStringSlice(fn.Container.Env))
}
}