ensure sync doesn't panic when given invalid or empty yaml content

hauler-dev · Dec 11, 2021 · d31a17f · d31a17f
1 parent d2d3183
commit d31a17f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmd/hauler/cli/store/sync.go b/cmd/hauler/cli/store/sync.go
@@ -62,7 +62,8 @@ func SyncCmd(ctx context.Context, o *SyncOpts, s *store.Store) error {
 		for _, doc := range docs {
 			obj, err := content.Load(doc)
 			if err != nil {
-				return err
+				l.Debugf("skipping sync of unknown content")
+				continue
 			}
 
 			l.Infof("syncing [%s] to store", obj.GroupVersionKind().String())

diff --git a/pkg/content/content.go b/pkg/content/content.go
@@ -11,7 +11,7 @@ import (
 )
 
 func Load(data []byte) (schema.ObjectKind, error) {
-	var tm *metav1.TypeMeta
+	var tm metav1.TypeMeta
 	if err := yaml.Unmarshal(data, &tm); err != nil {
 		return nil, err
 	}
@@ -20,5 +20,5 @@ func Load(data []byte) (schema.ObjectKind, error) {
 		return nil, fmt.Errorf("unrecognized content/collection type: %s", tm.GroupVersionKind().String())
 	}
 
-	return tm, nil
+	return &tm, nil
 }