fix: write yaml separator before manifsts

DoodleScheduling · Jan 19, 2024 · 41598d8 · 41598d8
1 parent 803cc28
commit 41598d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/internal/parser/parser.go b/internal/parser/parser.go
@@ -67,8 +67,10 @@ func (p *Parser) Run(ctx context.Context, in io.Reader) error {
 					return nil
 				}
 
+				_, errNewLine := p.Output.Write([]byte("---\n"))
 				err := p.Printer.PrintObj(obj, p.Output)
-				if err != nil {
+
+				if err != nil || errNewLine != nil {
 					p.Logger.Error(err, "failed to write manifests to output")
 					return abort(err)
 				}
@@ -205,6 +207,10 @@ func (p *Parser) unpack(pkg *crossplanev1.Provider) ([]byte, error) {
 	}
 
 	layers, err := ociImage.Layers()
+	if err != nil {
+		return nil, err
+	}
+
 	for _, layer := range layers {
 		contents, err := layer.Uncompressed()
 		if err != nil {

diff --git a/internal/xcrd/crd.go b/internal/xcrd/crd.go
@@ -27,7 +27,7 @@ import (
 
 	extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
 	"github.com/crossplane/crossplane-runtime/pkg/meta"
@@ -130,7 +130,7 @@ func genCrdVersion(vr v1.CompositeResourceDefinitionVersion) (*extv1.CustomResou
 		Name:                     vr.Name,
 		Served:                   vr.Served,
 		Storage:                  vr.Referenceable,
-		Deprecated:               pointer.BoolDeref(vr.Deprecated, false),
+		Deprecated:               ptr.Deref(vr.Deprecated, false),
 		DeprecationWarning:       vr.DeprecationWarning,
 		AdditionalPrinterColumns: vr.AdditionalPrinterColumns,
 		Schema: &extv1.CustomResourceValidation{