Skip to content

Commit

Permalink
Fix YAMLRemoteRefParser with empty input (#94)
Browse files Browse the repository at this point in the history
Do not treat empty input as an invalid remote reference, since apps may
use an empty file as an on/off switch. Also add some tests for parsing,
since there are several edge cases now.
  • Loading branch information
bluekeyes authored Aug 3, 2021
1 parent 10c0390 commit 69cf8c8
Show file tree
Hide file tree
Showing 2 changed files with 115 additions and 5 deletions.
20 changes: 15 additions & 5 deletions appconfig/yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,27 @@ import (
// YAMLRemoteRefParser parses b as a YAML-encoded RemoteRef. It assumes all
// parsing errors mean the content is not a RemoteRef.
func YAMLRemoteRefParser(path string, b []byte) (*RemoteRef, error) {
var ref RemoteRef
if err := yaml.UnmarshalStrict(b, &ref); err != nil {
var maybeRef struct {
Remote *string `yaml:"remote"`
Path string `yaml:"path"`
Ref string `yaml:"ref"`
}

if err := yaml.UnmarshalStrict(b, &maybeRef); err != nil {
// assume errors mean this isn't a remote config
return nil, nil
}
if maybeRef.Remote == nil {
return nil, nil
}

ref := RemoteRef{
Remote: *maybeRef.Remote,
Path: maybeRef.Path,
Ref: maybeRef.Ref,
}
if ref.Remote == "" {
return nil, errors.New("invalid remote reference: empty \"remote\" field")
}
if ref.Path == "" {
return nil, errors.New("invalid remote references: empty \"path\" field")
}
return &ref, nil
}
100 changes: 100 additions & 0 deletions appconfig/yaml_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
// Copyright 2021 Palantir Technologies, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package appconfig

import (
"testing"
)

func TestYAMLRemoteRefParser(t *testing.T) {
tests := map[string]struct {
Input string
Output *RemoteRef
Error bool
}{
"complete": {
Input: "{remote: test/test, path: test.yaml, ref: main}",
Output: &RemoteRef{
Remote: "test/test",
Path: "test.yaml",
Ref: "main",
},
},
"missingRemote": {
Input: "{path: test.yaml, ref: main}",
Output: nil,
},
"missingPath": {
Input: "{remote: test/test, ref: main}",
Output: &RemoteRef{
Remote: "test/test",
Ref: "main",
},
},
"missingRef": {
Input: "{remote: test/test, path: test.yaml}",
Output: &RemoteRef{
Remote: "test/test",
Path: "test.yaml",
},
},
"emptyRemote": {
Input: "{remote: ''}",
Error: true,
},
"empty": {
Input: "",
Output: nil,
},
"commentsOnly": {
Input: "# the existence of this file enables the app\n",
Output: nil,
},
"extraFields": {
Input: "{remote: test/test, path: test.yaml, ref: main, key: value}",
Output: nil,
},
"onlyUnknownFields": {
Input: "{key: value}",
Output: nil,
},
}

for name, test := range tests {
t.Run(name, func(t *testing.T) {
ref, err := YAMLRemoteRefParser("test.yml", []byte(test.Input))
if test.Error {
if err == nil {
t.Fatal("expected error parsing ref, but got nil")
}
return
}
if err != nil {
t.Fatalf("unexpected error parsing ref: %v", err)
}

switch {
case test.Output == nil && ref != nil:
t.Errorf("expected nil ref, but got: %+v", *ref)
case test.Output != nil && ref == nil:
t.Errorf("expected %+v, but got nil", *test.Output)
case test.Output != nil && ref != nil:
if *test.Output != *ref {
t.Errorf("expected %+v, but got %+v", *test.Output, *ref)
}
}
})
}
}

0 comments on commit 69cf8c8

Please sign in to comment.